Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/calculate

Conflicts:

	po/ne.po
	po/tr.po
