Merge framework-res (base) Close Issue #65

@imranz Some review needs to be done on the file to see if there are any left overs to translate.