change displayed revision name

packages/app/resource/locales/en_US/translation.json

@@ -466,10 +466,10 @@
     "resolve_conflict": "Resolve Conflict",
     "resolve_and_save" : "Resolve and save",
     "select_revision" : "Select {{revision}}",
-    "requested_revision": "requested page body",
-    "origin_revision": "page body before request",
-    "latest_revision": "latest page body",
-    "selected_editable_revision": "Selected Revision(Editable)"
+    "requested_revision": "mine",
+    "origin_revision": "origin",
+    "latest_revision": "theirs",
+    "selected_editable_revision": "Selected Page Body (Editable)"
   },
   "link_edit": {
     "edit_link": "Edit Link",

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -166,7 +166,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                   }}
                 >
                   <i className="icon-fw icon-arrow-down-circle"></i>
-                  {t('modal_resolve_conflict.select_revision', { revision: 'request' })}
+                  {t('modal_resolve_conflict.select_revision', { revision: 'mine' })}
                 </button>
               </div>
             </div>
@@ -196,7 +196,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
                   }}
                 >
                   <i className="icon-fw icon-arrow-down-circle"></i>
-                  {t('modal_resolve_conflict.select_revision', { revision: 'latest' })}
+                  {t('modal_resolve_conflict.select_revision', { revision: 'theirs' })}
                 </button>
               </div>
             </div>