josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix some conflicted strings.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-11-26 22:38:25 -06:00
parent 28355d886d
commit 1d4da0c217
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/334_world_trinity_string.sql
+20
View File
@@ -0,0 +1,20 @@
DELETE FROM `trinity_string` WHERE `entry` BETWEEN 770 AND 787;
INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
(770,'Your group has members not in your arena team. Please regroup to join.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(771,'Your group does not have enough players to join this match.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(772,'The Gold Team wins!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(773,'The Green Team wins!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(774,'There aren\'t enough players in this battleground. It will end soon unless some more players join to balance the fight.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(775,'Your group has an offline member. Please remove him before joining.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(776,'Your group has players from the opposing faction. You can\'t join the battleground as a group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(777,'Your group has players from different battleground brakets. You can\'t join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(778,'Someone in your party is already in this battleground queue. (S)he must leave it before joining as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(779,'Someone in your party is Deserter. You can\'t join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(780,'Someone in your party is already in three battleground queues. You cannot join as group.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(781,'You cannot teleport to a battleground or arena map.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(782,'You cannot summon players to a battleground or arena map.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(783,'You must be in GM mode to teleport to a player in a battleground.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(784,'You cannot teleport to a battleground from another battleground. Please leave the current battleground first.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(785,'Arena testing turned %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(786,'|cffff0000[Automatic]:|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(787,'|cffffff00[|c1f40af20Announce by|r |cffff0000%s|cffffff00]:|r %s|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
src/game/Language.h
+19 -19
View File
@@ -684,29 +684,29 @@ enum TrinityStrings
LANG_BG_AV_H_CAPTAIN_DEAD = 748,
LANG_BG_AV_A_CAPTAIN_DEAD = 749,
// Room for BG/ARENA 750-799 not used
// Room for BG/ARENA 750-769 not used
LANG_ARENA_YOUR_TEAM_ONLY = 730,
LANG_ARENA_NOT_ENOUGH_PLAYERS = 731,
LANG_ARENA_GOLD_WINS = 732,
LANG_ARENA_GREEN_WINS = 733,
LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING = 734,
LANG_BG_GROUP_OFFLINE_MEMBER = 735,
LANG_BG_GROUP_MIXED_FACTION = 736,
LANG_BG_GROUP_MIXED_LEVELS = 737,
LANG_BG_GROUP_MEMBER_ALREADY_IN_QUEUE = 738,
LANG_BG_GROUP_MEMBER_DESERTER = 739,
LANG_BG_GROUP_MEMBER_NO_FREE_QUEUE_SLOTS = 740,
LANG_ARENA_YOUR_TEAM_ONLY = 770,
LANG_ARENA_NOT_ENOUGH_PLAYERS = 771,
LANG_ARENA_GOLD_WINS = 772,
LANG_ARENA_GREEN_WINS = 773,
LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING = 774,
LANG_BG_GROUP_OFFLINE_MEMBER = 775,
LANG_BG_GROUP_MIXED_FACTION = 776,
LANG_BG_GROUP_MIXED_LEVELS = 777,
LANG_BG_GROUP_MEMBER_ALREADY_IN_QUEUE = 778,
LANG_BG_GROUP_MEMBER_DESERTER = 779,
LANG_BG_GROUP_MEMBER_NO_FREE_QUEUE_SLOTS = 780,
LANG_CANNOT_TELE_TO_BG = 741,
LANG_CANNOT_SUMMON_TO_BG = 742,
LANG_CANNOT_GO_TO_BG_GM = 743,
LANG_CANNOT_GO_TO_BG_FROM_BG = 744,
LANG_CANNOT_TELE_TO_BG = 781,
LANG_CANNOT_SUMMON_TO_BG = 782,
LANG_CANNOT_GO_TO_BG_GM = 783,
LANG_CANNOT_GO_TO_BG_FROM_BG = 784,
LANG_ARENA_TESTING = 745,
LANG_ARENA_TESTING = 785,
LANG_AUTO_ANN = 746,
LANG_ANNOUNCE_COLOR = 747,
LANG_AUTO_ANN = 786,
LANG_ANNOUNCE_COLOR = 787,
// in game strings
LANG_PET_INVALID_NAME = 800,