From 1cc544db648e06451c1de8c93bc7af327931e66a Mon Sep 17 00:00:00 2001 From: korikisulda Date: Tue, 20 Jan 2015 18:27:26 +0000 Subject: [PATCH] moar translatify :3 Add some missing TL nodes Remove Lang class You can now into changing command descriptions --- .../java/com/massivecraft/factions/Conf.java | 2 - .../listeners/FactionsPlayerListener.java | 8 +- .../scoreboards/sidebar/FDefaultSidebar.java | 4 +- .../factions/struct/ChatMode.java | 14 +- .../factions/util/AsciiCompass.java | 13 +- .../massivecraft/factions/util/MiscUtil.java | 8 +- .../com/massivecraft/factions/zcore/Lang.java | 10 - .../massivecraft/factions/zcore/MCommand.java | 14 +- .../factions/zcore/persist/MemoryFPlayer.java | 58 ++-- .../factions/zcore/util/PermUtil.java | 5 +- .../massivecraft/factions/zcore/util/TL.java | 122 ++++++- src/main/resources/lang/en_GB.yml | 31 ++ src/main/resources/lang/en_US.yml | 301 +++++++++++------- 13 files changed, 405 insertions(+), 185 deletions(-) delete mode 100644 src/main/java/com/massivecraft/factions/zcore/Lang.java create mode 100644 src/main/resources/lang/en_GB.yml diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 8c1c84c6..7aca21d8 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -205,8 +205,6 @@ public class Conf { public static boolean ownedAreaProtectMaterials = true; public static boolean ownedAreaDenyUseage = true; - public static String ownedLandMessage = "Owner(s): "; - public static String publicLandMessage = "Public faction land."; public static boolean ownedMessageOnBorder = true; public static boolean ownedMessageInsideTerritory = true; public static boolean ownedMessageByChunk = false; diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 6b22d474..9d7b508d 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -165,15 +165,15 @@ public class FactionsPlayerListener implements Listener { if (changedFaction) { me.sendFactionHereMessage(); if (Conf.ownedAreasEnabled && Conf.ownedMessageOnBorder && myFaction == factionTo && !ownersTo.isEmpty()) { - me.sendMessage(Conf.ownedLandMessage + ownersTo); + me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo)); } } else if (Conf.ownedAreasEnabled && Conf.ownedMessageInsideTerritory && factionFrom == factionTo && myFaction == factionTo) { String ownersFrom = myFaction.getOwnerListString(from); if (Conf.ownedMessageByChunk || !ownersFrom.equals(ownersTo)) { if (!ownersTo.isEmpty()) { - me.sendMessage(Conf.ownedLandMessage + ownersTo); - } else if (!Conf.publicLandMessage.isEmpty()) { - me.sendMessage(Conf.publicLandMessage); + me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo)); + } else if (!TL.GENERIC_PUBLICLAND.toString().isEmpty()) { + me.sendMessage(TL.GENERIC_PUBLICLAND.toString()); } } } diff --git a/src/main/java/com/massivecraft/factions/scoreboards/sidebar/FDefaultSidebar.java b/src/main/java/com/massivecraft/factions/scoreboards/sidebar/FDefaultSidebar.java index df72e298..19924aef 100644 --- a/src/main/java/com/massivecraft/factions/scoreboards/sidebar/FDefaultSidebar.java +++ b/src/main/java/com/massivecraft/factions/scoreboards/sidebar/FDefaultSidebar.java @@ -4,6 +4,8 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.P; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.scoreboards.FSidebarProvider; +import com.massivecraft.factions.zcore.util.TL; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -29,7 +31,7 @@ public class FDefaultSidebar extends FSidebarProvider { } private String replace(FPlayer fplayer, String s) { - String faction = !fplayer.getFaction().isNone() ? fplayer.getFaction().getTag() : "factionless"; + String faction = !fplayer.getFaction().isNone() ? fplayer.getFaction().getTag() : TL.GENERIC_FACTIONLESS.toString(); String powerBoost = String.valueOf((int) fplayer.getPowerBoost()); s = s.replace("{name}", fplayer.getName()).replace("{power}", String.valueOf(fplayer.getPowerRounded())).replace("{balance}", String.valueOf(Econ.getFriendlyBalance(fplayer.getPlayer().getUniqueId()))).replace("{faction}", faction).replace("{maxPower}", String.valueOf(fplayer.getPowerMaxRounded())).replace("{totalOnline}", String.valueOf(Bukkit.getServer().getOnlinePlayers().length)).replace("{powerBoost}", powerBoost); return ChatColor.translateAlternateColorCodes('&', s); diff --git a/src/main/java/com/massivecraft/factions/struct/ChatMode.java b/src/main/java/com/massivecraft/factions/struct/ChatMode.java index 1534c928..a522013e 100644 --- a/src/main/java/com/massivecraft/factions/struct/ChatMode.java +++ b/src/main/java/com/massivecraft/factions/struct/ChatMode.java @@ -1,14 +1,16 @@ package com.massivecraft.factions.struct; +import com.massivecraft.factions.zcore.util.TL; + public enum ChatMode { - FACTION(2, "faction chat"), - ALLIANCE(1, "alliance chat"), - PUBLIC(0, "public chat"); + FACTION(2, TL.CHAT_FACTION), + ALLIANCE(1, TL.CHAT_ALLIANCE), + PUBLIC(0, TL.CHAT_PUBLIC); public final int value; - public final String nicename; + public final TL nicename; - private ChatMode(final int value, final String nicename) { + private ChatMode(final int value, final TL nicename) { this.value = value; this.nicename = nicename; } @@ -23,7 +25,7 @@ public enum ChatMode { @Override public String toString() { - return this.nicename; + return this.nicename.toString(); } public ChatMode getNext() { diff --git a/src/main/java/com/massivecraft/factions/util/AsciiCompass.java b/src/main/java/com/massivecraft/factions/util/AsciiCompass.java index fa16c6f3..4e20e23d 100644 --- a/src/main/java/com/massivecraft/factions/util/AsciiCompass.java +++ b/src/main/java/com/massivecraft/factions/util/AsciiCompass.java @@ -2,11 +2,14 @@ package com.massivecraft.factions.util; import org.bukkit.ChatColor; +import com.massivecraft.factions.zcore.util.TL; + import java.util.ArrayList; public class AsciiCompass { public enum Point { + N('N'), NE('/'), E('E'), @@ -27,8 +30,16 @@ public class AsciiCompass { return String.valueOf(this.asciiChar); } + public String getTranslation(){ + if(this==N) return TL.COMPASS_SHORT_NORTH.toString(); + if(this==E) return TL.COMPASS_SHORT_EAST.toString(); + if(this==S) return TL.COMPASS_SHORT_SOUTH.toString(); + if(this==W) return TL.COMPASS_SHORT_WEST.toString(); + return toString(); + } + public String toString(boolean isActive, ChatColor colorActive, String colorDefault) { - return (isActive ? colorActive : colorDefault) + String.valueOf(this.asciiChar); + return (isActive ? colorActive : colorDefault) + getTranslation(); } } diff --git a/src/main/java/com/massivecraft/factions/util/MiscUtil.java b/src/main/java/com/massivecraft/factions/util/MiscUtil.java index 8db8044c..21c4f077 100644 --- a/src/main/java/com/massivecraft/factions/util/MiscUtil.java +++ b/src/main/java/com/massivecraft/factions/util/MiscUtil.java @@ -3,6 +3,8 @@ package com.massivecraft.factions.util; import com.massivecraft.factions.Conf; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.P; +import com.massivecraft.factions.zcore.util.TL; + import org.bukkit.ChatColor; import org.bukkit.entity.Creature; import org.bukkit.entity.Entity; @@ -64,16 +66,16 @@ public class MiscUtil { ArrayList errors = new ArrayList(); if (getComparisonString(str).length() < Conf.factionTagLengthMin) { - errors.add(P.p.txt.parse("The faction tag can't be shorter than %s chars.", Conf.factionTagLengthMin)); + errors.add(P.p.txt.parse(TL.GENERIC_FACTIONTAG_TOOSHORT.toString(), Conf.factionTagLengthMin)); } if (str.length() > Conf.factionTagLengthMax) { - errors.add(P.p.txt.parse("The faction tag can't be longer than %s chars.", Conf.factionTagLengthMax)); + errors.add(P.p.txt.parse(TL.GENERIC_FACTIONTAG_TOOLONG.toString(), Conf.factionTagLengthMax)); } for (char c : str.toCharArray()) { if (!substanceChars.contains(String.valueOf(c))) { - errors.add(P.p.txt.parse("Faction tag must be alphanumeric. \"%s\" is not allowed.", c)); + errors.add(P.p.txt.parse(TL.GENERIC_FACTIONTAG_ALPHANUMERIC.toString(), c)); } } diff --git a/src/main/java/com/massivecraft/factions/zcore/Lang.java b/src/main/java/com/massivecraft/factions/zcore/Lang.java deleted file mode 100644 index 7f946461..00000000 --- a/src/main/java/com/massivecraft/factions/zcore/Lang.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.massivecraft.factions.zcore; - -public class Lang { - public static final String permForbidden = "You don't have permission to %s."; - public static final String permDoThat = "do that"; - - public static final String commandSenderMustBePlayer = "This command can only be used by ingame players."; - public static final String commandToFewArgs = "Too few arguments. Use like this:"; - public static final String commandToManyArgs = "Strange argument \"

%s\". Use the command like this:"; -} diff --git a/src/main/java/com/massivecraft/factions/zcore/MCommand.java b/src/main/java/com/massivecraft/factions/zcore/MCommand.java index 4798722c..a5b71496 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MCommand.java +++ b/src/main/java/com/massivecraft/factions/zcore/MCommand.java @@ -52,9 +52,9 @@ public abstract class MCommand { public String getHelpShort() { if (this.helpShort == null) { - String pdesc = p.perm.getPermissionDescription(this.permission); + TL pdesc = TL.valueOf(this.permission.toUpperCase().replace('.', '_')); if (pdesc != null) { - return pdesc; + return pdesc.toString(); } return "*info unavailable*"; } @@ -158,7 +158,7 @@ public abstract class MCommand { public boolean validSenderType(CommandSender sender, boolean informSenderIfNot) { if (this.senderMustBePlayer && !(sender instanceof Player)) { if (informSenderIfNot) { - msg(Lang.commandSenderMustBePlayer); + msg(TL.GENERIC_PLAYERONLY); } return false; } @@ -172,7 +172,7 @@ public abstract class MCommand { public boolean validArgs(List args, CommandSender sender) { if (args.size() < this.requiredArgs.size()) { if (sender != null) { - msg(Lang.commandToFewArgs); + msg(TL.GENERIC_ARGS_TOOFEW); sender.sendMessage(this.getUseageTemplate()); } return false; @@ -182,7 +182,7 @@ public abstract class MCommand { if (sender != null) { // Get the to many string slice List theToMany = args.subList(this.requiredArgs.size() + this.optionalArgs.size(), args.size()); - msg(Lang.commandToManyArgs, TextUtil.implode(theToMany, " ")); + msg(TL.GENERIC_ARGS_TOOMANY, TextUtil.implode(theToMany, " ")); sender.sendMessage(this.getUseageTemplate()); } return false; @@ -372,7 +372,7 @@ public abstract class MCommand { } if (msg && ret == null) { - this.msg("No player \"

%s\" could not be found.", name); + this.msg(TL.GENERIC_NOPLAYERFOUND, name); } return ret; @@ -402,7 +402,7 @@ public abstract class MCommand { } if (msg && ret == null) { - this.msg("No player match found for \"

%s\".", name); + this.msg(TL.GENERIC_NOPLAYERMATCH, name); } return ret; diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index f4588eb1..0ac795f2 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -584,17 +584,17 @@ public abstract class MemoryFPlayer implements FPlayer { boolean perm = myFaction.isPermanent(); if (!perm && this.getRole() == Role.ADMIN && myFaction.getFPlayers().size() > 1) { - msg("You must give the admin role to someone else first."); + msg(TL.LEAVE_PASSADMIN); return; } if (!Conf.canLeaveWithNegativePower && this.getPower() < 0) { - msg("You cannot leave until your power is positive."); + msg(TL.LEAVE_NEGATIVEPOWER); return; } // if economy is enabled and they're not on the bypass list, make sure they can pay - if (makePay && !Econ.hasAtLeast(this, Conf.econCostLeave, "to leave your faction.")) { + if (makePay && !Econ.hasAtLeast(this, Conf.econCostLeave, TL.LEAVE_TOLEAVE.toString())) { return; } @@ -605,7 +605,7 @@ public abstract class MemoryFPlayer implements FPlayer { } // then make 'em pay (if applicable) - if (makePay && !Econ.modifyMoney(this, -Conf.econCostLeave, "to leave your faction.", "for leaving your faction.")) { + if (makePay && !Econ.modifyMoney(this, -Conf.econCostLeave, TL.LEAVE_TOLEAVE.toString(), TL.LEAVE_FORLEAVE.toString())) { return; } @@ -619,11 +619,11 @@ public abstract class MemoryFPlayer implements FPlayer { if (myFaction.isNormal()) { for (FPlayer fplayer : myFaction.getFPlayersWhereOnline(true)) { - fplayer.msg("%s left %s.", this.describeTo(fplayer, true), myFaction.describeTo(fplayer)); + fplayer.msg(TL.LEAVE_LEFT, this.describeTo(fplayer, true), myFaction.describeTo(fplayer)); } if (Conf.logFactionLeave) { - P.p.log(this.getName() + " left the faction: " + myFaction.getTag()); + P.p.log(TL.LEAVE_LEFT.format(this.getName(),myFaction.getTag())); } } @@ -633,12 +633,12 @@ public abstract class MemoryFPlayer implements FPlayer { if (myFaction.isNormal() && !perm && myFaction.getFPlayers().isEmpty()) { // Remove this faction for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { - fplayer.msg("%s was disbanded.", myFaction.describeTo(fplayer, true)); + fplayer.msg(TL.LEAVE_DISBANDED, myFaction.describeTo(fplayer, true)); } Factions.getInstance().removeFaction(myFaction.getId()); if (Conf.logFactionDisband) { - P.p.log("The faction " + myFaction.getTag() + " (" + myFaction.getId() + ") was disbanded due to the last player (" + this.getName() + ") leaving."); + P.p.log(TL.LEAVE_DISBANDEDLOG.format(myFaction.getTag(),myFaction.getId(),this.getName())); } } } @@ -656,9 +656,9 @@ public abstract class MemoryFPlayer implements FPlayer { if (Conf.worldGuardChecking && Worldguard.checkForRegionsInChunk(location)) { // Checks for WorldGuard regions in the chunk attempting to be claimed - error = P.p.txt.parse("This land is protected"); + error = P.p.txt.parse(TL.CLAIM_PROTECTED.toString()); } else if (Conf.worldsNoClaiming.contains(flocation.getWorldName())) { - error = P.p.txt.parse("Sorry, this world has land claiming disabled."); + error = P.p.txt.parse(TL.CLAIM_DISABLED.toString()); } else if (this.isAdminBypassing()) { return true; } else if (forFaction.isSafeZone() && Permission.MANAGE_SAFE_ZONE.has(getPlayer())) { @@ -666,39 +666,39 @@ public abstract class MemoryFPlayer implements FPlayer { } else if (forFaction.isWarZone() && Permission.MANAGE_WAR_ZONE.has(getPlayer())) { return true; } else if (myFaction != forFaction) { - error = P.p.txt.parse("You can't claim land for %s.", forFaction.describeTo(this)); + error = P.p.txt.parse(TL.CLAIM_CANTCLAIM.toString(), forFaction.describeTo(this)); } else if (forFaction == currentFaction) { - error = P.p.txt.parse("%s already own this land.", forFaction.describeTo(this, true)); + error = P.p.txt.parse(TL.CLAIM_ALREADYOWN.toString(), forFaction.describeTo(this, true)); } else if (this.getRole().value < Role.MODERATOR.value) { - error = P.p.txt.parse("You must be %s to claim land.", Role.MODERATOR.toString()); + error = P.p.txt.parse(TL.CLAIM_MUSTBE.toString(), Role.MODERATOR.toString()); } else if (forFaction.getFPlayers().size() < Conf.claimsRequireMinFactionMembers) { - error = P.p.txt.parse("Factions must have at least %s members to claim land.", Conf.claimsRequireMinFactionMembers); + error = P.p.txt.parse(TL.CLAIM_MEMBERS.toString(), Conf.claimsRequireMinFactionMembers); } else if (currentFaction.isSafeZone()) { - error = P.p.txt.parse("You can not claim a Safe Zone."); + error = P.p.txt.parse(TL.CLAIM_SAFEZONE.toString()); } else if (currentFaction.isWarZone()) { - error = P.p.txt.parse("You can not claim a War Zone."); + error = P.p.txt.parse(TL.CLAIM_WARZONE.toString()); } else if (ownedLand >= forFaction.getPowerRounded()) { - error = P.p.txt.parse("You can't claim more land! You need more power!"); + error = P.p.txt.parse(TL.CLAIM_POWER.toString()); } else if (Conf.claimedLandsMax != 0 && ownedLand >= Conf.claimedLandsMax && forFaction.isNormal()) { - error = P.p.txt.parse("Limit reached. You can't claim more land!"); + error = P.p.txt.parse(TL.CLAIM_LIMIT.toString()); } else if (currentFaction.getRelationTo(forFaction) == Relation.ALLY) { - error = P.p.txt.parse("You can't claim the land of your allies."); + error = P.p.txt.parse(TL.CLAIM_ALLY.toString()); } else if (Conf.claimsMustBeConnected && !this.isAdminBypassing() && myFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.getInstance().isConnectedLocation(flocation, myFaction) && (!Conf.claimsCanBeUnconnectedIfOwnedByOtherFaction || !currentFaction.isNormal())) { if (Conf.claimsCanBeUnconnectedIfOwnedByOtherFaction) { - error = P.p.txt.parse("You can only claim additional land which is connected to your first claim or controlled by another faction!"); + error = P.p.txt.parse(TL.CLAIM_CONTIGIOUS.toString()); } else { - error = P.p.txt.parse("You can only claim additional land which is connected to your first claim!"); + error = P.p.txt.parse(TL.CLAIM_FACTIONCONTIGUOUS.toString()); } } else if (currentFaction.isNormal()) { if (myFaction.isPeaceful()) { - error = P.p.txt.parse("%s owns this land. Your faction is peaceful, so you cannot claim land from other factions.", currentFaction.getTag(this)); + error = P.p.txt.parse(TL.CLAIM_PEACEFUL.toString(), currentFaction.getTag(this)); } else if (currentFaction.isPeaceful()) { - error = P.p.txt.parse("%s owns this land, and is a peaceful faction. You cannot claim land from them.", currentFaction.getTag(this)); + error = P.p.txt.parse(TL.CLAIM_PEACEFULTARGET.toString(), currentFaction.getTag(this)); } else if (!currentFaction.hasLandInflation()) { // TODO more messages WARN current faction most importantly - error = P.p.txt.parse("%s owns this land and is strong enough to keep it.", currentFaction.getTag(this)); + error = P.p.txt.parse(TL.CLAIM_THISISSPARTA.toString(), currentFaction.getTag(this)); } else if (!Board.getInstance().isBorderLocation(flocation)) { - error = P.p.txt.parse("You must start claiming land at the border of the territory."); + error = P.p.txt.parse(TL.CLAIM_BORDER.toString()); } } // TODO: Add more else if statements. @@ -739,7 +739,7 @@ public abstract class MemoryFPlayer implements FPlayer { payee = this; } - if (!Econ.hasAtLeast(payee, cost, "to claim this land")) { + if (!Econ.hasAtLeast(payee, cost, TL.CLAIM_TOCLAIM.toString())) { return false; } } @@ -751,7 +751,7 @@ public abstract class MemoryFPlayer implements FPlayer { } // then make 'em pay (if applicable) - if (mustPay && !Econ.modifyMoney(payee, -cost, "to claim this land", "for claiming this land")) { + if (mustPay && !Econ.modifyMoney(payee, -cost, TL.CLAIM_TOCLAIM.toString(), TL.CLAIM_FORCLAIM.toString())) { return false; } @@ -760,13 +760,13 @@ public abstract class MemoryFPlayer implements FPlayer { informTheseFPlayers.add(this); informTheseFPlayers.addAll(forFaction.getFPlayersWhereOnline(true)); for (FPlayer fp : informTheseFPlayers) { - fp.msg("%s claimed land for %s from %s.", this.describeTo(fp, true), forFaction.describeTo(fp), currentFaction.describeTo(fp)); + fp.msg(TL.CLAIM_CLAIMED, this.describeTo(fp, true), forFaction.describeTo(fp), currentFaction.describeTo(fp)); } Board.getInstance().setFactionAt(forFaction, flocation); if (Conf.logLandClaims) { - P.p.log(this.getName() + " claimed land at (" + flocation.getCoordString() + ") for the faction: " + forFaction.getTag()); + P.p.log(TL.CLAIM_CLAIMEDLOG.toString(),this.getName(),flocation.getCoordString(),forFaction.getTag()); } return true; diff --git a/src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java b/src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java index 6945b20a..e3b6830d 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/PermUtil.java @@ -1,6 +1,5 @@ package com.massivecraft.factions.zcore.util; -import com.massivecraft.factions.zcore.Lang; import com.massivecraft.factions.zcore.MPlugin; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -23,7 +22,7 @@ public class PermUtil { } public String getForbiddenMessage(String perm) { - return p.txt.parse(Lang.permForbidden, getPermissionDescription(perm)); + return p.txt.parse(TL.GENERIC_NOPERMISSION.toString(), getPermissionDescription(perm)); } /** @@ -39,7 +38,7 @@ public class PermUtil { public String getPermissionDescription(String perm) { String desc = permissionDescriptions.get(perm); if (desc == null) { - return Lang.permDoThat; + return TL.GENERIC_DOTHAT.toString(); } return desc; } 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 003495b7..6623979e 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -419,19 +419,135 @@ public enum TL { 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. + * Leaving */ + LEAVE_PASSADMIN("You must give the admin role to someone else first."), + LEAVE_NEGATIVEPOWER("You cannot leave until your power is positive."), + LEAVE_TOLEAVE("to leave your faction."), + LEAVE_FORLEAVE("for leaving your faction."), + LEAVE_LEFT("%s left faction %s."), + LEAVE_DISBANDED("%s was disbanded."), + LEAVE_DISBANDEDLOG("The faction %s (%s) was disbanded due to the last player (%s) leaving."), + /** + * Claiming + */ + CLAIM_PROTECTED("This land is protected"), + CLAIM_DISABLED("Sorry, this world has land claiming disabled."), + CLAIM_CANTCLAIM("You can't claim land for %s."), + CLAIM_ALREADYOWN("%s already own this land."), + CLAIM_MUSTBE("You must be %s to claim land."), + CLAIM_MEMBERS("Factions must have at least %s members to claim land."), + CLAIM_SAFEZONE("You can not claim a Safe Zone."), + CLAIM_WARZONE("You can not claim a War Zone."), + CLAIM_POWER("You can't claim more land! You need more power!"), + CLAIM_LIMIT("Limit reached. You can't claim more land!"), + CLAIM_ALLY("You can't claim the land of your allies."), + CLAIM_CONTIGIOUS("You can only claim additional land which is connected to your first claim or controlled by another faction!"), + CLAIM_FACTIONCONTIGUOUS("You can only claim additional land which is connected to your first claim!"), + CLAIM_PEACEFUL("%s owns this land. Your faction is peaceful, so you cannot claim land from other factions."), + CLAIM_PEACEFULTARGET("%s owns this land, and is a peaceful faction. You cannot claim land from them."), + CLAIM_THISISSPARTA("%s owns this land and is strong enough to keep it."), + CLAIM_BORDER("You must start claiming land at the border of the territory."), + CLAIM_TOCLAIM("to claim this land"), + CLAIM_FORCLAIM("for claiming this land"), + CLAIM_CLAIMED("%s claimed land for %s from %s."), + CLAIM_CLAIMEDLOG("%s claimed land at (%s) for the faction: %s"), + /** + * Command descriptions + */ + FACTIONS_ADMIN("hand over your admin rights"), + FACTIONS_AUTOCLAIM("auto-claim land as you walk around"), + FACTIONS_BYPASS("enable admin bypass mode"), + FACTIONS_CHAT("change chat mode"), + FACTIONS_CHATSPY("enable admin chat spy mode"), + FACTIONS_CLAIM("claim land where you are standing"), + FACTIONS_CONFIG("change a conf.json setting"), + FACTIONS_CREATE("create a new faction"), + FACTIONS_DEINVITE("remove a pending invitation"), + FACTIONS_DISBAND("disband a faction"), + FACTIONS_HELP("display a help page"), + FACTIONS_HOME("teleport to the faction home"), + FACTIONS_INVITE("invite a player to your faction"), + FACTIONS_JOIN("join a faction"), + FACTIONS_KICK("kick a player from the faction"), + FACTIONS_LEAVE("leave your faction"), + FACTIONS_LIST("see a list of the factions"), + FACTIONS_LOCK("lock all write stuff"), + FACTIONS_MANAGESAFEZONE("claim land as a safe zone and build/destroy within safe zones"), + FACTIONS_MANAGEWARZONE("claim land as a war zone and build/destroy within war zones"), + FACTIONS_MAP("show the territory map, and set optional auto update"), + FACTIONS_MOD("give or revoke moderator rights"), + FACTIONS_MONEY_BALANCE ("show your factions current money balance"), + FACTIONS_MONEY_DEPOSIT ("deposit money into a faction bank"), + FACTIONS_MONEY_WITHDRAW ("withdraw money from your faction bank"), + FACTIONS_MONEY_F2F ("transfer money from faction to faction"), + FACTIONS_MONEY_F2P ("transfer money from faction to player"), + FACTIONS_MONEY_P2F ("transfer money from player to faction"), + FACTIONS_NOBOOM ("toggle explosions (peaceful factions only),"), + FACTIONS_OPEN ("switch if invitation is required to join"), + FACTIONS_OWNER ("set ownership of claimed land"), + FACTIONS_OWNERLIST ("list owner(s), of this claimed land"), + FACTIONS_SETPEACEFUL("designate a faction as peaceful"), + FACTIONS_SETPERMANENT("designate a faction as permanent"), + FACTIONS_SETPERMANENTPOWER("set permanent power for a faction"), + FACTIONS_POWER("show player power info"), + FACTIONS_POWERBOOST("apply permanent power bonus/penalty to specified player or faction"), + FACTIONS_RELATION("set relation wish to another faction"), + FACTIONS_RELOAD("reload data file(s), from disk"), + FACTIONS_SAVE("save all data to disk"), + FACTIONS_SETHOME("set the faction home"), + FACTIONS_SHOW("show faction information"), + FACTIONS_TAG("change the faction tag"), + FACTIONS_TITLE("set or remove a players title"), + FACTIONS_VERSION("see the version of the plugin"), + FACTIONS_UNCLAIM("unclaim the land where you are standing"), + FACTIONS_UNCLAIMALL("unclaim all of your factions land"), + FACTIONS_SCOREBOARD("ability to toggle scoreboards"), + FACTIONS_SHOWINVITES("show pending invites to your faction"), + FACTIONS_SEECHUNK("see the chunk you stand in"), + FACTIONS_SETWARP("set a warp for your faction"), + FACTIONS_WARP("access your faction warps"), + FACTIONS_MODIFYPOWER("modify other player's power"), + FACTIONS_MONITORLOGINS("monitor join and leaves of faction members"), + /** + * More generic, or less easily categorisable translations, which may apply to more than one class + */ + GENERIC_NOPERMISSION("You don't have permission to %1$s."), + GENERIC_DOTHAT("do that"), //Ugh nuke this from high orbit + GENERIC_NOPLAYERMATCH("No player match found for \"

%1$s\"."), + GENERIC_NOPLAYERFOUND("No player \"

%1$s\" could not be found."), + GENERIC_ARGS_TOOFEW("Too few arguments. Use like this:"), + GENERIC_ARGS_TOOMANY("Strange argument \"

%1$s\". Use the command like this:"), + GENERIC_OWNERS("Owner(s): %1$s"), + GENERIC_PUBLICLAND("Public faction land."), + GENERIC_FACTIONLESS("factionless"), GENERIC_SERVERADMIN("A server admin"), GENERIC_DISABLED("disabled"), GENERIC_ENABLED("enabled"), GENERIC_CONSOLEONLY("This command cannot be run as a player."), + GENERIC_PLAYERONLY("This command can only be used by ingame players."), GENERIC_ASKYOURLEADER(" Ask your leader to:"), GENERIC_YOUSHOULD("You should:"), GENERIC_YOUMAYWANT("You may want to: "), 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"), - + GENERIC_FACTIONTAG_TOOSHORT("The faction tag can't be shorter than %1$s chars."), + GENERIC_FACTIONTAG_TOOLONG("The faction tag can't be longer than %s chars."), + GENERIC_FACTIONTAG_ALPHANUMERIC("Faction tag must be alphanumeric. \"%s\" is not allowed."), + /** + * ASCII compass (for chat map) + */ + COMPASS_SHORT_NORTH("N"), + COMPASS_SHORT_EAST("E"), + COMPASS_SHORT_SOUTH("S"), + COMPASS_SHORT_WEST("W"), + /** + * Chat modes + */ + CHAT_FACTION("faction chat"), + CHAT_ALLIANCE("alliance chat"), + CHAT_PUBLIC("public chat"), /** * Relations */ @@ -461,7 +577,7 @@ public enum TL { /** * Warmups */ - WARMUPS_NOTIFY_TELEPORT("&eYou will teleport to &d%1$s &ein &d%2$d &eseconds."), + WARMUPS_NOTIFY_TELEPORT("&eYou will teleport to &d%1$s &ein &d%2$d &eseconds.") ; private String path; diff --git a/src/main/resources/lang/en_GB.yml b/src/main/resources/lang/en_GB.yml new file mode 100644 index 00000000..d69fe605 --- /dev/null +++ b/src/main/resources/lang/en_GB.yml @@ -0,0 +1,31 @@ +# Lang file for FactionsUUID by drtshock +# Use & for color codes. +# Made with love <3 + +#Slightly different localised variant for UK-style english (Color→Colour, etc) +#It's cut down to the sections that were actually changed. Ie basically nothing. What ho, dear chap! + +root: + AUTHOR: misc + RESPONSIBLE: Korikisulda + LANGUAGE: English + ENCODING: UTF-8 + LOCALE: en_GB + EXTENDS: en_US + REQUIRESUNICODE: 'false' + DEFAULT: 'false' + STATE: complete + LOCAL: + AUTHOR: misc + RESPONSIBLE: Korikisulda + LANGUAGE: English + REGION: UK + STATE: complete +COMMAND: + CONFIG: + COLOURSET: '" colour option set to "' + INVALID: + COLOUR: 'Cannot set "%1$s": "%2$s" is not a valid colour.' + COLLECTION: '"%1$s" is not a data collection type which can be modified with this + command.' + diff --git a/src/main/resources/lang/en_US.yml b/src/main/resources/lang/en_US.yml index afa726ec..fbdee82d 100644 --- a/src/main/resources/lang/en_US.yml +++ b/src/main/resources/lang/en_US.yml @@ -2,6 +2,8 @@ # Use & for color codes. # Made with love <3 + + root: AUTHOR: misc RESPONSIBLE: misc @@ -19,25 +21,25 @@ root: STATE: complete COMMAND: ADMIN: - NOTMEMBER: '%s is not a member in your faction.' + NOTMEMBER: '%1$s is not a member in your faction.' NOTADMIN: You are not the faction admin. TARGETSELF: The target player musn't be yourself. - DEMOTES: You have demoted %s from the position of faction admin. - DEMOTED: You have been demoted from the position of faction admin by %s. - PROMOTES: You have promoted %s to the position of faction admin. - PROMOTED: '%s gave %s the leadership of %s.' + DEMOTES: You have demoted %1$s from the position of faction admin. + DEMOTED: You have been demoted from the position of faction admin by %1$s. + PROMOTES: You have promoted %1$s to the position of faction admin. + PROMOTED: '%1$s gave %2$s the leadership of %3$s.' AUTOCLAIM: - ENABLED: Now auto-claiming land for %s. + ENABLED: Now auto-claiming land for %1$s. DISABLED: Auto-claiming of land disabled. - REQUIREDRANK: You must be %s to claim land. - OTHERFACTION: You can't claim land for %s. + REQUIREDRANK: You must be %1$s to claim land. + OTHERFACTION: You can't claim land for %1$s. AUTOHELP: HELPFOR: Help for command " BOOM: PEACEFULONLY: This command is only usable by factions which are specifically designated as peaceful. TOTOGGLE: to toggle explosions FORTOGGLE: for toggling explosions - ENABLED: '%s has %s explosions in your faction''s territory.' + ENABLED: '%1$s has %2$s explosions in your faction''s territory.' BYPASS: ENABLE: You have enabled admin bypass mode. You will be able to build or destroy anywhere. ENABLELOG: ' has ENABLED admin bypass mode.' @@ -59,70 +61,70 @@ COMMAND: INVALIDRADIUS: If you specify a radius, it must be at least 1. DENIED: You do not have permission to claim in a radius. CONFIG: - NOEXIST: No configuration setting "%s" exists. + NOEXIST: No configuration setting "%1$s" exists. SET: 'TRUE': '" option set to true (enabled).' 'FALSE': '" option set to false (disabled).' - ADDED: '"%s" set: "%s" added.' - REMOVED: '"%s" set: "%s" removed.' + ADDED: '"%1$s" set: "%2$s" added.' + REMOVED: '"%1$s" set: "%2$s" removed.' OPTIONSET: '" option set to ' COLOURSET: '" color option set to "' - INTREQUIRED: 'Cannot set "%s": An integer (whole number) value required.' - LONGREQUIRED: 'Cannot set "%s": A long integer (whole number) value required.' - DOUBLEREQUIRED: 'Cannot set "%s": A double (numeric) value required.' - FLOATREQUIRED: 'Cannot set "%s": A float (numeric) value required.' + INTREQUIRED: 'Cannot set "%1$s": An integer (whole number) value required.' + LONGREQUIRED: 'Cannot set "%1$s": A long integer (whole number) value required.' + DOUBLEREQUIRED: 'Cannot set "%1$s": A double (numeric) value required.' + FLOATREQUIRED: 'Cannot set "%1$s": A float (numeric) value required.' INVALID: - COLOUR: 'Cannot set "%s": "%s" is not a valid color.' - COLLECTION: '"%s" is not a data collection type which can be modified with this - command.' - MATERIAL: 'Cannot change "%s" set: "%s" is not a valid material.' - TYPESET: '"%s" is not a data type set which can be modified with this command.' + COLOUR: 'Cannot set "%1$s": "%2$s" is not a valid color.' + COLLECTION: '"%1$s" is not a data collection type which can be modified with + this command.' + MATERIAL: 'Cannot change "%1$s" set: "%2$s" is not a valid material.' + TYPESET: '"%1$s" is not a data type set which can be modified with this command.' MATERIAL: - ADDED: '"%s" set: Material "%s" added.' - REMOVED: '"%s" set: Material "%s" removed.' - LOG: ' (Command was run by %s.)' + ADDED: '"%1$s" set: Material "%2$s" added.' + REMOVED: '"%1$s" set: Material "%2$s" removed.' + LOG: ' (Command was run by %1$s.)' ERROR: - SETTING: Error setting configuration setting "%s" to "%s". - MATCHING: Configuration setting "%s" couldn't be matched, though it should be... please report this error. - TYPE: '''%s'' is of type ''%s'', which cannot be modified with this command.' + SETTING: Error setting configuration setting "%1$s" to "%2$s". + MATCHING: Configuration setting "%1$s" couldn't be matched, though it should be... please report this error. + TYPE: '''%1$s'' is of type ''%2$s'', which cannot be modified with this command.' CREATE: MUSTLEAVE: You must leave your current faction first. INUSE: That tag is already in use. TOCREATE: to create a new faction FORCREATE: for creating a new faction ERROR: There was an internal error while trying to create your faction. Please try again. - CREATED: %s created a new faction %s + CREATED: '%1$s created a new faction %2$s' + YOUSHOULD: 'You should now: %1$s' CREATEDLOG: ' created a new faction: ' - YOUSHOULD: 'You should now: %s' DEINVITE: CANDEINVITE: 'Players you can deinvite: ' - CLICKTODEINVITE: Click to revoke invite for %s - ALREADYMEMBER: '%s is already a member of %s' - MIGHTWANT: 'You might want to: %s' - REVOKED: '%s revoked your invitation to %s.' - REVOKES: '%s revoked %s''s invitation.' + CLICKTODEINVITE: Click to revoke invite for %1$s + ALREADYMEMBER: '%1$s is already a member of %2$s' + MIGHTWANT: 'You might want to: %1$s' + REVOKED: '%1$s revoked your invitation to %2$s.' + REVOKES: '%1$s revoked %2$s''s invitation.' DELFWARP: - DELETED: Deleted warp %s - INVALID: Couldn't find warp %s + DELETED: Deleted warp %1$s + INVALID: Couldn't find warp %1$s TODELETE: to delete warp FORDELETE: for deleting warp DESCRIPTION: - CHANGES: 'You have changed the description for %s to:' - CHANGED: 'The faction %s changed their description to:' + CHANGES: 'You have changed the description for %1$s to:' + CHANGED: 'The faction %1$s changed their description to:' TOCHANGE: to change faction description FORCHANGE: for changing faction description DISBAND: IMMUTABLE: You cannot disband the Wilderness, SafeZone, or WarZone. MARKEDPERMANENT: This faction is designated as permanent, so you cannot disband it. BROADCAST: - YOURS: %s disbanded your faction. - NOTYOURS: %s disbanded the faction %s. - HOLDINGS: You have been given the disbanded faction's bank, totaling %s. + YOURS: %1$s disbanded your faction. + NOTYOURS: %1$s disbanded the faction %2$s. + HOLDINGS: You have been given the disbanded faction's bank, totaling %1$s. FWARP: CLICKTOWARP: Click to warp! COMMANDFORMAT: /f warp - WARPED: Warped to %s - INVALID: Couldn't find warp %s + WARPED: Warped to %1$s + INVALID: Couldn't find warp %1$s TOWARP: to warp FORWARPING: for warping WARPS: 'Warps: ' @@ -185,38 +187,38 @@ COMMAND: FORINVITE: for inviting someone CLICKTOJOIN: Click to join! INVITEDYOU: ' has invited you to join ' - INVITED: '%s invited %s to your faction.' - ALREADYMEMBER: '%s is already a member of %s' + INVITED: '%1$s invited %2$s to your faction.' + ALREADYMEMBER: '%1$s is already a member of %2$s' JOIN: CANNOTFORCE: You do not have permission to move other players into a faction. SYSTEMFACTION: Players may only join normal factions. This is a system faction. - ALREADYMEMBER: %s %s already a member of %s - ATLIMIT: ' ! The faction %s is at the limit of %d members, so %s cannot - currently join.' - INOTHERFACTION: %s must leave %s current faction first. - NEGATIVEPOWER: %s cannot join a faction with a negative power level. + ALREADYMEMBER: %1$s %2$s already a member of %3$s + ATLIMIT: ' ! The faction %1$s is at the limit of %2$d members, so %3$s + cannot currently join.' + INOTHERFACTION: %1$s must leave %2$s current faction first. + NEGATIVEPOWER: %1$s cannot join a faction with a negative power level. REQUIRESINVITATION: This faction requires invitation. - ATTEMPTEDJOIN: '%s tried to join your faction.' + ATTEMPTEDJOIN: '%1$s tried to join your faction.' TOJOIN: to join a faction FORJOIN: for joining a faction - SUCCESS: %s successfully joined %s. - MOVED: %s moved you into the faction %s. - JOINED: %s joined your faction. - JOINEDLOG: '%s joined the faction %s.' - MOVEDLOG: '%s moved the player %s into the faction %s.' + SUCCESS: %1$s successfully joined %2$s. + MOVED: %1$s moved you into the faction %2$s. + JOINED: %1$s joined your faction. + JOINEDLOG: '%1$s joined the faction %2$s.' + MOVEDLOG: '%1$s moved the player %2$s into the faction %3$s.' KICK: CANDIDATES: 'Players you can kick: ' CLICKTOKICK: 'Click to kick ' SELF: You cannot kick yourself. NONE: That player is not in a faction. - NOTMEMBER: '%s is not a member of %s' + NOTMEMBER: '%1$s is not a member of %2$s' INSUFFICIENTRANK: Your rank is too low to kick this player. NEGATIVEPOWER: You cannot kick that member until their power is positive. TOKICK: to kick someone from the faction FORKICK: for kicking someone from the faction - FACTION: '%s kicked %s from the faction! :O' - KICKS: You kicked %s from the faction %s! - KICKED: '%s kicked you from %s! :O' + FACTION: '%1$s kicked %2$s from the faction! :O' + KICKS: You kicked %1$s from the faction %2$s! + KICKED: '%1$s kicked you from %2$s! :O' LIST: FACTIONLIST: 'Faction List ' TOLIST: to list the factions @@ -225,6 +227,8 @@ COMMAND: LOCK: LOCKED: Factions is now locked UNLOCKED: Factions in now unlocked + LOGINS: + TOGGLE: 'Set login / logout notifications for Faction members to: %s' MAP: TOSHOW: to show the map FORSHOW: for showing the map @@ -234,16 +238,16 @@ COMMAND: MOD: CANDIDATES: 'Players you can promote: ' CLICKTOPROMOTE: 'Click to promote ' - NOTMEMBER: '%s is not a member in your faction.' + NOTMEMBER: '%1$s is not a member in your faction.' NOTADMIN: You are not the faction admin. SELF: The target player musn't be yourself. TARGETISADMIN: The target player is a faction admin. Demote them first. - REVOKES: You have removed moderator status from %s. - REVOKED: '%s is no longer moderator in your faction.' - PROMOTES: '%s was promoted to moderator in your faction.' - PROMOTED: You have promoted %s to moderator. + REVOKES: You have removed moderator status from %1$s. + REVOKED: '%1$s is no longer moderator in your faction.' + PROMOTES: '%1$s was promoted to moderator in your faction.' + PROMOTED: You have promoted %1$s to moderator. MODIFYPOWER: - ADDED: 'Added %f power to %s. New total rounded power: %d' + ADDED: 'Added %1$f power to %2$s. New total rounded power: %3$d' MONEY: SHORT: faction money commands LONG: The faction money commands. @@ -251,47 +255,47 @@ COMMAND: SHORT: show faction balance MONEYDEPOSIT: SHORT: deposit money - DEPOSITED: '%s deposited %s in the faction bank: %s' + DEPOSITED: '%1$s deposited %2$s in the faction bank: %3$s' MONEYTRANSFERFF: SHORT: transfer f -> f - TRANSFER: '%s transferred %s from the faction "%s" to the faction "%s"' + TRANSFER: '%1$s transferred %2$s from the faction "%3$s" to the faction "%4$s"' MONEYTRANSFERFP: SHORT: transfer f -> p - TRANSFER: '%s transferred %s from the faction "%s" to the player "%s"' + TRANSFER: '%1$s transferred %2$s from the faction "%3$s" to the player "%4$s"' MONEYTRANSFERPF: SHORT: transfer p -> f - TRANSFER: '%s transferred %s from the player "%s" to the faction "%s"' + TRANSFER: '%1$s transferred %2$s from the player "%3$s" to the faction "%4$s"' MONEYWITHDRAW: SHORT: withdraw money - WITHDRAW: '%s withdrew %s from the faction bank: %s' + WITHDRAW: '%1$s withdrew %2$s from the faction bank: %3$s' OPEN: TOOPEN: to open or close the faction FOROPEN: for opening or closing the faction OPEN: open CLOSED: closed - CHANGES: '%s changed the faction to %s.' - CHANGED: The faction %s is now %s + CHANGES: '%1$s changed the faction to %2$s.' + CHANGED: The faction %1$s is now %2$s OWNER: DISABLED: Sorry, but owned areas are disabled on this server. - LIMIT: Sorry, but you have reached the server's limit of %d owned areas per faction. + LIMIT: Sorry, but you have reached the server's limit of %1$d owned areas per faction. WRONGFACTION: This land is not claimed by your faction, so you can't set ownership of it. NOTCLAIMED: This land is not claimed by a faction. Ownership is not possible. - NOTMEMBER: '%s is not a member of this faction.' + NOTMEMBER: '%1$s is not a member of this faction.' CLEARED: You have cleared ownership for this claimed area. - REMOVED: You have removed ownership of this claimed land from %s. + REMOVED: You have removed ownership of this claimed land from %1$s. TOSET: to set ownership of claimed land FORSET: for setting ownership of claimed land - ADDED: You have added %s to the owner list for this claimed land. + ADDED: You have added %1$s to the owner list for this claimed land. OWNERLIST: DISABLED: Sorry, but owned areas are disabled on this server. WRONGFACTION: This land is not claimed by your faction. NOTCLAIMED: This land is not claimed by any faction, thus no owners. NONE: No owners are set here; everyone in the faction has access. - OWNERS: 'Current owner(s) of this land: %s' + OWNERS: 'Current owner(s) of this land: %1$s' POWER: TOSHOW: to show player power info FORSHOW: for showing player power info - POWER: '%s - Power / Maxpower: %d / %d %s' + POWER: '%1$s - Power / Maxpower: %2$d / %3$d %4$s' BONUS: ' (bonus: ' PENALTY: ' (penalty: ' POWERBOOST: @@ -299,21 +303,21 @@ COMMAND: '1': You must specify "p" or "player" to target a player or "f" or "faction" to target a faction. '2': ex. /f powerboost p SomePlayer 0.5 -or- /f powerboost f SomeFaction -5 INVALIDNUM: You must specify a valid numeric value for the power bonus/penalty amount. - PLAYER: Player "%s" - FACTION: Faction "%s" - BOOST: %s now has a power bonus/penalty of %d to min and max power levels. - BOOSTLOG: '%s has set the power bonus/penalty for %s to %d.' + PLAYER: Player "%1$s" + FACTION: Faction "%1$s" + BOOST: %1$s now has a power bonus/penalty of %2$d to min and max power levels. + BOOSTLOG: '%1$s has set the power bonus/penalty for %2$s to %3$d.' RELOAD: - TIME: Reloaded conf.json from disk, took %dms. + TIME: Reloaded conf.json from disk, took %1$d ms. SAFEUNCLAIMALL: SHORT: Unclaim all safezone land UNCLAIMED: You unclaimed ALL safe zone land. - UNCLAIMEDLOG: '%s unclaimed all safe zones.' + UNCLAIMEDLOG: '%1$s unclaimed all safe zones.' SAVEALL: Factions saved to disk! SETFWARP: NOTCLAIMED: You can only set warps in your faction territory. - LIMIT: Your Faction already has the max amount of warps set (%d). - SET: Set warp %s to your location. + LIMIT: Your Faction already has the max amount of warps set (%1$d). + SET: Set warp %1$s to your location. TOSET: to set warp FORSET: for setting warp SETHOME: @@ -321,44 +325,47 @@ COMMAND: NOTCLAIMED: Sorry, your faction home can only be set inside your own claimed territory. TOSET: to set the faction home FORSET: for setting the faction home - SET: '%s set the home for your faction. You can now use:' - SETOTHER: You have set the home for the %s faction. + SET: '%1$s set the home for your faction. You can now use:' + SETOTHER: You have set the home for the %1$s faction. SHOW: + NOFACTION: + SELF: You are not in a faction + OTHER: That's not a faction TOSHOW: to show faction information FORSHOW: for showing faction information - DESCRIPTION: 'Description: %s' + DESCRIPTION: 'Description: %1$s' PEACEFUL: This faction is Peaceful PERMANENT: This faction is permanent, remaining even with no members. - JOINING: 'Joining: %s ' + JOINING: 'Joining: %1$s ' INVITATION: invitation is required UNINVITED: no invitation is needed - POWER: 'Land / Power / Maxpower: %d/%d/%d %s' + POWER: 'Land / Power / Maxpower: %1$d/%2$d/%3$d %4$s' BONUS: ' (bonus: ' PENALTY: ' (penalty: ' - DEPRECIATED: (%s depreciated) - LANDVALUE: 'Total land value: %s%s' - BANKCONTAINS: 'Bank contains: %s' + DEPRECIATED: (%1$s depreciated) + LANDVALUE: 'Total land value: %1$s %2$s' + BANKCONTAINS: 'Bank contains: %1$s' ALLIES: 'Allies: ' ENEMIES: 'Enemies: ' MEMBERSONLINE: 'Members online: ' MEMBERSOFFLINE: 'Members offline: ' SHOWINVITES: PENDING: 'Players with pending invites: ' - CLICKTOREVOKE: Click to revoke invite for %s + CLICKTOREVOKE: Click to revoke invite for %1$s STATUS: - FORMAT: '%s Power: %s Last Seen: %s' + FORMAT: '%1$s Power: %2$s Last Seen: %3$s' ONLINE: Online AGOSUFFIX: ' ago.' TAG: TAKEN: That tag is already taken TOCHANGE: to change the faction tag FORCHANGE: for changing the faction tag - FACTION: '%s changed your faction tag to %s' - CHANGED: The faction %s changed their name to %s. + FACTION: '%1$s changed your faction tag to %2$s' + CHANGED: The faction %1$s changed their name to %2$s. TITLE: TOCHANGE: to change a players title FORCHANGE: for changing a players title - CHANGED: '%s changed a title: %s' + CHANGED: '%1$s changed a title: %2$s' UNCLAIM: SAFEZONE: SUCCESS: Safe zone was unclaimed. @@ -366,37 +373,37 @@ COMMAND: WARZONE: SUCCESS: War zone was unclaimed. NOPERM: This is a war zone. You lack permissions to unclaim. - UNCLAIMED: '%s unclaimed some of your land.' + UNCLAIMED: '%1$s unclaimed some of your land.' UNCLAIMS: You unclaimed this land. - LOG: '%s unclaimed land at (%s) from the faction: %s' + LOG: '%1$s unclaimed land at (%2$s) from the faction: %3$s' WRONGFACTION: You don't own this land. TOUNCLAIM: to unclaim this land FORUNCLAIM: for unclaiming this land - FACTIONUNCLAIMED: '%s unclaimed some land.' + FACTIONUNCLAIMED: '%1$s unclaimed some land.' UNCLAIMALL: TOUNCLAIM: to unclaim all faction land FORUNCLAIM: for unclaiming all faction land - UNCLAIMED: '%s unclaimed ALL of your faction''s land.' - LOG: '%s unclaimed everything for the faction: %s' + UNCLAIMED: '%1$s unclaimed ALL of your faction''s land.' + LOG: '%1$s unclaimed everything for the faction: %2$s' VERSION: - VERSION: You are running %s + VERSION: You are running %1$s WARUNCLAIMALL: SHORT: unclaim all warzone land SUCCESS: You unclaimed ALL war zone land. - LOG: '%s unclaimed all war zones.' + LOG: '%1$s unclaimed all war zones.' RELATIONS: ALLTHENOPE: Nope! You can't. MORENOPE: Nope! You can't declare a relation to yourself :) - ALREADYINRELATIONSHIP: You already have that relation wish set with %s. + ALREADYINRELATIONSHIP: You already have that relation wish set with %1$s. TOMARRY: to change a relation wish FORMARRY: for changing a relation wish - MUTUAL: Your faction is now %s to %s + MUTUAL: Your faction is now %1$s to %2$s PEACEFUL: This will have no effect while your faction is peaceful. PEACEFULOTHER: This will have no effect while their faction is peaceful. PROPOSAL: - '1': '%s wishes to be your %s' - '2': Type /%s %s %s to accept. - SENT: '%s were informed that you wish to be %s' + '1': '%1$s wishes to be your %2$s' + '2': Type /%1$s %2$s %3$s to accept. + SENT: '%1$s were informed that you wish to be %2$s' command: convert: backend: @@ -404,25 +411,82 @@ command: invalid: Invalid backend help: invitations: 'You might want to close it and use invitations:' +LEAVE: + PASSADMIN: You must give the admin role to someone else first. + NEGATIVEPOWER: You cannot leave until your power is positive. + TOLEAVE: to leave your faction. + FORLEAVE: for leaving your faction. + LEFT: '%s left faction %s.' + DISBANDED: %s was disbanded. + DISBANDEDLOG: The faction %s (%s) was disbanded due to the last player (%s) leaving. +CLAIM: + PROTECTED: This land is protected + DISABLED: Sorry, this world has land claiming disabled. + CANTCLAIM: You can't claim land for %s. + ALREADYOWN: '%s already own this land.' + MUSTBE: You must be %s to claim land. + MEMBERS: Factions must have at least %s members to claim land. + SAFEZONE: You can not claim a Safe Zone. + WARZONE: You can not claim a War Zone. + POWER: You can't claim more land! You need more power! + LIMIT: Limit reached. You can't claim more land! + ALLY: You can't claim the land of your allies. + CONTIGIOUS: You can only claim additional land which is connected to your first claim or controlled by another faction! + FACTIONCONTIGUOUS: You can only claim additional land which is connected to your first claim! + PEACEFUL: '%s owns this land. Your faction is peaceful, so you cannot claim land + from other factions.' + PEACEFULTARGET: '%s owns this land, and is a peaceful faction. You cannot claim + land from them.' + THISISSPARTA: '%s owns this land and is strong enough to keep it.' + BORDER: You must start claiming land at the border of the territory. + TOCLAIM: to claim this land + FORCLAIM: for claiming this land + CLAIMED: %s claimed land for %s from %s. + CLAIMEDLOG: '%s claimed land at (%s) for the faction: %s' GENERIC: + NOPERMISSION: You don't have permission to %1$s. + DOTHAT: do that + NOPLAYERMATCH: No player match found for "

%1$s". + NOPLAYERFOUND: No player "

%1$s" could not be found. + ARGS: + TOOFEW: 'Too few arguments. Use like this:' + TOOMANY: 'Strange argument "

%1$s". Use the command like this:' + OWNERS: 'Owner(s): %1$s' + PUBLICLAND: Public faction land. + FACTIONLESS: factionless SERVERADMIN: A server admin DISABLED: disabled ENABLED: enabled CONSOLEONLY: This command cannot be run as a player. + PLAYERONLY: This command can only be used by ingame players. ASKYOURLEADER: ' Ask your leader to:' YOUSHOULD: 'You should:' YOUMAYWANT: 'You may want to: ' TRANSLATION: - VERSION: 'Translation: %s(%s,%s) State: %s' - CONTRIBUTORS: 'Translation contributors: %s' - RESPONSIBLE: 'Responsible for translation: %s' + VERSION: 'Translation: %1$s(%2$s,%3$s) State: %4$s' + CONTRIBUTORS: 'Translation contributors: %1$s' + RESPONSIBLE: 'Responsible for translation: %1$s' + FACTIONTAG: + TOOSHORT: The faction tag can't be shorter than %1$s chars. + TOOLONG: The faction tag can't be longer than %s chars. + ALPHANUMERIC: Faction tag must be alphanumeric. "%s" is not allowed. +COMPASS: + SHORT: + NORTH: N + EAST: E + SOUTH: S + WEST: W +CHAT: + FACTION: faction chat + ALLIANCE: alliance chat + PUBLIC: public chat RELATION: MEMBER: member ALLY: ally NEUTRAL: neutral ENEMY: enemy NOPAGES: Sorry. No Pages available. -INVALIDPAGE: Invalid page. Must be between 1 and %d +INVALIDPAGE: Invalid page. Must be between 1 and %1$d title: '&bFactions &0|&r' wilderness: '&2Wilderness' wilderness-description: '' @@ -432,3 +496,8 @@ safezone: '&6Safezone' safezone-description: Free from pvp and monsters. toggle-sb: You now have scoreboards set to {value} default-prefix: '{relationcolor}[{faction}] &r' +faction-login: '&e%1$s &9logged in.' +faction-logout: '&e%1$s &9logged out..' +WARMUPS: + NOTIFY: + TELEPORT: '&eYou will teleport to &d%1$s &ein &d%2$d &eseconds.'