I just commited the cleanup for this to my sandbox and will merge to trunk later today so you may want to leave those files alone on your end until you can get my changes otherwise there could be conflicts merging.
I split the contents out of your SiteOfficeResource.sv.resx into SiteMailResources.sv.resx and GoogleDBTools.sv.resx
Joe