[X2Go-Commits] [x2goclient] 01/46: general: fix spelling and English language syntax issues. Fixes: #389.
git-admin at x2go.org
git-admin at x2go.org
Mon May 25 01:31:18 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 05689c7275195fa8650f6bd25b9f0e8f9c73624f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 24 19:55:59 2015 +0200
general: fix spelling and English language syntax issues. Fixes: #389.
v2: apply more fixes in the original changes context. (Mihai Moldovan)
---
debian/changelog | 5 +++++
src/httpbrokerclient.cpp | 4 ++--
src/onmainwindow.cpp | 6 +++---
src/sessionwidget.cpp | 12 ++++++------
src/sharewidget.cpp | 6 +++---
src/sshmasterconnection.cpp | 4 ++--
6 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d830bc8..ebbdc77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -429,6 +429,11 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
configuration with x2goplugin. Fixes: #798.
+ v2: refactor patch, fix whitespace issues. (Mihai Moldovan)
+ [ Stefan Baur ]
+ * New upstream release (4.0.4.0):
+ - general: fix spelling and English language syntax issues. Fixes: #389.
+ + v2: apply more fixes in the original changes context. (Mihai Moldovan)
+
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 13:25:28 +0100
x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 5780cca..b25ffb1 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -165,8 +165,8 @@ void HttpBrokerClient::slotSshServerAuthError(int error, QString sshMessage, Ssh
slotSshUserAuthError ( sshMessage );
return ;
case SSH_SERVER_FILE_NOT_FOUND:
- errMsg=tr ( "Could not find known host file."
- "If you accept the host key here, the file will be automatically created" );
+ errMsg=tr ( "Could not find known hosts file."
+ "If you accept the host key here, the file will be automatically created." );
break;
case SSH_SERVER_NOT_KNOWN:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index fecf6ed..db51edc 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -3001,8 +3001,8 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
slotSshUserAuthError ( sshMessage );
return ;
case SSH_SERVER_FILE_NOT_FOUND:
- errMsg=tr ( "Could not find known host file."
- "If you accept the host key here, the file will be automatically created" );
+ errMsg=tr ( "Could not find known hosts file."
+ "If you accept the host key here, the file will be automatically created." );
break;
case SSH_SERVER_NOT_KNOWN:
@@ -10194,7 +10194,7 @@ void ONMainWindow::slotConfigXinerama()
QRect newGeometry=proxyWinGeometry();
if (newGeometry.isNull())
{
- x2goWarningf(7)<< tr("Error getting window geometry (window closed)?");
+ x2goWarningf(7)<< tr("Error getting window geometry. (Did you close the window?)");
xineramaTimer->stop();
return;
}
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 13abd99..f06efde 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -325,11 +325,11 @@ void SessionWidget::slot_proxyGetKey()
{
QMessageBox::critical (
0l,tr ( "Error" ),
- tr ( "x2goclient is running in "
+ tr ( "X2Go Client is running in "
"portable mode. You should "
- "use a path on your usb device "
+ "use a path on your USB device "
"to be able to access your data "
- "whereever you are" ),
+ "wherever you are." ),
QMessageBox::Ok,QMessageBox::NoButton );
slot_getKey();
return;
@@ -440,11 +440,11 @@ void SessionWidget::slot_getKey()
{
QMessageBox::critical (
0l,tr ( "Error" ),
- tr ( "x2goclient is running in "
+ tr ( "X2Go Client is running in "
"portable mode. You should "
- "use a path on your usb device "
+ "use a path on your USB device "
"to be able to access your data "
- "whereever you are" ),
+ "wherever you are." ),
QMessageBox::Ok,QMessageBox::NoButton );
slot_getKey();
return;
diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp
index 7004938..b42fd75 100644
--- a/src/sharewidget.cpp
+++ b/src/sharewidget.cpp
@@ -173,11 +173,11 @@ void ShareWidget::slot_openDir()
{
QMessageBox::critical (
0l,tr ( "Error" ),
- tr ( "x2goclient is running in "
+ tr ( "X2Go Client is running in "
"portable mode. You should "
- "use a path on your usb device "
+ "use a path on your USB device "
"to be able to access your data "
- "whereever you are" ),
+ "wherever you are." ),
QMessageBox::Ok,QMessageBox::NoButton );
slot_openDir();
return;
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 1e11c62..17cde87 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1170,7 +1170,7 @@ bool SshMasterConnection::userAuthKrb()
if (!ssh.waitForFinished(20000))
{
sshProcErrString=ssh.errorString();
- authErrors<<tr("Failed to start SSH Client. Please check your installation and GSSApi configuration");
+ authErrors<<tr("Failed to start SSH Client. Please check your installation and GSSApi configuration.");
authErrors<<sshProcErrString;
#ifdef DEBUG
x2goDebug<<"ssh not finished:" <<sshProcErrString<<endl;
@@ -1196,7 +1196,7 @@ bool SshMasterConnection::userAuthKrb()
if (ssh.exitCode() == 0 && ssh.exitStatus() == 0 && outp== user)
return true;
- authErrors<<tr("Check your GSSApi configuration or choose another authentication method");
+ authErrors<<tr("Check your GSSApi configuration or choose another authentication method.");
return false;
}
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list