Merge branch 'larryhynes-patch-1'

This commit is contained in:
Florian Bruhin 2015-11-23 11:26:24 +01:00
commit d68798a15b
3 changed files with 4 additions and 3 deletions

View File

@ -172,11 +172,11 @@ Contributors, sorted by the number of commits in descending order:
* jnphilipp * jnphilipp
* Tobias Patzl * Tobias Patzl
* Peter Michely * Peter Michely
* Larry Hynes
* Johannes Altmanninger * Johannes Altmanninger
* Samir Benmendil * Samir Benmendil
* Regina Hug * Regina Hug
* Mathias Fussenegger * Mathias Fussenegger
* Larry Hynes
* Fritz V155 Reichwald * Fritz V155 Reichwald
* Franz Fellner * Franz Fellner
* zwarag * zwarag

View File

@ -530,7 +530,7 @@ class WebView(QWebView):
"match for: {}".format(text), "match for: {}".format(text),
immediately=True) immediately=True)
else: else:
message.error(self.win_id, "Text '{}' not found on " message.warning(self.win_id, "Text '{}' not found on "
"page!".format(text), immediately=True) "page!".format(text), immediately=True)
else: else:
def check_scroll_pos(): def check_scroll_pos():

View File

@ -391,6 +391,7 @@ def _get_authors():
'Alexey Nabrodov': 'Alexey "Averrin" Nabrodov', 'Alexey Nabrodov': 'Alexey "Averrin" Nabrodov',
'Michael': 'Halfwit', 'Michael': 'Halfwit',
'Error 800': 'error800', 'Error 800': 'error800',
'larryhynes': 'Larry Hynes',
} }
commits = subprocess.check_output(['git', 'log', '--format=%aN']) commits = subprocess.check_output(['git', 'log', '--format=%aN'])
authors = [corrections.get(author, author) authors = [corrections.get(author, author)