activities, improve some strings
(cherry picked from commit 623352613a0a60d2ae83d27ef68633f89ca02c3c)