You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(102) |
Dec
(255) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(38) |
Feb
(16) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager In directory sc8-pr-cvs1:/tmp/cvs-serv9842/src/server/http/manager Modified Files: PostMethodProcessor.cpp HttpProcessor.cpp HeadMethodProcessor.cpp GetMethodProcessor.cpp Log Message: 01/01/2004 Mikael Barbeaux * Fixed a bug while parsing query string of http request. * Basic implementation for method processors ( GET, HEAD and POST ). Index: PostMethodProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/PostMethodProcessor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PostMethodProcessor.cpp 1 Jan 2004 14:21:11 -0000 1.1 +++ PostMethodProcessor.cpp 1 Jan 2004 14:51:00 -0000 1.2 @@ -18,6 +18,8 @@ */ #include "PostMethodProcessor.h" +#include "../Writer.h" +#include "../TextWriter.h" /** * Creates a PostMethodProcessor object. @@ -35,6 +37,10 @@ * Processes a Post http method. */ HttpResponse *PostMethodProcessor::process(HttpRequest& request) { - return new HttpResponse(0); + TextWriter *writer = new TextWriter(); + *writer << "<html><body>\nPOST method processed !\n</body></html>"; + writer->close(); + HttpResponse *response = new HttpResponse(writer); + return response; } Index: HttpProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpProcessor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HttpProcessor.cpp 1 Jan 2004 14:21:11 -0000 1.3 +++ HttpProcessor.cpp 1 Jan 2004 14:51:00 -0000 1.4 @@ -24,6 +24,8 @@ #include "GetMethodProcessor.h" #include "PostMethodProcessor.h" #include "HeadMethodProcessor.h" +#include <iostream> +using namespace std; /** * Creates a HttpProcessor with the given id. @@ -84,14 +86,15 @@ } response = processor->process(request); delete processor; - + /** * Now we can send the response to the client. */ connection->sendHttpResponse(*response); delete response; } - catch(Exception& http) { + catch(Exception& e) { + cout << e.getMessage() << endl; } connection->close(); Index: HeadMethodProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HeadMethodProcessor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HeadMethodProcessor.cpp 1 Jan 2004 14:21:11 -0000 1.1 +++ HeadMethodProcessor.cpp 1 Jan 2004 14:51:00 -0000 1.2 @@ -18,6 +18,8 @@ */ #include "HeadMethodProcessor.h" +#include "../Writer.h" +#include "../TextWriter.h" /** * Creates a HeadMethodProcessor object. @@ -35,6 +37,10 @@ * Processes a Head http method. */ HttpResponse *HeadMethodProcessor::process(HttpRequest& request) { - return new HttpResponse(0); + TextWriter *writer = new TextWriter(); + *writer << "<html><body>\nHEAD method processed !\n</body></html>"; + writer->close(); + HttpResponse *response = new HttpResponse(writer); + return response; } Index: GetMethodProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/GetMethodProcessor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GetMethodProcessor.cpp 1 Jan 2004 14:21:11 -0000 1.1 +++ GetMethodProcessor.cpp 1 Jan 2004 14:51:00 -0000 1.2 @@ -18,6 +18,8 @@ */ #include "GetMethodProcessor.h" +#include "../Writer.h" +#include "../TextWriter.h" /** * Creates a GetMethodProcessor object. @@ -35,6 +37,10 @@ * Processes a GET http method. */ HttpResponse *GetMethodProcessor::process(HttpRequest& request) { - return new HttpResponse(0); + TextWriter *writer = new TextWriter(); + *writer << "<html><body>\nGET method processed !\n</body></html>"; + writer->close(); + HttpResponse *response = new HttpResponse(writer); + return response; } |
From: <mik...@us...> - 2004-01-01 14:51:04
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http In directory sc8-pr-cvs1:/tmp/cvs-serv9842/src/server/http Modified Files: HttpRequest.cpp Log Message: 01/01/2004 Mikael Barbeaux * Fixed a bug while parsing query string of http request. * Basic implementation for method processors ( GET, HEAD and POST ). Index: HttpRequest.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/HttpRequest.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpRequest.cpp 26 Dec 2003 22:56:41 -0000 1.1 +++ HttpRequest.cpp 1 Jan 2004 14:51:00 -0000 1.2 @@ -100,7 +100,8 @@ string r_uri = req_str.substr(start, pos - start); // Retrieving parameters if any... unsigned int ind; - if((ind = r_uri.find("?", 0)) != string::npos) { + if(((ind = r_uri.find("?", 0)) != string::npos) && + (ind != (r_uri.size()-1))) { // parse query string for parameters parseQueryString(r_uri.substr(ind+1,r_uri.length())); } |
From: <mik...@us...> - 2004-01-01 14:21:14
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager In directory sc8-pr-cvs1:/tmp/cvs-serv6022/src/server/http/manager Modified Files: HttpProcessor.cpp HttpProcessor.h Added Files: PostMethodProcessor.h PostMethodProcessor.cpp MethodProcessor.h GetMethodProcessor.h HeadMethodProcessor.cpp GetMethodProcessor.cpp HeadMethodProcessor.h Log Message: 01/01/2004 Mikael Barbeaux * Externalized http method processing algorithms. --- NEW FILE: PostMethodProcessor.h --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _POST_METHOD_PROCESSOR_H_ #define _POST_METHOD_PROCESSOR_H_ #include "MethodProcessor.h" /** * Defines a processor for the POST http method. * Implements the MethodProcessor abstract class. */ class PostMethodProcessor : public MethodProcessor { public: /** * Creates a PostMethodProcessor object. */ PostMethodProcessor(); /** * Destructor for PostMethodProcessor. */ ~PostMethodProcessor(); /** * Processes a POST http method. * * @param request * @return HttpResponse* */ virtual HttpResponse *process(HttpRequest& request); }; #endif --- NEW FILE: PostMethodProcessor.cpp --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "PostMethodProcessor.h" /** * Creates a PostMethodProcessor object. */ PostMethodProcessor::PostMethodProcessor() : MethodProcessor() { } /** * Destructor for PostMethodProcessor. */ PostMethodProcessor::~PostMethodProcessor() { } /** * Processes a Post http method. */ HttpResponse *PostMethodProcessor::process(HttpRequest& request) { return new HttpResponse(0); } --- NEW FILE: MethodProcessor.h --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _METHOD_PROCESSOR_H_ #define _METHOD_PROCESSOR_H_ #include "../HttpRequest.h" #include "../HttpResponse.h" /** * Defines a generic processor for Http methods. * As this class is abstract, you need to extend * it in a subclass and implement the process * method. */ class MethodProcessor { public: /** * Creates a MethodProcessor object. */ MethodProcessor() {} /** * Destructor for MethodProcessor. */ virtual ~MethodProcessor() {} /** * Process a request to build the response. * * @param request * @return HttpResponse* */ virtual HttpResponse *process(HttpRequest& request) = 0; }; #endif --- NEW FILE: GetMethodProcessor.h --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _GET_METHOD_PROCESSOR_H_ #define _GET_METHOD_PROCESSOR_H_ #include "MethodProcessor.h" /** * Defines a processor for the GET http method. * Implements the MethodProcessor abstract class. */ class GetMethodProcessor : public MethodProcessor { public: /** * Creates a GetMethodProcessor object. */ GetMethodProcessor(); /** * Destructor for GetMethodProcessor. */ ~GetMethodProcessor(); /** * Processes a GET http method. * * @param request * @return HttpResponse* */ virtual HttpResponse *process(HttpRequest& request); }; #endif --- NEW FILE: HeadMethodProcessor.cpp --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "HeadMethodProcessor.h" /** * Creates a HeadMethodProcessor object. */ HeadMethodProcessor::HeadMethodProcessor() : MethodProcessor() { } /** * Destructor for HeadMethodProcessor. */ HeadMethodProcessor::~HeadMethodProcessor() { } /** * Processes a Head http method. */ HttpResponse *HeadMethodProcessor::process(HttpRequest& request) { return new HttpResponse(0); } --- NEW FILE: GetMethodProcessor.cpp --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "GetMethodProcessor.h" /** * Creates a GetMethodProcessor object. */ GetMethodProcessor::GetMethodProcessor() : MethodProcessor() { } /** * Destructor for GetMethodProcessor. */ GetMethodProcessor::~GetMethodProcessor() { } /** * Processes a GET http method. */ HttpResponse *GetMethodProcessor::process(HttpRequest& request) { return new HttpResponse(0); } --- NEW FILE: HeadMethodProcessor.h --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef _HEAD_METHOD_PROCESSOR_H_ #define _HEAD_METHOD_PROCESSOR_H_ #include "MethodProcessor.h" /** * Defines a processor for the HEAD http method. * Implements the MethodProcessor abstract class. */ class HeadMethodProcessor : public MethodProcessor { public: /** * Creates a HeadMethodProcessor object. */ HeadMethodProcessor(); /** * Destructor for HeadMethodProcessor. */ ~HeadMethodProcessor(); /** * Processes a HEAD http method. * * @param request * @return HttpResponse* */ virtual HttpResponse *process(HttpRequest& request); }; #endif Index: HttpProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpProcessor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HttpProcessor.cpp 1 Jan 2004 10:44:11 -0000 1.2 +++ HttpProcessor.cpp 1 Jan 2004 14:21:11 -0000 1.3 @@ -20,7 +20,10 @@ #include "HttpProcessor.h" #include "HttpManager.h" #include "../TextWriter.h" - +#include "MethodProcessor.h" +#include "GetMethodProcessor.h" +#include "PostMethodProcessor.h" +#include "HeadMethodProcessor.h" /** * Creates a HttpProcessor with the given id. @@ -68,15 +71,19 @@ * response. */ HttpResponse *response; - if(request.getMethod() == GET) - response = processGet(request, connection); + MethodProcessor *processor; + if(request.getMethod() == GET) + processor = new GetMethodProcessor(); else if(request.getMethod() == POST) - response = processPost(request, connection); + processor = new PostMethodProcessor(); else if(request.getMethod() == HEAD) - response = processHead(request, connection); - else - response = processError(); - + processor = new HeadMethodProcessor(); + else { + processor = 0; + // process an error + } + response = processor->process(request); + delete processor; /** * Now we can send the response to the client. @@ -92,34 +99,3 @@ } } -/** - * Processes a GET method. - */ -HttpResponse *HttpProcessor::processGet(HttpRequest& request, - HttpSocket *client) { - return new HttpResponse(new TextWriter()); -} - -/** - * Processes a POST method. - */ -HttpResponse *HttpProcessor::processPost(HttpRequest& request, - HttpSocket *client) { - return new HttpResponse(new TextWriter()); -} - -/** - * Processes a HEAD method. - */ -HttpResponse *HttpProcessor::processHead(HttpRequest& request, - HttpSocket *client) { - return new HttpResponse(new TextWriter()); -} - -/** - * Process a HTTP error - */ -HttpResponse *HttpProcessor::processError() { - return new HttpResponse(new TextWriter()); -} - Index: HttpProcessor.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpProcessor.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HttpProcessor.h 1 Jan 2004 10:44:11 -0000 1.2 +++ HttpProcessor.h 1 Jan 2004 14:21:11 -0000 1.3 @@ -38,42 +38,6 @@ // identifiant for this thread unsigned int id; - - /** - * Processes a GET method. - * - * @param request - * @param client - * @return HttpResponse* - */ - HttpResponse *processGet(HttpRequest& request, - HttpSocket *client); - - /** - * Processes a POST method. - * - * @param request - * @param client - * @return HttpResponse* - */ - HttpResponse *processPost(HttpRequest& request, - HttpSocket *client); - - /** - * Processes a HEAD method. - * - * @param request - * @param client - * @return HttpResponse* - */ - HttpResponse *processHead(HttpRequest& request, - HttpSocket *client); - - /** - * Process a HTTP error - */ - HttpResponse *processError(); - public: |
From: <mik...@us...> - 2004-01-01 14:21:14
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv6022 Modified Files: ChangeLog Log Message: 01/01/2004 Mikael Barbeaux * Externalized http method processing algorithms. Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChangeLog 1 Jan 2004 10:44:12 -0000 1.29 +++ ChangeLog 1 Jan 2004 14:21:11 -0000 1.30 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 01/01/2004 Mikael Barbeaux + * Externalized http method processing algorithms. * HAPPY NEW YEAR !!!! :P * Started to implement http processing code. |
From: <mik...@us...> - 2004-01-01 14:21:14
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv6022/src/server/http/servlet Modified Files: HttpSession.h SessionManager.h Log Message: 01/01/2004 Mikael Barbeaux * Externalized http method processing algorithms. Index: HttpSession.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpSession.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HttpSession.h 31 Dec 2003 10:43:58 -0000 1.2 +++ HttpSession.h 1 Jan 2004 14:21:10 -0000 1.3 @@ -17,6 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef _HTTP_SESSION_H_ +#define _HTTP_SESSION_H_ + #include <time.h> #include <vector> #include <string> @@ -112,3 +115,6 @@ void setAttribute(string name, void *value); }; + +#endif + Index: SessionManager.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/SessionManager.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SessionManager.h 31 Dec 2003 10:43:58 -0000 1.1 +++ SessionManager.h 1 Jan 2004 14:21:10 -0000 1.2 @@ -17,6 +17,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef _SESSION_MANAGER_H_ +#define _SESSION_MANAGER_H_ + #include "HttpSession.h" #include <map> #include <vector> @@ -74,3 +77,6 @@ vector<string> getIds(); }; + +#endif + |
From: <mik...@us...> - 2004-01-01 10:44:15
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv9267 Modified Files: configure ChangeLog Log Message: 01/01/2004 Mikael Barbeaux * HAPPY NEW YEAR !!!! :P * Started to implement http processing code. Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/configure,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- configure 30 Dec 2003 19:51:06 -0000 1.10 +++ configure 1 Jan 2004 10:44:12 -0000 1.11 @@ -78,7 +78,7 @@ if test -z ${COMM} then echo "Checking for $1 not found" - help_comp $1; + help_comp; else echo "Checking for $1 ${COMM}" fi @@ -87,6 +87,22 @@ #### +# Help about compilation +#### +help_comp() { + echo "" + echo "It seems that your system doesn't support compilation." + echo "If you are missing a binary or a library, try to install" + echo "the needed dependencies. If another error occurs, contact" + echo "me at this address : <mik...@us...>" + echo "or come into our forums : http://sharedaemon.sf.net" + echo "Exiting." + exit; +} + + + +#### # Check for library #### check_lib() { @@ -298,18 +314,6 @@ echo " --help : Displays this help" echo " --enable-optimize : Enable optimization" echo " --disable-optimize : Disable optimization" - exit; -} - - - -#### -# Displays compilation help -#### -help_comp() { - echo "" - echo "Compilation error" - echo "Unable to find $1" exit; } Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ChangeLog 31 Dec 2003 13:57:30 -0000 1.28 +++ ChangeLog 1 Jan 2004 10:44:12 -0000 1.29 @@ -23,6 +23,11 @@ ----------------------------------------------------------- +01/01/2004 Mikael Barbeaux + * HAPPY NEW YEAR !!!! :P + * Started to implement http processing code. + + 31/12/2003 Mikael Barbeaux * Changed server port on test4 * Implemented a Session manager. |
From: <mik...@us...> - 2004-01-01 10:44:15
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager In directory sc8-pr-cvs1:/tmp/cvs-serv9267/src/server/http/manager Modified Files: HttpProcessor.cpp HttpProcessor.h Log Message: 01/01/2004 Mikael Barbeaux * HAPPY NEW YEAR !!!! :P * Started to implement http processing code. Index: HttpProcessor.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpProcessor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpProcessor.cpp 30 Dec 2003 10:45:10 -0000 1.1 +++ HttpProcessor.cpp 1 Jan 2004 10:44:11 -0000 1.2 @@ -21,6 +21,7 @@ #include "HttpManager.h" #include "../TextWriter.h" + /** * Creates a HttpProcessor with the given id. */ @@ -46,25 +47,79 @@ // Set the cancellation point setCancelPoint(); // Retrieve the connection - HttpSocket *socket = theManager->getNextConnection(); + HttpSocket *connection = theManager->getNextConnection(); // No connection ? - if(socket == 0) + if(connection == 0) continue; - // Processes the connection. + /** + * Now we are able to process the connection. + * First of all, we need to retrieve the request + * sent by the client, and to parse it to test + * if it's a http compliant request. + */ HttpRequest request; - socket->receiveHttpRequest(request); - TextWriter *writer = new TextWriter; - *writer << "<html><body>Your request has been "; - *writer << "processed by HttpProcessor nb "; - *writer << (int)id; - *writer << "</body></html>\n"; - writer->close(); - HttpResponse resp(writer); - resp.setContentType("text/html"); - // send response - socket->sendHttpResponse(resp); - socket->close(); - delete socket; + try { + connection->receiveHttpRequest(request); + + /** + * Then, depending the method used in this + * request, we process it to obtain the + * response. + */ + HttpResponse *response; + if(request.getMethod() == GET) + response = processGet(request, connection); + else if(request.getMethod() == POST) + response = processPost(request, connection); + else if(request.getMethod() == HEAD) + response = processHead(request, connection); + else + response = processError(); + + + /** + * Now we can send the response to the client. + */ + connection->sendHttpResponse(*response); + delete response; + } + catch(Exception& http) { + } + + connection->close(); + delete connection; } } + +/** + * Processes a GET method. + */ +HttpResponse *HttpProcessor::processGet(HttpRequest& request, + HttpSocket *client) { + return new HttpResponse(new TextWriter()); +} + +/** + * Processes a POST method. + */ +HttpResponse *HttpProcessor::processPost(HttpRequest& request, + HttpSocket *client) { + return new HttpResponse(new TextWriter()); +} + +/** + * Processes a HEAD method. + */ +HttpResponse *HttpProcessor::processHead(HttpRequest& request, + HttpSocket *client) { + return new HttpResponse(new TextWriter()); +} + +/** + * Process a HTTP error + */ +HttpResponse *HttpProcessor::processError() { + return new HttpResponse(new TextWriter()); +} + Index: HttpProcessor.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/manager/HttpProcessor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpProcessor.h 30 Dec 2003 10:45:10 -0000 1.1 +++ HttpProcessor.h 1 Jan 2004 10:44:11 -0000 1.2 @@ -22,6 +22,10 @@ #include "../../../thread/Thread.h" #include "../../../exceptions/ThreadException.h" +#include "../HttpRequest.h" +#include "../HttpResponse.h" +#include "../HttpConstants.h" +#include "../HttpSocket.h" /** * Defines a processor for HttpConnection. @@ -34,6 +38,42 @@ // identifiant for this thread unsigned int id; + + /** + * Processes a GET method. + * + * @param request + * @param client + * @return HttpResponse* + */ + HttpResponse *processGet(HttpRequest& request, + HttpSocket *client); + + /** + * Processes a POST method. + * + * @param request + * @param client + * @return HttpResponse* + */ + HttpResponse *processPost(HttpRequest& request, + HttpSocket *client); + + /** + * Processes a HEAD method. + * + * @param request + * @param client + * @return HttpResponse* + */ + HttpResponse *processHead(HttpRequest& request, + HttpSocket *client); + + /** + * Process a HTTP error + */ + HttpResponse *processError(); + public: |
From: <mik...@us...> - 2004-01-01 10:44:15
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http In directory sc8-pr-cvs1:/tmp/cvs-serv9267/src/server/http Modified Files: HttpSocket.h HttpSocket.cpp Log Message: 01/01/2004 Mikael Barbeaux * HAPPY NEW YEAR !!!! :P * Started to implement http processing code. Index: HttpSocket.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/HttpSocket.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpSocket.h 26 Dec 2003 22:56:41 -0000 1.1 +++ HttpSocket.h 1 Jan 2004 10:44:12 -0000 1.2 @@ -23,6 +23,7 @@ #include "../network/Socket.h" #include "../../exceptions/SocketException.h" #include "../../exceptions/WriterException.h" +#include "../../exceptions/HttpException.h" #include "HttpRequest.h" #include "HttpResponse.h" @@ -72,7 +73,7 @@ * @param HttpRequest */ void receiveHttpRequest(HttpRequest& request) - throw (SocketException); + throw (SocketException, HttpException); /** * Send the HttpResponse of this socket. Index: HttpSocket.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/HttpSocket.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpSocket.cpp 26 Dec 2003 22:56:41 -0000 1.1 +++ HttpSocket.cpp 1 Jan 2004 10:44:12 -0000 1.2 @@ -47,7 +47,7 @@ * parse the data to build the associated http request. */ void HttpSocket::receiveHttpRequest(HttpRequest& request) - throw (SocketException) { + throw (SocketException, HttpException) { // Get the data from the client char *data = new char; receive(&data); |
From: <ma...@us...> - 2003-12-31 17:21:30
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv28131 Modified Files: Changelog Log Message: splash credits Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- Changelog 31 Dec 2003 17:15:40 -0000 1.121 +++ Changelog 31 Dec 2003 17:21:27 -0000 1.122 @@ -30,6 +30,7 @@ 2003/12/31 Alo Sarv * Fixed font colours in toolbar when using radical colour schemes on wxMSW. + * New special-themed splashscreen from Avi :) 2003/12/30 Alo Sarv * Improved BSD support. |
From: <ma...@us...> - 2003-12-31 17:20:57
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/emule_inverted In directory sc8-pr-cvs1:/tmp/cvs-serv27973/emule_inverted Modified Files: splashscreen.png Log Message: 0.2.0 splashscreen from Avi Index: splashscreen.png =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/images/emule_inverted/splashscreen.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvshf8CKC and /tmp/cvswM2JX4 differ |
From: <ma...@us...> - 2003-12-31 17:20:57
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/emule_greyscale In directory sc8-pr-cvs1:/tmp/cvs-serv27973/emule_greyscale Modified Files: splashscreen.png Log Message: 0.2.0 splashscreen from Avi Index: splashscreen.png =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/images/emule_greyscale/splashscreen.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsZIrNZv and /tmp/cvsKv7AsR differ |
From: <ma...@us...> - 2003-12-31 17:20:57
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/default In directory sc8-pr-cvs1:/tmp/cvs-serv27973/default Modified Files: splashscreen.png Log Message: 0.2.0 splashscreen from Avi Index: splashscreen.png =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/images/default/splashscreen.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsRweD45 and /tmp/cvsUId3B1 differ |
From: <ma...@us...> - 2003-12-31 17:15:43
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv27061 Modified Files: Changelog Log Message: 0.2.0 release Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- Changelog 31 Dec 2003 11:44:49 -0000 1.120 +++ Changelog 31 Dec 2003 17:15:40 -0000 1.121 @@ -25,6 +25,8 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +Version 0.2.0 +------------- 2003/12/31 Alo Sarv * Fixed font colours in toolbar when using radical colour schemes on wxMSW. |
From: <ma...@us...> - 2003-12-31 16:40:15
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv19710 Modified Files: wxInterface.cpp Log Message: BSD i18n workaround Index: wxInterface.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- wxInterface.cpp 29 Dec 2003 06:08:48 -0000 1.14 +++ wxInterface.cpp 31 Dec 2003 16:40:12 -0000 1.15 @@ -264,6 +264,9 @@ * returned (use system setting). */ int wxInterface::GetLangType(const wxString lang) { +#ifdef __BSD__ + return wxLANGUAGE_DEFAULT; /* Doesn't work on BSD for some reason */ +#endif if (lang == wxT("German")) { return wxLANGUAGE_GERMAN; } else if (lang == wxT("Estonian")) { |
From: <ma...@us...> - 2003-12-31 16:27:24
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv15618/src/lang Modified Files: Estonian.po French.po German.po Spanish.po empty.po Log Message: Fixed message catalogs for UTF-8. Index: Estonian.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Estonian.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Estonian.po 31 Dec 2003 14:28:23 -0000 1.5 +++ Estonian.po 31 Dec 2003 16:27:19 -0000 1.6 @@ -6,34 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" -"PO-Revision-Date: 2003-09-09 01:10+0300\n" +"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"PO-Revision-Date: 2003-12-31 17:18+0200\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" -#: ../DownloadListCtrl.cpp:52 ../SharedFilesListCtrl.cpp:52 +#: ../DownloadListCtrl.cpp:52 +#: ../SharedFilesListCtrl.cpp:52 msgid "File Name" msgstr "Faili Nimi" -#: ../DownloadListCtrl.cpp:52 ../SearchListCtrl.cpp:56 +#: ../DownloadListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 #: ../SharedFilesListCtrl.cpp:52 msgid "Size" msgstr "Suurus" -#: ../DownloadListCtrl.cpp:52 ../UploadListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:285 ../wxInterface_wdr.cpp:333 -msgid "Transferred" -msgstr "Üle kantud" - #: ../DownloadListCtrl.cpp:52 -msgid "Completed" -msgstr "Lõpetatud" - -#: ../DownloadListCtrl.cpp:53 ../UploadListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 +#: ../wxInterface_wdr.cpp:285 +#: ../wxInterface_wdr.cpp:333 +#: ../DownloadListCtrl.cpp:53 msgid "Speed" msgstr "Kiirus" @@ -41,26 +37,19 @@ msgid "Progress" msgstr "Progress" -#: ../DownloadListCtrl.cpp:53 ../SearchListCtrl.cpp:56 +#: ../DownloadListCtrl.cpp:53 +#: ../SearchListCtrl.cpp:56 msgid "Sources" msgstr "Allikad" -#: ../DownloadListCtrl.cpp:53 ../SharedFilesListCtrl.cpp:53 -msgid "Priority" -msgstr "Tähtsus" - -#: ../DownloadListCtrl.cpp:54 ../UploadListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:53 +#: ../SharedFilesListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:54 +#: ../UploadListCtrl.cpp:53 msgid "Status" msgstr "Status" #: ../DownloadListCtrl.cpp:54 -msgid "Remaining" -msgstr "Jäänud" - -#: ../DownloadListCtrl.cpp:54 -msgid "Last Seen Complete" -msgstr "Viimane terve nähtud" - #: ../DownloadListCtrl.cpp:55 msgid "Last Reception" msgstr "Viimane edastamine" @@ -69,7 +58,8 @@ msgid "Category" msgstr "Kategooria" -#: ../GUISettingsDlg.cpp:319 ../GUISettingsDlg.cpp:409 +#: ../GUISettingsDlg.cpp:319 +#: ../GUISettingsDlg.cpp:409 msgid "Add new language" msgstr "Lisa uus keel" @@ -84,7 +74,8 @@ msgid "Confirm remove language" msgstr "" -#: ../GUISettingsDlg.cpp:353 ../GUISettingsDlg.cpp:446 +#: ../GUISettingsDlg.cpp:353 +#: ../GUISettingsDlg.cpp:446 #, fuzzy msgid "Add new iconset" msgstr "Lisa uus keel" @@ -106,19 +97,17 @@ #: ../GUISettingsDlg.cpp:397 #, fuzzy -msgid "" -"Change the language of the interface. Requires interface \t\trestart to take " -"effect" +msgid "Change the language of the interface. Requires interface \t\trestart to take effect" msgstr "" -"Menüü ja nupurea seadete muutmine vajab\n" -"kasutajaliidese taaskäivitamist." -#: ../GUISettingsDlg.cpp:405 ../GUISettingsDlg.cpp:442 +#: ../GUISettingsDlg.cpp:405 +#: ../GUISettingsDlg.cpp:442 #, fuzzy msgid "Add" msgstr "Lisa uus" -#: ../GUISettingsDlg.cpp:414 ../GUISettingsDlg.cpp:451 +#: ../GUISettingsDlg.cpp:414 +#: ../GUISettingsDlg.cpp:451 msgid "Remove" msgstr "" @@ -163,69 +152,58 @@ msgstr "" #: ../GUISettingsDlg.cpp:510 -msgid "Remember last" -msgstr "Mäleta viimast" - #: ../GUISettingsDlg.cpp:515 msgid "Automatically remember which page was \t\topen between sessions" msgstr "" #: ../GUISettingsDlg.cpp:527 -msgid "Show splashscreen" -msgstr "Näita algus-logo" - #: ../GUISettingsDlg.cpp:533 -msgid "" -"Toggle wether splashscreen should be shown on program \t\tstartup or not. " -"Speeds up application starting if turned off. \t\tDefault: On" +msgid "Toggle wether splashscreen should be shown on program \t\tstartup or not. Speeds up application starting if turned off. \t\tDefault: On" msgstr "" #: ../GUISettingsDlg.cpp:541 -msgid "Prompt on exit" -msgstr "Küsi väljumisel" - #: ../GUISettingsDlg.cpp:546 msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "" -#: ../GUISettingsDlg.cpp:558 ../MainDlg.cpp:647 ../MainDlg.cpp:917 -#, fuzzy -msgid "Show ToolBar" -msgstr "Näita nupurida" - +#: ../GUISettingsDlg.cpp:558 +#: ../MainDlg.cpp:647 +#: ../MainDlg.cpp:917 #: ../GUISettingsDlg.cpp:563 #, fuzzy msgid "Toggle wether toolbar is shown or not." msgstr "" -"Menüü ja nupurea seadete muutmine vajab\n" -"kasutajaliidese taaskäivitamist." -#: ../GUISettingsDlg.cpp:571 ../MainDlg.cpp:654 ../MainDlg.cpp:668 -#: ../MainDlg.cpp:925 ../MainDlg.cpp:939 +#: ../GUISettingsDlg.cpp:571 +#: ../MainDlg.cpp:654 +#: ../MainDlg.cpp:668 +#: ../MainDlg.cpp:925 +#: ../MainDlg.cpp:939 msgid "Horizontal" msgstr "Horisontaalne" -#: ../GUISettingsDlg.cpp:572 ../MainDlg.cpp:657 ../MainDlg.cpp:669 -#: ../MainDlg.cpp:926 ../MainDlg.cpp:940 +#: ../GUISettingsDlg.cpp:572 +#: ../MainDlg.cpp:657 +#: ../MainDlg.cpp:669 +#: ../MainDlg.cpp:926 +#: ../MainDlg.cpp:940 msgid "Vertical" msgstr "Vertikaalne" #: ../GUISettingsDlg.cpp:580 -msgid "" -"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " -"on the left side of window." +msgid "Horizontal tooltip is shown on top of window (default),\t\tvertical is shown on the left side of window." msgstr "" -#: ../GUISettingsDlg.cpp:591 ../MainDlg.cpp:643 ../MainDlg.cpp:911 -#, fuzzy -msgid "Show MenuBar" -msgstr "Näita menüüd" - +#: ../GUISettingsDlg.cpp:591 +#: ../MainDlg.cpp:643 +#: ../MainDlg.cpp:911 #: ../GUISettingsDlg.cpp:596 +#, fuzzy msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." msgstr "" -#: ../GUISettingsDlg.cpp:610 ../wxInterface_wdr.cpp:668 +#: ../GUISettingsDlg.cpp:610 +#: ../wxInterface_wdr.cpp:668 #: ../wxInterface_wdr.cpp:710 msgid "OK" msgstr "Okei" @@ -234,8 +212,10 @@ msgid "Save settings and close dialog" msgstr "" -#: ../GUISettingsDlg.cpp:619 ../wxInterface_wdr.cpp:199 -#: ../wxInterface_wdr.cpp:672 ../wxInterface_wdr.cpp:714 +#: ../GUISettingsDlg.cpp:619 +#: ../wxInterface_wdr.cpp:199 +#: ../wxInterface_wdr.cpp:672 +#: ../wxInterface_wdr.cpp:714 msgid "Cancel" msgstr "Katkesta" @@ -268,7 +248,6 @@ "translated and compiled .mo file exists in\t\t\t lang subdir." msgstr "" "Palun kontrollige et sisestasite korrektse faili\n" -"nime ja tõlgitud ja kompileeritud .mo fail eksisteerib\n" "lang/ alamkataloogis." #: ../GUISettingsDlg.cpp:690 @@ -281,25 +260,14 @@ msgstr "Uus keel %s lisatud.\n" #: ../GUISettingsDlg.cpp:702 -msgid "Please restart the interface to test your new language!" -msgstr "Palun taaskäivita kasutajaliides testimaks oma uut keelt!" - #: ../GUISettingsDlg.cpp:703 -msgid "Success!" -msgstr "Õnnestus!" - -#: ../KnownListCtrl.cpp:53 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../KnownListCtrl.cpp:53 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "Username" msgstr "Kasutajanimi" #: ../KnownListCtrl.cpp:53 -msgid "Upload Status" -msgstr "Üleslaadimise Staatus" - -#: ../KnownListCtrl.cpp:53 -msgid "Transferred Up" -msgstr "Üleslaaditud" - #: ../KnownListCtrl.cpp:54 msgid "Download Status" msgstr "Allalaadimise Staatus" @@ -309,9 +277,6 @@ msgstr "Kliendi Tarkvara" #: ../KnownListCtrl.cpp:54 -msgid "Connected" -msgstr "Ühendatud" - #: ../KnownListCtrl.cpp:55 msgid "Userhash" msgstr "Kasutajakood" @@ -324,28 +289,40 @@ msgid "Visit http://sharedaemon.sourceforge.net for latest updates." msgstr "" -#: ../MainDlg.cpp:339 ../MainDlg.cpp:377 ../MainDlg.cpp:383 ../MainDlg.cpp:394 -#: ../MainDlg.cpp:403 ../MainDlg.cpp:415 ../MainDlg.cpp:610 -msgid "Connect" -msgstr "Ühenda" - -#: ../MainDlg.cpp:340 ../MainDlg.cpp:447 ../MainDlg.cpp:453 ../MainDlg.cpp:464 -#: ../MainDlg.cpp:473 ../MainDlg.cpp:485 +#: ../MainDlg.cpp:339 +#: ../MainDlg.cpp:377 +#: ../MainDlg.cpp:383 +#: ../MainDlg.cpp:394 +#: ../MainDlg.cpp:403 +#: ../MainDlg.cpp:415 +#: ../MainDlg.cpp:610 +#: ../MainDlg.cpp:340 +#: ../MainDlg.cpp:447 +#: ../MainDlg.cpp:453 +#: ../MainDlg.cpp:464 +#: ../MainDlg.cpp:473 +#: ../MainDlg.cpp:485 #, fuzzy msgid "Options" msgstr "Loogimise seaded" -#: ../MainDlg.cpp:384 ../MainDlg.cpp:404 ../ServerWnd.cpp:247 +#: ../MainDlg.cpp:384 +#: ../MainDlg.cpp:404 +#: ../ServerWnd.cpp:247 msgid "Log" msgstr "Loog" -#: ../MainDlg.cpp:397 ../MainDlg.cpp:398 ../MainDlg.cpp:418 ../MainDlg.cpp:419 +#: ../MainDlg.cpp:397 +#: ../MainDlg.cpp:398 +#: ../MainDlg.cpp:418 +#: ../MainDlg.cpp:419 +#: ../MainDlg.cpp:454 +#: ../MainDlg.cpp:474 +#: ../MainDlg.cpp:677 +#: ../MainDlg.cpp:684 +#: ../SysTray.cpp:70 +#: ../SysTray.cpp:557 #, fuzzy -msgid "Connect to random server" -msgstr "Ühenda suvalise serveriga" - -#: ../MainDlg.cpp:454 ../MainDlg.cpp:474 ../MainDlg.cpp:677 ../MainDlg.cpp:684 -#: ../SysTray.cpp:70 ../SysTray.cpp:557 msgid "Help" msgstr "Abi" @@ -354,10 +331,9 @@ msgstr "" #: ../MainDlg.cpp:509 -msgid "Question" -msgstr "Küsimus" - -#: ../MainDlg.cpp:529 ../MainDlg.cpp:615 ../MainDlg.cpp:950 +#: ../MainDlg.cpp:529 +#: ../MainDlg.cpp:615 +#: ../MainDlg.cpp:950 msgid "Preferences" msgstr "Seaded" @@ -369,7 +345,8 @@ msgid "Server list" msgstr "Serverite nimekiri" -#: ../MainDlg.cpp:561 ../wxInterface_wdr.cpp:61 +#: ../MainDlg.cpp:561 +#: ../wxInterface_wdr.cpp:61 msgid "Search" msgstr "Otsing" @@ -378,51 +355,43 @@ msgstr "Failide otsimine" #: ../MainDlg.cpp:565 -msgid "Transfer" -msgstr "Ülekanne" - -#: ../MainDlg.cpp:565 -msgid "File Transfer" -msgstr "Failide Ülekanne" - -#: ../MainDlg.cpp:569 ../MainDlg.cpp:570 ../wxInterface_wdr.cpp:255 +#: ../MainDlg.cpp:569 +#: ../MainDlg.cpp:570 +#: ../wxInterface_wdr.cpp:255 msgid "Shared Files" msgstr "Jagatud Failid" #: ../MainDlg.cpp:573 +#: ../MainDlg.cpp:577 +#: ../wxInterface_wdr.cpp:263 #, fuzzy -msgid "Messaging" -msgstr "Sõnumid" - -#: ../MainDlg.cpp:573 -msgid "Chatting" -msgstr "Sõnumite saatmine teistele kasutajatele" - -#: ../MainDlg.cpp:577 ../wxInterface_wdr.cpp:263 msgid "Statistics" msgstr "Statistika" #: ../MainDlg.cpp:578 -msgid "Show live statistics" -msgstr "Näita statistikat" - -#: ../MainDlg.cpp:611 ../SysTray.cpp:71 +#: ../MainDlg.cpp:611 +#: ../SysTray.cpp:71 msgid "Quit" msgstr "Sulge" -#: ../MainDlg.cpp:672 ../MainDlg.cpp:942 +#: ../MainDlg.cpp:672 +#: ../MainDlg.cpp:942 msgid "ToolBar Alignment" msgstr "" -#: ../MainDlg.cpp:673 ../MainDlg.cpp:951 +#: ../MainDlg.cpp:673 +#: ../MainDlg.cpp:951 msgid "Fullscreen" msgstr "" -#: ../MainDlg.cpp:678 ../MainDlg.cpp:952 +#: ../MainDlg.cpp:678 +#: ../MainDlg.cpp:952 msgid "About..." msgstr "Info" -#: ../MainDlg.cpp:681 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../MainDlg.cpp:681 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "File" msgstr "Fail" @@ -438,16 +407,13 @@ msgid "Detach current page" msgstr "" -#: ../MainDlg.cpp:953 ../SysTray.cpp:667 +#: ../MainDlg.cpp:953 +#: ../SysTray.cpp:667 #, fuzzy msgid "Exit" msgstr "Muuda" #: ../QueueListCtrl.cpp:52 -msgid "File Priority" -msgstr "Faili Tähtsus" - -#: ../QueueListCtrl.cpp:52 msgid "Rating" msgstr "Hinne" @@ -456,36 +422,26 @@ msgstr "Skoor" #: ../QueueListCtrl.cpp:53 -msgid "Asked" -msgstr "Küsitud" - -#: ../QueueListCtrl.cpp:53 -msgid "Last Seen" -msgstr "Viimati nähtud" - -#: ../QueueListCtrl.cpp:53 -msgid "Entered Queue" -msgstr "Sisenes Järjekorda" - #: ../QueueListCtrl.cpp:54 msgid "Banned" msgstr "Keelatud" -#: ../QueueListCtrl.cpp:54 ../SharedFilesListCtrl.cpp:54 +#: ../QueueListCtrl.cpp:54 +#: ../SharedFilesListCtrl.cpp:54 #: ../UploadListCtrl.cpp:53 msgid "Obtained Parts" msgstr "Omab Osi" -#: ../SearchListCtrl.cpp:56 ../ServerWnd.cpp:505 ../wxInterface_wdr.cpp:64 +#: ../SearchListCtrl.cpp:56 +#: ../ServerWnd.cpp:505 +#: ../wxInterface_wdr.cpp:64 msgid "Name" msgstr "Nimi" -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:52 #: ../wxInterface_wdr.cpp:75 -msgid "Type" -msgstr "Tüüp" - -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:53 +#: ../SharedFilesListCtrl.cpp:53 msgid "Hash" msgstr "Kood" @@ -522,10 +478,8 @@ msgstr "Eelistus" #: ../ServerListCtrl.cpp:56 -msgid "Failed" -msgstr "Ebaõnnestunud" - -#: ../ServerListCtrl.cpp:57 ../ServerWnd.cpp:362 +#: ../ServerListCtrl.cpp:57 +#: ../ServerWnd.cpp:362 msgid "Static" msgstr "Staatiline" @@ -534,9 +488,6 @@ msgstr "Failide Pehme Limiit" #: ../ServerListCtrl.cpp:57 -msgid "Hard File Limit" -msgstr "Failide Kõva Limiit" - #: ../ServerListCtrl.cpp:58 msgid "Version" msgstr "Versioon" @@ -568,13 +519,8 @@ msgstr "Uuenda" #: ../ServerWnd.cpp:308 -msgid "Autoconnect" -msgstr "Autoühenda" - #: ../ServerWnd.cpp:313 -msgid "" -"Toggle wether application should automatically connect \t\tto any server on " -"startup" +msgid "Toggle wether application should automatically connect \t\tto any server on startup" msgstr "" #: ../ServerWnd.cpp:322 @@ -582,25 +528,15 @@ msgstr "Ainult staatilistesse" #: ../ServerWnd.cpp:327 -msgid "" -"Toggle wether application should connect \t\tto servers marked as \"static\" " -"only" +msgid "Toggle wether application should connect \t\tto servers marked as \"static\" only" msgstr "" #: ../ServerWnd.cpp:367 -msgid "" -"Set server static. Static servers are not \t\tremoved from list if they do " -"not respond" +msgid "Set server static. Static servers are not \t\tremoved from list if they do not respond" msgstr "" #: ../ServerWnd.cpp:378 -msgid "Priority:" -msgstr "Tähtsus:" - #: ../ServerWnd.cpp:384 -msgid "High" -msgstr "Kõrge" - #: ../ServerWnd.cpp:385 msgid "Normal" msgstr "Tavaline" @@ -618,8 +554,7 @@ msgstr "Rea limiit" #: ../ServerWnd.cpp:431 -msgid "" -"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" +msgid "Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" msgstr "" #: ../ServerWnd.cpp:442 @@ -677,9 +612,7 @@ msgstr "Keela" #: ../ServerWnd.cpp:603 -msgid "" -"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " -"less sources as client<->client source \t\texchange is done via UDP" +msgid "Disable UDP port. This can somewhat lower traffic, \t\tbut also results in less sources as client<->client source \t\texchange is done via UDP" msgstr "" #: ../ServerWnd.cpp:615 @@ -694,30 +627,26 @@ msgid "Permission" msgstr "Luba" -#: ../SharedFilesListCtrl.cpp:53 ../wxInterface_wdr.cpp:279 +#: ../SharedFilesListCtrl.cpp:53 +#: ../wxInterface_wdr.cpp:279 #: ../wxInterface_wdr.cpp:327 -msgid "Requests" -msgstr "Küsitud" - -#: ../SharedFilesListCtrl.cpp:54 -msgid "Transferred Data" -msgstr "Ülekantud andmemaht" - #: ../SharedFilesListCtrl.cpp:54 msgid "Folder" msgstr "Kataloog" #: ../SysTray.cpp:68 -msgid "Hide/Show Interface" -msgstr "Peida/Näita kasutajaliides" - -#: ../SysTray.cpp:69 ../SysTray.cpp:87 +#: ../SysTray.cpp:69 +#: ../SysTray.cpp:87 #, fuzzy msgid "Settings" msgstr "Tuuma Seaded" -#: ../SysTray.cpp:206 ../SysTray.cpp:227 ../SysTray.cpp:320 ../SysTray.cpp:322 -#: ../SysTray.cpp:473 ../SysTray.cpp:516 +#: ../SysTray.cpp:206 +#: ../SysTray.cpp:227 +#: ../SysTray.cpp:320 +#: ../SysTray.cpp:322 +#: ../SysTray.cpp:473 +#: ../SysTray.cpp:516 #, fuzzy msgid "Unlimited" msgstr "Rea limiit" @@ -734,7 +663,10 @@ msgid "Nick: " msgstr "" -#: ../SysTray.cpp:336 ../SysTray.cpp:347 ../SysTray.cpp:371 ../SysTray.cpp:380 +#: ../SysTray.cpp:336 +#: ../SysTray.cpp:347 +#: ../SysTray.cpp:371 +#: ../SysTray.cpp:380 msgid "Not Ready" msgstr "" @@ -747,11 +679,9 @@ msgid "ClientID: " msgstr "" -#: ../SysTray.cpp:356 ../SysTray.cpp:414 ../SysTray.cpp:417 -#, fuzzy -msgid "Not Connected" -msgstr "Ühendatud" - +#: ../SysTray.cpp:356 +#: ../SysTray.cpp:414 +#: ../SysTray.cpp:417 #: ../SysTray.cpp:361 #, fuzzy msgid "IP: " @@ -862,39 +792,18 @@ msgstr "Allalaadimised" #: ../SysTray.cpp:637 -#, fuzzy -msgid "Upload Limit" -msgstr "Üleslaadimis Aeg" - #: ../SysTray.cpp:647 -msgid "Connect to any server" -msgstr "Ühenda suvalise serveriga" - #: ../SysTray.cpp:657 -#, fuzzy -msgid "Disconnect from server" -msgstr "Ühenda suvalise serveriga" - #: ../TransferWnd.cpp:144 -msgid "Client on Queue:" -msgstr "Kliente järjekorras:" - #: ../TransferWnd.cpp:187 +#, fuzzy msgid "Downloads" msgstr "Allalaadimised" -#: ../TransferWnd.cpp:208 ../wxInterface_wdr.cpp:225 -msgid "All" -msgstr "Kõik" - +#: ../TransferWnd.cpp:208 +#: ../wxInterface_wdr.cpp:225 #: ../TransferWnd.cpp:251 -msgid "Uploads" -msgstr "Üleslaadimised" - #: ../TransferWnd.cpp:294 -msgid "On Queue" -msgstr "Järjekorras" - #: ../TransferWnd.cpp:334 msgid "Known Clients" msgstr "Tuntud Kliendid" @@ -904,17 +813,11 @@ msgstr "Oodanud" #: ../UploadListCtrl.cpp:53 -msgid "Upload Time" -msgstr "Üleslaadimis Aeg" - #: ../wxInterface_wdr.cpp:72 msgid "Method" msgstr "Meetod" #: ../wxInterface_wdr.cpp:82 -msgid "Global" -msgstr "Üldine" - #: ../wxInterface_wdr.cpp:83 msgid "Server" msgstr "Server" @@ -944,9 +847,6 @@ msgstr "Pilt" #: ../wxInterface_wdr.cpp:100 -msgid "Reset" -msgstr "Algväärtused" - #: ../wxInterface_wdr.cpp:107 msgid "Filter" msgstr "Filter" @@ -960,9 +860,6 @@ msgstr "max suurus" #: ../wxInterface_wdr.cpp:144 -msgid "Availability" -msgstr "Kättesaadavus" - #: ../wxInterface_wdr.cpp:156 msgid "Extension" msgstr "Laiend" @@ -991,22 +888,14 @@ msgid "Current Session" msgstr "Praegune sessioon" -#: ../wxInterface_wdr.cpp:282 ../wxInterface_wdr.cpp:330 -msgid "Accepted Uploads" -msgstr "Aktsepteeritud üleslaadimised" - +#: ../wxInterface_wdr.cpp:282 +#: ../wxInterface_wdr.cpp:330 #: ../wxInterface_wdr.cpp:320 msgid "Total" msgstr "Kokku" #: ../wxInterface_wdr.cpp:383 -msgid "Friends" -msgstr "Sõbrad" - #: ../wxInterface_wdr.cpp:402 -msgid "Messages" -msgstr "Sõnumid" - #: ../wxInterface_wdr.cpp:411 #, fuzzy msgid "Page" @@ -1025,41 +914,32 @@ msgstr "Statistika viimati nullitud: Teadmata" #: ../wxInterface_wdr.cpp:474 -msgid "Connection Statistics" -msgstr "Ühenduse Statistika" - #: ../wxInterface_wdr.cpp:483 msgid "active downloads" msgstr "aktiivsed allalaadimised" #: ../wxInterface_wdr.cpp:498 -msgid "active connections (1:3)" -msgstr "aktiivsed ühendused (1:3)" - #: ../wxInterface_wdr.cpp:509 -msgid "active uploads" -msgstr "aktiivsed ülesladimised" - #: ../wxInterface_wdr.cpp:533 msgid "Download-Speed" msgstr "Allalaadimis kiirus" -#: ../wxInterface_wdr.cpp:542 ../wxInterface_wdr.cpp:595 +#: ../wxInterface_wdr.cpp:542 +#: ../wxInterface_wdr.cpp:595 msgid "session average" msgstr "sessiooni keskmine" -#: ../wxInterface_wdr.cpp:558 ../wxInterface_wdr.cpp:611 +#: ../wxInterface_wdr.cpp:558 +#: ../wxInterface_wdr.cpp:611 msgid "current" msgstr "praegune" -#: ../wxInterface_wdr.cpp:569 ../wxInterface_wdr.cpp:622 +#: ../wxInterface_wdr.cpp:569 +#: ../wxInterface_wdr.cpp:622 msgid "average (5 mins)" msgstr "keskmine (5 minutit)" #: ../wxInterface_wdr.cpp:586 -msgid "Upload-Speed" -msgstr "Üleslaadimise kiirus" - #: ../wxInterface_wdr.cpp:656 msgid "" "Please speciy the name for your new language. \n" @@ -1067,7 +947,6 @@ "in lang/ subdirectory. To create that file, refer to\n" "the TRANSLATION file in the package directory." msgstr "" -"Palun märgi uue keele nimi. Selle nime ja .mo\n" "laiendiga fail peab eksisteerima lang/ alam-\n" "kataloogis. Selle faili loomise instruktsioonid on\n" "TRANSLATION failis." @@ -1090,37 +969,3 @@ msgid "0 kb/s" msgstr "" -#: ../wxInterface_wdr.cpp:788 -#, fuzzy -msgid "Disconnected" -msgstr "Ühendatud" - -#~ msgid "Show shared files" -#~ msgstr "Näita jagatud faile" - -#~ msgid "Modify settings" -#~ msgstr "Muuda seadeid" - -#~ msgid "Update from URL" -#~ msgstr "Uuenda aadressilt" - -#~ msgid "Debug Log" -#~ msgstr "Veaotsingu Loog" - -#~ msgid "Restart needed" -#~ msgstr "Vajab taaskäivitust" - -#~ msgid "xMule v2 ready!" -#~ msgstr "xMule v2 valmis!" - -#~ msgid "Change GUI Settings" -#~ msgstr "Muuda kasutajaliidese seadeid" - -#~ msgid "Change Core Settings" -#~ msgstr "Muuda Tuuma Seadeid" - -#~ msgid "Close xmule2-ui-wx?" -#~ msgstr "Sulge xmule2+ui+wx?" - -#~ msgid "Server Info" -#~ msgstr "Serveri info" Index: French.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/French.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- French.po 31 Dec 2003 14:28:23 -0000 1.3 +++ French.po 31 Dec 2003 16:27:19 -0000 1.4 @@ -6,33 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: wxInterface CVS-30-12-2003\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" -"PO-Revision-Date: 2003-12-23 14:53+0100\n" -"Last-Translator: Nicolas Lussier\n" +"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"PO-Revision-Date: 2003-12-31 17:42+0200\n" +"Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: French <n.l...@fr...>\n" "MIME-Version: 1.0\n" [...972 lines suppressed...] - #: ../wxInterface_wdr.cpp:779 msgid "0 kb/s" msgstr "0 Ko/s" -#: ../wxInterface_wdr.cpp:788 -msgid "Disconnected" -msgstr "Déconnecter" - -#~ msgid "Show shared files" -#~ msgstr "Afficher les fichiers partagés" - -#~ msgid "Modify settings" -#~ msgstr "Modifier les paramètres" - -#~ msgid "Update from URL" -#~ msgstr "MAJ depuis l'URL" - -#~ msgid "Debug Log" -#~ msgstr "Journal de deboguage" Index: German.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/German.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- German.po 31 Dec 2003 14:28:23 -0000 1.6 +++ German.po 31 Dec 2003 16:27:19 -0000 1.7 @@ -6,34 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" -"PO-Revision-Date: 2003-09-09 01:25+0300\n" +"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"PO-Revision-Date: 2003-12-31 17:32+0200\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" -#: ../DownloadListCtrl.cpp:52 ../SharedFilesListCtrl.cpp:52 +#: ../DownloadListCtrl.cpp:52 +#: ../SharedFilesListCtrl.cpp:52 msgid "File Name" msgstr "Dateiname" -#: ../DownloadListCtrl.cpp:52 ../SearchListCtrl.cpp:56 -#: ../SharedFilesListCtrl.cpp:52 -msgid "Size" -msgstr "Größe" - -#: ../DownloadListCtrl.cpp:52 ../UploadListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:285 ../wxInterface_wdr.cpp:333 -msgid "Transferred" -msgstr "Übertragen" - #: ../DownloadListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 +#: ../wxInterface_wdr.cpp:285 +#: ../wxInterface_wdr.cpp:333 msgid "Completed" msgstr "Fertiggestellt" -#: ../DownloadListCtrl.cpp:53 ../UploadListCtrl.cpp:52 +#: ../DownloadListCtrl.cpp:53 +#: ../UploadListCtrl.cpp:52 msgid "Speed" msgstr "Geschwindigkeit" @@ -41,15 +37,15 @@ msgid "Progress" msgstr "Fortschritt" -#: ../DownloadListCtrl.cpp:53 ../SearchListCtrl.cpp:56 +#: ../DownloadListCtrl.cpp:53 +#: ../SearchListCtrl.cpp:56 msgid "Sources" msgstr "Quellen" -#: ../DownloadListCtrl.cpp:53 ../SharedFilesListCtrl.cpp:53 -msgid "Priority" -msgstr "Priorität" - -#: ../DownloadListCtrl.cpp:54 ../UploadListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:53 +#: ../SharedFilesListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:54 +#: ../UploadListCtrl.cpp:53 msgid "Status" msgstr "Status" @@ -58,9 +54,6 @@ msgstr "Verbleibend" #: ../DownloadListCtrl.cpp:54 -msgid "Last Seen Complete" -msgstr "Zuletzt vollständig entdeckt" - #: ../DownloadListCtrl.cpp:55 msgid "Last Reception" msgstr "Letzter Empfang" @@ -69,10 +62,8 @@ msgid "Category" msgstr "Kategorie" -#: ../GUISettingsDlg.cpp:319 ../GUISettingsDlg.cpp:409 -msgid "Add new language" -msgstr "Füge neue Sprache hinzu" - +#: ../GUISettingsDlg.cpp:319 +#: ../GUISettingsDlg.cpp:409 #: ../GUISettingsDlg.cpp:335 #, c-format msgid "" @@ -84,11 +75,8 @@ msgid "Confirm remove language" msgstr "" -#: ../GUISettingsDlg.cpp:353 ../GUISettingsDlg.cpp:446 -#, fuzzy -msgid "Add new iconset" -msgstr "Füge neue Sprache hinzu" - +#: ../GUISettingsDlg.cpp:353 +#: ../GUISettingsDlg.cpp:446 #: ../GUISettingsDlg.cpp:369 #, c-format msgid "" @@ -106,19 +94,14 @@ #: ../GUISettingsDlg.cpp:397 #, fuzzy -msgid "" -"Change the language of the interface. Requires interface \t\trestart to take " -"effect" -msgstr "" -"Veränderungen der Menubar und Toolbar Einstellungen\n" -"erfordern eine Neustart vom User Interface." +msgid "Change the language of the interface. Requires interface \t\trestart to take effect" +msgstr "erfordern eine Neustart vom User Interface." -#: ../GUISettingsDlg.cpp:405 ../GUISettingsDlg.cpp:442 +#: ../GUISettingsDlg.cpp:405 +#: ../GUISettingsDlg.cpp:442 +#: ../GUISettingsDlg.cpp:414 +#: ../GUISettingsDlg.cpp:451 #, fuzzy -msgid "Add" -msgstr "Neu hinzufügen" - -#: ../GUISettingsDlg.cpp:414 ../GUISettingsDlg.cpp:451 msgid "Remove" msgstr "" @@ -175,9 +158,7 @@ msgstr "Zeige Splashscreen" #: ../GUISettingsDlg.cpp:533 -msgid "" -"Toggle wether splashscreen should be shown on program \t\tstartup or not. " -"Speeds up application starting if turned off. \t\tDefault: On" +msgid "Toggle wether splashscreen should be shown on program \t\tstartup or not. Speeds up application starting if turned off. \t\tDefault: On" msgstr "" #: ../GUISettingsDlg.cpp:541 @@ -188,7 +169,9 @@ msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "" -#: ../GUISettingsDlg.cpp:558 ../MainDlg.cpp:647 ../MainDlg.cpp:917 +#: ../GUISettingsDlg.cpp:558 +#: ../MainDlg.cpp:647 +#: ../MainDlg.cpp:917 #, fuzzy msgid "Show ToolBar" msgstr "Zeige Toolbar" @@ -196,27 +179,31 @@ #: ../GUISettingsDlg.cpp:563 #, fuzzy msgid "Toggle wether toolbar is shown or not." -msgstr "" -"Veränderungen der Menubar und Toolbar Einstellungen\n" -"erfordern eine Neustart vom User Interface." +msgstr "erfordern eine Neustart vom User Interface." -#: ../GUISettingsDlg.cpp:571 ../MainDlg.cpp:654 ../MainDlg.cpp:668 -#: ../MainDlg.cpp:925 ../MainDlg.cpp:939 +#: ../GUISettingsDlg.cpp:571 +#: ../MainDlg.cpp:654 +#: ../MainDlg.cpp:668 +#: ../MainDlg.cpp:925 +#: ../MainDlg.cpp:939 msgid "Horizontal" msgstr "Horizontal" -#: ../GUISettingsDlg.cpp:572 ../MainDlg.cpp:657 ../MainDlg.cpp:669 -#: ../MainDlg.cpp:926 ../MainDlg.cpp:940 +#: ../GUISettingsDlg.cpp:572 +#: ../MainDlg.cpp:657 +#: ../MainDlg.cpp:669 +#: ../MainDlg.cpp:926 +#: ../MainDlg.cpp:940 msgid "Vertical" msgstr "Vertikal" #: ../GUISettingsDlg.cpp:580 -msgid "" -"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " -"on the left side of window." +msgid "Horizontal tooltip is shown on top of window (default),\t\tvertical is shown on the left side of window." msgstr "" -#: ../GUISettingsDlg.cpp:591 ../MainDlg.cpp:643 ../MainDlg.cpp:911 +#: ../GUISettingsDlg.cpp:591 +#: ../MainDlg.cpp:643 +#: ../MainDlg.cpp:911 #, fuzzy msgid "Show MenuBar" msgstr "Zeige Menubar" @@ -224,11 +211,10 @@ #: ../GUISettingsDlg.cpp:596 #, fuzzy msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." -msgstr "" -"Veränderungen der Menubar und Toolbar Einstellungen\n" -"erfordern eine Neustart vom User Interface." +msgstr "erfordern eine Neustart vom User Interface." -#: ../GUISettingsDlg.cpp:610 ../wxInterface_wdr.cpp:668 +#: ../GUISettingsDlg.cpp:610 +#: ../wxInterface_wdr.cpp:668 #: ../wxInterface_wdr.cpp:710 msgid "OK" msgstr "OK" @@ -237,8 +223,10 @@ msgid "Save settings and close dialog" msgstr "" -#: ../GUISettingsDlg.cpp:619 ../wxInterface_wdr.cpp:199 -#: ../wxInterface_wdr.cpp:672 ../wxInterface_wdr.cpp:714 +#: ../GUISettingsDlg.cpp:619 +#: ../wxInterface_wdr.cpp:199 +#: ../wxInterface_wdr.cpp:672 +#: ../wxInterface_wdr.cpp:714 msgid "Cancel" msgstr "Abbrechen" @@ -252,8 +240,6 @@ "You need to enter the name for your new language!\n" "\t\t\tIf you no longer wish to add a language, click\t\t\t'Cancel'" msgstr "" -"Sie müssen den Namen für die neue Übersetzung eingeben!\n" -"Falls Sie keine Übersetzung mehr hinzufügen wollen, klicken Sie 'Abbrechen'." #: ../GUISettingsDlg.cpp:673 msgid "Missing information" @@ -269,30 +255,25 @@ msgid "" "Please make sure you specified correct name, and\t\t\t the\n" "translated and compiled .mo file exists in\t\t\t lang subdir." -msgstr "" -"Bitte überprüfen Sie, ob Sie den korrekte Namen angegeben\n" -"haben und die übersetzte und kompilierte .mo Datei im \n" -"Unterverzeichnis existiert." +msgstr "Unterverzeichnis existiert." #: ../GUISettingsDlg.cpp:690 msgid "File not found" msgstr "Datei nicht gefunden" #: ../GUISettingsDlg.cpp:701 -#, c-format -msgid "New language %s added.\n" -msgstr "Neue Übersetzung %s hinzugefügt.\n" - #: ../GUISettingsDlg.cpp:702 +#, c-format msgid "Please restart the interface to test your new language!" msgstr "" -"Bitte starten Sie das User Interface neu um die neue Übersetzung zu testen!" #: ../GUISettingsDlg.cpp:703 msgid "Success!" msgstr "Erfolg!" -#: ../KnownListCtrl.cpp:53 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../KnownListCtrl.cpp:53 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "Username" msgstr "Benutzername" @@ -301,9 +282,6 @@ msgstr "Upload Status" #: ../KnownListCtrl.cpp:53 -msgid "Transferred Up" -msgstr "Übertragen" - #: ../KnownListCtrl.cpp:54 msgid "Download Status" msgstr "Download Status" @@ -328,28 +306,46 @@ msgid "Visit http://sharedaemon.sourceforge.net for latest updates." msgstr "" -#: ../MainDlg.cpp:339 ../MainDlg.cpp:377 ../MainDlg.cpp:383 ../MainDlg.cpp:394 -#: ../MainDlg.cpp:403 ../MainDlg.cpp:415 ../MainDlg.cpp:610 +#: ../MainDlg.cpp:339 +#: ../MainDlg.cpp:377 +#: ../MainDlg.cpp:383 +#: ../MainDlg.cpp:394 +#: ../MainDlg.cpp:403 +#: ../MainDlg.cpp:415 +#: ../MainDlg.cpp:610 msgid "Connect" msgstr "Verbinden" -#: ../MainDlg.cpp:340 ../MainDlg.cpp:447 ../MainDlg.cpp:453 ../MainDlg.cpp:464 -#: ../MainDlg.cpp:473 ../MainDlg.cpp:485 +#: ../MainDlg.cpp:340 +#: ../MainDlg.cpp:447 +#: ../MainDlg.cpp:453 +#: ../MainDlg.cpp:464 +#: ../MainDlg.cpp:473 +#: ../MainDlg.cpp:485 #, fuzzy msgid "Options" msgstr "Logging Optionen" -#: ../MainDlg.cpp:384 ../MainDlg.cpp:404 ../ServerWnd.cpp:247 +#: ../MainDlg.cpp:384 +#: ../MainDlg.cpp:404 +#: ../ServerWnd.cpp:247 msgid "Log" msgstr "Log" -#: ../MainDlg.cpp:397 ../MainDlg.cpp:398 ../MainDlg.cpp:418 ../MainDlg.cpp:419 +#: ../MainDlg.cpp:397 +#: ../MainDlg.cpp:398 +#: ../MainDlg.cpp:418 +#: ../MainDlg.cpp:419 #, fuzzy msgid "Connect to random server" msgstr "Verbinde zu einem Server" -#: ../MainDlg.cpp:454 ../MainDlg.cpp:474 ../MainDlg.cpp:677 ../MainDlg.cpp:684 -#: ../SysTray.cpp:70 ../SysTray.cpp:557 +#: ../MainDlg.cpp:454 +#: ../MainDlg.cpp:474 +#: ../MainDlg.cpp:677 +#: ../MainDlg.cpp:684 +#: ../SysTray.cpp:70 +#: ../SysTray.cpp:557 msgid "Help" msgstr "Hilfe" @@ -361,10 +357,9 @@ msgid "Question" msgstr "Frage" -#: ../MainDlg.cpp:529 ../MainDlg.cpp:615 ../MainDlg.cpp:950 -msgid "Preferences" -msgstr "Präferenzen" - +#: ../MainDlg.cpp:529 +#: ../MainDlg.cpp:615 +#: ../MainDlg.cpp:950 #: ../MainDlg.cpp:557 msgid "Servers" msgstr "Server" @@ -373,7 +368,8 @@ msgid "Server list" msgstr "Server Liste" -#: ../MainDlg.cpp:561 ../wxInterface_wdr.cpp:61 +#: ../MainDlg.cpp:561 +#: ../wxInterface_wdr.cpp:61 msgid "Search" msgstr "Suche" @@ -389,7 +385,9 @@ msgid "File Transfer" msgstr "Datei Transfer" -#: ../MainDlg.cpp:569 ../MainDlg.cpp:570 ../wxInterface_wdr.cpp:255 +#: ../MainDlg.cpp:569 +#: ../MainDlg.cpp:570 +#: ../wxInterface_wdr.cpp:255 msgid "Shared Files" msgstr "Freigaben" @@ -402,7 +400,8 @@ msgid "Chatting" msgstr "Chatten" -#: ../MainDlg.cpp:577 ../wxInterface_wdr.cpp:263 +#: ../MainDlg.cpp:577 +#: ../wxInterface_wdr.cpp:263 msgid "Statistics" msgstr "Statistik" @@ -410,23 +409,26 @@ msgid "Show live statistics" msgstr "Zeige " -#: ../MainDlg.cpp:611 ../SysTray.cpp:71 +#: ../MainDlg.cpp:611 +#: ../SysTray.cpp:71 msgid "Quit" msgstr "Verlassen" -#: ../MainDlg.cpp:672 ../MainDlg.cpp:942 +#: ../MainDlg.cpp:672 +#: ../MainDlg.cpp:942 msgid "ToolBar Alignment" msgstr "" -#: ../MainDlg.cpp:673 ../MainDlg.cpp:951 +#: ../MainDlg.cpp:673 +#: ../MainDlg.cpp:951 msgid "Fullscreen" msgstr "" -#: ../MainDlg.cpp:678 ../MainDlg.cpp:952 -msgid "About..." -msgstr "Über..." - -#: ../MainDlg.cpp:681 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../MainDlg.cpp:678 +#: ../MainDlg.cpp:952 +#: ../MainDlg.cpp:681 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "File" msgstr "Datei" @@ -442,16 +444,13 @@ msgid "Detach current page" msgstr "" -#: ../MainDlg.cpp:953 ../SysTray.cpp:667 +#: ../MainDlg.cpp:953 +#: ../SysTray.cpp:667 #, fuzzy msgid "Exit" msgstr "Schreibe" #: ../QueueListCtrl.cpp:52 -msgid "File Priority" -msgstr "Datei Priorität" - -#: ../QueueListCtrl.cpp:52 msgid "Rating" msgstr "Bewertung" @@ -475,21 +474,26 @@ msgid "Banned" msgstr "Gebanned" -#: ../QueueListCtrl.cpp:54 ../SharedFilesListCtrl.cpp:54 +#: ../QueueListCtrl.cpp:54 +#: ../SharedFilesListCtrl.cpp:54 #: ../UploadListCtrl.cpp:53 msgid "Obtained Parts" msgstr "Erhaltene Teile" -#: ../SearchListCtrl.cpp:56 ../ServerWnd.cpp:505 ../wxInterface_wdr.cpp:64 +#: ../SearchListCtrl.cpp:56 +#: ../ServerWnd.cpp:505 +#: ../wxInterface_wdr.cpp:64 msgid "Name" msgstr "Name" -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:52 #: ../wxInterface_wdr.cpp:75 msgid "Type" msgstr "Typ" -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:53 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:53 msgid "Hash" msgstr "Hash" @@ -529,7 +533,8 @@ msgid "Failed" msgstr "Fehlgeschlagen" -#: ../ServerListCtrl.cpp:57 ../ServerWnd.cpp:362 +#: ../ServerListCtrl.cpp:57 +#: ../ServerWnd.cpp:362 msgid "Static" msgstr "Statisch" @@ -546,11 +551,8 @@ msgstr "Version" #: ../ServerWnd.cpp:148 -#, fuzzy -msgid "Add new server" -msgstr "Server hinzufügen" - #: ../ServerWnd.cpp:155 +#, fuzzy msgid "Server settings" msgstr "Server Optionen" @@ -577,9 +579,7 @@ msgstr "Automatisch verbinden" #: ../ServerWnd.cpp:313 -msgid "" -"Toggle wether application should automatically connect \t\tto any server on " -"startup" +msgid "Toggle wether application should automatically connect \t\tto any server on startup" msgstr "" #: ../ServerWnd.cpp:322 @@ -587,21 +587,14 @@ msgstr "Nur zu statischen" #: ../ServerWnd.cpp:327 -msgid "" -"Toggle wether application should connect \t\tto servers marked as \"static\" " -"only" +msgid "Toggle wether application should connect \t\tto servers marked as \"static\" only" msgstr "" #: ../ServerWnd.cpp:367 -msgid "" -"Set server static. Static servers are not \t\tremoved from list if they do " -"not respond" +msgid "Set server static. Static servers are not \t\tremoved from list if they do not respond" msgstr "" #: ../ServerWnd.cpp:378 -msgid "Priority:" -msgstr "Priorität:" - #: ../ServerWnd.cpp:384 msgid "High" msgstr "Hoch" @@ -623,8 +616,7 @@ msgstr "Liniengrenze" #: ../ServerWnd.cpp:431 -msgid "" -"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" +msgid "Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" msgstr "" #: ../ServerWnd.cpp:442 @@ -661,15 +653,9 @@ msgstr "" #: ../ServerWnd.cpp:522 -msgid "Add to List" -msgstr "Zur Liste hinzufügen" - #: ../ServerWnd.cpp:526 -#, fuzzy -msgid "Add the server to list" -msgstr "Server hinzufügen" - #: ../ServerWnd.cpp:575 +#, fuzzy msgid "Enter the TCP port for connections (default: 4662)" msgstr "" @@ -682,9 +668,7 @@ msgstr "" #: ../ServerWnd.cpp:603 -msgid "" -"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " -"less sources as client<->client source \t\texchange is done via UDP" +msgid "Disable UDP port. This can somewhat lower traffic, \t\tbut also results in less sources as client<->client source \t\texchange is done via UDP" msgstr "" #: ../ServerWnd.cpp:615 @@ -699,7 +683,8 @@ msgid "Permission" msgstr "Erlaubnis" -#: ../SharedFilesListCtrl.cpp:53 ../wxInterface_wdr.cpp:279 +#: ../SharedFilesListCtrl.cpp:53 +#: ../wxInterface_wdr.cpp:279 #: ../wxInterface_wdr.cpp:327 msgid "Requests" msgstr "Anfragen" @@ -716,13 +701,18 @@ msgid "Hide/Show Interface" msgstr "Verstecke/Zeige Schnittstelle" -#: ../SysTray.cpp:69 ../SysTray.cpp:87 +#: ../SysTray.cpp:69 +#: ../SysTray.cpp:87 #, fuzzy msgid "Settings" msgstr "Kern Optionen" -#: ../SysTray.cpp:206 ../SysTray.cpp:227 ../SysTray.cpp:320 ../SysTray.cpp:322 -#: ../SysTray.cpp:473 ../SysTray.cpp:516 +#: ../SysTray.cpp:206 +#: ../SysTray.cpp:227 +#: ../SysTray.cpp:320 +#: ../SysTray.cpp:322 +#: ../SysTray.cpp:473 +#: ../SysTray.cpp:516 #, fuzzy msgid "Unlimited" msgstr "Liniengrenze" @@ -739,7 +729,10 @@ msgid "Nick: " msgstr "" -#: ../SysTray.cpp:336 ../SysTray.cpp:347 ../SysTray.cpp:371 ../SysTray.cpp:380 +#: ../SysTray.cpp:336 +#: ../SysTray.cpp:347 +#: ../SysTray.cpp:371 +#: ../SysTray.cpp:380 msgid "Not Ready" msgstr "" @@ -752,7 +745,9 @@ msgid "ClientID: " msgstr "" -#: ../SysTray.cpp:356 ../SysTray.cpp:414 ../SysTray.cpp:417 +#: ../SysTray.cpp:356 +#: ../SysTray.cpp:414 +#: ../SysTray.cpp:417 #, fuzzy msgid "Not Connected" msgstr "Verbunden" @@ -887,7 +882,8 @@ msgid "Downloads" msgstr "Downloads" -#: ../TransferWnd.cpp:208 ../wxInterface_wdr.cpp:225 +#: ../TransferWnd.cpp:208 +#: ../wxInterface_wdr.cpp:225 msgid "All" msgstr "Alles" @@ -948,25 +944,13 @@ msgstr "Bilder" #: ../wxInterface_wdr.cpp:100 -msgid "Reset" -msgstr "Zurücksetzen" - #: ../wxInterface_wdr.cpp:107 msgid "Filter" msgstr "Filter" #: ../wxInterface_wdr.cpp:114 -msgid "min Size" -msgstr "min Größe" - #: ../wxInterface_wdr.cpp:127 -msgid "max Size" -msgstr "max Größe" - #: ../wxInterface_wdr.cpp:144 -msgid "Availability" -msgstr "Verfügbarkeit" - #: ../wxInterface_wdr.cpp:156 msgid "Extension" msgstr "Erweiterung" @@ -988,14 +972,9 @@ msgstr "Start" #: ../wxInterface_wdr.cpp:215 -msgid "Download Selected" -msgstr "Download ausgewählt" - #: ../wxInterface_wdr.cpp:272 -msgid "Current Session" -msgstr "Gegenwärtige Sitzung" - -#: ../wxInterface_wdr.cpp:282 ../wxInterface_wdr.cpp:330 +#: ../wxInterface_wdr.cpp:282 +#: ../wxInterface_wdr.cpp:330 msgid "Accepted Uploads" msgstr "Akzeptierte Uploads" @@ -1021,13 +1000,7 @@ msgstr "Senden" #: ../wxInterface_wdr.cpp:426 -msgid "Close" -msgstr "Schließen" - #: ../wxInterface_wdr.cpp:461 -msgid "Statistics last reset: Unknown" -msgstr "Statistik zuletzt zurückgesetzt: Unbekannt" - #: ../wxInterface_wdr.cpp:474 msgid "Connection Statistics" msgstr "Verbindungsstatistik" @@ -1048,15 +1021,15 @@ msgid "Download-Speed" msgstr "Download Geschwindigkeit" -#: ../wxInterface_wdr.cpp:542 ../wxInterface_wdr.cpp:595 +#: ../wxInterface_wdr.cpp:542 +#: ../wxInterface_wdr.cpp:595 msgid "session average" msgstr "Sitzungsdurchschnitt" -#: ../wxInterface_wdr.cpp:558 ../wxInterface_wdr.cpp:611 -msgid "current" -msgstr "Gegenwärtig" - -#: ../wxInterface_wdr.cpp:569 ../wxInterface_wdr.cpp:622 +#: ../wxInterface_wdr.cpp:558 +#: ../wxInterface_wdr.cpp:611 +#: ../wxInterface_wdr.cpp:569 +#: ../wxInterface_wdr.cpp:622 msgid "average (5 mins)" msgstr "Durchschnitt (5 Min)" @@ -1071,8 +1044,6 @@ "in lang/ subdirectory. To create that file, refer to\n" "the TRANSLATION file in the package directory." msgstr "" -"Bitte geben Sie einen Namen für die neue Übersetzung an. \n" -"Dateien mit diesem Namen und der Erweiterung .mo müssen \n" "im lang/ Verzeichnis existieren. Um die Datei zu erstellen, \n" "beachten Sie die Datei TRANSLATION im Package Verzeichnis." @@ -1099,32 +1070,3 @@ msgid "Disconnected" msgstr "Verbunden" -#~ msgid "Show shared files" -#~ msgstr "Freigegebene Dateien zeigen" - -#~ msgid "Modify settings" -#~ msgstr "Einstellungen ändern" - -#~ msgid "Update from URL" -#~ msgstr "Update von URL" - -#~ msgid "Debug Log" -#~ msgstr "Debug Log" - -#~ msgid "Restart needed" -#~ msgstr "Neustart erfoderlich" - -#~ msgid "xMule v2 ready!" -#~ msgstr "xMule v2 bereit!" - -#~ msgid "Change GUI Settings" -#~ msgstr "GUI Einstellungen ändern" - -#~ msgid "Change Core Settings" -#~ msgstr "Kern Einstellungen ändern" - -#~ msgid "Close xmule2-ui-wx?" -#~ msgstr "xmule2+ui+wx beenden?" - -#~ msgid "Server Info" -#~ msgstr "Server Info" Index: Spanish.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Spanish.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Spanish.po 31 Dec 2003 14:28:23 -0000 1.3 +++ Spanish.po 31 Dec 2003 16:27:19 -0000 1.4 @@ -10,28 +10,29 @@ msgid "" msgstr "" "Project-Id-Version: spanish\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" -"PO-Revision-Date: 2003-12-01 18:40+0100\n" -"Last-Translator: José MarÃa RodrÃguez Gutiérrez (thorero) <thorerocs@hotmail." -"com>\n" +"POT-Creation-Date: 2003-12-31 16:43+0200\n" +"PO-Revision-Date: 2003-12-31 17:32+0200\n" +"Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: Español\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" -"X-Generator: KBabel 1.3\n" -#: ../DownloadListCtrl.cpp:52 ../SharedFilesListCtrl.cpp:52 +#: ../DownloadListCtrl.cpp:52 +#: ../SharedFilesListCtrl.cpp:52 msgid "File Name" msgstr "Nombre Archivo" -#: ../DownloadListCtrl.cpp:52 ../SearchListCtrl.cpp:56 +#: ../DownloadListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 #: ../SharedFilesListCtrl.cpp:52 msgid "Size" msgstr "Tamaño" -#: ../DownloadListCtrl.cpp:52 ../UploadListCtrl.cpp:52 -#: ../wxInterface_wdr.cpp:285 ../wxInterface_wdr.cpp:333 +#: ../DownloadListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 +#: ../wxInterface_wdr.cpp:285 +#: ../wxInterface_wdr.cpp:333 msgid "Transferred" msgstr "Transferido" @@ -39,7 +40,8 @@ msgid "Completed" msgstr "Completado" -#: ../DownloadListCtrl.cpp:53 ../UploadListCtrl.cpp:52 +#: ../DownloadListCtrl.cpp:53 +#: ../UploadListCtrl.cpp:52 msgid "Speed" msgstr "Velocidad" @@ -47,15 +49,18 @@ msgid "Progress" msgstr "Progreso" -#: ../DownloadListCtrl.cpp:53 ../SearchListCtrl.cpp:56 +#: ../DownloadListCtrl.cpp:53 +#: ../SearchListCtrl.cpp:56 msgid "Sources" msgstr "Fuentes" -#: ../DownloadListCtrl.cpp:53 ../SharedFilesListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:53 +#: ../SharedFilesListCtrl.cpp:53 msgid "Priority" msgstr "Prioridad" -#: ../DownloadListCtrl.cpp:54 ../UploadListCtrl.cpp:53 +#: ../DownloadListCtrl.cpp:54 +#: ../UploadListCtrl.cpp:53 msgid "Status" msgstr "Estado" @@ -75,7 +80,8 @@ msgid "Category" msgstr "CategorÃa" -#: ../GUISettingsDlg.cpp:319 ../GUISettingsDlg.cpp:409 +#: ../GUISettingsDlg.cpp:319 +#: ../GUISettingsDlg.cpp:409 msgid "Add new language" msgstr "Añadir nuevo idioma" @@ -92,7 +98,8 @@ msgid "Confirm remove language" msgstr "Confirmar borrar idioma" -#: ../GUISettingsDlg.cpp:353 ../GUISettingsDlg.cpp:446 +#: ../GUISettingsDlg.cpp:353 +#: ../GUISettingsDlg.cpp:446 msgid "Add new iconset" msgstr "Añadir nuevo icono" @@ -115,18 +122,16 @@ #: ../GUISettingsDlg.cpp:397 #, fuzzy -msgid "" -"Change the language of the interface. Requires interface \t\trestart to take " -"effect" -msgstr "" -"Cambiar el idioma del interface. Debes reiniciar el interface para que tenga " -"efecto" +msgid "Change the language of the interface. Requires interface \t\trestart to take effect" +msgstr "Cambiar el idioma del interface. Debes reiniciar el interface para que tenga efecto" -#: ../GUISettingsDlg.cpp:405 ../GUISettingsDlg.cpp:442 +#: ../GUISettingsDlg.cpp:405 +#: ../GUISettingsDlg.cpp:442 msgid "Add" msgstr "Añadir" -#: ../GUISettingsDlg.cpp:414 ../GUISettingsDlg.cpp:451 +#: ../GUISettingsDlg.cpp:414 +#: ../GUISettingsDlg.cpp:451 msgid "Remove" msgstr "Borrar" @@ -141,8 +146,7 @@ #: ../GUISettingsDlg.cpp:435 #, fuzzy msgid "Change the iconet the interface should use." -msgstr "" -"Cambiar el icono que usa el interface. Debes reiniciar para que tenga efecto" +msgstr "Cambiar el icono que usa el interface. Debes reiniciar para que tenga efecto" #: ../GUISettingsDlg.cpp:455 msgid "Remove currently selected iconset" @@ -187,12 +191,8 @@ #: ../GUISettingsDlg.cpp:533 #, fuzzy -msgid "" -"Toggle wether splashscreen should be shown on program \t\tstartup or not. " -"Speeds up application starting if turned off. \t\tDefault: On" -msgstr "" -"Elegir si la la pantalla de inicio debe ser mostrada al iniciar o no. La " -"aplicación se iniciará mas rápisi si eliges no. Predeterminado. Si" +msgid "Toggle wether splashscreen should be shown on program \t\tstartup or not. Speeds up application starting if turned off. \t\tDefault: On" +msgstr "Elegir si la la pantalla de inicio debe ser mostrada al iniciar o no. La aplicación se iniciará mas rápisi si eliges no. Predeterminado. Si" #: ../GUISettingsDlg.cpp:541 msgid "Prompt on exit" @@ -203,49 +203,51 @@ msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "Elegir si se pide confirmación al cerrar el programa" -#: ../GUISettingsDlg.cpp:558 ../MainDlg.cpp:647 ../MainDlg.cpp:917 +#: ../GUISettingsDlg.cpp:558 +#: ../MainDlg.cpp:647 +#: ../MainDlg.cpp:917 msgid "Show ToolBar" msgstr "Mostrar barra de herramientas" #: ../GUISettingsDlg.cpp:563 #, fuzzy msgid "Toggle wether toolbar is shown or not." -msgstr "" -"Elegir si se muestra la barra de herramientas o no. Debes reiniciar para que " -"tome efecto" +msgstr "Elegir si se muestra la barra de herramientas o no. Debes reiniciar para que tome efecto" -#: ../GUISettingsDlg.cpp:571 ../MainDlg.cpp:654 ../MainDlg.cpp:668 -#: ../MainDlg.cpp:925 ../MainDlg.cpp:939 +#: ../GUISettingsDlg.cpp:571 +#: ../MainDlg.cpp:654 +#: ../MainDlg.cpp:668 +#: ../MainDlg.cpp:925 +#: ../MainDlg.cpp:939 msgid "Horizontal" msgstr "Horizontal" -#: ../GUISettingsDlg.cpp:572 ../MainDlg.cpp:657 ../MainDlg.cpp:669 -#: ../MainDlg.cpp:926 ../MainDlg.cpp:940 +#: ../GUISettingsDlg.cpp:572 +#: ../MainDlg.cpp:657 +#: ../MainDlg.cpp:669 +#: ../MainDlg.cpp:926 +#: ../MainDlg.cpp:940 msgid "Vertical" msgstr "Vertical" #: ../GUISettingsDlg.cpp:580 #, fuzzy -msgid "" -"Horizontal tooltip is shown on top of window (default),\t\tvertical is shown " -"on the left side of window." -msgstr "" -"El tooltip horizontal se muestra en la parte superior de la ventana " -"(predeterminado) el bertical se muestra a la izquierda de la ventana. Debes " -"reiniciar para que toma efecto" +msgid "Horizontal tooltip is shown on top of window (default),\t\tvertical is shown on the left side of window." +msgstr "El tooltip horizontal se muestra en la parte superior de la ventana (predeterminado) el bertical se muestra a la izquierda de la ventana. Debes reiniciar para que toma efecto" -#: ../GUISettingsDlg.cpp:591 ../MainDlg.cpp:643 ../MainDlg.cpp:911 +#: ../GUISettingsDlg.cpp:591 +#: ../MainDlg.cpp:643 +#: ../MainDlg.cpp:911 msgid "Show MenuBar" msgstr "Mostrar barra de menu" #: ../GUISettingsDlg.cpp:596 #, fuzzy msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." -msgstr "" -"Elegir si se muestra la barra de menu (archivo/vista/etc) o no. Debes " -"reiniciar para que tome efecto" +msgstr "Elegir si se muestra la barra de menu (archivo/vista/etc) o no. Debes reiniciar para que tome efecto" -#: ../GUISettingsDlg.cpp:610 ../wxInterface_wdr.cpp:668 +#: ../GUISettingsDlg.cpp:610 +#: ../wxInterface_wdr.cpp:668 #: ../wxInterface_wdr.cpp:710 msgid "OK" msgstr "OK" @@ -254,8 +256,10 @@ msgid "Save settings and close dialog" msgstr "Salvar opciones y cerrar" -#: ../GUISettingsDlg.cpp:619 ../wxInterface_wdr.cpp:199 -#: ../wxInterface_wdr.cpp:672 ../wxInterface_wdr.cpp:714 +#: ../GUISettingsDlg.cpp:619 +#: ../wxInterface_wdr.cpp:199 +#: ../wxInterface_wdr.cpp:672 +#: ../wxInterface_wdr.cpp:714 msgid "Cancel" msgstr "Cancelar" @@ -269,8 +273,7 @@ "\t\t\tIf you no longer wish to add a language, click\t\t\t'Cancel'" msgstr "" "Debes introducir el nombre del nuevo idioma\n" -"\t\t\tsi no tienes ningún deseo más para añadir el idioma, marca\t\t" -"\t'Cancelar'" +"\t\t\tsi no tienes ningún deseo más para añadir el idioma, marca\t\t\t'Cancelar'" #: ../GUISettingsDlg.cpp:673 msgid "Missing information" @@ -287,8 +290,7 @@ "translated and compiled .mo file exists in\t\t\t lang subdir." msgstr "" "Por favor comprueba que el nombre especificado es correcto, y\t\t\t el\n" -" archivo de traducción .mo existe y está compilado en\t\t\t el subdirectorio " -"lang" +" archivo de traducción .mo existe y está compilado en\t\t\t el subdirectorio lang" #: ../GUISettingsDlg.cpp:690 msgid "File not found" @@ -307,7 +309,9 @@ msgid "Success!" msgstr "Echo!" -#: ../KnownListCtrl.cpp:53 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../KnownListCtrl.cpp:53 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "Username" msgstr "Nombre de usuario" @@ -344,28 +348,46 @@ msgid "Visit http://sharedaemon.sourceforge.net for latest updates." msgstr "" -#: ../MainDlg.cpp:339 ../MainDlg.cpp:377 ../MainDlg.cpp:383 ../MainDlg.cpp:394 -#: ../MainDlg.cpp:403 ../MainDlg.cpp:415 ../MainDlg.cpp:610 +#: ../MainDlg.cpp:339 +#: ../MainDlg.cpp:377 +#: ../MainDlg.cpp:383 +#: ../MainDlg.cpp:394 +#: ../MainDlg.cpp:403 +#: ../MainDlg.cpp:415 +#: ../MainDlg.cpp:610 msgid "Connect" msgstr "Conectar" -#: ../MainDlg.cpp:340 ../MainDlg.cpp:447 ../MainDlg.cpp:453 ../MainDlg.cpp:464 -#: ../MainDlg.cpp:473 ../MainDlg.cpp:485 +#: ../MainDlg.cpp:340 +#: ../MainDlg.cpp:447 +#: ../MainDlg.cpp:453 +#: ../MainDlg.cpp:464 +#: ../MainDlg.cpp:473 +#: ../MainDlg.cpp:485 #, fuzzy msgid "Options" msgstr "Opciones del log" -#: ../MainDlg.cpp:384 ../MainDlg.cpp:404 ../ServerWnd.cpp:247 +#: ../MainDlg.cpp:384 +#: ../MainDlg.cpp:404 +#: ../ServerWnd.cpp:247 msgid "Log" msgstr "Registro" -#: ../MainDlg.cpp:397 ../MainDlg.cpp:398 ../MainDlg.cpp:418 ../MainDlg.cpp:419 +#: ../MainDlg.cpp:397 +#: ../MainDlg.cpp:398 +#: ../MainDlg.cpp:418 +#: ../MainDlg.cpp:419 #, fuzzy msgid "Connect to random server" msgstr "Conectar con cualquier servidor" -#: ../MainDlg.cpp:454 ../MainDlg.cpp:474 ../MainDlg.cpp:677 ../MainDlg.cpp:684 -#: ../SysTray.cpp:70 ../SysTray.cpp:557 +#: ../MainDlg.cpp:454 +#: ../MainDlg.cpp:474 +#: ../MainDlg.cpp:677 +#: ../MainDlg.cpp:684 +#: ../SysTray.cpp:70 +#: ../SysTray.cpp:557 msgid "Help" msgstr "Ayuda" @@ -377,7 +399,9 @@ msgid "Question" msgstr "Pregunta" -#: ../MainDlg.cpp:529 ../MainDlg.cpp:615 ../MainDlg.cpp:950 +#: ../MainDlg.cpp:529 +#: ../MainDlg.cpp:615 +#: ../MainDlg.cpp:950 msgid "Preferences" msgstr "Opciones" @@ -389,7 +413,8 @@ msgid "Server list" msgstr "Lista de servidores" -#: ../MainDlg.cpp:561 ../wxInterface_wdr.cpp:61 +#: ../MainDlg.cpp:561 +#: ../wxInterface_wdr.cpp:61 msgid "Search" msgstr "Buscar" @@ -405,7 +430,9 @@ msgid "File Transfer" msgstr "Archivo transferido" -#: ../MainDlg.cpp:569 ../MainDlg.cpp:570 ../wxInterface_wdr.cpp:255 +#: ../MainDlg.cpp:569 +#: ../MainDlg.cpp:570 +#: ../wxInterface_wdr.cpp:255 msgid "Shared Files" msgstr "Compartidos" @@ -417,7 +444,8 @@ msgid "Chatting" msgstr "Conversar" -#: ../MainDlg.cpp:577 ../wxInterface_wdr.cpp:263 +#: ../MainDlg.cpp:577 +#: ../wxInterface_wdr.cpp:263 msgid "Statistics" msgstr "EstadÃsticas" @@ -425,23 +453,29 @@ msgid "Show live statistics" msgstr "Mostrar estadÃsticas activas" -#: ../MainDlg.cpp:611 ../SysTray.cpp:71 +#: ../MainDlg.cpp:611 +#: ../SysTray.cpp:71 msgid "Quit" msgstr "Salir" -#: ../MainDlg.cpp:672 ../MainDlg.cpp:942 +#: ../MainDlg.cpp:672 +#: ../MainDlg.cpp:942 msgid "ToolBar Alignment" msgstr "Alineamiento de la barra de herramientas" -#: ../MainDlg.cpp:673 ../MainDlg.cpp:951 +#: ../MainDlg.cpp:673 +#: ../MainDlg.cpp:951 msgid "Fullscreen" msgstr "" -#: ../MainDlg.cpp:678 ../MainDlg.cpp:952 +#: ../MainDlg.cpp:678 +#: ../MainDlg.cpp:952 msgid "About..." msgstr "Sobre.." -#: ../MainDlg.cpp:681 ../QueueListCtrl.cpp:52 ../UploadListCtrl.cpp:52 +#: ../MainDlg.cpp:681 +#: ../QueueListCtrl.cpp:52 +#: ../UploadListCtrl.cpp:52 msgid "File" msgstr "Archivo" @@ -457,7 +491,8 @@ msgid "Detach current page" msgstr "" -#: ../MainDlg.cpp:953 ../SysTray.cpp:667 +#: ../MainDlg.cpp:953 +#: ../SysTray.cpp:667 #, fuzzy msgid "Exit" msgstr "Editar" @@ -490,21 +525,26 @@ msgid "Banned" msgstr "Baneado" -#: ../QueueListCtrl.cpp:54 ../SharedFilesListCtrl.cpp:54 +#: ../QueueListCtrl.cpp:54 +#: ../SharedFilesListCtrl.cpp:54 #: ../UploadListCtrl.cpp:53 msgid "Obtained Parts" msgstr "Partes Obtenidas" -#: ../SearchListCtrl.cpp:56 ../ServerWnd.cpp:505 ../wxInterface_wdr.cpp:64 +#: ../SearchListCtrl.cpp:56 +#: ../ServerWnd.cpp:505 +#: ../wxInterface_wdr.cpp:64 msgid "Name" msgstr "Nombre" -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:52 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:52 #: ../wxInterface_wdr.cpp:75 msgid "Type" msgstr "Tipo" -#: ../SearchListCtrl.cpp:56 ../SharedFilesListCtrl.cpp:53 +#: ../SearchListCtrl.cpp:56 +#: ../SharedFilesListCtrl.cpp:53 msgid "Hash" msgstr "Hash" @@ -544,7 +584,8 @@ msgid "Failed" msgstr "Fallo" -#: ../ServerListCtrl.cpp:57 ../ServerWnd.cpp:362 +#: ../ServerListCtrl.cpp:57 +#: ../ServerWnd.cpp:362 msgid "Static" msgstr "Fijo" @@ -590,9 +631,7 @@ #: ../ServerWnd.cpp:313 #, fuzzy -msgid "" -"Toggle wether application should automatically connect \t\tto any server on " -"startup" +msgid "Toggle wether application should automatically connect \t\tto any server on startup" msgstr "Elegir si el programa debe autoconectarse a un servidor al inciarse" #: ../ServerWnd.cpp:322 @@ -601,19 +640,13 @@ #: ../ServerWnd.cpp:327 #, fuzzy -msgid "" -"Toggle wether application should connect \t\tto servers marked as \"static\" " -"only" +msgid "Toggle wether application should connect \t\tto servers marked as \"static\" only" msgstr "Elegir si el programa debe conectar solo a servidores \"fijos\"" #: ../ServerWnd.cpp:367 #, fuzzy -msgid "" -"Set server static. Static servers are not \t\tremoved from list if they do " -"not respond" -msgstr "" -"Marcar servidor fijo. Servidores fijos no son borrados de la lista aunque no " -"respondan" +msgid "Set server static. Static servers are not \t\tremoved from list if they do not respond" +msgstr "Marcar servidor fijo. Servidores fijos no son borrados de la lista aunque no respondan" #: ../ServerWnd.cpp:378 msgid "Priority:" @@ -641,11 +674,8 @@ #: ../ServerWnd.cpp:431 #, fuzzy -msgid "" -"Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" -msgstr "" -"Elegir si debe haber un lÃmite de lÃnea si para las ventanas del registro " -"(ahorra memoria)" +msgid "Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" +msgstr "Elegir si debe haber un lÃmite de lÃnea si para las ventanas del registro (ahorra memoria)" #: ../ServerWnd.cpp:442 msgid "Maximum number of lines in log boxes" @@ -674,8 +704,7 @@ #: ../ServerWnd.cpp:498 #, fuzzy msgid "Type in the ip address and port of the new \t\tserver, separated by `:`" -msgstr "" -"Escriba la dirección ip y el puerto del nuevo servidor, serparado por :" +msgstr "Escriba la dirección ip y el puerto del nuevo servidor, serparado por :" #: ../ServerWnd.cpp:515 msgid "Optional: Enter the name of the new server" @@ -703,12 +732,8 @@ #: ../ServerWnd.cpp:603 #, fuzzy -msgid "" -"Disable UDP port. This can somewhat lower traffic, \t\tbut also results in " -"less sources as client<->client source \t\texchange is done via UDP" -msgstr "" -"Desactivar el puerto UDP. Esto puede reducir el tráfico, pero también da " -"lugar a menos fuentes <->el intercambio de fientes se hace vÃa UDP" +msgid "Disable UDP port. This can somewhat lower traffic, \t\tbut also results in less sources as client<->client source \t\texchange is done via UDP" +msgstr "Desactivar el puerto UDP. Esto puede reducir el tráfico, pero también da lugar a menos fuentes <->el intercambio de fientes se hace vÃa UDP" #: ../ServerWnd.cpp:615 msgid "Apply changes" @@ -722,7 +747,8 @@ msgid "Permission" msgstr "Permiso" -#: ../SharedFilesListCtrl.cpp:53 ../wxInterface_wdr.cpp:279 +#: ../SharedFilesListCtrl.cpp:53 +#: ../wxInterface_wdr.cpp:279 #: ../wxInterface_wdr.cpp:327 msgid "Requests" msgstr "Peticiones" @@ -739,12 +765,17 @@ msgid "Hide/Show Interface" msgstr "Ocultar/Mostrar interface" -#: ../SysTray.cpp:69 ../SysTray.cpp:87 +#: ../SysTray.cpp:69 +#: ../SysTray.cpp:87 msgid "Settings" msgstr "Ajustes" -#: ../SysTray.cpp:206 ../SysTray.cpp:227 ../SysTray.cpp:320 ../SysTray.cpp:322 -#: ../SysTray.cpp:473 ../SysTray.cpp:516 +#: ../SysTray.cpp:206 +#: ../SysTray.cpp:227 +#: ../SysTray.cpp:320 +#: ../SysTray.cpp:322 +#: ../SysTray.cpp:473 +#: ../SysTray.cpp:516 #, fuzzy msgid "Unlimited" msgstr "LÃmite de lÃnea" @@ -762,7 +793,10 @@ msgid "Nick: " msgstr "" -#: ../SysTray.cpp:336 ../SysTray.cpp:347 ../SysTray.cpp:371 ../SysTray.cpp:380 +#: ../SysTray.cpp:336 +#: ../SysTray.cpp:347 +#: ../SysTray.cpp:371 +#: ../SysTray.cpp:380 msgid "Not Ready" msgstr "" @@ -775,7 +809,9 @@ msgid "ClientID: " msgstr "" -#: ../SysTray.cpp:356 ../SysTray.cpp:414 ../SysTray.cpp:417 +#: ../SysTray.cpp:356 +#: ../SysTray.cpp:414 +#: ../SysTray.cpp:417 #, fuzzy msgid "Not Connected" msgstr "Conectado" @@ -913,7 +949,8 @@ msgid "Downloads" msgstr "Descargas" -#: ../TransferWnd.cpp:208 ../wxInterface_wdr.cpp:225 +#: ../TransferWnd.cpp:208 +#: ../wxInterface_wdr.cpp:225 msgid "All" msgstr "Todo" @@ -1021,7 +1058,8 @@ msgid "Current Session" msgstr "Sesión actual" -#: ../wxInterface_wdr.cpp:282 ../wxInterface_wdr.cpp:330 +#: ../wxInterface_wdr.cpp:282 +#: ../wxInterface_wdr.cpp:330 msgid "Accepted Uploads" msgstr "Subidas aceptadas" @@ -1073,15 +1111,18 @@ msgid "Download-Speed" msgstr "Velocidad de descarga" -#: ../wxInterface_wdr.cpp:542 ../wxInterface_wdr.cpp:595 +#: ../wxInterface_wdr.cpp:542 +#: ../wxInterface_wdr.cpp:595 msgid "session average" msgstr "Promedio de la sesión" -#: ../wxInterface_wdr.cpp:558 ../wxInterface_wdr.cpp:611 +#: ../wxInterface_wdr.cpp:558 +#: ../wxInterface_wdr.cpp:611 msgid "current" msgstr "actual" -#: ../wxInterface_wdr.cpp:569 ../wxInterface_wdr.cpp:622 +#: ../wxInterface_wdr.cpp:569 +#: ../wxInterface_wdr.cpp:622 msgid "average (5 mins)" msgstr "Promedio (5 min" @@ -1110,8 +1151,7 @@ "iconset name is MyNewIconSet, it will be looked for in\n" "images/mynewiconset dir." msgstr "" -"Por favor introduzca el nombre paea su nuevo icono elegido en el bloque de " -"abajo\n" +"Por favor introduzca el nombre paea su nuevo icono elegido en el bloque de abajo\n" "Los archivos de icono deben ser formato PNG y los nombres deben\n" "coincidir con los que hay en otros paquetes. Los archivos deben observarse\n" "en /imágenes/tuiconoelegidonombre (minúsculas!!). Asi que si tu\n" @@ -1130,14 +1170,3 @@ msgid "Disconnected" msgstr "Desconectado" -#~ msgid "Show shared files" -#~ msgstr "Mostrar archivos compartidos" - -#~ msgid "Modify settings" -#~ msgstr "Cambiar opciones" - -#~ msgid "Update from URL" -#~ msgstr "Actualizar desde una URL" - -#~ msgid "Debug Log" -#~ msgstr "Registros de debug" Index: empty.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/empty.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- empty.po 31 Dec 2003 14:28:23 -0000 1.4 +++ empty.po 31 Dec 2003 16:27:19 -0000 1.5 @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-31 16:27+0200\n" +"POT-Creation-Date: 2003-12-31 16:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "... [truncated message content] |
From: <ma...@us...> - 2003-12-31 15:16:21
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv4543 Modified Files: Makefile Log Message: Nonono, dont send error messages to /dev/null :) Index: Makefile =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 31 Dec 2003 14:27:39 -0000 1.1 +++ Makefile 31 Dec 2003 15:16:18 -0000 1.2 @@ -2,10 +2,10 @@ @echo Updating language catalogs...; @xgettext -k'_:1' ../*.cpp ../*.h -o empty.po; # @sed 's/CHARSET/iso-8859-1/' empty.po > empty.po; - @msgmerge Estonian.po empty.po -o Estonian.po 2> /dev/null; - @msgmerge French.po empty.po -o French.po 2> /dev/null; - @msgmerge German.po empty.po -o German.po 2> /dev/null; - @msgmerge Spanish.po empty.po -o Spanish.po 2> /dev/null; + @msgmerge Estonian.po empty.po -o Estonian.po; + @msgmerge French.po empty.po -o French.po; + @msgmerge German.po empty.po -o German.po; + @msgmerge Spanish.po empty.po -o Spanish.po; @echo Compiling language catalogs...; @msgfmt Estonian.po -o Estonian.mo; |
From: <ma...@us...> - 2003-12-31 14:29:06
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv28913 Modified Files: Makefile.am Log Message: Minor coloring fix. Index: Makefile.am =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 30 Dec 2003 13:22:06 -0000 1.11 +++ Makefile.am 31 Dec 2003 14:29:02 -0000 1.12 @@ -98,7 +98,7 @@ echo -e "$(ACTIONCOLOR)\\c"; \ echo -e "$(WELLCOLOR)Successfully compiled \\c"; \ echo -e "$(WARNINGCOLOR)$(BUILD)\\c"; \ - echo -e "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!"; \ + echo -e "$(OUTPUTCOLOR)$@$(WELLCOLOR) binary!$(ACTIONCOLOR)"; \ echo -e "$(ACTIONCOLOR)Now cd to src/ dir and type $(OUTPUTCOLOR)./$@$(ACTIONCOLOR) to start the application."; \ else \ echo -e "failed:"; \ |
From: <ma...@us...> - 2003-12-31 14:28:28
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv28786 Modified Files: Estonian.po French.po German.po Spanish.po empty.po Log Message: Updated message catalogs for v0.2.0 Index: Estonian.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Estonian.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Estonian.po 1 Dec 2003 20:39:48 -0000 1.4 +++ Estonian.po 31 Dec 2003 14:28:23 -0000 1.5 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-01 22:36+0200\n" +"POT-Creation-Date: 2003-12-31 16:27+0200\n" "PO-Revision-Date: 2003-09-09 01:10+0300\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -15,95 +15,96 @@ "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" [...1347 lines suppressed...] + +#~ msgid "Update from URL" +#~ msgstr "Uuenda aadressilt" + +#~ msgid "Debug Log" +#~ msgstr "Veaotsingu Loog" + #~ msgid "Restart needed" #~ msgstr "Vajab taaskäivitust" @@ -927,9 +1118,6 @@ #~ msgid "Change Core Settings" #~ msgstr "Muuda Tuuma Seadeid" - -#~ msgid "User Interface Settings" -#~ msgstr "Kasutajaliidese seaded" #~ msgid "Close xmule2-ui-wx?" #~ msgstr "Sulge xmule2+ui+wx?" Index: French.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/French.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- French.po 30 Dec 2003 13:53:00 -0000 1.2 +++ French.po 31 Dec 2003 14:28:23 -0000 1.3 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: wxInterface CVS-30-12-2003\n" -"POT-Creation-Date: 2003-12-01 22:36+0200\n" +"POT-Creation-Date: 2003-12-31 16:27+0200\n" "PO-Revision-Date: 2003-12-23 14:53+0100\n" "Last-Translator: Nicolas Lussier\n" "Language-Team: French <n.l...@fr...>\n" @@ -14,74 +14,65 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" [...1449 lines suppressed...] +#: ../wxInterface_wdr.cpp:779 msgid "0 kb/s" msgstr "0 Ko/s" -#: wxInterface_wdr.cpp:916 +#: ../wxInterface_wdr.cpp:788 msgid "Disconnected" msgstr "Déconnecter" +#~ msgid "Show shared files" +#~ msgstr "Afficher les fichiers partagés" + +#~ msgid "Modify settings" +#~ msgstr "Modifier les paramètres" + +#~ msgid "Update from URL" +#~ msgstr "MAJ depuis l'URL" + +#~ msgid "Debug Log" +#~ msgstr "Journal de deboguage" Index: German.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/German.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- German.po 1 Dec 2003 20:39:48 -0000 1.5 +++ German.po 31 Dec 2003 14:28:23 -0000 1.6 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-01 22:36+0200\n" +"POT-Creation-Date: 2003-12-31 16:27+0200\n" "PO-Revision-Date: 2003-09-09 01:25+0300\n" "Last-Translator: Alo Sarv <ma...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -15,95 +15,96 @@ "Content-Transfer-Encoding: 8bit\n" "Report-Msgid-Bugs-To: \n" [...1351 lines suppressed...] + +#~ msgid "Update from URL" +#~ msgstr "Update von URL" + +#~ msgid "Debug Log" +#~ msgstr "Debug Log" + #~ msgid "Restart needed" #~ msgstr "Neustart erfoderlich" @@ -929,9 +1122,6 @@ #~ msgid "Change Core Settings" #~ msgstr "Kern Einstellungen ändern" - -#~ msgid "User Interface Settings" -#~ msgstr "User Interface Einstellungen" #~ msgid "Close xmule2-ui-wx?" #~ msgstr "xmule2+ui+wx beenden?" Index: Spanish.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/Spanish.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Spanish.po 1 Dec 2003 20:39:48 -0000 1.2 +++ Spanish.po 31 Dec 2003 14:28:23 -0000 1.3 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: spanish\n" -"POT-Creation-Date: 2003-12-01 22:36+0200\n" +"POT-Creation-Date: 2003-12-31 16:27+0200\n" "PO-Revision-Date: 2003-12-01 18:40+0100\n" "Last-Translator: José MarÃa RodrÃguez Gutiérrez (thorero) <thorerocs@hotmail." "com>\n" @@ -21,64 +21,65 @@ "Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3\n" [...1348 lines suppressed...] +#: ../wxInterface_wdr.cpp:779 msgid "0 kb/s" msgstr "0 kb/s" -#: wxInterface_wdr.cpp:916 +#: ../wxInterface_wdr.cpp:788 msgid "Disconnected" msgstr "Desconectado" + +#~ msgid "Show shared files" +#~ msgstr "Mostrar archivos compartidos" + +#~ msgid "Modify settings" +#~ msgstr "Cambiar opciones" + +#~ msgid "Update from URL" +#~ msgstr "Actualizar desde una URL" + +#~ msgid "Debug Log" +#~ msgstr "Registros de debug" Index: empty.po =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/lang/empty.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- empty.po 1 Dec 2003 20:39:48 -0000 1.3 +++ empty.po 31 Dec 2003 14:28:23 -0000 1.4 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-12-01 22:36+0200\n" +"POT-Creation-Date: 2003-12-31 16:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -15,849 +15,1010 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" [...1275 lines suppressed...] "Please enter the name of your new icon set in the box below.\n" "The iconset files must be in PNG format and filenames must\n" @@ -875,14 +1036,14 @@ "images/mynewiconset dir." msgstr "" -#: wxInterface_wdr.cpp:871 +#: ../wxInterface_wdr.cpp:743 msgid "ShareDaemon wxInterface ready!" msgstr "" -#: wxInterface_wdr.cpp:907 +#: ../wxInterface_wdr.cpp:779 msgid "0 kb/s" msgstr "" -#: wxInterface_wdr.cpp:916 +#: ../wxInterface_wdr.cpp:788 msgid "Disconnected" msgstr "" |
From: <ma...@us...> - 2003-12-31 14:27:42
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv28703 Added Files: Makefile Log Message: Makefile for languages catalogs compilation. --- NEW FILE: Makefile --- all: @echo Updating language catalogs...; @xgettext -k'_:1' ../*.cpp ../*.h -o empty.po; # @sed 's/CHARSET/iso-8859-1/' empty.po > empty.po; @msgmerge Estonian.po empty.po -o Estonian.po 2> /dev/null; @msgmerge French.po empty.po -o French.po 2> /dev/null; @msgmerge German.po empty.po -o German.po 2> /dev/null; @msgmerge Spanish.po empty.po -o Spanish.po 2> /dev/null; @echo Compiling language catalogs...; @msgfmt Estonian.po -o Estonian.mo; @msgfmt French.po -o French.mo; @msgfmt German.po -o German.mo; @msgfmt Spanish.po -o Spanish.mo; clean: @echo Cleaning up language catalogs...; @rm -f Estonian.mo French.mo German.mo Spanish.mo; |
From: <mik...@us...> - 2003-12-31 13:57:34
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/test In directory sc8-pr-cvs1:/tmp/cvs-serv23361/src/test Modified Files: TestSocket.cpp Log Message: 31/12/2003 Mikael Barbeaux * Changed server port on test4 Index: TestSocket.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/test/TestSocket.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TestSocket.cpp 29 Dec 2003 16:05:37 -0000 1.5 +++ TestSocket.cpp 31 Dec 2003 13:57:30 -0000 1.6 @@ -57,7 +57,7 @@ cout << "Validates the server socket..." << endl; server.validate(); cout << "Bind server socket on port 4589..." << endl; - server.bind(4662); + server.bind(4589); cout << "Listening for connections..." << endl; server.listen(5); cout << "Take your browser to test \"http://localhost:4589\"..." << endl; |
From: <mik...@us...> - 2003-12-31 13:57:33
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv23361 Modified Files: ChangeLog Log Message: 31/12/2003 Mikael Barbeaux * Changed server port on test4 Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ChangeLog 31 Dec 2003 10:43:58 -0000 1.27 +++ ChangeLog 31 Dec 2003 13:57:30 -0000 1.28 @@ -24,6 +24,7 @@ ----------------------------------------------------------- 31/12/2003 Mikael Barbeaux + * Changed server port on test4 * Implemented a Session manager. * Implemented HttpSession code source. |
From: <ma...@us...> - 2003-12-31 11:44:52
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv2673 Modified Files: Changelog Log Message: Last two days improvements. Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- Changelog 29 Dec 2003 06:22:42 -0000 1.119 +++ Changelog 31 Dec 2003 11:44:49 -0000 1.120 @@ -25,9 +25,25 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +2003/12/31 Alo Sarv + * Fixed font colours in toolbar when using radical colour schemes on + wxMSW. + +2003/12/30 Alo Sarv + * Improved BSD support. + * wxMSW vertical toolbar and wxMac toolbar don't support controls - + using old-style toolbar there. + * Faster shutdown. + * Detached frames now have icons. + * Fixed sidebar buttons on wxMac. + * Fixed bitmapbutton/toolbarbutton fonts on wxMac and wxGTK2. + 2003/12/29 Alo Sarv * Fixed win9x font issues; now using system font for bitmapbuttons. * Log messages are also now passed to log box on server page. + * Fixed fullscreen-mode on wxMSW, added fullscreen option to menubar + and fixed toolbar popup-menu positioning while in fullscreen. + * Fixed variable redefinition warnings with MS VC6. 2003/12/28 Alo Sarv * Applied patch 866355: Hetfields GTK-tray improvements: |
From: <ma...@us...> - 2003-12-31 10:52:59
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv27604 Modified Files: Images.cpp Log Message: Fixes font colour issues in toolbar buttons when using radical colour schemes on win32. Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- Images.cpp 31 Dec 2003 10:24:26 -0000 1.54 +++ Images.cpp 31 Dec 2003 10:52:55 -0000 1.55 @@ -186,13 +186,7 @@ GetImage(image), (tmp_new.GetWidth()-32)/2, 2, true ); -#ifdef __WXMSW__ /* Well, this gives correct colour on MSW */ - mdc.SetTextForeground( - wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) - ); -#else /* However, it doesn't work anywhere else, so use 0, 0, 0 instead */ - mdc.SetTextForeground(wxColour(0, 0, 0)); -#endif + mdc.GetTextExtent(name, &x, &y); mdc.DrawText(name, (tmp_new.GetWidth()-x)/2, 36); #ifndef __WXMSW__ /* Use wxMask for transparency */ |
Update of /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv26010/src/server/http/servlet Modified Files: HttpSession.h HttpSession.cpp HttpServletRequest.cpp Added Files: SessionManager.h SessionManager.cpp Log Message: 31/12/2003 Mikael Barbeaux * Implemented a Session manager. * Implemented HttpSession code source. --- NEW FILE: SessionManager.h --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "HttpSession.h" #include <map> #include <vector> /** * Defines a manager for Session objects. * Used to retrieve sessions for servlet request, and * to manage them ( time life, creation, destruction... ) * Implements the singleton design pattern. */ class SessionManager{ private: // unique instance of SessionManager static SessionManager *instance; // sessions managed map<string, HttpSession*> sessions; protected: /** * Creates a SessionManager object. */ SessionManager(); public: /** * Destructor for SessionManager. */ ~SessionManager(); /** * Returns the unique instance of SessionManager * * @return SessionManager* */ static SessionManager *getInstance(); /** * Returns the session associated to this id, * or create a new one if the id is empty. * * @param session_id * @return HttpSession* */ HttpSession *getSession(string session_id); /** * Returns all the ids defined. * * @return vector<string> */ vector<string> getIds(); }; --- NEW FILE: SessionManager.cpp --- /* * This file is part of webInterface. * Copyright (C) 2003 Mikael Barbeaux <mik...@us...> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "SessionManager.h" SessionManager *SessionManager::instance = 0; /** * Creates a SessionManager objet. */ SessionManager::SessionManager() { } /** * Destructor for SessionManager. * Deletes all Session included in the manager. */ SessionManager::~SessionManager() { } /** * Returns the unique instance of SessionManager. */ SessionManager *SessionManager::getInstance() { if(instance == 0) instance = new SessionManager(); return instance; } /** * Returns the session associated to this id, * or create a new one if the id is empty. */ HttpSession *SessionManager::getSession(string session_id) { map<string, HttpSession*>::iterator it = sessions.find(session_id); if(it != sessions.end()) return (*it).second; else { // create a session return 0; } } /** * Returns all the ids defined. */ vector<string> SessionManager::getIds() { map<string, HttpSession*>::iterator it = sessions.begin(); vector<string> ids(sessions.size()); int i=0; while(it != sessions.end()) { ids[i] = (*it).first; i++; it++; } return ids; } Index: HttpSession.h =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpSession.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpSession.h 30 Dec 2003 17:11:59 -0000 1.1 +++ HttpSession.h 31 Dec 2003 10:43:58 -0000 1.2 @@ -20,6 +20,7 @@ #include <time.h> #include <vector> #include <string> +#include <map> using namespace std; /** @@ -27,13 +28,26 @@ * into servlets. */ class HttpSession { + + private: + + // its id + string session_id; + // attributes bounded to this session. + map<string, void*> attributes; + // session valid ? + bool valid; + // creation time + time_t creation_time; + // last accessed time + time_t last_accessed; public: /** * Creates a HttpSession object. */ - HttpSession(); + HttpSession(string id); /** * Destructor for HttpSession. Index: HttpSession.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpSession.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- HttpSession.cpp 30 Dec 2003 17:11:59 -0000 1.1 +++ HttpSession.cpp 31 Dec 2003 10:43:58 -0000 1.2 @@ -22,62 +22,85 @@ /** * Creates a HttpSession object. */ -HttpSession::HttpSession() { +HttpSession::HttpSession(string id) { + session_id = id; + valid = true; + creation_time = time(NULL); } /** * Destructor for HttpSession. */ HttpSession::~HttpSession() { + if(valid) + invalidate(); } /** * Returns the value of a given attribute. - * */ void *HttpSession::getAttribute(string name) { - return 0; + map<string, void*>::iterator it = attributes.find(name); + if(it == attributes.end()) + return 0; + else return (*it).second; } /** * Returns a vector of all attribute names. */ vector<string> HttpSession::getAttributeNames() { - vector<string> v; - return v; + map<string, void*>::iterator it = attributes.begin(); + vector<string> names(attributes.size()); + int i=0; + while(it != attributes.end()) { + names[i] = (*it).first; + i++; it++; + } + return names; } /** * Returns the creation time of this session. */ time_t HttpSession::getCreationTime() { - return 0; + return creation_time; } /** * Returns the identifiant of this session. */ string HttpSession::getId() { - return ""; + return session_id; } /** * Returns the last accessed time to this servlet. */ time_t HttpSession::getLastAccessedTime() { - return 0; + return last_accessed; } /** * Invalidates this session. */ void HttpSession::invalidate() { + valid = false; + // Unbound any attributes + map<string, void*>::iterator it = attributes.begin(); + while(it != attributes.end()) { + attributes.erase(it); + it++; + } } /** * Removes the given attribute from the session. */ void HttpSession::removeAttribute(string name) { + map<string, void*>::iterator it = attributes.find(name); + if(it != attributes.end()) + attributes.erase(it); } /** @@ -85,5 +108,6 @@ * name and value. */ void HttpSession::setAttribute(string name, void *value) { + attributes[name] = value; } Index: HttpServletRequest.cpp =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/src/server/http/servlet/HttpServletRequest.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- HttpServletRequest.cpp 30 Dec 2003 17:11:59 -0000 1.2 +++ HttpServletRequest.cpp 31 Dec 2003 10:43:58 -0000 1.3 @@ -22,7 +22,7 @@ /** * Creates a HttpServletRequest object. */ -HttpServletRequest::HttpServletRequest() { +HttpServletRequest::HttpServletRequest() : HttpRequest() { } /** |
From: <mik...@us...> - 2003-12-31 10:44:02
|
Update of /cvsroot/sharedaemon/sharedaemon-ui-web In directory sc8-pr-cvs1:/tmp/cvs-serv26010 Modified Files: ChangeLog Log Message: 31/12/2003 Mikael Barbeaux * Implemented a Session manager. * Implemented HttpSession code source. Index: ChangeLog =================================================================== RCS file: /cvsroot/sharedaemon/sharedaemon-ui-web/ChangeLog,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- ChangeLog 30 Dec 2003 19:50:12 -0000 1.26 +++ ChangeLog 31 Dec 2003 10:43:58 -0000 1.27 @@ -23,6 +23,11 @@ ----------------------------------------------------------- +31/12/2003 Mikael Barbeaux + * Implemented a Session manager. + * Implemented HttpSession code source. + + 30/12/2003 Mikael Barbeaux * Put the configure script as executable into CVS * Implemented first version of HttpSession object. |