added pot
merged
git errors fixed