Merge branch 'dev'

This commit is contained in:
2015-06-08 21:13:24 +02:00
46 changed files with 1439 additions and 524 deletions

View File

@@ -316,7 +316,7 @@ void wxUI::ChangeUser()
void wxUI::OnButtonAbout()
{
QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2012 Grégory Soutadé");
QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2014 Grégory Soutadé");
}
void wxUI::OnButtonQuit()