Merge "Moved po directory to resources folder & added missing language strings" into...