beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
# -*- coding: utf-8 -*-
# See COPYING.Runtime file for copyrights details.
def _(x):
"""No translation"""
return x
Broken = _("Broken")
Started = _("Started")
Stopped = _("Stopped")
Disconnected = _("Disconnected")
Empty = _("Empty")