Skip to content

Commit

Permalink
CLOUD: Improve some labels
Browse files Browse the repository at this point in the history
  • Loading branch information
criezy committed Sep 4, 2016
1 parent 2cbf7da commit 7ad922f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions gui/options.cpp
Expand Up @@ -1311,22 +1311,22 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
_storageUsedSpaceDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StorageUsedSpaceDesc", _("Used space:"), _("Space used by ScummVM's saves on this storage"));
_storageUsedSpace = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StorageUsedSpaceLabel", "0 bytes");

_storageLastSyncDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StorageLastSyncDesc", _("Last sync time:"), _("When this storage did saves sync last time"));
_storageLastSyncDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StorageLastSyncDesc", _("Last sync time:"), _("When the last saves sync for this storage occured"));
_storageLastSync = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.StorageLastSyncLabel", "<never>");

_storageConnectButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.ConnectButton", _("Connect"), _("Open wizard dialog to connect your cloud storage account"), kConfigureStorageCmd);
_storageRefreshButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RefreshButton", _("Refresh"), _("Refresh current cloud storage information (username and usage)"), kRefreshStorageCmd);
_storageDownloadButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.DownloadButton", _("Downloads"), _("Open downloads manager dialog"), kDownloadStorageCmd);
_storageDownloadButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.DownloadButton", _("Download"), _("Open downloads manager dialog"), kDownloadStorageCmd);

_runServerButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RunServerButton", _("Run server"), _("Run local webserver"), kRunServerCmd);
_serverInfoLabel = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.ServerInfoLabel", _("Not running"));

// Root path
if (g_system->getOverlayWidth() > 320)
_rootPathButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RootPathButton", _("/root/ Path:"), _("Specifies where Files Manager can access to"), kChooseRootDirCmd);
_rootPathButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RootPathButton", _("/root/ Path:"), _("Specifies which directory the Files Manager can access"), kChooseRootDirCmd);
else
_rootPathButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RootPathButton", _c("/root/ Path:", "lowres"), _("Specifies where Files Manager can access to"), kChooseRootDirCmd);
_rootPath = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.RootPath", "/foo/bar", _("Specifies where Files Manager can access to"));
_rootPathButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RootPathButton", _c("/root/ Path:", "lowres"), _("Specifies which directory the Files Manager can access"), kChooseRootDirCmd);
_rootPath = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.RootPath", "/foo/bar", _("Specifies which directory the Files Manager can access"));

_rootPathClearButton = addClearButton(container, "GlobalOptions_Cloud_Container.RootPathClearButton", kRootPathClearCmd);

Expand All @@ -1335,7 +1335,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
#else
uint32 port = 0; // the following widgets are hidden anyway
#endif
_serverPortDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.ServerPortDesc", _("Server's port:"), _("Which port is used by server\nAuth with server is not available with non-default port"));
_serverPortDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.ServerPortDesc", _("Server's port:"), _("Which port is used by the server\nAuth with server is not available with non-default port"));
_serverPort = new EditTextWidget(container, "GlobalOptions_Cloud_Container.ServerPortEditText", Common::String::format("%u", port), 0);
_serverPortClearButton = addClearButton(container, "GlobalOptions_Cloud_Container.ServerPortClearButton", kServerPortClearCmd);

Expand Down Expand Up @@ -1521,7 +1521,7 @@ void GlobalOptionsDialog::close() {
Common::String message = _("Failed to change cloud storage!");
if (anotherStorageIsWorking) {
message += "\n";
message += _("Current cloud storage is working at the moment.");
message += _("Another cloud storage is already active.");
}
MessageDialog dialog(message);
dialog.runModal();
Expand Down
2 changes: 1 addition & 1 deletion gui/remotebrowser.cpp
Expand Up @@ -125,7 +125,7 @@ void RemoteBrowserDialog::handleTickle() {

if (_showError) {
_showError = false;
MessageDialog alert(_("ScummVM couldn't list the directory!"));
MessageDialog alert(_("ScummVM could not access the directory!"));
alert.runModal();
}

Expand Down
8 changes: 4 additions & 4 deletions gui/storagewizarddialog.cpp
Expand Up @@ -76,8 +76,8 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId):

if (Cloud::CloudManager::couldUseLocalServer()) {
// hide fields and even the button if local webserver is on
_returnLine1->setLabel(_("You would be navigated to ScummVM's page"));
_returnLine2->setLabel(_("when you'd allow it to use your storage."));
_returnLine1->setLabel(_("You will be directed to ScummVM's page where"));
_returnLine2->setLabel(_("you should allow it to access your storage."));
}

_picture = new GraphicsWidget(container, "GlobalOptions_Cloud_ConnectionWizard_Container.Picture");
Expand Down Expand Up @@ -110,7 +110,7 @@ void StorageWizardDialog::open() {
if (CloudMan.isWorking()) {
bool doClose = true;

MessageDialog alert(_("The other Storage is working. Do you want to interrupt it?"), _("Yes"), _("No"));
MessageDialog alert(_("Another Storage is active. Do you want to interrupt it?"), _("Yes"), _("No"));
if (alert.runModal() == GUI::kMessageOK) {
if (CloudMan.isDownloading())
CloudMan.cancelDownload();
Expand Down Expand Up @@ -207,7 +207,7 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
}
case kOpenUrlCmd: {
if (!Networking::Browser::openUrl(getUrl())) {
MessageDialog alert(_("Failed to open URL!\nYou should navigate there manually then."));
MessageDialog alert(_("Failed to open URL!\nPlease navigate to this page manually."));
alert.runModal();
}
break;
Expand Down

0 comments on commit 7ad922f

Please sign in to comment.