chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-05-06 14:34:09 +02:00
Code

Use … instead of 3 dots

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
(cherry picked from commit a4fa8b05e5065da62bb7f6d3cc8c371a2a68ed06)
Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Joas Schilling 2019-11-14 23:23:43 +01:00 committed by Michael Schuster
parent 06ffd3e841
commit b6ef8edb12
No known key found for this signature in database
GPG Key ID: 00819E3BF4177B28
10 changed files with 20 additions and 20 deletions

4
shell_integration/dolphin/ownclouddolphinpluginhelper.h
View File

@ -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"]; }

2
src/gui/accountsettings.cpp
View File

@ -1032,7 +1032,7 @@ void AccountSettings::slotAccountStateChanged()
"<a href='%1'>Click here</a> 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.")

8
src/gui/folderstatusmodel.cpp
View File

@ -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();

8
src/gui/owncloudgui.cpp
View File

@ -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);

4
src/gui/owncloudsetupwizard.cpp
View File

@ -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.<br/><br/>")
.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);

2
src/gui/selectivesyncdialog.cpp
View File

@ -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);

4
src/gui/socketapi.cpp
View File

@ -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)

4
src/gui/updater/ocupdater.cpp
View File

@ -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 <a href='%3'>here</a> 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:

2
src/gui/wizard/owncloudadvancedsetuppage.cpp
View File

@ -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);

2
src/libsync/theme.cpp
View File

@ -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");