From fd8e67e236ac5e59c13329639eab9d56aca58f24 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Fri, 24 Jan 2014 07:24:29 -0200 Subject: [PATCH] Fix version conflicts --- locales/en/main.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/main.json b/locales/en/main.json index f7c5be21f6..603b6bd107 100644 --- a/locales/en/main.json +++ b/locales/en/main.json @@ -552,9 +552,9 @@ "automaticallocationpopover" : "Places points into attributes according to your preferences, when you level up.", "evenallocation" : "Distribute attribute points evenly ", "evenallocationpopover" : "Assigns the same number of points to each attribute.", -"classallocation" : "Distribute attribute points based on Class ", +"classallocation" : "Distribute points based on Class ", "classallocationpopover" : "Assigns more points to the attributes important to your Class.", -"taskallocation" : "Distribute attribute points based on task activity ", +"taskallocation" : "Distribute points based on task activity ", "taskallocationpopover" : "Assigns points based on the Physical (STR), Mental (INT), Social (CON), and Other (PER) categories associated with the tasks you complete.", "allocatestr" : "Points allocated to STR:", "allocatestrpop" : "Add a point to Strength",