eric: changeset 5734:d8b99b5fa673

--- a/APIs/Python3/eric6.api	Thu May 11 18:26:56 2017 +0200
+++ b/APIs/Python3/eric6.api	Sat May 13 12:09:45 2017 +0200
@@ -10267,12 +10267,15 @@
 eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.backButton?4()
 eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.exitFullScreenButton?4()
 eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.forwardButton?4()
-eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.reloadButton?4()
+eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.reloadStopButton?4()
 eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.searchEdit?4()
-eric6.WebBrowser.Navigation.NavigationBar.NavigationBar.stopButton?4()
 eric6.WebBrowser.Navigation.NavigationBar.NavigationBar?1(mainWindow, parent=None)
 eric6.WebBrowser.Navigation.NavigationContainer.NavigationContainer.addWidget?4(widget)
 eric6.WebBrowser.Navigation.NavigationContainer.NavigationContainer?1(parent=None)
+eric6.WebBrowser.Navigation.ReloadStopButton.ReloadStopButton.reloadClicked?7
+eric6.WebBrowser.Navigation.ReloadStopButton.ReloadStopButton.setLoading?4(loading)
+eric6.WebBrowser.Navigation.ReloadStopButton.ReloadStopButton.stopClicked?7
+eric6.WebBrowser.Navigation.ReloadStopButton.ReloadStopButton?1(parent=None)
 eric6.WebBrowser.Network.EricSchemeHandler.EricSchemeHandler.SupportedPages?7
 eric6.WebBrowser.Network.EricSchemeHandler.EricSchemeHandler.requestStarted?4(job)
 eric6.WebBrowser.Network.EricSchemeHandler.EricSchemeHandler?1(parent=None)
--- a/APIs/Python3/eric6.bas	Thu May 11 18:26:56 2017 +0200
+++ b/APIs/Python3/eric6.bas	Sat May 13 12:09:45 2017 +0200
@@ -676,6 +676,7 @@
 RebaseProjectHelper HgExtensionProjectHelper
 RecursionError OverflowError ValueError
 Redirector QObject
+ReloadStopButton QToolButton
 RemoveBookmarksCommand QUndoCommand
 RestructuredTextProvider MarkupBase
 SafariImporter BookmarksImporter
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Thu May 11 18:26:56 2017 +0200
+++ b/Documentation/Help/source.qhp	Sat May 13 12:09:45 2017 +0200
@@ -1176,6 +1176,7 @@
             <section title="eric6.WebBrowser.Navigation" ref="index-eric6.WebBrowser.Navigation.html">
               <section title="eric6.WebBrowser.Navigation.NavigationBar" ref="eric6.WebBrowser.Navigation.NavigationBar.html" />
               <section title="eric6.WebBrowser.Navigation.NavigationContainer" ref="eric6.WebBrowser.Navigation.NavigationContainer.html" />
+              <section title="eric6.WebBrowser.Navigation.ReloadStopButton" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html" />
             </section>
             <section title="eric6.WebBrowser.Network" ref="index-eric6.WebBrowser.Network.html">
               <section title="eric6.WebBrowser.Network.EricSchemeHandler" ref="eric6.WebBrowser.Network.EricSchemeHandler.html" />
@@ -4981,6 +4982,7 @@
       <keyword name="Editor.__setAutoCompletion" id="Editor.__setAutoCompletion" ref="eric6.QScintilla.Editor.html#Editor.__setAutoCompletion" />
       <keyword name="Editor.__setCallTips" id="Editor.__setCallTips" ref="eric6.QScintilla.Editor.html#Editor.__setCallTips" />
       <keyword name="Editor.__setEolMode" id="Editor.__setEolMode" ref="eric6.QScintilla.Editor.html#Editor.__setEolMode" />
+      <keyword name="Editor.__setLineMarkerColours" id="Editor.__setLineMarkerColours" ref="eric6.QScintilla.Editor.html#Editor.__setLineMarkerColours" />
       <keyword name="Editor.__setMarginsDisplay" id="Editor.__setMarginsDisplay" ref="eric6.QScintilla.Editor.html#Editor.__setMarginsDisplay" />
       <keyword name="Editor.__setSpelling" id="Editor.__setSpelling" ref="eric6.QScintilla.Editor.html#Editor.__setSpelling" />
       <keyword name="Editor.__setSpellingLanguage" id="Editor.__setSpellingLanguage" ref="eric6.QScintilla.Editor.html#Editor.__setSpellingLanguage" />
@@ -9993,9 +9995,8 @@
       <keyword name="NavigationBar.backButton" id="NavigationBar.backButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.backButton" />
       <keyword name="NavigationBar.exitFullScreenButton" id="NavigationBar.exitFullScreenButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.exitFullScreenButton" />
       <keyword name="NavigationBar.forwardButton" id="NavigationBar.forwardButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.forwardButton" />
-      <keyword name="NavigationBar.reloadButton" id="NavigationBar.reloadButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.reloadButton" />
+      <keyword name="NavigationBar.reloadStopButton" id="NavigationBar.reloadStopButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.reloadStopButton" />
       <keyword name="NavigationBar.searchEdit" id="NavigationBar.searchEdit" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.searchEdit" />
-      <keyword name="NavigationBar.stopButton" id="NavigationBar.stopButton" ref="eric6.WebBrowser.Navigation.NavigationBar.html#NavigationBar.stopButton" />
       <keyword name="NavigationContainer" id="NavigationContainer" ref="eric6.WebBrowser.Navigation.NavigationContainer.html#NavigationContainer" />
       <keyword name="NavigationContainer (Constructor)" id="NavigationContainer (Constructor)" ref="eric6.WebBrowser.Navigation.NavigationContainer.html#NavigationContainer.__init__" />
       <keyword name="NavigationContainer (Module)" id="NavigationContainer (Module)" ref="eric6.WebBrowser.Navigation.NavigationContainer.html" />
@@ -12185,6 +12186,12 @@
       <keyword name="Reindenter.fixedLine" id="Reindenter.fixedLine" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter.fixedLine" />
       <keyword name="Reindenter.getline" id="Reindenter.getline" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter.getline" />
       <keyword name="Reindenter.run" id="Reindenter.run" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#Reindenter.run" />
+      <keyword name="ReloadStopButton" id="ReloadStopButton" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html#ReloadStopButton" />
+      <keyword name="ReloadStopButton (Constructor)" id="ReloadStopButton (Constructor)" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html#ReloadStopButton.__init__" />
+      <keyword name="ReloadStopButton (Module)" id="ReloadStopButton (Module)" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html" />
+      <keyword name="ReloadStopButton.__buttonClicked" id="ReloadStopButton.__buttonClicked" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html#ReloadStopButton.__buttonClicked" />
+      <keyword name="ReloadStopButton.__updateButton" id="ReloadStopButton.__updateButton" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html#ReloadStopButton.__updateButton" />
+      <keyword name="ReloadStopButton.setLoading" id="ReloadStopButton.setLoading" ref="eric6.WebBrowser.Navigation.ReloadStopButton.html#ReloadStopButton.setLoading" />
       <keyword name="RemoveBookmarksCommand" id="RemoveBookmarksCommand" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand" />
       <keyword name="RemoveBookmarksCommand" id="RemoveBookmarksCommand" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand" />
       <keyword name="RemoveBookmarksCommand (Constructor)" id="RemoveBookmarksCommand (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.__init__" />
@@ -18083,6 +18090,7 @@
       <file>eric6.WebBrowser.JavaScript.StartPageJsObject.html</file>
       <file>eric6.WebBrowser.Navigation.NavigationBar.html</file>
       <file>eric6.WebBrowser.Navigation.NavigationContainer.html</file>
+      <file>eric6.WebBrowser.Navigation.ReloadStopButton.html</file>
       <file>eric6.WebBrowser.Network.EricSchemeHandler.html</file>
       <file>eric6.WebBrowser.Network.NetworkManager.html</file>
       <file>eric6.WebBrowser.Network.NetworkUrlInterceptor.html</file>
--- a/Documentation/Source/eric6.QScintilla.Editor.html	Thu May 11 18:26:56 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.Editor.html	Sat May 13 12:09:45 2017 +0200
@@ -513,6 +513,9 @@
 <td><a href="#Editor.__setEolMode">__setEolMode</a></td>
 <td>Private method to configure the eol mode of the editor.</td>
 </tr><tr>
+<td><a href="#Editor.__setLineMarkerColours">__setLineMarkerColours</a></td>
+<td>Private method to set the line marker colours.</td>
+</tr><tr>
 <td><a href="#Editor.__setMarginsDisplay">__setMarginsDisplay</a></td>
 <td>Private method to configure margins 0 and 2.</td>
 </tr><tr>
@@ -2350,6 +2353,11 @@
 <b>__setEolMode</b>(<i></i>)
 <p>
         Private method to configure the eol mode of the editor.
+</p><a NAME="Editor.__setLineMarkerColours" ID="Editor.__setLineMarkerColours"></a>
+<h4>Editor.__setLineMarkerColours</h4>
+<b>__setLineMarkerColours</b>(<i></i>)
+<p>
+        Private method to set the line marker colours.
 </p><a NAME="Editor.__setMarginsDisplay" ID="Editor.__setMarginsDisplay"></a>
 <h4>Editor.__setMarginsDisplay</h4>
 <b>__setMarginsDisplay</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.Navigation.NavigationBar.html	Thu May 11 18:26:56 2017 +0200
+++ b/Documentation/Source/eric6.WebBrowser.Navigation.NavigationBar.html	Sat May 13 12:09:45 2017 +0200
@@ -96,14 +96,11 @@
 <td><a href="#NavigationBar.forwardButton">forwardButton</a></td>
 <td>Public method to get a reference to the forward button.</td>
 </tr><tr>
-<td><a href="#NavigationBar.reloadButton">reloadButton</a></td>
-<td>Public method to get a reference to the reload button.</td>
+<td><a href="#NavigationBar.reloadStopButton">reloadStopButton</a></td>
+<td>Public method to get a reference to the reload/stop button.</td>
 </tr><tr>
 <td><a href="#NavigationBar.searchEdit">searchEdit</a></td>
 <td>Public method to get a reference to the web search edit.</td>
-</tr><tr>
-<td><a href="#NavigationBar.stopButton">stopButton</a></td>
-<td>Public method to get a reference to the stop button.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -219,15 +216,15 @@
 <dd>
 QToolButton
 </dd>
-</dl><a NAME="NavigationBar.reloadButton" ID="NavigationBar.reloadButton"></a>
-<h4>NavigationBar.reloadButton</h4>
-<b>reloadButton</b>(<i></i>)
+</dl><a NAME="NavigationBar.reloadStopButton" ID="NavigationBar.reloadStopButton"></a>
+<h4>NavigationBar.reloadStopButton</h4>
+<b>reloadStopButton</b>(<i></i>)
 <p>
-        Public method to get a reference to the reload button.
+        Public method to get a reference to the reload/stop button.
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-reference to the reload button
+reference to the reload/stop button
 </dd>
 </dl><dl>
 <dt>Return Type:</dt>
@@ -249,21 +246,6 @@
 <dd>
 WebBrowserWebSearchWidget
 </dd>
-</dl><a NAME="NavigationBar.stopButton" ID="NavigationBar.stopButton"></a>
-<h4>NavigationBar.stopButton</h4>
-<b>stopButton</b>(<i></i>)
-<p>
-        Public method to get a reference to the stop button.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-reference to the stop button
-</dd>
-</dl><dl>
-<dt>Return Type:</dt>
-<dd>
-QToolButton
-</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.WebBrowser.Navigation.ReloadStopButton.html	Sat May 13 12:09:45 2017 +0200
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.WebBrowser.Navigation.ReloadStopButton</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.WebBrowser.Navigation.ReloadStopButton</h1>
+<p>
+Module implementing a button alternating between reload and stop.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#ReloadStopButton">ReloadStopButton</a></td>
+<td>Class implementing a button alternating between reload and stop.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="ReloadStopButton" ID="ReloadStopButton"></a>
+<h2>ReloadStopButton</h2>
+<p>
+    Class implementing a button alternating between reload and stop.
+</p><h3>Signals</h3>
+<dl>
+<dt>reloadClicked()</dt>
+<dd>
+emitted to initiate a reload action
+</dd><dt>stopClicked()</dt>
+<dd>
+emitted to initiate a stop action
+</dd>
+</dl>
+<h3>Derived from</h3>
+QToolButton
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#ReloadStopButton.__init__">ReloadStopButton</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#ReloadStopButton.__buttonClicked">__buttonClicked</a></td>
+<td>Private slot handling a user clicking the button.</td>
+</tr><tr>
+<td><a href="#ReloadStopButton.__updateButton">__updateButton</a></td>
+<td>Private slot to update the button.</td>
+</tr><tr>
+<td><a href="#ReloadStopButton.setLoading">setLoading</a></td>
+<td>Public method to set the loading state.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="ReloadStopButton.__init__" ID="ReloadStopButton.__init__"></a>
+<h4>ReloadStopButton (Constructor)</h4>
+<b>ReloadStopButton</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="ReloadStopButton.__buttonClicked" ID="ReloadStopButton.__buttonClicked"></a>
+<h4>ReloadStopButton.__buttonClicked</h4>
+<b>__buttonClicked</b>(<i></i>)
+<p>
+        Private slot handling a user clicking the button.
+</p><a NAME="ReloadStopButton.__updateButton" ID="ReloadStopButton.__updateButton"></a>
+<h4>ReloadStopButton.__updateButton</h4>
+<b>__updateButton</b>(<i></i>)
+<p>
+        Private slot to update the button.
+</p><a NAME="ReloadStopButton.setLoading" ID="ReloadStopButton.setLoading"></a>
+<h4>ReloadStopButton.setLoading</h4>
+<b>setLoading</b>(<i>loading</i>)
+<p>
+        Public method to set the loading state.
+</p><dl>
+<dt><i>loading</i> (bool)</dt>
+<dd>
+flag indicating the new loading state
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/index-eric6.WebBrowser.Navigation.html	Thu May 11 18:26:56 2017 +0200
+++ b/Documentation/Source/index-eric6.WebBrowser.Navigation.html	Sat May 13 12:09:45 2017 +0200
@@ -33,6 +33,9 @@
 </tr><tr>
 <td><a href="eric6.WebBrowser.Navigation.NavigationContainer.html">NavigationContainer</a></td>
 <td>Module implementing the navigation container widget.</td>
+</tr><tr>
+<td><a href="eric6.WebBrowser.Navigation.ReloadStopButton.html">ReloadStopButton</a></td>
+<td>Module implementing a button alternating between reload and stop.</td>
 </tr>
 </table>
 </body></html>
\ No newline at end of file
--- a/WebBrowser/Navigation/NavigationBar.py	Thu May 11 18:26:56 2017 +0200
+++ b/WebBrowser/Navigation/NavigationBar.py	Sat May 13 12:09:45 2017 +0200
@@ -17,6 +17,8 @@

 import UI.PixmapCache

+from .ReloadStopButton import ReloadStopButton
+

 class NavigationBar(QWidget):
     """
@@ -70,23 +72,7 @@
         self.__backNextLayout.addWidget(self.__backButton)
         self.__backNextLayout.addWidget(self.__forwardButton)

-        self.__reloadButton = QToolButton(self)
-        self.__reloadButton.setObjectName("navigation_reload_button")
-        self.__reloadButton.setToolTip(self.tr("Reload the current screen"))
-        self.__reloadButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
-        self.__reloadButton.setFocusPolicy(Qt.NoFocus)
-        self.__reloadButton.setAutoRaise(True)
-        self.__reloadButton.setIcon(
-            UI.PixmapCache.getIcon("reload.png"))
-
-        self.__stopButton = QToolButton(self)
-        self.__stopButton.setObjectName("navigation_stop_button")
-        self.__stopButton.setToolTip(self.tr("Stop loading"))
-        self.__stopButton.setToolButtonStyle(Qt.ToolButtonIconOnly)
-        self.__stopButton.setFocusPolicy(Qt.NoFocus)
-        self.__stopButton.setAutoRaise(True)
-        self.__stopButton.setIcon(
-            UI.PixmapCache.getIcon("stopLoading.png"))
+        self.__reloadStopButton = ReloadStopButton(self)

         self.__homeButton = QToolButton(self)
         self.__homeButton.setObjectName("navigation_home_button")
@@ -128,8 +114,7 @@
         self.__navigationSplitter.setCollapsible(0, False)

         self.__layout.addLayout(self.__backNextLayout)
-        self.__layout.addWidget(self.__reloadButton)
-        self.__layout.addWidget(self.__stopButton)
+        self.__layout.addWidget(self.__reloadStopButton)
         self.__layout.addWidget(self.__homeButton)
         self.__layout.addWidget(self.__navigationSplitter)
         self.__layout.addWidget(self.__exitFullScreenButton)
@@ -149,8 +134,8 @@

         self.__backButton.clicked.connect(self.__goBack)
         self.__forwardButton.clicked.connect(self.__goForward)
-        self.__reloadButton.clicked.connect(self.__reload)
-        self.__stopButton.clicked.connect(self.__stopLoad)
+        self.__reloadStopButton.reloadClicked.connect(self.__reload)
+        self.__reloadStopButton.stopClicked.connect(self.__stopLoad)
         self.__homeButton.clicked.connect(self.__goHome)

     def backButton(self):
@@ -171,23 +156,14 @@
         """
         return self.__forwardButton

-    def reloadButton(self):
+    def reloadStopButton(self):
         """
-        Public method to get a reference to the reload button.
+        Public method to get a reference to the reload/stop button.

-        @return reference to the reload button
+        @return reference to the reload/stop button
         @rtype QToolButton
         """
-        return self.__reloadButton
-
-    def stopButton(self):
-        """
-        Public method to get a reference to the stop button.
-
-        @return reference to the stop button
-        @rtype QToolButton
-        """
-        return self.__stopButton
+        return self.__reloadStopButton

     def exitFullScreenButton(self):
         """
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebBrowser/Navigation/ReloadStopButton.py	Sat May 13 12:09:45 2017 +0200
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a button alternating between reload and stop.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt
+from PyQt5.QtWidgets import QToolButton
+
+import UI.PixmapCache
+
+
+class ReloadStopButton(QToolButton):
+    """
+    Class implementing a button alternating between reload and stop.
+
+    @signal reloadClicked() emitted to initiate a reload action
+    @signal stopClicked() emitted to initiate a stop action
+    """
+    reloadClicked = pyqtSignal()
+    stopClicked = pyqtSignal()
+
+    def __init__(self, parent=None):
+        """
+        Constructor
+
+        @param parent reference to the parent widget
+        @type QWidget
+        """
+        super(ReloadStopButton, self).__init__(parent)
+
+        self.setObjectName("navigation_reloadstop_button")
+        self.setToolButtonStyle(Qt.ToolButtonIconOnly)
+        self.setFocusPolicy(Qt.NoFocus)
+        self.setAutoRaise(True)
+
+        self.__loading = False
+
+        self.clicked.connect(self.__buttonClicked)
+
+        self.__updateButton()
+
+    @pyqtSlot()
+    def __buttonClicked(self):
+        """
+        Private slot handling a user clicking the button.
+        """
+        if self.__loading:
+            self.stopClicked.emit()
+        else:
+            self.reloadClicked.emit()
+
+    @pyqtSlot()
+    def __updateButton(self):
+        """
+        Private slot to update the button.
+        """
+        if self.__loading:
+            self.setIcon(UI.PixmapCache.getIcon("stopLoading.png"))
+            self.setToolTip(self.tr("Stop loading"))
+        else:
+            self.setIcon(UI.PixmapCache.getIcon("reload.png"))
+            self.setToolTip(self.tr("Reload the current screen"))
+
+    def setLoading(self, loading):
+        """
+        Public method to set the loading state.
+
+        @param loading flag indicating the new loading state
+        @type bool
+        """
+        self.__loading = loading
+        self.__updateButton()
--- a/WebBrowser/WebBrowserWindow.py	Thu May 11 18:26:56 2017 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Sat May 13 12:09:45 2017 +0200
@@ -2359,8 +2359,7 @@
         self.reloadAct.setEnabled(not b)
         self.stopAct.setEnabled(b)

-        self.__navigationBar.reloadButton().setEnabled(not b)
-        self.__navigationBar.stopButton().setEnabled(b)
+        self.__navigationBar.reloadStopButton().setLoading(b)

     def __addBookmark(self):
         """
--- a/changelog	Thu May 11 18:26:56 2017 +0200
+++ b/changelog	Sat May 13 12:09:45 2017 +0200
@@ -9,6 +9,8 @@
   -- reintroduced the highlighting of current instruction line and the error
      line using colored background. It is configurable whether to use these
      backgrounds or the arrows.
+- Web Browser (NG)
+  -- united the stop and reload buttons of the navigation bar

 Version 17.05:
 - bug fixes
--- a/eric6.e4p	Thu May 11 18:26:56 2017 +0200
+++ b/eric6.e4p	Sat May 13 12:09:45 2017 +0200
@@ -1360,6 +1360,7 @@
     <Source>WebBrowser/JavaScript/__init__.py</Source>
     <Source>WebBrowser/Navigation/NavigationBar.py</Source>
     <Source>WebBrowser/Navigation/NavigationContainer.py</Source>
+    <Source>WebBrowser/Navigation/ReloadStopButton.py</Source>
     <Source>WebBrowser/Navigation/__init__.py</Source>
     <Source>WebBrowser/Network/EricSchemeHandler.py</Source>
     <Source>WebBrowser/Network/NetworkManager.py</Source>
@@ -1988,14 +1989,14 @@
   <Interfaces/>
   <Others>
     <Other>.hgignore</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
--- a/i18n/eric6_cs.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_cs.ts	Sat May 13 12:09:45 2017 +0200
@@ -38404,37 +38404,32 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation type="unfinished">Zastavit načítání</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Zastavit načítání</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished">Vyčistit historii</translation>
     </message>
@@ -50447,6 +50442,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Zastavit načítání</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71401,7 +71409,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73110,12 +73118,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73140,93 +73148,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Uložkt taby</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Asociovaný obsah nelze nalézt.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished">Aktualizovat index pro hledání</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">Vyhledat dokumentaci...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Nefiltrováno</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished">Engine nápovědy</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
+        <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_de.ts	Sat May 13 12:09:45 2017 +0200
@@ -13283,17 +13283,17 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
         <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswählen, um Debugmarken durch farbige Zeilenhintergründe anzuzeigen, ansonsten durch Pfeilindikatoren</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/>
         <source>Select the colour for the current line marker.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle die Farbe der Markierung für die aktuelle Zeile.</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
         <source>Select the colour for the error line marker.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation>
     </message>
 </context>
 <context>
@@ -37515,37 +37515,27 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation>Eine Seite zurück</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation>Eine Seite vorwärts</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation>Die aktuelle Seite erneut laden</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
-        <source>Stop loading</source>
-        <translation>Laden anhalten</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation>Zur Startseite wechseln</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation>Vollbild verlassen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation>Chronik löschen</translation>
     </message>
@@ -49530,6 +49520,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation>Laden anhalten</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation>Die aktuelle Seite erneut laden</translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -70191,7 +70194,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation>eric6 Web-Browser</translation>
     </message>
@@ -71885,12 +71888,12 @@
         <translation>Aktuelle Seite prüfen</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation>IP Adressenbericht</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation>Domänenbericht</translation>
     </message>
@@ -71910,94 +71913,94 @@
         <translation>&lt;b&gt;eric6 Web-Browser – {0}&lt;/b&gt;&lt;p&gt;Der eric6 Web-Browser ist eine kombinierte Anzeige für Hilfe- und HTML-Dateien. Er ist Bestandteil der eric6-Entwicklungsumgebung.&lt;/p&gt;&lt;p&gt;Er basiert auf QtWebEngine {1} und Chrome {2}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation>Gesicherte Tabs</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation>Konnte keinen zugehörigen Inhalt finden.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation>Aktualisiere Suchindex</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation>Suche nach Dokumentation...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation>Ungefiltert</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation>Hilfe</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation>ISO</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation>ISO</translation>
+        <source>Windows</source>
+        <translation>Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
+        <source>ISCII</source>
+        <translation>ISCII</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation>ISCII</translation>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
+        <source>Other</source>
+        <translation>Sonstige</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation>Sonstige</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation>IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation>Standardkodierung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation>VirusTotal-Prüfung</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die VirusTotal-Prüfung konnte nicht beauftragt werden.&lt;p&gt;
 &lt;p&gt;Ursache: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation>Gib eine gültige IPv4 Adresse in Vierpunktnotation ein:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation>Die eingegebene IP Adresse ist nicht in Vierpunktnotation.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation>Gib einen gültigen Domänennamen ein:</translation>
     </message>
--- a/i18n/eric6_empty.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_empty.ts	Sat May 13 12:09:45 2017 +0200
@@ -13180,6 +13180,21 @@
         <source>Error line marker:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
+        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/>
+        <source>Select the colour for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
+        <source>Select the colour for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -37309,37 +37324,27 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
-        <source>Stop loading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49120,6 +49125,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -69589,7 +69607,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71345,12 +71363,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71375,93 +71393,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
+        <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_en.ts	Sat May 13 12:09:45 2017 +0200
@@ -13194,6 +13194,21 @@
         <source>Error line marker:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
+        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/>
+        <source>Select the colour for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
+        <source>Select the colour for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -37348,37 +37363,27 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
-        <source>Stop loading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49161,6 +49166,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -69629,7 +69647,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71323,12 +71341,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71348,93 +71366,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
+        <source>ISCII</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_es.ts	Sat May 13 12:09:45 2017 +0200
@@ -13286,6 +13286,21 @@
         <source>Error line marker:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
+        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/>
+        <source>Select the colour for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
+        <source>Select the colour for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -37500,37 +37515,37 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation>Ir una pantalla hacia atrás</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation>Ir una pantalla hacia adelante</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
         <source>Reload the current screen</source>
-        <translation>Recargar la pantalla actual</translation>
+        <translation type="obsolete">Recargar la pantalla actual</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation>Detener carga</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Detener carga</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation>Mover a la pantalla inicial</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation>Salir de Pantalla Completa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation>Borrar Historial</translation>
     </message>
@@ -49478,6 +49493,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Detener carga</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished">Recargar la pantalla actual</translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -70125,7 +70153,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation>Navegador Web de eric6</translation>
     </message>
@@ -71819,12 +71847,12 @@
         <translation>Analizar sitio actual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation>Informe de Dirección IP</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation>Informe de Dominio</translation>
     </message>
@@ -71844,94 +71872,94 @@
         <translation>&lt;b&gt;Navegador Web de eric6- {0}&lt;/b&gt;&lt;p&gt;El Navegador Web de eric6 is una combinación de navegador de archivos de ayuda y de HTML. Es parte del conjunto de herramientas de desarrollo de eric6.&lt;/p&gt;&lt;p&gt;Está basado en QtWebEngine {1} y Chrome {2}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation>Pestañas Guardadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation>No se ha podido encontrar un contenido asociado.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation>Actualizando índice de búsqueda</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation>Buscando Documentación...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation>Sin filtrar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation>Motor de Ayuda</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation>ISO</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation>ISO</translation>
+        <source>Windows</source>
+        <translation>Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
+        <source>ISCII</source>
+        <translation>ISCII</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation>ISCII</translation>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
+        <source>Other</source>
+        <translation>Otro</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation>Otro</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation>IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation>Codificación por Defecto</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation>Análisis con VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El análisis con VirusTotal no se ha podido programar.&lt;p&gt;
 &lt;p&gt;Razón: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation>Introducir una dirección IPv4 válida en notación decimal punteada:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation>La dirección IP no se ha proporcionado en notación decimal punteada.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation>Introducir un nombre de dominio válido:</translation>
     </message>
--- a/i18n/eric6_fr.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_fr.ts	Sat May 13 12:09:45 2017 +0200
@@ -38191,37 +38191,27 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
-        <source>Stop loading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50248,6 +50238,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71234,7 +71237,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72939,12 +72942,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72969,93 +72972,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation type="unfinished"></translation>
+        <source>Windows</source>
+        <translation type="unfinished">Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation type="unfinished">Windows</translation>
+        <source>ISCII</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
+        <source>Other</source>
+        <translation type="unfinished">Autre</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished">Autre</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_it.ts	Sat May 13 12:09:45 2017 +0200
@@ -38634,37 +38634,32 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation type="unfinished">Ferma caricamento</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Ferma caricamento</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished">Pulisci la history</translation>
     </message>
@@ -50696,6 +50691,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Ferma caricamento</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71784,7 +71792,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73493,12 +73501,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73523,93 +73531,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Salva Linguette</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Non posso trovare un contenuto associato.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished">Aggiornamento indice di ricerca</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">Ricerca documentazione...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Non filtrato</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished">Motore di help</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished">ISO</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation type="unfinished">ISO</translation>
+        <source>Windows</source>
+        <translation type="unfinished">Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation type="unfinished">Windows</translation>
+        <source>ISCII</source>
+        <translation type="unfinished">ISCII</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation type="unfinished">ISCII</translation>
+        <source>Unicode</source>
+        <translation type="unfinished">Unicode</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation type="unfinished">Unicode</translation>
+        <source>Other</source>
+        <translation type="unfinished">Altro</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished">Altro</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished">IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished">Encoding di default</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_pt.ts	Sat May 13 12:09:45 2017 +0200
@@ -38797,37 +38797,32 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation type="unfinished">Parar a carga</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Parar a carga</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished">Limpar Histórico</translation>
     </message>
@@ -50683,6 +50678,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Parar a carga</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71512,7 +71520,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished">Navegador Web de eric6</translation>
     </message>
@@ -73216,12 +73224,12 @@
         <translation type="unfinished">Analizar sítio atual</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73241,7 +73249,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Separadores Guardados</translation>
     </message>
@@ -73251,88 +73259,88 @@
         <translation type="obsolete">Restaurar Janela</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Não se encontrou nenhum conteúdo associado.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished">A atualizar índice de pesquisa</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">A procurar a Documentação...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Sem filtrar</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished">Motor de Ajuda</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation type="unfinished"></translation>
+        <source>Windows</source>
+        <translation type="unfinished">Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation type="unfinished">Windows</translation>
+        <source>ISCII</source>
+        <translation type="unfinished">ISCII</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation type="unfinished">ISCII</translation>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
+        <source>Other</source>
+        <translation type="unfinished">Outro</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished">Outro</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished">IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished">Codificação Padrão</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished">Análise de VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_ru.ts	Sat May 13 12:09:45 2017 +0200
@@ -13325,6 +13325,21 @@
         <source>Error line marker:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
+        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/>
+        <source>Select the colour for the current line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
+        <source>Select the colour for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -37595,37 +37610,37 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation>Перейти на один экран назад</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation>Перейти на один экран вперед</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
         <source>Reload the current screen</source>
-        <translation>Перегрузить текущий экран</translation>
+        <translation type="obsolete">Перегрузить текущий экран</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation>Остановить загрузку</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Остановить загрузку</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation>Очистить историю</translation>
     </message>
@@ -49666,6 +49681,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Остановить загрузку</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished">Перегрузить текущий экран</translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -70399,7 +70427,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation>Eric6 Web браузер</translation>
     </message>
@@ -72094,12 +72122,12 @@
         <translation>Проверить текущий сервер</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation>Отчет IP адреса</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation>Отчет домена</translation>
     </message>
@@ -72119,94 +72147,94 @@
         <translation>&lt;b&gt;Еric6 Web-браузер - {0}&lt;/b&gt;&lt;p&gt;Eric6 Web-браузер - это комбинированный браузер для отображения файлов справки и HTML. Он является частью набора инструментов среды разработки eric6.&lt;/p&gt;&lt;p&gt;Базируется на основе QtWebEngine {1} и Chrome {2}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation>Сохраненные вкладки</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation>Невозможно найти соответствующее содержание.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation>Обновление поискового индекса</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation>Идёт поиск помощи...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation>Unfiltered</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation>Движок для системы справки</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation>ISO</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation>ISO</translation>
+        <source>Windows</source>
+        <translation>Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
+        <source>ISCII</source>
+        <translation>ISCII</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation>ISCII</translation>
+        <source>Unicode</source>
+        <translation>Юникод</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation>Юникод</translation>
+        <source>Other</source>
+        <translation>Другое</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation>Другое</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation>IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation>Кодировка по умолчанию</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation>Проверка VirusTotal</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно запланировать проверку VirusTotal.&lt;p&gt;
 &lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation>Введите действительный адрес IPv4 в четырехкомпонентой нотации с точками:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation>Данный IP адрес приведен не в четырехкомпонентой нотации с точками.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation>Введите действительное имя домена:</translation>
     </message>
--- a/i18n/eric6_tr.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_tr.ts	Sat May 13 12:09:45 2017 +0200
@@ -13610,6 +13610,16 @@
         <source>Select the colour for the current line marker.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/>
+        <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/>
+        <source>Select the colour for the error line marker.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -38226,37 +38236,32 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation type="unfinished">Yüklemeyi durdur</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">Yüklemeyi durdur</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished">Geçmişi Sil</translation>
     </message>
@@ -50128,6 +50133,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">Yüklemeyi durdur</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71019,7 +71037,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72728,12 +72746,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72758,93 +72776,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">Sekmeleri Kaydet</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished">Birleştirilmiş bir içerek bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished">Arama index yenileniyor</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished">Dökümanlara bakılıyor...</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished">Süzülmemiş</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished">Yardım Motoru</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation type="unfinished"></translation>
+        <source>Windows</source>
+        <translation type="unfinished">Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation type="unfinished">Windows</translation>
+        <source>ISCII</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation type="unfinished"></translation>
+        <source>Unicode</source>
+        <translation type="unfinished">Evrensel kod</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation type="unfinished">Evrensel kod</translation>
+        <source>Other</source>
+        <translation type="unfinished">Diğer</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished">Diğer</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished">Varsayılan Kodlama</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Thu May 11 18:26:56 2017 +0200
+++ b/i18n/eric6_zh_CN.ts	Sat May 13 12:09:45 2017 +0200
@@ -38226,37 +38226,32 @@
 <context>
     <name>NavigationBar</name>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="49"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="51"/>
         <source>Move one screen backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="59"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="61"/>
         <source>Move one screen forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="75"/>
-        <source>Reload the current screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../WebBrowser/Navigation/NavigationBar.py" line="84"/>
         <source>Stop loading</source>
-        <translation type="unfinished">停止加载</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="93"/>
+        <translation type="obsolete">停止加载</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="79"/>
         <source>Move to the initial screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="103"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="89"/>
         <source>Exit Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="261"/>
+        <location filename="../WebBrowser/Navigation/NavigationBar.py" line="237"/>
         <source>Clear History</source>
         <translation type="unfinished">清除历史记录</translation>
     </message>
@@ -50288,6 +50283,19 @@
     </message>
 </context>
 <context>
+    <name>ReloadStopButton</name>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="65"/>
+        <source>Stop loading</source>
+        <translation type="unfinished">停止加载</translation>
+    </message>
+    <message>
+        <location filename="../WebBrowser/Navigation/ReloadStopButton.py" line="68"/>
+        <source>Reload the current screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ReplaceWidget</name>
     <message>
         <location filename="../QScintilla/ReplaceWidget.ui" line="20"/>
@@ -71274,7 +71282,7 @@
 <context>
     <name>WebBrowserWindow</name>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3226"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3225"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -72983,12 +72991,12 @@
         <translation type="unfinished">扫描当前站点</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>IP Address Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Domain Report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -73013,93 +73021,93 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="2445"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="2444"/>
         <source>Saved Tabs</source>
         <translation type="unfinished">已保存的选项卡</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3043"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3042"/>
         <source>Could not find an associated content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3146"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3145"/>
         <source>Updating search index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3216"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3215"/>
         <source>Looking for Documentation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3251"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3250"/>
         <source>Unfiltered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3270"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3269"/>
         <source>Help Engine</source>
         <translation type="unfinished">帮助引擎</translation>
     </message>
     <message>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3745"/>
+        <source>ISO</source>
+        <translation type="unfinished">ISO</translation>
+    </message>
+    <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3746"/>
-        <source>ISO</source>
-        <translation type="unfinished">ISO</translation>
+        <source>Windows</source>
+        <translation type="unfinished">Windows</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3747"/>
-        <source>Windows</source>
-        <translation type="unfinished">Windows</translation>
+        <source>ISCII</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3748"/>
-        <source>ISCII</source>
-        <translation type="unfinished"></translation>
+        <source>Unicode</source>
+        <translation type="unfinished">Unicode</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3749"/>
-        <source>Unicode</source>
-        <translation type="unfinished">Unicode</translation>
+        <source>Other</source>
+        <translation type="unfinished">其它</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserWindow.py" line="3750"/>
-        <source>Other</source>
-        <translation type="unfinished">其它</translation>
-    </message>
-    <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3751"/>
         <source>IBM</source>
         <translation type="unfinished">IBM</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="3773"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="3772"/>
         <source>Default Encoding</source>
         <translation type="unfinished">默认编码</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>VirusTotal Scan</source>
         <translation type="unfinished">VirusTotal 扫描</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4058"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4057"/>
         <source>&lt;p&gt;The VirusTotal scan could not be scheduled.&lt;p&gt;
 &lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4084"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4083"/>
         <source>Enter a valid IPv4 address in dotted quad notation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4093"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4092"/>
         <source>The given IP address is not in dotted quad notation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="4103"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="4102"/>
         <source>Enter a valid domain name:</source>
         <translation type="unfinished"></translation>
     </message>
APIs/Python3/eric6.api		file \| annotate \| diff \| comparison \| revisions
APIs/Python3/eric6.bas		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Documentation/Help/source.qhp		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.QScintilla.Editor.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.WebBrowser.Navigation.NavigationBar.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/eric6.WebBrowser.Navigation.ReloadStopButton.html		file \| annotate \| diff \| comparison \| revisions
Documentation/Source/index-eric6.WebBrowser.Navigation.html		file \| annotate \| diff \| comparison \| revisions
WebBrowser/Navigation/NavigationBar.py		file \| annotate \| diff \| comparison \| revisions
WebBrowser/Navigation/ReloadStopButton.py		file \| annotate \| diff \| comparison \| revisions
WebBrowser/WebBrowserWindow.py		file \| annotate \| diff \| comparison \| revisions
changelog		file \| annotate \| diff \| comparison \| revisions
eric6.e4p		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_cs.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_de.qm		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_de.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_empty.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_en.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_es.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_fr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_it.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_pt.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_ru.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_tr.ts		file \| annotate \| diff \| comparison \| revisions
i18n/eric6_zh_CN.ts		file \| annotate \| diff \| comparison \| revisions