diff options
| author | QAston <none@none> | 2009-04-07 20:40:00 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-07 20:40:00 +0200 |
| commit | 741b51cc471d8a3f897b7ded51e1d3122e3d8300 (patch) | |
| tree | 3c579933847679c780be6b672e00d636a32690dd /src/game/Language.h | |
| parent | 26b856a5135f51372cb1b15de21a0e995cdb6435 (diff) | |
| parent | c6b6a72956efdc10da8fac982db734b054984d08 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Language.h')
| -rw-r--r-- | src/game/Language.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/game/Language.h b/src/game/Language.h index b58a5b82b60..51df64227f8 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -272,9 +272,9 @@ enum TrinityStrings LANG_COMMAND_WHISPERON = 285, LANG_COMMAND_WHISPEROFF = 286, LANG_COMMAND_CREATGUIDNOTFOUND = 287, - // TICKET STRINGS NEED REWRITE // 288-296 FREE + // TICKET STRINGS NEED REWRITE // 288-296 FREE - // END + // END LANG_COMMAND_SPAWNDIST = 297, LANG_COMMAND_SPAWNTIME = 298, LANG_COMMAND_MODIFY_HONOR = 299, @@ -768,7 +768,7 @@ enum TrinityStrings // Room for more level 3 1128-1199 not used // AV - LANG_BG_AV_ALLY = 1200, + LANG_BG_AV_ALLY = 1200, LANG_BG_AV_HORDE = 1201, LANG_BG_AV_TOWER_TAKEN = 1202, LANG_BG_AV_TOWER_ASSAULTED = 1203, @@ -806,24 +806,24 @@ enum TrinityStrings LANG_BG_AV_A_CAPTAIN_DEAD = 1232, // FREE IDS 1233-9999 - // Ticket Strings 2000-2029 - LANG_COMMAND_TICKETNEW = 2000, + // Ticket Strings 2000-2029 + LANG_COMMAND_TICKETNEW = 2000, LANG_COMMAND_TICKETUPDATED = 2001, - LANG_COMMAND_TICKETPLAYERABANDON = 2002, - LANG_COMMAND_TICKETCLOSED = 2003, - LANG_COMMAND_TICKETDELETED = 2004, - LANG_COMMAND_TICKETNOTEXIST = 2005, - LANG_COMMAND_TICKETCLOSEFIRST = 2006, - LANG_COMMAND_TICKETALREADYASSIGNED = 2007, - LANG_COMMAND_TICKETRELOAD = 2008, - LANG_COMMAND_TICKETSHOWLIST = 2009, - LANG_COMMAND_TICKETSHOWONLINELIST = 2010, - LANG_COMMAND_TICKETSHOWCLOSEDLIST = 2011, - LANG_COMMAND_TICKETASSIGNERROR_A = 2012, - LANG_COMMAND_TICKETASSIGNERROR_B = 2013, - LANG_COMMAND_TICKETNOTASSIGNED = 2014, - LANG_COMMAND_TICKETUNASSIGNSECURITY = 2015, - LANG_COMMAND_TICKETCANNOTCLOSE = 2016, + LANG_COMMAND_TICKETPLAYERABANDON = 2002, + LANG_COMMAND_TICKETCLOSED = 2003, + LANG_COMMAND_TICKETDELETED = 2004, + LANG_COMMAND_TICKETNOTEXIST = 2005, + LANG_COMMAND_TICKETCLOSEFIRST = 2006, + LANG_COMMAND_TICKETALREADYASSIGNED = 2007, + LANG_COMMAND_TICKETRELOAD = 2008, + LANG_COMMAND_TICKETSHOWLIST = 2009, + LANG_COMMAND_TICKETSHOWONLINELIST = 2010, + LANG_COMMAND_TICKETSHOWCLOSEDLIST = 2011, + LANG_COMMAND_TICKETASSIGNERROR_A = 2012, + LANG_COMMAND_TICKETASSIGNERROR_B = 2013, + LANG_COMMAND_TICKETNOTASSIGNED = 2014, + LANG_COMMAND_TICKETUNASSIGNSECURITY = 2015, + LANG_COMMAND_TICKETCANNOTCLOSE = 2016, LANG_COMMAND_TICKETLISTGUID = 2017, LANG_COMMAND_TICKETLISTNAME = 2018, LANG_COMMAND_TICKETLISTAGE = 2019, @@ -842,7 +842,7 @@ enum TrinityStrings LANG_COMMAND_NO_FROZEN_PLAYERS = 5004, LANG_COMMAND_LIST_FREEZE = 5005, LANG_COMMAND_FROZEN_PLAYERS = 5006, - //LANG_INSTANCE_MUST_RAID_GRP = 5007, + LANG_INSTANCE_RAID_GROUP_ONLY = 5007, //LANG_INSTANCE_NOT_AS_GHOST = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, // Room for more Trinity strings 5010-9999 @@ -925,7 +925,7 @@ enum TrinityStrings LANG_OPVP_EP_FLIGHT_CGT = 10053, LANG_OPVP_ZM_GOSSIP_ALLIANCE = 10054, LANG_OPVP_ZM_GOSSIP_HORDE = 10055, - + // Use for custom patches 11000-11999 // NOT RESERVED IDS 12000-1999999999 |