Merge from translate.androplus.org and moved not-translatable strings