Software / code / prosody
Comparison
prosodyctl @ 6367:769a3577dd85
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 09:23:24 +0100 |
| parent | 6326:a3b9496673ee |
| parent | 6356:fb1535328ac7 |
| child | 6405:61801dacc90b |
comparison
equal
deleted
inserted
replaced
| 6355:c2d144d3f8dd | 6367:769a3577dd85 |
|---|---|
| 218 ["no-password"] = "No password was supplied"; | 218 ["no-password"] = "No password was supplied"; |
| 219 ["no-such-user"] = "The given user does not exist on the server"; | 219 ["no-such-user"] = "The given user does not exist on the server"; |
| 220 ["no-such-host"] = "The given hostname does not exist in the config"; | 220 ["no-such-host"] = "The given hostname does not exist in the config"; |
| 221 ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?"; | 221 ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?"; |
| 222 ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help"; | 222 ["no-pidfile"] = "There is no 'pidfile' option in the configuration file, see http://prosody.im/doc/prosodyctl#pidfile for help"; |
| 223 ["invalid-pidfile"] = "The 'pidfile' option in the configuration file is not a string, see http://prosody.im/doc/prosodyctl#pidfile for help"; | |
| 223 ["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info"; | 224 ["no-posix"] = "The mod_posix module is not enabled in the Prosody config file, see http://prosody.im/doc/prosodyctl for more info"; |
| 224 ["no-such-method"] = "This module has no commands"; | 225 ["no-such-method"] = "This module has no commands"; |
| 225 ["not-running"] = "Prosody is not running"; | 226 ["not-running"] = "Prosody is not running"; |
| 226 }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end }); | 227 }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end }); |
| 227 | 228 |