Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

1 files changed, 12 insertions, 0 deletions

diff --git a/sql/updates/world/2013_03_17_03_world_misc.sql b/sql/updates/world/2013_03_17_03_world_misc.sql
new file mode 100644
index 00000000000..17468c626d3
--- /dev/null
+++ b/sql/updates/world/2013_03_17_03_world_misc.sql
@@ -0,0 +1,12 @@
+DELETE FROM `trinity_string` WHERE `entry` IN (1151, 1152, 1153, 1154, 1155, 1156);
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+(1151, 'Mail List Info: # of mails: %u, Player: %s(%u)'),
+(1152, 'Mail Id: %u Title: \"%s\" Money: %ug%us%uc'),
+(1153, 'Sender: %s(%u), Receiver: %s(%u)'),
+(1154, 'Time deliver: %s, Time expire: %s'),
+(1155, 'Item: %s[Entry:%u Guid:%u Count:%u]'),
+(1156, 'Mail List Info: No mail found for this character.');
+
+DELETE FROM `command` WHERE `name` = 'list mail';
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('list mail', 3, 'Syntax: .list mail $character\nList of mails the character received.');