diff --git a/src/app/t.const.ts b/src/app/t.const.ts index 2d8d6607ec..329c8d1a75 100644 --- a/src/app/t.const.ts +++ b/src/app/t.const.ts @@ -969,6 +969,10 @@ const T = { VECTOR_COMPARISON_LOCAL_GREATER: 'F.SYNC.D_CONFLICT.VECTOR_COMPARISON_LOCAL_GREATER', VECTOR_COMPARISON_LOCAL_LESS: 'F.SYNC.D_CONFLICT.VECTOR_COMPARISON_LOCAL_LESS', + DATE: 'F.SYNC.D_CONFLICT.DATE', + TIME: 'F.SYNC.D_CONFLICT.TIME', + VECTOR_CLOCK: 'F.SYNC.D_CONFLICT.VECTOR_CLOCK', + RESULT: 'F.SYNC.D_CONFLICT.RESULT', }, D_DECRYPT_ERROR: { BTN_OVER_WRITE_REMOTE: 'F.SYNC.D_DECRYPT_ERROR.BTN_OVER_WRITE_REMOTE', diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 921ccbaa82..35ec07abfd 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -953,7 +953,11 @@ "VECTOR_COMPARISON_CONCURRENT": "Concurrent (True Conflict)", "VECTOR_COMPARISON_EQUAL": "Equal", "VECTOR_COMPARISON_LOCAL_GREATER": "Local > Remote", - "VECTOR_COMPARISON_LOCAL_LESS": "Local < Remote" + "VECTOR_COMPARISON_LOCAL_LESS": "Local < Remote", + "DATE": "Date", + "TIME": "Time", + "VECTOR_CLOCK": "Vector Clock", + "RESULT": "Result" }, "D_DECRYPT_ERROR": { "BTN_OVER_WRITE_REMOTE": "Change & Overwrite Remote",