0fd6eeb025
* Updated and added missing italian translation * Resolved conflicts * Fix conflict * Fix some translation * Update messages.po Some other fixes