From b58b6f5963351fa1cf46d1a441513b0c33a35ced Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Fri, 2 Jan 2015 00:28:57 +1100
Subject: [PATCH] feedback

---
 .../java/com/intellectualcrafters/plot/commands/Merge.java     | 2 +-
 .../src/main/java/com/intellectualcrafters/plot/config/C.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
index fc6f3d0ca..cad149393 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
@@ -87,7 +87,7 @@ public class Merge extends SubCommand {
             return false;
         }
         boolean admin = PlotMain.hasPermission(plr, "plots.admin");
-        if (!plot.getOwner().equals(UUIDHandler.getUUID(    plr)) && !admin) {
+        if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !admin) {
             PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
index bd2684e70..9c21d0908 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -153,7 +153,7 @@ public enum C {
      */
     NO_SCHEMATIC_PERMISSION("&cYou don't have the permission required to use schematic &6%s"),
     NO_PERMISSION("&cYou are lacking the permission node: &6%s"),
-    NO_PLOT_PERMS("&cYou don't have the permissions to do that in this plot"),
+    NO_PLOT_PERMS("&cYou must be the plot owner to perform this action"),
     CANT_CLAIM_MORE_PLOTS("&cYou can't claim more plots."),
     CANT_CLAIM_MORE_PLOTS_NUM("&cYou can't claim more than &6%s &cplots at once"),
     YOU_BE_DENIED("&cYou are not allowed to enter this plot"),
@@ -245,6 +245,7 @@ public enum C {
      * Info
      */
     PLOT_UNOWNED("&cThe current plot must have an owner to perform this action"),
+    PLOT_INFO_UNCLAIMED("&cPlot &6%s&c is not yet claimed"),
     /*
      * PLOT_INFO("" +
      * "&6ID&7: &a%id%&7\n" +