From: Christian Kamm <mail@ckamm.de>
Date: Wed, 16 May 2018 09:34:01 +0000 (+0200)
Subject: Rename "placeholder" feature
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~589
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ddeeecd0615733eb2ede852042d611f61115b087;p=nextcloud-desktop.git

Rename "placeholder" feature
---

diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 90f750d66..dbbdbd06f 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -495,7 +495,7 @@ FolderWizardSelectiveSync::FolderWizardSelectiveSync(const AccountPtr &account)
     layout->addWidget(_selectiveSync);
 
     if (ConfigFile().showExperimentalOptions()) {
-        _placeholderCheckBox = new QCheckBox(tr("Create placeholders instead of downloading files (experimental)"));
+        _placeholderCheckBox = new QCheckBox(tr("Use virtual files instead of downloading content immediately (experimental)"));
         connect(_placeholderCheckBox, &QCheckBox::clicked, this, &FolderWizardSelectiveSync::placeholderCheckboxClicked);
         layout->addWidget(_placeholderCheckBox);
     }
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui
index 303590b34..0f9a7bc87 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -238,7 +238,7 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Create placeholders instead of downloading files (experimental)</string>
+             <string>Use virtual files instead of downloading content immediately (e&amp;xperimental)</string>
             </property>
             <property name="checkable">
              <bool>false</bool>
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index d9adb828e..effc6955f 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -331,8 +331,8 @@ void OwncloudWizard::askExperimentalPlaceholderFeature(const std::function<void(
     auto msgBox = new QMessageBox(
         QMessageBox::Warning,
         tr("Enable experimental feature?"),
-        tr("When the \"synchronize placeholders\" mode is enabled no files will be downloaded initially. "
-           "Instead, a tiny \"%1\" file will be created for each file on the server. "
+        tr("When the \"virtual files\" mode is enabled no files will be downloaded initially. "
+           "Instead, a tiny \"%1\" file will be created for each file that exists on the server. "
            "The contents can be downloaded by running these files or by using their context menu."
            "\n\n"
            "This is a new, experimental mode. If you decide to use it, please report any "
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index 93cab726f..a6f3e9c28 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -862,7 +862,7 @@ void SyncEngine::startSync()
     _csync_ctx->placeholder_suffix = _syncOptions._placeholderSuffix.toUtf8();
 
     if (_csync_ctx->new_files_are_placeholders && _csync_ctx->placeholder_suffix.isEmpty()) {
-        csyncError(tr("Using placeholder files, but placeholder suffix is not set"));
+        csyncError(tr("Using virtual files but placeholder suffix is not set"));
         finalize(false);
         return;
     }