From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Wed, 3 May 2023 11:59:29 +0000 (+0200)
Subject: replace "OK" button by "Resolve conflicts" to help users
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8f61d539da2dc9c0da44f5eb4408cb82e3227ea4;p=nextcloud-desktop.git

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 e03404fd8..643b92f95 100644
--- 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")