fixed conflicts test1
[meabook] / i18n /
drwxr-xr-x   ..
-rw-r--r-- 1014 meabook.pot
drwxr-xr-x - ru