Conflicts: onionshare/web.py onionshare_gui/onionshare_gui.py resources/locale/cs.json resources/locale/eo.json resources/locale/nl.json This merge required quite a bit of refactoring because.