diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-05-31 20:57:48 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-05-31 20:57:48 +0100 |
| commit | df4313f5bbacbfcb6592b6d90fe5362192287d59 (patch) | |
| tree | f16f74b745083d6f8575d86c8d19565869c4d9c4 /include | |
| parent | 53cd3f47b5c5afa503e96380e9e22d7d35108714 (diff) | |
| parent | 3728a0bda1cf010520c4fae821fc9c98b2adb083 (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/language.h | 2 | ||||
| -rw-r--r-- | include/modes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/language.h b/include/language.h index 8cc3efc40..bdf5b3042 100644 --- a/include/language.h +++ b/include/language.h @@ -82,7 +82,7 @@ namespace Language #define CHAN_X_SUSPENDED _("Channel %s is currently suspended.") #define CHAN_X_NOT_REGISTERED _("Channel \002%s\002 isn't registered.") #define CHAN_X_NOT_IN_USE _("Channel \002%s\002 doesn't exist.") -#define NICK_IDENTIFY_REQUIRED _("Password authentication required for that command.") +#define NICK_IDENTIFY_REQUIRED _("You must be logged into an account to use that command.") #define MAIL_X_INVALID _("\002%s\002 is not a valid e-mail address.") #define UNKNOWN _("<unknown>") #define NO_EXPIRE _("does not expire") diff --git a/include/modes.h b/include/modes.h index 0fa0d8d86..ed55f5911 100644 --- a/include/modes.h +++ b/include/modes.h @@ -221,7 +221,7 @@ class CoreExport ChannelModeVirtual : public T ChannelMode *Wrap(Anope::string ¶m) anope_override; - ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) = 0; + ChannelMode *Unwrap(ChannelMode *cm, Anope::string ¶m) anope_override = 0; }; /* The status a user has on a channel (+v, +h, +o) etc */ |