From 9ce2491d67a656b5b61ba6a507514cc9a9ab0f0a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 14 Nov 2019 23:23:43 +0100 Subject: [PATCH] =?utf8?q?Use=20=E2=80=A6=20instead=20of=203=20dots?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Joas Schilling --- shell_integration/dolphin/ownclouddolphinpluginhelper.h | 4 ++-- src/gui/accountsettings.cpp | 2 +- src/gui/folderstatusmodel.cpp | 8 ++++---- src/gui/owncloudgui.cpp | 8 ++++---- src/gui/owncloudsetupwizard.cpp | 4 ++-- src/gui/selectivesyncdialog.cpp | 2 +- src/gui/socketapi.cpp | 4 ++-- src/gui/updater/ocupdater.cpp | 4 ++-- src/gui/wizard/owncloudadvancedsetuppage.cpp | 2 +- src/libsync/theme.cpp | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.h b/shell_integration/dolphin/ownclouddolphinpluginhelper.h index 3e7a97477..92d9fcdf8 100644 --- a/shell_integration/dolphin/ownclouddolphinpluginhelper.h +++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.h @@ -35,11 +35,11 @@ public: QString contextMenuTitle() const { - return _strings.value("CONTEXT_MENU_TITLE", "ownCloud"); + return _strings.value("CONTEXT_MENU_TITLE", "Nextcloud"); } QString shareActionTitle() const { - return _strings.value("SHARE_MENU_TITLE", "Share..."); + return _strings.value("SHARE_MENU_TITLE", "Share …"); } QString copyPrivateLinkTitle() const { return _strings["COPY_PRIVATE_LINK_MENU_TITLE"]; } diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 7eb65cfba..c62f29f86 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -1032,7 +1032,7 @@ void AccountSettings::slotAccountStateChanged() "Click here to re-open the browser.") .arg(url.toString(QUrl::FullyEncoded))); } else { - showConnectionLabel(tr("Connecting to %1...").arg(serverWithUser)); + showConnectionLabel(tr("Connecting to %1 …").arg(serverWithUser)); } } else { showConnectionLabel(tr("No connection to %1 at %2.") diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index fb16dfacb..319436cd2 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -186,7 +186,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const return QVariant(tr("Error while loading the list of folders from the server.") + QString("\n") + x->_lastErrorString); } else { - return tr("Fetching folder list from server..."); + return tr("Fetching folder list from server …"); } break; default: @@ -1099,15 +1099,15 @@ void FolderStatusModel::slotFolderSyncStateChange(Folder *f) } QString message; if (pos <= 0) { - message = tr("Waiting..."); + message = tr("Waiting …"); } else { - message = tr("Waiting for %n other folder(s)...", "", pos); + message = tr("Waiting for %n other folder(s) …", "", pos); } pi = SubFolderInfo::Progress(); pi._overallSyncString = message; } else if (state == SyncResult::SyncPrepare) { pi = SubFolderInfo::Progress(); - pi._overallSyncString = tr("Preparing to sync..."); + pi._overallSyncString = tr("Preparing to sync …"); } else if (state == SyncResult::Problem || state == SyncResult::Success) { // Reset the progress info after a sync. pi = SubFolderInfo::Progress(); diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 0ee84fcfb..6ece39b92 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -421,7 +421,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men } if (accountState->isSignedOut()) { - QAction *signin = menu->addAction(tr("Log in...")); + QAction *signin = menu->addAction(tr("Log in …")); signin->setProperty(propertyAccountC, QVariant::fromValue(accountState)); connect(signin, &QAction::triggered, this, &ownCloudGui::slotLogin); } else { @@ -786,9 +786,9 @@ void ownCloudGui::setupActions() _actionStatus->setEnabled(false); _navLinksMenu = new QMenu(tr("Apps")); _navLinksMenu->setEnabled(false); - _actionSettings = new QAction(tr("Settings..."), this); - _actionNewAccountWizard = new QAction(tr("New account..."), this); - _actionRecent = new QAction(tr("View more activity..."), this); + _actionSettings = new QAction(tr("Settings …"), this); + _actionNewAccountWizard = new QAction(tr("New account …"), this); + _actionRecent = new QAction(tr("View more activity …"), this); _actionRecent->setEnabled(true); QObject::connect(_actionRecent, &QAction::triggered, this, &ownCloudGui::slotShowSyncProtocol); diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 3d2034466..ec2512f85 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -331,7 +331,7 @@ void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url) AbstractCredentials *creds = _ocWizard->getCredentials(); _ocWizard->account()->setCredentials(creds); _ocWizard->setField(QLatin1String("OCUrl"), url); - _ocWizard->appendToConfigurationLog(tr("Trying to connect to %1 at %2...") + _ocWizard->appendToConfigurationLog(tr("Trying to connect to %1 at %2 …") .arg(Theme::instance()->appNameGUI()) .arg(url)); @@ -452,7 +452,7 @@ void OwncloudSetupWizard::slotCreateLocalAndRemoteFolders(const QString &localFo tr("Local sync folder %1 already exists, setting it up for sync.

") .arg(Utility::escape(localFolder))); } else { - QString res = tr("Creating local sync folder %1...").arg(localFolder); + QString res = tr("Creating local sync folder %1 …").arg(localFolder); if (fi.mkpath(localFolder)) { FileSystem::setFolderMinimumPermissions(localFolder); Utility::setupFavLink(localFolder); diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 38e5a1fe6..485880db4 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -70,7 +70,7 @@ SelectiveSyncWidget::SelectiveSyncWidget(AccountPtr account, QWidget *parent) , _inserting(false) , _folderTree(new QTreeWidget(this)) { - _loading = new QLabel(tr("Loading ..."), _folderTree); + _loading = new QLabel(tr("Loading …"), _folderTree); auto layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp index 120d7140b..b09973d5b 100644 --- a/src/gui/socketapi.cpp +++ b/src/gui/socketapi.cpp @@ -625,7 +625,7 @@ void SocketApi::command_GET_STRINGS(const QString &argument, SocketListener *lis { "SHARE_MENU_TITLE", tr("Share options") }, { "CONTEXT_MENU_TITLE", tr("Share via %1").arg(Theme::instance()->appNameGUI())}, { "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") }, - { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email...") }, + { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email …") }, } }; listener->sendMessage(QString("GET_STRINGS:BEGIN")); for (const auto& key_value : strings) { @@ -673,7 +673,7 @@ void SocketApi::sendSharingContextMenuOptions(const FileData &fileData, SocketLi // Disabled: only providing email option for private links would look odd, // and the copy option is more general. - //listener->sendMessage(QLatin1String("MENU_ITEM:EMAIL_PRIVATE_LINK") + flagString + tr("Send private link by email...")); + //listener->sendMessage(QLatin1String("MENU_ITEM:EMAIL_PRIVATE_LINK") + flagString + tr("Send private link by email …")); } SocketApi::FileData SocketApi::FileData::get(const QString &localFile) diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp index 7db3e6ed0..90294712c 100644 --- a/src/gui/updater/ocupdater.cpp +++ b/src/gui/updater/ocupdater.cpp @@ -140,7 +140,7 @@ QString OCUpdater::statusString() const switch (downloadState()) { case Downloading: - return tr("Downloading version %1. Please wait...").arg(updateVersion); + return tr("Downloading version %1. Please wait …").arg(updateVersion); case DownloadComplete: return tr("%1 version %2 available. Restart application to start the update.").arg(Theme::instance()->appNameGUI(), updateVersion); case DownloadFailed: @@ -150,7 +150,7 @@ QString OCUpdater::statusString() const case UpdateOnlyAvailableThroughSystem: return tr("New %1 version %2 is available. Please click here to download the update.").arg(Theme::instance()->appNameGUI(), updateVersion, _updateInfo.web()); case CheckingServer: - return tr("Checking update server..."); + return tr("Checking update server …"); case Unknown: return tr("Update status is unknown: Did not check for new updates."); case UpToDate: diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp index 19ffd1a70..7cfb79644 100644 --- a/src/gui/wizard/owncloudadvancedsetuppage.cpp +++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp @@ -58,7 +58,7 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage() setupCustomization(); connect(_ui.pbSelectLocalFolder, &QAbstractButton::clicked, this, &OwncloudAdvancedSetupPage::slotSelectFolder); - setButtonText(QWizard::NextButton, tr("Connect...")); + setButtonText(QWizard::NextButton, tr("Connect …")); connect(_ui.rSyncEverything, &QAbstractButton::clicked, this, &OwncloudAdvancedSetupPage::slotSyncEverythingClicked); connect(_ui.rSelectiveSync, &QAbstractButton::clicked, this, &OwncloudAdvancedSetupPage::slotSelectiveSyncClicked); diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 093995513..9d6a2a405 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -83,7 +83,7 @@ QString Theme::statusHeaderText(SyncResult::Status status) const resultStr = QCoreApplication::translate("theme", "Preparing to sync"); break; case SyncResult::SyncAbortRequested: - resultStr = QCoreApplication::translate("theme", "Aborting..."); + resultStr = QCoreApplication::translate("theme", "Aborting …"); break; case SyncResult::Paused: resultStr = QCoreApplication::translate("theme", "Sync is paused"); -- 2.30.2