[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.3.0-13-g3848587

X2Go dev team git-admin at x2go.org
Thu Dec 6 08:48:53 CET 2012


The branch, master has been updated
       via  3848587d0311ec15de7ce523901cf92a17139efd (commit)
      from  8913672eea21b4f262b6dd73002e2df7957627a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3848587d0311ec15de7ce523901cf92a17139efd
Author: Terje Andersen <teranders at gmail.com>
Date:   Thu Dec 6 08:48:42 2012 +0100

    Update Bokmal (Norway) translation file.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog     |    4 ++++
 httpbrokerclient.cpp |    9 +++++++++
 onmainwindow.cpp     |   12 ++++++------
 x2goclient_nb_no.ts  |   20 ++++++++++----------
 x2goclientconfig.h   |    2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 119db06..3943c9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,10 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.99.3.1):
     - Update German translation file.
 
+  [ Terje Andersen ]
+  * New upstream version (3.99.3.1):
+    - Update Bokmal (Norway) translation file.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Nov 2012 16:26:49 +0100
 
 x2goclient (3.99.3.0-0~x2go1) unstable; urgency=low
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 3788600..d2dcf6e 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -449,22 +449,31 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error )
 
 void HttpBrokerClient::parseSession(QString sinfo)
 {
+    x2goDebug<<"starting parser\n";
     QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts);
     int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
     QString endStr="-----END DSA PRIVATE KEY-----";
     int keyEndPos=sinfo.indexOf(endStr);
+    x2goDebug<<"1\n";
     if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0))
         config->key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos);
     QString serverLine=(lst[1].split("\n"))[0];
+    x2goDebug<<"2\n";
     QStringList words=serverLine.split(":",QString::SkipEmptyParts);
+    x2goDebug<<"3\n";
     config->serverIp=words[0];
+    x2goDebug<<"4\n";
     if (words.count()>1)
         config->sshport=words[1];
+    x2goDebug<<"server IP: "<<config->serverIp<<"\n";
+    x2goDebug<<"server port: "<<config->sshport<<"\n";
     if (sinfo.indexOf("SESSION_INFO")!=-1)
     {
         QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts);
         config->sessiondata=(lst[1].split("\n"))[0];
+        x2goDebug<<"session data: "<<config->sessiondata<<"\n";
     }
+    x2goDebug<<"parsing has finished\n";
     emit sessionSelected();
 }
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 76f8ba9..1f2e2b7 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -261,7 +261,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
 
     QDesktopWidget wd;
 
-    x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this));
+    //x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this));
 
     if ( wd.screenGeometry(wd.screenNumber(this)).width() <1024 ||
             wd.screenGeometry(wd.screenNumber(this)).height() <768 )
@@ -9375,7 +9375,7 @@ void ONMainWindow::slotSetProxyWinFullscreen()
 void ONMainWindow::resizeProxyWinOnDisplay(int disp)
 {
     QRect geom=QApplication::desktop()->screenGeometry(disp-1);
-    x2goDebug<<"resizing proxy win to fit display "<<disp<<"("<<geom<<")"<<endl;
+    //x2goDebug<<"resizing proxy win to fit display "<<disp<<"("<<geom<<")"<<endl;
 #ifdef Q_OS_LINUX
     XSync(QX11Info::display(),false);
     XMoveWindow(QX11Info::display(), proxyWinId,geom.x(),geom.y());
@@ -9425,7 +9425,7 @@ void ONMainWindow::slotConfigXinerama()
     if (newGeometry==lastDisplayGeometry)
         return;
     lastDisplayGeometry=newGeometry;
-    x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl;
+//    x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl;
     QDesktopWidget* root=QApplication::desktop();
     QList<QRect> newXineramaScreens;
     for (int i=0; i< root->numScreens(); ++i)
@@ -9437,17 +9437,17 @@ void ONMainWindow::slotConfigXinerama()
             intersection=root->screenGeometry(i).intersected(lastDisplayGeometry);
         if (!intersection.isNull())
         {
-            x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl;
+//            x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl;
             intersection.moveLeft(intersection.x()-lastDisplayGeometry.x());
             intersection.moveTop(intersection.y()-lastDisplayGeometry.y());
-            x2goDebug<<"xinerama screen: "<<intersection<<endl;
+//            x2goDebug<<"xinerama screen: "<<intersection<<endl;
             newXineramaScreens<<intersection;
         }
     }
     if (xineramaScreens != newXineramaScreens)
     {
         xineramaScreens=newXineramaScreens;
-        x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl;
+//        x2goDebug<<"xinerama screen changed, new screens: "<<xineramaScreens<<endl;
         xineramaTimer->stop();
         QStringList screens;
         foreach (QRect disp, xineramaScreens)
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index fb0976c..d3768ff 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -618,56 +618,56 @@
         <location filename="httpbrokerclient.cpp" line="113"/>
         <source>Host key for server changed.
 It is now: </source>
-        <translation type="unfinished">Vertsnøkkel for serveren har endret seg.
+        <translation>Vertsnøkkel for serveren har endret seg.
 Den er nå: </translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="114"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation type="unfinished">Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
+        <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="127"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation type="unfinished">Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
+        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="153"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation type="unfinished">Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
+        <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="158"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
-        <translation type="unfinished">Serveren er ukjent. Stoler du på vertsnøkkelen?
+        <translation>Serveren er ukjent. Stoler du på vertsnøkkelen?
 Offentlig nøkkel: </translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="162"/>
         <location filename="httpbrokerclient.cpp" line="172"/>
         <source>Host key verification failed</source>
-        <translation type="unfinished">Verifiseringen av vertsnøkkelen feilet</translation>
+        <translation>Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="162"/>
         <source>Yes</source>
-        <translation type="unfinished">Ja</translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="162"/>
         <source>No</source>
-        <translation type="unfinished">Nei</translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="185"/>
         <source>Enter passphrase to decrypt a key</source>
-        <translation type="unfinished">Oppgi passordfrase for dekryptere en nøkkel</translation>
+        <translation>Oppgi passordfrase for dekryptere en nøkkel</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="208"/>
         <source>Authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Autentisering feilet</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="332"/>
diff --git a/x2goclientconfig.h b/x2goclientconfig.h
index 48a8992..ba6c0f9 100644
--- a/x2goclientconfig.h
+++ b/x2goclientconfig.h
@@ -6,7 +6,7 @@
 #include <qglobal.h>
 
 
-// #define LOGFILE QDir::homePath()+"/x2goclient.log"
+#define LOGFILE QDir::homePath()+"/x2goclient.log"
 
 #if !defined Q_OS_WIN
 #define USELDAP


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).




More information about the x2go-commits mailing list