changed i18n so that parametrized strings are also foundby gettext workflow

In fact, the __() function was changed not to translate by itself. Instead, the strings are always translated by __() before feeding them to __r(). This way, xgettext() finds all strings properly.
changed two translatable strings to use same parameter names for reusability