From 3d52704c5d3211fd6928baeaf11f96824ea51aa8 Mon Sep 17 00:00:00 2001 From: korikisulda Date: Tue, 20 Jan 2015 15:23:01 +0000 Subject: [PATCH] Changed TL to use numbered strings --- .../massivecraft/factions/zcore/util/TL.java | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index 5cc511f7..003495b7 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -47,25 +47,25 @@ public enum TL { /** * Command translations */ - COMMAND_ADMIN_NOTMEMBER("%s is not a member in your faction."), + COMMAND_ADMIN_NOTMEMBER("%1$s is not a member in your faction."), COMMAND_ADMIN_NOTADMIN("You are not the faction admin."), COMMAND_ADMIN_TARGETSELF("The target player musn't be yourself."), - COMMAND_ADMIN_DEMOTES("You have demoted %s from the position of faction admin."), - COMMAND_ADMIN_DEMOTED("You have been demoted from the position of faction admin by %s."), - COMMAND_ADMIN_PROMOTES("You have promoted %s to the position of faction admin."), - COMMAND_ADMIN_PROMOTED("%s gave %s the leadership of %s."), + COMMAND_ADMIN_DEMOTES("You have demoted %1$s from the position of faction admin."), + COMMAND_ADMIN_DEMOTED("You have been demoted from the position of faction admin by %1$s."), + COMMAND_ADMIN_PROMOTES("You have promoted %1$s to the position of faction admin."), + COMMAND_ADMIN_PROMOTED("%1$s gave %2$s the leadership of %3$s."), - COMMAND_AUTOCLAIM_ENABLED("Now auto-claiming land for %s."), + COMMAND_AUTOCLAIM_ENABLED("Now auto-claiming land for %1$s."), COMMAND_AUTOCLAIM_DISABLED("Auto-claiming of land disabled."), - COMMAND_AUTOCLAIM_REQUIREDRANK("You must be %s to claim land."), - COMMAND_AUTOCLAIM_OTHERFACTION("You can't claim land for %s."), + COMMAND_AUTOCLAIM_REQUIREDRANK("You must be %1$s to claim land."), + COMMAND_AUTOCLAIM_OTHERFACTION("You can't claim land for %1$s."), COMMAND_AUTOHELP_HELPFOR("Help for command \""), COMMAND_BOOM_PEACEFULONLY("This command is only usable by factions which are specifically designated as peaceful."), COMMAND_BOOM_TOTOGGLE("to toggle explosions"), COMMAND_BOOM_FORTOGGLE("for toggling explosions"), - COMMAND_BOOM_ENABLED("%s has %s explosions in your faction's territory."), + COMMAND_BOOM_ENABLED("%1$s has %2$s explosions in your faction's territory."), COMMAND_BYPASS_ENABLE("You have enabled admin bypass mode. You will be able to build or destroy anywhere."), COMMAND_BYPASS_ENABLELOG(" has ENABLED admin bypass mode."), @@ -87,27 +87,27 @@ public enum TL { COMMAND_CLAIM_INVALIDRADIUS("If you specify a radius, it must be at least 1."), COMMAND_CLAIM_DENIED("You do not have permission to claim in a radius."), - COMMAND_CONFIG_NOEXIST("No configuration setting \"%s\" exists."), + COMMAND_CONFIG_NOEXIST("No configuration setting \"%1$s\" exists."), COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."), COMMAND_CONFIG_SET_FALSE("\" option set to false (disabled)."), COMMAND_CONFIG_OPTIONSET("\" option set to "), COMMAND_CONFIG_COLOURSET("\" color option set to \""), - COMMAND_CONFIG_INTREQUIRED("Cannot set \"%s\": An integer (whole number) value required."), - COMMAND_CONFIG_LONGREQUIRED("Cannot set \"%s\": A long integer (whole number) value required."), - COMMAND_CONFIG_DOUBLEREQUIRED("Cannot set \"%s\": A double (numeric) value required."), - COMMAND_CONFIG_FLOATREQUIRED("Cannot set \"%s\": A float (numeric) value required."), - COMMAND_CONFIG_INVALID_COLOUR("Cannot set \"%s\": \"%s\" is not a valid color."), - COMMAND_CONFIG_INVALID_COLLECTION("\"%s\" is not a data collection type which can be modified with this command."), - COMMAND_CONFIG_INVALID_MATERIAL("Cannot change \"%s\" set: \"%s\" is not a valid material."), - COMMAND_CONFIG_INVALID_TYPESET("\"%s\" is not a data type set which can be modified with this command."), - COMMAND_CONFIG_MATERIAL_ADDED("\"%s\" set: Material \"%s\" added."), - COMMAND_CONFIG_MATERIAL_REMOVED("\"%s\" set: Material \"%s\" removed."), - COMMAND_CONFIG_SET_ADDED("\"%s\" set: \"%s\" added."), - COMMAND_CONFIG_SET_REMOVED("\"%s\" set: \"%s\" removed."), - COMMAND_CONFIG_LOG(" (Command was run by %s.)"), - COMMAND_CONFIG_ERROR_SETTING("Error setting configuration setting \"%s\" to \"%s\"."), - COMMAND_CONFIG_ERROR_MATCHING("Configuration setting \"%s\" couldn't be matched, though it should be... please report this error."), - COMMAND_CONFIG_ERROR_TYPE("'%s' is of type '%s', which cannot be modified with this command."), + COMMAND_CONFIG_INTREQUIRED("Cannot set \"%1$s\": An integer (whole number) value required."), + COMMAND_CONFIG_LONGREQUIRED("Cannot set \"%1$s\": A long integer (whole number) value required."), + COMMAND_CONFIG_DOUBLEREQUIRED("Cannot set \"%1$s\": A double (numeric) value required."), + COMMAND_CONFIG_FLOATREQUIRED("Cannot set \"%1$s\": A float (numeric) value required."), + COMMAND_CONFIG_INVALID_COLOUR("Cannot set \"%1$s\": \"%2$s\" is not a valid color."), + COMMAND_CONFIG_INVALID_COLLECTION("\"%1$s\" is not a data collection type which can be modified with this command."), + COMMAND_CONFIG_INVALID_MATERIAL("Cannot change \"%1$s\" set: \"%2$s\" is not a valid material."), + COMMAND_CONFIG_INVALID_TYPESET("\"%1$s\" is not a data type set which can be modified with this command."), + COMMAND_CONFIG_MATERIAL_ADDED("\"%1$s\" set: Material \"%2$s\" added."), + COMMAND_CONFIG_MATERIAL_REMOVED("\"%1$s\" set: Material \"%2$s\" removed."), + COMMAND_CONFIG_SET_ADDED("\"%1$s\" set: \"%2$s\" added."), + COMMAND_CONFIG_SET_REMOVED("\"%1$s\" set: \"%2$s\" removed."), + COMMAND_CONFIG_LOG(" (Command was run by %1$s.)"), + COMMAND_CONFIG_ERROR_SETTING("Error setting configuration setting \"%1$s\" to \"%2$s\"."), + COMMAND_CONFIG_ERROR_MATCHING("Configuration setting \"%1$s\" couldn't be matched, though it should be... please report this error."), + COMMAND_CONFIG_ERROR_TYPE("'%1$s' is of type '%2$s', which cannot be modified with this command."), COMMAND_CONVERT_BACKEND_RUNNING("command.convert.backend.running", "Already running that backend."), COMMAND_CONVERT_BACKEND_INVALID("command.convert.backend.invalid", "Invalid backend"), @@ -117,37 +117,37 @@ public enum TL { COMMAND_CREATE_TOCREATE("to create a new faction"), COMMAND_CREATE_FORCREATE("for creating a new faction"), COMMAND_CREATE_ERROR("There was an internal error while trying to create your faction. Please try again."), - COMMAND_CREATE_CREATED("%s created a new faction %s"), - COMMAND_CREATE_YOUSHOULD("You should now: %s"), + COMMAND_CREATE_CREATED("%1$s created a new faction %2$s"), + COMMAND_CREATE_YOUSHOULD("You should now: %1$s"), COMMAND_CREATE_CREATEDLOG(" created a new faction: "), COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "), - COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %s"), - COMMAND_DEINVITE_ALREADYMEMBER("%s is already a member of %s"), - COMMAND_DEINVITE_MIGHTWANT("You might want to: %s"), - COMMAND_DEINVITE_REVOKED("%s revoked your invitation to %s."), - COMMAND_DEINVITE_REVOKES("%s revoked %s's invitation."), + COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %1$s"), + COMMAND_DEINVITE_ALREADYMEMBER("%1$s is already a member of %2$s"), + COMMAND_DEINVITE_MIGHTWANT("You might want to: %1$s"), + COMMAND_DEINVITE_REVOKED("%1$s revoked your invitation to %2$s."), + COMMAND_DEINVITE_REVOKES("%1$s revoked %2$s's invitation."), - COMMAND_DELFWARP_DELETED("Deleted warp %s"), - COMMAND_DELFWARP_INVALID("Couldn't find warp %s"), + COMMAND_DELFWARP_DELETED("Deleted warp %1$s"), + COMMAND_DELFWARP_INVALID("Couldn't find warp %1$s"), COMMAND_DELFWARP_TODELETE("to delete warp"), COMMAND_DELFWARP_FORDELETE("for deleting warp"), - COMMAND_DESCRIPTION_CHANGES("You have changed the description for %s to:"), - COMMAND_DESCRIPTION_CHANGED("The faction %s changed their description to:"), + COMMAND_DESCRIPTION_CHANGES("You have changed the description for %1$s to:"), + COMMAND_DESCRIPTION_CHANGED("The faction %1$s changed their description to:"), COMMAND_DESCRIPTION_TOCHANGE("to change faction description"), COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"), COMMAND_DISBAND_IMMUTABLE("You cannot disband the Wilderness, SafeZone, or WarZone."), COMMAND_DISBAND_MARKEDPERMANENT("This faction is designated as permanent, so you cannot disband it."), - COMMAND_DISBAND_BROADCAST_YOURS("%s disbanded your faction."), - COMMAND_DISBAND_BROADCAST_NOTYOURS("%s disbanded the faction %s."), - COMMAND_DISBAND_HOLDINGS("You have been given the disbanded faction's bank, totaling %s."), + COMMAND_DISBAND_BROADCAST_YOURS("%1$s disbanded your faction."), + COMMAND_DISBAND_BROADCAST_NOTYOURS("%1$s disbanded the faction %2$s."), + COMMAND_DISBAND_HOLDINGS("You have been given the disbanded faction's bank, totaling %1$s."), COMMAND_FWARP_CLICKTOWARP("Click to warp!"), COMMAND_FWARP_COMMANDFORMAT("/f warp "), - COMMAND_FWARP_WARPED("Warped to %s"), - COMMAND_FWARP_INVALID("Couldn't find warp %s"), + COMMAND_FWARP_WARPED("Warped to %1$s"), + COMMAND_FWARP_INVALID("Couldn't find warp %1$s"), COMMAND_FWARP_TOWARP("to warp"), COMMAND_FWARP_FORWARPING("for warping"), COMMAND_FWARP_WARPS("Warps: "), @@ -205,37 +205,37 @@ public enum TL { COMMAND_INVITE_FORINVITE("for inviting someone"), COMMAND_INVITE_CLICKTOJOIN("Click to join!"), COMMAND_INVITE_INVITEDYOU(" has invited you to join "), - COMMAND_INVITE_INVITED("%s invited %s to your faction."), - COMMAND_INVITE_ALREADYMEMBER("%s is already a member of %s"), + COMMAND_INVITE_INVITED("%1$s invited %2$s to your faction."), + COMMAND_INVITE_ALREADYMEMBER("%1$s is already a member of %2$s"), COMMAND_JOIN_CANNOTFORCE("You do not have permission to move other players into a faction."), COMMAND_JOIN_SYSTEMFACTION("Players may only join normal factions. This is a system faction."), - COMMAND_JOIN_ALREADYMEMBER("%s %s already a member of %s"), - COMMAND_JOIN_ATLIMIT(" ! The faction %s is at the limit of %d members, so %s cannot currently join."), - COMMAND_JOIN_INOTHERFACTION("%s must leave %s current faction first."), - COMMAND_JOIN_NEGATIVEPOWER("%s cannot join a faction with a negative power level."), + COMMAND_JOIN_ALREADYMEMBER("%1$s %2$s already a member of %3$s"), + COMMAND_JOIN_ATLIMIT(" ! The faction %1$s is at the limit of %2$d members, so %3$s cannot currently join."), + COMMAND_JOIN_INOTHERFACTION("%1$s must leave %2$s current faction first."), + COMMAND_JOIN_NEGATIVEPOWER("%1$s cannot join a faction with a negative power level."), COMMAND_JOIN_REQUIRESINVITATION("This faction requires invitation."), - COMMAND_JOIN_ATTEMPTEDJOIN("%s tried to join your faction."), + COMMAND_JOIN_ATTEMPTEDJOIN("%1$s tried to join your faction."), COMMAND_JOIN_TOJOIN("to join a faction"), COMMAND_JOIN_FORJOIN("for joining a faction"), - COMMAND_JOIN_SUCCESS("%s successfully joined %s."), - COMMAND_JOIN_MOVED("%s moved you into the faction %s."), - COMMAND_JOIN_JOINED("%s joined your faction."), - COMMAND_JOIN_JOINEDLOG("%s joined the faction %s."), - COMMAND_JOIN_MOVEDLOG("%s moved the player %s into the faction %s."), + COMMAND_JOIN_SUCCESS("%1$s successfully joined %2$s."), + COMMAND_JOIN_MOVED("%1$s moved you into the faction %2$s."), + COMMAND_JOIN_JOINED("%1$s joined your faction."), + COMMAND_JOIN_JOINEDLOG("%1$s joined the faction %2$s."), + COMMAND_JOIN_MOVEDLOG("%1$s moved the player %2$s into the faction %3$s."), COMMAND_KICK_CANDIDATES("Players you can kick: "), COMMAND_KICK_CLICKTOKICK("Click to kick "), COMMAND_KICK_SELF("You cannot kick yourself."), COMMAND_KICK_NONE("That player is not in a faction."), - COMMAND_KICK_NOTMEMBER("%s is not a member of %s"), + COMMAND_KICK_NOTMEMBER("%1$s is not a member of %2$s"), COMMAND_KICK_INSUFFICIENTRANK("Your rank is too low to kick this player."), COMMAND_KICK_NEGATIVEPOWER("You cannot kick that member until their power is positive."), COMMAND_KICK_TOKICK("to kick someone from the faction"), COMMAND_KICK_FORKICK("for kicking someone from the faction"), - COMMAND_KICK_FACTION("%s kicked %s from the faction! :O"), //message given to faction members - COMMAND_KICK_KICKS("You kicked %s from the faction %s!"), //kicker perspective - COMMAND_KICK_KICKED("%s kicked you from %s! :O"), //kicked player perspective + COMMAND_KICK_FACTION("%1$s kicked %2$s from the faction! :O"), //message given to faction members + COMMAND_KICK_KICKS("You kicked %1$s from the faction %2$s!"), //kicker perspective + COMMAND_KICK_KICKED("%1$s kicked you from %2$s! :O"), //kicked player perspective COMMAND_LIST_FACTIONLIST("Faction List "), @@ -255,16 +255,16 @@ public enum TL { COMMAND_MOD_CANDIDATES("Players you can promote: "), COMMAND_MOD_CLICKTOPROMOTE("Click to promote "), - COMMAND_MOD_NOTMEMBER("%s is not a member in your faction."), + COMMAND_MOD_NOTMEMBER("%1$s is not a member in your faction."), COMMAND_MOD_NOTADMIN("You are not the faction admin."), COMMAND_MOD_SELF("The target player musn't be yourself."), COMMAND_MOD_TARGETISADMIN("The target player is a faction admin. Demote them first."), - COMMAND_MOD_REVOKES("You have removed moderator status from %s."), - COMMAND_MOD_REVOKED("%s is no longer moderator in your faction."), - COMMAND_MOD_PROMOTES("%s was promoted to moderator in your faction."), - COMMAND_MOD_PROMOTED("You have promoted %s to moderator."), + COMMAND_MOD_REVOKES("You have removed moderator status from %1$s."), + COMMAND_MOD_REVOKED("%1$s is no longer moderator in your faction."), + COMMAND_MOD_PROMOTES("%1$s was promoted to moderator in your faction."), + COMMAND_MOD_PROMOTED("You have promoted %1$s to moderator."), - COMMAND_MODIFYPOWER_ADDED("Added %f power to %s. New total rounded power: %d"), + COMMAND_MODIFYPOWER_ADDED("Added %1$f power to %2$s. New total rounded power: %3$d"), COMMAND_MONEY_SHORT("faction money commands"), COMMAND_MONEY_LONG("The faction money commands."), @@ -272,69 +272,69 @@ public enum TL { COMMAND_MONEYBALANCE_SHORT("show faction balance"), COMMAND_MONEYDEPOSIT_SHORT("deposit money"), - COMMAND_MONEYDEPOSIT_DEPOSITED("%s deposited %s in the faction bank: %s"), + COMMAND_MONEYDEPOSIT_DEPOSITED("%1$s deposited %2$s in the faction bank: %3$s"), COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"), - COMMAND_MONEYTRANSFERFF_TRANSFER("%s transferred %s from the faction \"%s\" to the faction \"%s\""), + COMMAND_MONEYTRANSFERFF_TRANSFER("%1$s transferred %2$s from the faction \"%3$s\" to the faction \"%4$s\""), COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"), - COMMAND_MONEYTRANSFERFP_TRANSFER("%s transferred %s from the faction \"%s\" to the player \"%s\""), + COMMAND_MONEYTRANSFERFP_TRANSFER("%1$s transferred %2$s from the faction \"%3$s\" to the player \"%4$s\""), COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"), - COMMAND_MONEYTRANSFERPF_TRANSFER("%s transferred %s from the player \"%s\" to the faction \"%s\""), + COMMAND_MONEYTRANSFERPF_TRANSFER("%1$s transferred %2$s from the player \"%3$s\" to the faction \"%4$s\""), COMMAND_MONEYWITHDRAW_SHORT("withdraw money"), - COMMAND_MONEYWITHDRAW_WITHDRAW("%s withdrew %s from the faction bank: %s"), + COMMAND_MONEYWITHDRAW_WITHDRAW("%1$s withdrew %2$s from the faction bank: %3$s"), COMMAND_OPEN_TOOPEN("to open or close the faction"), COMMAND_OPEN_FOROPEN("for opening or closing the faction"), COMMAND_OPEN_OPEN("open"), COMMAND_OPEN_CLOSED("closed"), - COMMAND_OPEN_CHANGES("%s changed the faction to %s."), - COMMAND_OPEN_CHANGED("The faction %s is now %s"), + COMMAND_OPEN_CHANGES("%1$s changed the faction to %2$s."), + COMMAND_OPEN_CHANGED("The faction %1$s is now %2$s"), COMMAND_OWNER_DISABLED("Sorry, but owned areas are disabled on this server."), - COMMAND_OWNER_LIMIT("Sorry, but you have reached the server's limit of %d owned areas per faction."), + COMMAND_OWNER_LIMIT("Sorry, but you have reached the server's limit of %1$d owned areas per faction."), COMMAND_OWNER_WRONGFACTION("This land is not claimed by your faction, so you can't set ownership of it."), COMMAND_OWNER_NOTCLAIMED("This land is not claimed by a faction. Ownership is not possible."), - COMMAND_OWNER_NOTMEMBER("%s is not a member of this faction."), + COMMAND_OWNER_NOTMEMBER("%1$s is not a member of this faction."), COMMAND_OWNER_CLEARED("You have cleared ownership for this claimed area."), - COMMAND_OWNER_REMOVED("You have removed ownership of this claimed land from %s."), + COMMAND_OWNER_REMOVED("You have removed ownership of this claimed land from %1$s."), COMMAND_OWNER_TOSET("to set ownership of claimed land"), COMMAND_OWNER_FORSET("for setting ownership of claimed land"), - COMMAND_OWNER_ADDED("You have added %s to the owner list for this claimed land."), + COMMAND_OWNER_ADDED("You have added %1$s to the owner list for this claimed land."), COMMAND_OWNERLIST_DISABLED("Sorry, but owned areas are disabled on this server."),//dup-> COMMAND_OWNERLIST_WRONGFACTION("This land is not claimed by your faction."),//eq COMMAND_OWNERLIST_NOTCLAIMED("This land is not claimed by any faction, thus no owners."),//eq COMMAND_OWNERLIST_NONE("No owners are set here; everyone in the faction has access."), - COMMAND_OWNERLIST_OWNERS("Current owner(s) of this land: %s"), + COMMAND_OWNERLIST_OWNERS("Current owner(s) of this land: %1$s"), COMMAND_POWER_TOSHOW("to show player power info"), COMMAND_POWER_FORSHOW("for showing player power info"), - COMMAND_POWER_POWER("%s - Power / Maxpower: %d / %d %s"), + COMMAND_POWER_POWER("%1$s - Power / Maxpower: %2$d / %3$d %4$s"), COMMAND_POWER_BONUS(" (bonus: "), COMMAND_POWER_PENALTY(" (penalty: "), COMMAND_POWERBOOST_HELP_1("You must specify \"p\" or \"player\" to target a player or \"f\" or \"faction\" to target a faction."), COMMAND_POWERBOOST_HELP_2("ex. /f powerboost p SomePlayer 0.5 -or- /f powerboost f SomeFaction -5"), COMMAND_POWERBOOST_INVALIDNUM("You must specify a valid numeric value for the power bonus/penalty amount."), - COMMAND_POWERBOOST_PLAYER("Player \"%s\""), - COMMAND_POWERBOOST_FACTION("Faction \"%s\""), - COMMAND_POWERBOOST_BOOST("%s now has a power bonus/penalty of %d to min and max power levels."), - COMMAND_POWERBOOST_BOOSTLOG("%s has set the power bonus/penalty for %s to %d."), + COMMAND_POWERBOOST_PLAYER("Player \"%1$s\""), + COMMAND_POWERBOOST_FACTION("Faction \"%1$s\""), + COMMAND_POWERBOOST_BOOST("%1$s now has a power bonus/penalty of %2$d to min and max power levels."), + COMMAND_POWERBOOST_BOOSTLOG("%1$s has set the power bonus/penalty for %2$s to %3$d."), - COMMAND_RELOAD_TIME("Reloaded conf.json from disk, took %dms."), + COMMAND_RELOAD_TIME("Reloaded conf.json from disk, took %1$d ms."), COMMAND_SAFEUNCLAIMALL_SHORT("Unclaim all safezone land"), COMMAND_SAFEUNCLAIMALL_UNCLAIMED("You unclaimed ALL safe zone land."), - COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG("%s unclaimed all safe zones."), + COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG("%1$s unclaimed all safe zones."), COMMAND_SAVEALL("Factions saved to disk!"), COMMAND_SETFWARP_NOTCLAIMED("You can only set warps in your faction territory."), - COMMAND_SETFWARP_LIMIT("Your Faction already has the max amount of warps set (%d)."), - COMMAND_SETFWARP_SET("Set warp %s to your location."), + COMMAND_SETFWARP_LIMIT("Your Faction already has the max amount of warps set (%1$d)."), + COMMAND_SETFWARP_SET("Set warp %1$s to your location."), COMMAND_SETFWARP_TOSET("to set warp"), COMMAND_SETFWARP_FORSET("for setting warp"), @@ -342,82 +342,82 @@ public enum TL { COMMAND_SETHOME_NOTCLAIMED("Sorry, your faction home can only be set inside your own claimed territory."), COMMAND_SETHOME_TOSET("to set the faction home"), COMMAND_SETHOME_FORSET("for setting the faction home"), - COMMAND_SETHOME_SET("%s set the home for your faction. You can now use:"), - COMMAND_SETHOME_SETOTHER("You have set the home for the %s faction."), + COMMAND_SETHOME_SET("%1$s set the home for your faction. You can now use:"), + COMMAND_SETHOME_SETOTHER("You have set the home for the %1$s faction."), COMMAND_SHOW_NOFACTION_SELF("You are not in a faction"), COMMAND_SHOW_NOFACTION_OTHER("That's not a faction"), COMMAND_SHOW_TOSHOW("to show faction information"), COMMAND_SHOW_FORSHOW("for showing faction information"), - COMMAND_SHOW_DESCRIPTION("Description: %s"), + COMMAND_SHOW_DESCRIPTION("Description: %1$s"), COMMAND_SHOW_PEACEFUL("This faction is Peaceful"), COMMAND_SHOW_PERMANENT("This faction is permanent, remaining even with no members."), - COMMAND_SHOW_JOINING("Joining: %s "), + COMMAND_SHOW_JOINING("Joining: %1$s "), COMMAND_SHOW_INVITATION("invitation is required"), COMMAND_SHOW_UNINVITED("no invitation is needed"), - COMMAND_SHOW_POWER("Land / Power / Maxpower: %d/%d/%d %s"), + COMMAND_SHOW_POWER("Land / Power / Maxpower: %1$d/%2$d/%3$d %4$s"), COMMAND_SHOW_BONUS(" (bonus: "), COMMAND_SHOW_PENALTY(" (penalty: "), - COMMAND_SHOW_DEPRECIATED("(%s depreciated)"), //This is spelled correctly. - COMMAND_SHOW_LANDVALUE("Total land value: %s%s"), - COMMAND_SHOW_BANKCONTAINS("Bank contains: %s"), + COMMAND_SHOW_DEPRECIATED("(%1$s depreciated)"), //This is spelled correctly. + COMMAND_SHOW_LANDVALUE("Total land value: %1$s %2$s"), + COMMAND_SHOW_BANKCONTAINS("Bank contains: %1$s"), COMMAND_SHOW_ALLIES("Allies: "), COMMAND_SHOW_ENEMIES("Enemies: "), COMMAND_SHOW_MEMBERSONLINE("Members online: "), COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), - COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %s"), + COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %1$s"), - COMMAND_STATUS_FORMAT("%s Power: %s Last Seen: %s"), + COMMAND_STATUS_FORMAT("%1$s Power: %2$s Last Seen: %3$s"), COMMAND_STATUS_ONLINE("Online"), COMMAND_STATUS_AGOSUFFIX(" ago."), COMMAND_TAG_TAKEN("That tag is already taken"), COMMAND_TAG_TOCHANGE("to change the faction tag"), COMMAND_TAG_FORCHANGE("for changing the faction tag"), - COMMAND_TAG_FACTION("%s changed your faction tag to %s"), - COMMAND_TAG_CHANGED("The faction %s changed their name to %s."), + COMMAND_TAG_FACTION("%1$s changed your faction tag to %2$s"), + COMMAND_TAG_CHANGED("The faction %1$s changed their name to %2$s."), COMMAND_TITLE_TOCHANGE("to change a players title"), COMMAND_TITLE_FORCHANGE("for changing a players title"), - COMMAND_TITLE_CHANGED("%s changed a title: %s"), + COMMAND_TITLE_CHANGED("%1$s changed a title: %2$s"), COMMAND_UNCLAIM_SAFEZONE_SUCCESS("Safe zone was unclaimed."), COMMAND_UNCLAIM_SAFEZONE_NOPERM("This is a safe zone. You lack permissions to unclaim."), COMMAND_UNCLAIM_WARZONE_SUCCESS("War zone was unclaimed."), COMMAND_UNCLAIM_WARZONE_NOPERM("This is a war zone. You lack permissions to unclaim."), - COMMAND_UNCLAIM_UNCLAIMED("%s unclaimed some of your land."), + COMMAND_UNCLAIM_UNCLAIMED("%1$s unclaimed some of your land."), COMMAND_UNCLAIM_UNCLAIMS("You unclaimed this land."), - COMMAND_UNCLAIM_LOG("%s unclaimed land at (%s) from the faction: %s"), + COMMAND_UNCLAIM_LOG("%1$s unclaimed land at (%2$s) from the faction: %3$s"), COMMAND_UNCLAIM_WRONGFACTION("You don't own this land."), COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"), COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"), - COMMAND_UNCLAIM_FACTIONUNCLAIMED("%s unclaimed some land."), + COMMAND_UNCLAIM_FACTIONUNCLAIMED("%1$s unclaimed some land."), COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"), COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"), - COMMAND_UNCLAIMALL_UNCLAIMED("%s unclaimed ALL of your faction's land."), - COMMAND_UNCLAIMALL_LOG("%s unclaimed everything for the faction: %s"), + COMMAND_UNCLAIMALL_UNCLAIMED("%1$s unclaimed ALL of your faction's land."), + COMMAND_UNCLAIMALL_LOG("%1$s unclaimed everything for the faction: %2$s"), - COMMAND_VERSION_VERSION("You are running %s"), + COMMAND_VERSION_VERSION("You are running %1$s"), COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"), COMMAND_WARUNCLAIMALL_SUCCESS("You unclaimed ALL war zone land."), - COMMAND_WARUNCLAIMALL_LOG("%s unclaimed all war zones."), + COMMAND_WARUNCLAIMALL_LOG("%1$s unclaimed all war zones."), COMMAND_RELATIONS_ALLTHENOPE("Nope! You can't."), COMMAND_RELATIONS_MORENOPE("Nope! You can't declare a relation to yourself :)"), - COMMAND_RELATIONS_ALREADYINRELATIONSHIP("You already have that relation wish set with %s."), + COMMAND_RELATIONS_ALREADYINRELATIONSHIP("You already have that relation wish set with %1$s."), COMMAND_RELATIONS_TOMARRY("to change a relation wish"), COMMAND_RELATIONS_FORMARRY("for changing a relation wish"), - COMMAND_RELATIONS_MUTUAL("Your faction is now %s to %s"), + COMMAND_RELATIONS_MUTUAL("Your faction is now %1$s to %2$s"), COMMAND_RELATIONS_PEACEFUL("This will have no effect while your faction is peaceful."), COMMAND_RELATIONS_PEACEFULOTHER("This will have no effect while their faction is peaceful."), - COMMAND_RELATIONS_PROPOSAL_1("%s wishes to be your %s"), - COMMAND_RELATIONS_PROPOSAL_2("Type /%s %s %s to accept."), - COMMAND_RELATIONS_PROPOSAL_SENT("%s were informed that you wish to be %s"), + COMMAND_RELATIONS_PROPOSAL_1("%1$s wishes to be your %2$s"), + COMMAND_RELATIONS_PROPOSAL_2("Type /%1$s %2$s %3$s to accept."), + COMMAND_RELATIONS_PROPOSAL_SENT("%1$s were informed that you wish to be %2$s"), /** * More generic translations, which will apply to more than one class. */ @@ -428,9 +428,9 @@ public enum TL { GENERIC_ASKYOURLEADER(" Ask your leader to:"), GENERIC_YOUSHOULD("You should:"), GENERIC_YOUMAYWANT("You may want to: "), - GENERIC_TRANSLATION_VERSION("Translation: %s(%s,%s) State: %s"), - GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %s"), - GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %s"), + GENERIC_TRANSLATION_VERSION("Translation: %1$s(%2$s,%3$s) State: %4$s"), + GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %1$s"), + GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %1$s"), /** * Relations @@ -443,7 +443,7 @@ public enum TL { * Strings lying around in other bits of the plugins */ NOPAGES("Sorry. No Pages available."), - INVALIDPAGE("Invalid page. Must be between 1 and %d"), + INVALIDPAGE("Invalid page. Must be between 1 and %1$d"), /** * The ones here before I started messing around with this */ @@ -456,12 +456,12 @@ public enum TL { SAFEZONE_DESCRIPTION("safezone-description", "Free from pvp and monsters."), TOGGLE_SB("toggle-sb", "You now have scoreboards set to {value}"), DEFAULT_PREFIX("default-prefix", "{relationcolor}[{faction}] &r"), - FACTION_LOGIN("faction-login", "&e%s &9logged in."), - FACTION_LOGOUT("faction-logout", "&e%s &9logged out.."), + FACTION_LOGIN("faction-login", "&e%1$s &9logged in."), + FACTION_LOGOUT("faction-logout", "&e%1$s &9logged out.."), /** * Warmups */ - WARMUPS_NOTIFY_TELEPORT("&eYou will teleport to &d%s &ein &d%d &eseconds."), + WARMUPS_NOTIFY_TELEPORT("&eYou will teleport to &d%1$s &ein &d%2$d &eseconds."), ; private String path;