Permalink
Browse files

ID consistency updates

We have "(Id: %d)" 71 times and (Id:%d) 291 times in our entire GM. For
the sake of being consistent, let's go with the former.
  • Loading branch information...
George
George committed Feb 11, 2017
1 parent 66f82c2 commit 44a11dda582cf6293cca978857651bf38b2129dc
View
@@ -1,15 +1,15 @@
{
"TEST_MESSAGE": "Hello, world!",
"ABUSE_ANNOUNCE_DETECTED": "%s (Id: %d) has just abused %s (%s time).",
"ABUSE_ANNOUNCE_KICKED": "%s (Id: %d) has been kicked for %s.",
"ABUSE_ANNOUNCE_DETECTED": "%s (Id:%d) has just abused %s (%s time).",
"ABUSE_ANNOUNCE_KICKED": "%s (Id:%d) has been kicked for %s.",
"ANNOUNCE_ADMINISTRATORS": "{FFFF00}Admin notice{FFFFFF}: %s",
"ANNOUNCE_ALL": "{80CBC4}*** %s",
"ANNOUNCE_MINIGAME": "{CCD782}Sign up for the {838F31}%s{CCD782}! Type {838F31}%s{CCD782} to join.",
"ANNOUNCE_MINIGAME_JOINED_IRC": "%s (Id: %d) has signed up for the %s.",
"ANNOUNCE_MINIGAME_JOINED_IRC": "%s (Id:%d) has signed up for the %s.",
"ANNOUNCE_NEWS_MINIGAME_JOINED": "~r~~h~%s~w~ has signed up for ~y~%s~w~ (~p~%s~w~)",
"ANNOUNCE_REPORT": "{FFFF00}* Report by %s (Id: %d): Player: %s (Id: %d) - Reason: %s",
"ANNOUNCE_REPORT": "{FFFF00}* Report by %s (Id:%d): Player: %s (Id:%d) - Reason: %s",
"COMMAND_ERROR_INSUFFICIENT_RIGHTS": "@error Sorry, this command is only available to %s.",
"COMMAND_ERROR_INSUFFICIENT_RIGHTS_BETA": "@error Sorry, you must have a registered account in order to use this command.",
@@ -35,36 +35,36 @@
"GANG_ANNOUNCE_CREATED": "%s has just founded the %s gang!",
"GANG_ANNOUNCE_INTERNAL": "{29B6F6}*** %s",
"GANG_ANNOUNCE_INVITATION": "%s (Id: %d) has invited %s (Id: %d) to join the %s gang.",
"GANG_ANNOUNCE_INVITATION": "%s (Id:%d) has invited %s (Id:%d) to join the %s gang.",
"GANG_ANNOUNCE_JOINED": "%s has joined the %s gang!",
"GANG_ANNOUNCE_KICKED": "%s (Id: %d) has kicked %s from the %s gang.",
"GANG_ANNOUNCE_KICKED": "%s (Id:%d) has kicked %s from the %s gang.",
"GANG_ANNOUNCE_LEFT": "%s has left the %s gang!",
"GANG_ANNOUNCE_NEW_COLOR": "%s (Id: %d) updated %s gang's color to: %s",
"GANG_ANNOUNCE_NEW_GOAL": "%s (Id: %d) updated %s gang's goal to: %s",
"GANG_ANNOUNCE_NEW_NAME": "%s (Id: %d) updated %s gang's name to: %s",
"GANG_ANNOUNCE_NEW_TAG": "%s (Id: %d) updated %s gang's tag to: %s",
"GANG_ANNOUNCE_NEW_COLOR": "%s (Id:%d) updated %s gang's color to: %s",
"GANG_ANNOUNCE_NEW_GOAL": "%s (Id:%d) updated %s gang's goal to: %s",
"GANG_ANNOUNCE_NEW_NAME": "%s (Id:%d) updated %s gang's name to: %s",
"GANG_ANNOUNCE_NEW_TAG": "%s (Id:%d) updated %s gang's tag to: %s",
"GANG_CHAT": "{29B6F6}[%s] [%d] %s: %s",
"GANG_CHAT_ENCRYPTED": "{64DD17}$ {29B6F6}[%s] [%d] %s: %s",
"GANG_CHAT_NO_GANG": "{29B6F6}*** You need to be in a gang in order to use the gang chat.",
"GANG_CHAT_NO_GANG_FOUND": "{29B6F6}*** Cannot find the gang to send a remote message to for tag [%s].",
"GANG_CHAT_REMOTE_USAGE": "{29B6F6}*** Usage: !!TAG Your message",
"GANG_CHAT_REMOTE": "{29B6F6}[%s] [%d] %s {FFFF00}*{29B6F6}: %s",
"GANG_CHAT_SERVER_MUTED": "@error Sorry, an administrator is making an announcement.",
"GANG_CHAT_SPY": "{29B6F6}*** %s (Id: %d) has bought the Seti @ Home and will start receiving your gang chat!",
"GANG_CHAT_SPY": "{29B6F6}*** %s (Id:%d) has bought the Seti @ Home and will start receiving your gang chat!",
"GANG_CHAT_SPY_ENC": "{29B6F6}*** Mind that %s have encrypted their communication.",
"GANG_CREATE_INVALID_GOAL": "@error You must enter a valid goal when creating a gang.",
"GANG_CREATE_INVALID_NAME": "@error You must enter a valid name when creating a gang.",
"GANG_CREATE_INVALID_TAG": "@error You must enter a valid tag when creating a gang.",
"GANG_DID_CREATE": "@success You have created the gang %s, and are now its leader!",
"GANG_DID_INVITE": "@success You have invited %s (Id: %d) to join your gang.",
"GANG_DID_INVITE": "@success You have invited %s (Id:%d) to join your gang.",
"GANG_DID_JOIN": "@success You have joined the %s gang.",
"GANG_DID_LEAVE": "@success You have left the %s gang.",
"GANG_INFO_1": "{FFFFFF}Gangs are groups of players that have declared an alliance and fight",
"GANG_INFO_2": "{FFFFFF}together. They will persist between different playing sessions.",
"GANGS_INFO_PLAYER": "{29B6F6}*** %s (Id: %d) is a {B3E5FC}%s{29B6F6} of the {B3E5FC}%s{29B6F6} gang.",
"GANGS_INFO_PLAYER_NONE": "{29B6F6}*** %s (Id: %d) is not part of a gang.",
"GANG_INTERNAL_ANNOUNCE_INVITATION": "%s has invited %s (Id: %d) to your gang.",
"GANG_INTERNAL_ANNOUNCE_JOINED": "%s (Id: %d) has joined your gang.",
"GANGS_INFO_PLAYER": "{29B6F6}*** %s (Id:%d) is a {B3E5FC}%s{29B6F6} of the {B3E5FC}%s{29B6F6} gang.",
"GANGS_INFO_PLAYER_NONE": "{29B6F6}*** %s (Id:%d) is not part of a gang.",
"GANG_INTERNAL_ANNOUNCE_INVITATION": "%s has invited %s (Id:%d) to your gang.",
"GANG_INTERNAL_ANNOUNCE_JOINED": "%s (Id:%d) has joined your gang.",
"GANG_INTERNAL_ANNOUNCE_KICKED": "%s has kicked %s from your gang.",
"GANG_INTERNAL_ANNOUNCE_LEFT": "%s has left your gang.",
"GANG_INTERNAL_ANNOUNCE_NEW_COLOR": "%s has updated your gang's color to \"%s\".",
@@ -77,7 +77,7 @@
"GANG_INVITE_NO_MANAGER": "@error Only leaders and managers of a gang can invite new members.",
"GANG_INVITE_NOT_REGISTERED": "@error %s needs to register on https://sa-mp.nl/ before they can join your gang.",
"GANG_INVITE_SELF": "@error You cannot invite yourself, silly!",
"GANG_INVITED": "{B1FC17}*** %s (Id: %d) invites you to join %s. Type `/gang join` to accept!",
"GANG_INVITED": "{B1FC17}*** %s (Id:%d) invites you to join %s. Type `/gang join` to accept!",
"GANG_JOIN_IN_GANG": "@error You must leave the %s before you can accept this invitation.",
"GANG_JOIN_NO_INVITATION": "@error You have not been invited to join another gang.",
"GANG_KICK_AMBIGUOUS_MATCH": "@error Multiple members match your description: %s",
@@ -111,12 +111,12 @@
"GANGS_NOT_REGISTERED": "@error You need to register on https://sa-mp.nl/ before you can participate in a gang.",
"GANGS_ONLINE": "{%s}[%s]{FFFFFF} - %s ({B1FC17}%d player%s{FFFFFF})",
"HOUSE_ANNOUNCE_CREATED": "%s (Id: %d) has created a new house location.",
"HOUSE_ANNOUNCE_DELETED": "%s (Id: %d) has deleted a house location (Id: %d).",
"HOUSE_ANNOUNCE_EVICTED": "%s (Id: %d) has evicted %s from their house (Id: %d).",
"HOUSE_ANNOUNCE_PURCHASED": "%s (Id: %d) has purchased a house for %$.",
"HOUSE_ANNOUNCE_SOLD": "%s (Id: %d) has sold the %s house (Id: %d).",
"HOUSE_ANNOUNCE_TELEPORTED": "%s (Id: %d) has teleported to one of their houses.",
"HOUSE_ANNOUNCE_CREATED": "%s (Id:%d) has created a new house location.",
"HOUSE_ANNOUNCE_DELETED": "%s (Id:%d) has deleted a house location (Id:%d).",
"HOUSE_ANNOUNCE_EVICTED": "%s (Id:%d) has evicted %s from their house (Id:%d).",
"HOUSE_ANNOUNCE_PURCHASED": "%s (Id:%d) has purchased a house for %$.",
"HOUSE_ANNOUNCE_SOLD": "%s (Id:%d) has sold the %s house (Id:%d).",
"HOUSE_ANNOUNCE_TELEPORTED": "%s (Id:%d) has teleported to one of their houses.",
"HOUSE_BUY_CONFIRMED": "The Las Venturas Playground Real Estate Council hereby congratulates you with your purchase!",
"HOUSE_BUY_NO_LOCATION": "@error You need to stand in a house entrance to use this command.",
"HOUSE_BUY_NO_MULTIPLE": "@error You've reached the maximum number of houses you can own, sorry.",
@@ -160,12 +160,12 @@
"HOUSE_PARKING_LOT_TOO_FAR": "The parking lot must be within %d units from the property (you are %d units away). Try again?",
"HOUSE_PICKUP_ARMOUR_RESTORED": "{10F441}Your armour has been restored at the courtesy of %s!",
"HOUSE_PICKUP_ARMOUR_RESTORED_SELF": "{10F441}Your armour has been restored!",
"HOUSE_PICKUP_ARMOUR_USED": "{CCCCCC}* %s (Id: %d) has used the health pickup in one of your houses.",
"HOUSE_PICKUP_ARMOUR_USED": "{CCCCCC}* %s (Id:%d) has used the health pickup in one of your houses.",
"HOUSE_PICKUP_CAN_PURCHASE": "{10F441}This house is available for purchase, starting at %$. Type `{DDFFDD}/house buy{10F441}` if you're interested!",
"HOUSE_PICKUP_CANNOT_PURCHASE": "{CCCCCC}This house is available for purchase, starting at %$, but you cannot buy any more houses.",
"HOUSE_PICKUP_HEALTH_RESTORED": "{10F441}Your health has been restored at the courtesy of %s!",
"HOUSE_PICKUP_HEALTH_RESTORED_SELF": "{10F441}Your health has been restored!",
"HOUSE_PICKUP_HEALTH_USED": "{CCCCCC}* %s (Id: %d) has used the armour pickup in one of your houses.",
"HOUSE_PICKUP_HEALTH_USED": "{CCCCCC}* %s (Id:%d) has used the armour pickup in one of your houses.",
"HOUSE_PURCHASE_TOO_EXPENSIVE": "Sorry, you cannot purchase this house because you don't have enough money available.",
"HOUSE_REMOVE_UNKNOWN": "@error Unable to remove - you're not currently in an interactive operation.",
"HOUSE_SAVE_UNKNOWN": "@error Unable to confirm - you're not currently in an interactive operation.",
@@ -206,28 +206,28 @@
"LOCATION_NO_TELEPORT": "@error Sorry, the owner has locked the door because you %s!",
"LVP_ANNOUNCE_ADMIN_NOTICE": "%s (Id: %d) has %s the %s option.",
"LVP_ANNOUNCE_ADMIN_NOTICE": "%s (Id:%d) has %s the %s option.",
"LVP_ANNOUNCE_PARTY": "%s has %s the Pirate Ship Party mode!",
"LVP_ANNOUNCE_CMD_AVAILABLE": "%s has made the /%s command available to players.",
"LVP_ANNOUNCE_CMD_EXCEPTION": "%s (Id: %d) has allowed %s to use /%s.",
"LVP_ANNOUNCE_CMD_LEVEL": "%s (Id: %d) has changed the level of /%s to %s.",
"LVP_ANNOUNCE_CMD_REMOVED_EXCEPTION": "%s (Id: %d) has revoked %s ability to use /%s.",
"LVP_ANNOUNCE_CMD_EXCEPTION": "%s (Id:%d) has allowed %s to use /%s.",
"LVP_ANNOUNCE_CMD_LEVEL": "%s (Id:%d) has changed the level of /%s to %s.",
"LVP_ANNOUNCE_CMD_REMOVED_EXCEPTION": "%s (Id:%d) has revoked %s ability to use /%s.",
"LVP_ANNOUNCE_CMD_REVOKED": "%s has removed the /%s command from players again.",
"LVP_ANNOUNCE_FEATURE_RELOADED": "%s (Id: %d) has reloaded the '%s' feature.",
"LVP_ANNOUNCE_FEATURE_RELOADED": "%s (Id:%d) has reloaded the '%s' feature.",
"LVP_ANNOUNCE_PROFILE_FINISHED": "The profile initiated by %s has been concluded.",
"LVP_ANNOUNCE_PROFILE_START": "%s (Id: %d) has started profiling the JavaScript code for %dms.",
"LVP_ANNOUNCE_SETTING_TOGGLED": "%s (Id: %d) has %s the '%s' setting.",
"LVP_ANNOUNCE_SETTING_UPDATED_NUM": "%s (Id: %d) has updated the '%s' setting to '%d'.",
"LVP_CMD_EXCEPTION_GRANTED": "{ADFF2F}*** %s (Id: %d) has given you an exception to use /%s.",
"LVP_ANNOUNCE_PROFILE_START": "%s (Id:%d) has started profiling the JavaScript code for %dms.",
"LVP_ANNOUNCE_SETTING_TOGGLED": "%s (Id:%d) has %s the '%s' setting.",
"LVP_ANNOUNCE_SETTING_UPDATED_NUM": "%s (Id:%d) has updated the '%s' setting to '%d'.",
"LVP_CMD_EXCEPTION_GRANTED": "{ADFF2F}*** %s (Id:%d) has given you an exception to use /%s.",
"LVP_CMD_EXCEPTION_RESTORED": "{ADFF2F}*** Your %d command exceptions has been restored.",
"LVP_CMD_EXCEPTION_REVOKED": "{ADFF2F}*** %s (Id: %d) has removed your exception to use /%s.",
"LVP_JETPACK_ANNOUNCE": "%s (Id: %d) has %s a jetpack %s %s (Id: %d).",
"LVP_CMD_EXCEPTION_REVOKED": "{ADFF2F}*** %s (Id:%d) has removed your exception to use /%s.",
"LVP_JETPACK_ANNOUNCE": "%s (Id:%d) has %s a jetpack %s %s (Id:%d).",
"LVP_JETPACK_NOT_AVAILABLE_VW": "@error Sorry, you can't use the /jetpack command in this world!",
"LVP_JETPACK_GRANTED_OTHER": "@success %s (Id: %d) has been given a jetpack.",
"LVP_JETPACK_GRANTED_OTHER": "@success %s (Id:%d) has been given a jetpack.",
"LVP_JETPACK_GRANTED_SELF": "@success You have been given a jetpack, enjoy!",
"LVP_JETPACK_GRANTED": "{33AA33}%s (Id: %d) has given you a jetpack, enjoy!",
"LVP_JETPACK_REMOVED_OTHER": "{DC143C}The jetpack has been removed from %s (Id: %d).",
"LVP_JETPACK_REMOVED": "{DC143C}%s (Id: %d) has removed your jetpack.",
"LVP_JETPACK_GRANTED": "{33AA33}%s (Id:%d) has given you a jetpack, enjoy!",
"LVP_JETPACK_REMOVED_OTHER": "{DC143C}The jetpack has been removed from %s (Id:%d).",
"LVP_JETPACK_REMOVED": "{DC143C}%s (Id:%d) has removed your jetpack.",
"LVP_PLAYGROUND_HEADER": "Las Venturas Playground is the SA-MP server you're playing on.",
"LVP_PLAYGROUND_OPTIONS": "@usage /lvp %s [on/off]",
"LVP_PLAYGROUND_OPTION_STATUS": "The {FF8282}%s{FFFFFF} option is {FF8282}%s{FFFFFF}. Type {FF8282}/lvp %s [on/off]{FFFFFF} to change this.",
@@ -252,19 +252,19 @@
"RACE_COMMAND_JOIN": "{CCD782}You have signed up for the {838F31}%s{CCD782}!",
"RACE_COMMAND_LEFT": "{CCD782}You have left the {838F31}%s{CCD782}!",
"REPORT_MESSAGE": "{33AA33}Your report has been delivered to the crew{FFFFFF}: Player: %s (Id: %d) - Reason: %s",
"REPORT_MESSAGE": "{33AA33}Your report has been delivered to the crew{FFFFFF}: Player: %s (Id:%d) - Reason: %s",
"REPORT_ALREADY_REPORTED": "@error We have already received a report about %s and are on it. Thank you!",
"VEHICLE_ACCESS_CHANGED": "@success Access restrictions of the %s have been updated.",
"VEHICLE_ACCESS_RESTRICTED": "@info This %s is restricted to {FF8282}%s{FFFFFF}.",
"VEHICLE_ACCESS_UNRESTRICTED": "@info This %s does not have any restrictions.",
"VEHICLE_ACCESS_USAGE": "@usage /v [player]? access [%s]",
"VEHICLE_ANNOUNCE_ACCESS": "%s (Id: %d) has restricted a %s to %s.",
"VEHICLE_ANNOUNCE_ACCESS_LIFTED": "%s (Id: %d) has lifted restrictions from a %s.",
"VEHICLE_ANNOUNCE_DELETED": "%s (Id: %d) has deleted a %s from the database.",
"VEHICLE_ANNOUNCE_OPTIMISED": "%s (Id: %d) has optimised the streamer (%dms -> %dms, in %dms)",
"VEHICLE_ANNOUNCE_RESET": "%s (Id: %d) has reset the vehicle layout.",
"VEHICLE_ANNOUNCE_SAVED": "%s (Id: %d) has stored a %s in the database.",
"VEHICLE_ANNOUNCE_ACCESS": "%s (Id:%d) has restricted a %s to %s.",
"VEHICLE_ANNOUNCE_ACCESS_LIFTED": "%s (Id:%d) has lifted restrictions from a %s.",
"VEHICLE_ANNOUNCE_DELETED": "%s (Id:%d) has deleted a %s from the database.",
"VEHICLE_ANNOUNCE_OPTIMISED": "%s (Id:%d) has optimised the streamer (%dms -> %dms, in %dms)",
"VEHICLE_ANNOUNCE_RESET": "%s (Id:%d) has reset the vehicle layout.",
"VEHICLE_ANNOUNCE_SAVED": "%s (Id:%d) has stored a %s in the database.",
"VEHICLE_COLOR_CURRENT": "@info The vehicle's current colors are {FF8282}%d{FFFFFF} and {FF8282}%d{FFFFFF}.",
"VEHICLE_COLOR_UPDATED": "@success The vehicle's colors are updated to {FF8282}%d{FFFFFF} and {FF8282}%d{FFFFFF}.",
"VEHICLE_COLOR_USAGE": "@usage /v [player]? color [0-255]? [0-255]?",
@@ -928,7 +928,7 @@ lvp_p(playerId, params[]) {
}
GodHelp:
format(g_message, sizeof(g_message), "%s (Id: %d) currently has god mode {FFFF00}%s{FFFFFF}.",
format(g_message, sizeof(g_message), "%s (Id:%d) currently has god mode {FFFF00}%s{FFFFFF}.",
Player(subjectId)->nicknameString(), subjectId, (g_bPlayerGodmode[subjectId] ? "enabled": "disabled"));
SendClientMessage(playerId, Color::Information, g_message);
@@ -1162,7 +1162,7 @@ lvp_showreport(playerId, params[]) {
SendClientMessage(subjectId, Color::Warning, REPORT_MESSAGE);
// Inform the mutee.
format(g_message, sizeof(g_message), "You have been muted for two minutes by %s (Id: %d).",
format(g_message, sizeof(g_message), "You have been muted for two minutes by %s (Id:%d).",
Player(playerId)->nicknameString(), playerId);
SendClientMessage(subjectId, Color::Error, g_message);
@@ -1177,7 +1177,7 @@ lvp_showreport(playerId, params[]) {
Admin(playerId, g_message);
// Inform the muter.
format(g_message, sizeof(g_message), "%s (Id: %d) has been warned and muted for two minutes.",
format(g_message, sizeof(g_message), "%s (Id:%d) has been warned and muted for two minutes.",
Player(subjectId)->nicknameString(), subjectId);
SendClientMessage(playerId, Color::Success, g_message);
Oops, something went wrong.

0 comments on commit 44a11dd

Please sign in to comment.