replace "OK" button by "Resolve conflicts" to help users

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index e03404fd8a16595154dd31668f850a0d88726381..643b92f95307299a73838b6986fdc4a6783ef721 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -173,7 +173,14 @@ Window {
         DialogButtonBox {
             Layout.fillWidth: true
 
-            standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel
+            Button {
+                text: qsTr("Resolve conflicts")
+                DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
+            }
+            Button {
+                text: qsTr("Cancel")
+                DialogButtonBox.buttonRole: DialogButtonBox.RejectRole
+            }
 
             onAccepted: function() {
                 console.log("Ok clicked")