fixed conflicts
[meabook] / i18n /
2010-06-19 Max Usachevupdated localization
2010-06-17 Max Usachevupdated i18n
2010-06-17 Max Usachevadded localization templates