Merge branch 'release/20.08' into master

diff --combined src/settings/general/previewssettingspage.cpp
index a080fd0be8efbf253a03aac15f86e202f4e6b6a6,80ff8938ae54769a3edb9a36465d37e5782cdc66..c2f21dfab20b0ed2df16ac3ba002a8ff0703fb80
--- 1/src/settings/general/previewssettingspage.cpp
--- 2/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@@ -1,8 -1,21 +1,8 @@@
 -/***************************************************************************
 - *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *
 - *                                                                         *
 - *   This program is free software; you can redistribute it and/or modify  *
 - *   it under the terms of the GNU General Public License as published by  *
 - *   the Free Software Foundation; either version 2 of the License, or     *
 - *   (at your option) any later version.                                   *
 - *                                                                         *
 - *   This program is distributed in the hope that it will be useful,       *
 - *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 - *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 - *   GNU General Public License for more details.                          *
 - *                                                                         *
 - *   You should have received a copy of the GNU General Public License     *
 - *   along with this program; if not, write to the                         *
 - *   Free Software Foundation, Inc.,                                       *
 - *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
 - ***************************************************************************/
 +/*
 + * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz19@gmail.com>
 + *
 + * SPDX-License-Identifier: GPL-2.0-or-later
 + */
  
  #include "previewssettingspage.h"
  
@@@ -61,7 -74,7 +61,7 @@@ PreviewsSettingsPage::PreviewsSettingsP
  
      m_localFileSizeBox = new QSpinBox(this);
      m_localFileSizeBox->setSingleStep(1);
-     m_localFileSizeBox->setSuffix(QStringLiteral(" MB"));
+     m_localFileSizeBox->setSuffix(i18nc("Mebibytes; used as a suffix in a spinbox showing e.g. '3 MiB'", " MiB"));
      m_localFileSizeBox->setRange(0, 9999999); /* MB */
      m_localFileSizeBox->setSpecialValueText(i18n("No limit"));
  
@@@ -74,7 -87,7 +74,7 @@@
  
      m_remoteFileSizeBox = new QSpinBox(this);
      m_remoteFileSizeBox->setSingleStep(1);
-     m_remoteFileSizeBox->setSuffix(QStringLiteral(" MB"));
+     m_remoteFileSizeBox->setSuffix(i18nc("Mebibytes; used as a suffix in a spinbox showing e.g. '3 MiB'", " MiB"));
      m_remoteFileSizeBox->setRange(0, 9999999); /* MB */
      m_remoteFileSizeBox->setSpecialValueText(i18n("No previews"));