Implemented lock settings in bbb-client and bbb-apps.
Merging locales file