From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 14 Dec 2022 19:25:07 +0000 (+0100)
Subject: Improve wording in the case clash resolution dialog
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~27^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4c4e8707daa1a593ee934640c5aaafce286a6c09;p=nextcloud-desktop.git

Improve wording in the case clash resolution dialog

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/caseclashfilenamedialog.cpp b/src/gui/caseclashfilenamedialog.cpp
index 827e537e2..fff17c0b8 100644
--- a/src/gui/caseclashfilenamedialog.cpp
+++ b/src/gui/caseclashfilenamedialog.cpp
@@ -100,7 +100,7 @@ CaseClashFilenameDialog::CaseClashFilenameDialog(AccountPtr account,
 
     const auto preexistingConflictingFile = caseClashConflictFile(_filePath);
     updateFileWidgetGroup(preexistingConflictingFile,
-                          tr("Open local version"),
+                          tr("Open existing file"),
                           _ui->localVersionFilename,
                           _ui->localVersionLink,
                           _ui->localVersionMtime,
@@ -108,7 +108,7 @@ CaseClashFilenameDialog::CaseClashFilenameDialog(AccountPtr account,
                           _ui->localVersionButton);
 
     updateFileWidgetGroup(conflictTaggedPath,
-                          tr("Open server version"),
+                          tr("Open clashing file"),
                           _ui->remoteVersionFilename,
                           _ui->remoteVersionLink,
                           _ui->remoteVersionMtime,
diff --git a/src/gui/caseclashfilenamedialog.ui b/src/gui/caseclashfilenamedialog.ui
index 17eb96d74..42d9a6754 100644
--- a/src/gui/caseclashfilenamedialog.ui
+++ b/src/gui/caseclashfilenamedialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>553</width>
+    <width>451</width>
     <height>349</height>
    </rect>
   </property>
@@ -50,7 +50,7 @@
        <item>
         <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Local case clash file</string>
+          <string>Existing file</string>
          </property>
         </widget>
        </item>
@@ -118,7 +118,7 @@
            <item>
             <widget class="QLabel" name="localVersionLink">
              <property name="text">
-              <string>Open original version</string>
+              <string>Open existing file</string>
              </property>
             </widget>
            </item>
@@ -162,7 +162,7 @@
        <item>
         <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Server case clash file</string>
+          <string>Case clashing file</string>
          </property>
         </widget>
        </item>
@@ -224,7 +224,7 @@
            <item>
             <widget class="QLabel" name="remoteVersionLink">
              <property name="text">
-              <string>Open incoming conflict version</string>
+              <string>Open clashing file</string>
              </property>
             </widget>
            </item>
@@ -265,7 +265,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Please enter a new name for the remote file:</string>
+      <string>Please enter a new name for the clashing file:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>