diff --git a/README.md b/README.md index 37188e1a21cca9db1bb2e559986154b6a1fbd498..1cdfffa588274e0bb9d489628bcfaa1b71fada6b 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,4 @@ Git-Workflow * branch `master` is protected * changes are pushed into branch `dev` +* merge requests can then be created from `dev` into `master`, they are only merged if the project in `dev` is fully functional diff --git a/translate.py b/translate.py index 7e48c2e5011dba9f063abd0ac66717840695bd0f..d4768b28a59283486520075888327909bb0febc2 100644 --- a/translate.py +++ b/translate.py @@ -8,7 +8,7 @@ class Translator(Plugin): def __init__(self): super().__init__() - self.handle_command_translate.docstring = "translate an own post. Syntax: !tr  " + self.handle_command_translate.docstring = "translate an own post. Syntax: !tr  ; e.g. '!tr en de I am a happy text.' will be translated from english to german." # self.handle_command_translate_thread.docstring = "translate a thread. Answer to a message of the thread you want to translate. Arguments: `` ``" @listen_to(r"\A!tr ")