From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- sc/uiconfig/scalc/ui/conflictsdialog.ui | 256 ++++++++++++++++++++++++++++++++ 1 file changed, 256 insertions(+) create mode 100644 sc/uiconfig/scalc/ui/conflictsdialog.ui (limited to 'sc/uiconfig/scalc/ui/conflictsdialog.ui') diff --git a/sc/uiconfig/scalc/ui/conflictsdialog.ui b/sc/uiconfig/scalc/ui/conflictsdialog.ui new file mode 100644 index 0000000000..b12b5ad5c6 --- /dev/null +++ b/sc/uiconfig/scalc/ui/conflictsdialog.ui @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + False + 6 + Resolve Conflicts + False + dialog + + + + + + False + vertical + 12 + + + False + end + + + _Keep All Mine + True + True + True + True + + + False + True + 0 + + + + + Keep _All Others + True + True + True + True + + + False + True + 1 + + + + + _Cancel + True + True + True + True + + + False + True + 2 + + + + + _Help + True + True + True + True + + + False + True + 3 + True + True + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + start + There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes. + True + 120 + 0 + + + False + True + 0 + + + + + True + True + True + True + in + + + True + True + True + True + True + liststore1 + 0 + True + + + + + + True + 6 + Conflict + True + + + + 0 + + + + + + + True + 6 + Author + True + + + + 1 + + + + + + + True + 6 + Date + True + + + + 2 + + + + + + + + + Changes + + + + + True + True + 1 + + + + + True + False + 6 + center + + + Keep _Mine + True + True + True + True + + + False + True + 0 + + + + + Keep _Other + True + True + True + True + + + False + True + 1 + + + + + False + True + 2 + + + + + True + True + 1 + + + + + + keepallmine + keepallothers + cancel + help + + + -- cgit v1.2.3