Added i18n strings for suveryindexview and surveyindexwindow
Fixed a merge conflict in SurveysIndexView