fixed warnings and added strings to /values/strings
master update