From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Mon, 26 Oct 2020 12:58:34 +0000 (+0100)
Subject: Remove last left over of the "remote" wording
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~86^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3e6b257ccd29750855d4dc963484800e8cc12640;p=nextcloud-desktop.git

Remove last left over of the "remote" wording

I switched from "remote" to "server" but apparently left one behind by
mistake...

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/gui/conflictdialog.cpp b/src/gui/conflictdialog.cpp
index bad4e7c2d..74ce2034b 100644
--- a/src/gui/conflictdialog.cpp
+++ b/src/gui/conflictdialog.cpp
@@ -153,7 +153,7 @@ void ConflictDialog::updateWidgets()
     const auto remoteVersion = _solver->remoteVersionFilename();
     updateGroup(remoteVersion,
                 _ui->remoteVersionLink,
-                tr("Open remote version"),
+                tr("Open server version"),
                 _ui->remoteVersionMtime,
                 _ui->remoteVersionSize,
                 _ui->remoteVersionButton);