Marius Stanciu ab9db619ee - fix the conflicts %!s(int64=6) %!d(string=hai) anos
..
strings.mo 3c991e1c2d - updated all the translations files %!s(int64=6) %!d(string=hai) anos
strings.po ab9db619ee - fix the conflicts %!s(int64=6) %!d(string=hai) anos