Conflicts:
	src/app/pages/api-keys/api-keys.component.ts
	src/app/pages/data-protection/cloudsync/cloudsync-list/cloudsync-list.component.ts
	src/app/pages/data-protection/rsync-task/rsync-task-list/rsync-task-list.component.ts
	src/app/pages/data-protection/scrub-task/scrub-list/scrub-list.component.ts
	src/app/pages/data-protection/smart-task/smart-task-list/smart-task-list.component.ts
	src/app/pages/data-protection/snapshot/snapshot-list/snapshot-list.component.ts
	src/app/pages/system/advanced/cron/cron-list/cron-list.component.ts
	src/app/services/task.service.ts
	src/assets/i18n/af.json
	src/assets/i18n/ar.json
	src/assets/i18n/ast.json
	src/assets/i18n/az.json
	src/assets/i18n/be.json
	src/assets/i18n/bg.json
	src/assets/i18n/bn.json
	src/assets/i18n/br.json
	src/assets/i18n/bs.json
	src/assets/i18n/ca.json
	src/assets/i18n/cs.json
	src/assets/i18n/cy.json
	src/assets/i18n/da.json
	src/assets/i18n/dsb.json
	src/assets/i18n/el.json
	src/assets/i18n/en-au.json
	src/assets/i18n/en-gb.json
	src/assets/i18n/en.json
	src/assets/i18n/eo.json
	src/assets/i18n/es-co.json
	src/assets/i18n/es-mx.json
	src/assets/i18n/es-ni.json
	src/assets/i18n/es-ve.json
	src/assets/i18n/es.json
	src/assets/i18n/et.json
	src/assets/i18n/eu.json
	src/assets/i18n/fa.json
	src/assets/i18n/fi.json
	src/assets/i18n/fy.json
	src/assets/i18n/ga.json
	src/assets/i18n/gd.json
	src/assets/i18n/gl.json
	src/assets/i18n/he.json
	src/assets/i18n/hi.json
	src/assets/i18n/hr.json
	src/assets/i18n/hsb.json
	src/assets/i18n/hu.json
	src/assets/i18n/ia.json
	src/assets/i18n/id.json
	src/assets/i18n/io.json
	src/assets/i18n/is.json
	src/assets/i18n/it.json
	src/assets/i18n/ja.json
	src/assets/i18n/ka.json
	src/assets/i18n/kk.json
	src/assets/i18n/km.json
	src/assets/i18n/kn.json
	src/assets/i18n/ko.json
	src/assets/i18n/lb.json
	src/assets/i18n/lt.json
	src/assets/i18n/lv.json
	src/assets/i18n/mk.json
	src/assets/i18n/ml.json
	src/assets/i18n/mn.json
	src/assets/i18n/mr.json
	src/assets/i18n/my.json
	src/assets/i18n/nb.json
	src/assets/i18n/ne.json
	src/assets/i18n/nl.json
	src/assets/i18n/nn.json
	src/assets/i18n/os.json
	src/assets/i18n/pa.json
	src/assets/i18n/pl.json
	src/assets/i18n/pt-br.json
	src/assets/i18n/pt.json
	src/assets/i18n/ro.json
	src/assets/i18n/ru.json
	src/assets/i18n/sk.json
	src/assets/i18n/sl.json
	src/assets/i18n/sq.json
	src/assets/i18n/sr-latn.json
	src/assets/i18n/sr.json
	src/assets/i18n/strings.json
	src/assets/i18n/sv.json
	src/assets/i18n/sw.json
	src/assets/i18n/ta.json
	src/assets/i18n/te.json
	src/assets/i18n/th.json
	src/assets/i18n/tr.json
	src/assets/i18n/tt.json
	src/assets/i18n/udm.json
	src/assets/i18n/uk.json
	src/assets/i18n/vi.json
	src/assets/i18n/zh-hans.json
	src/assets/i18n/zh-hant.json