* DownloadEngine.{h, cc}:

	* ConsoleDownloadEngine.{h, cc}: Console output message(size, 
speed)
	is now generated by ConsoleDownloadEngine not by DownloadEngine.
	* main.cc: Download complete/abort message is now generated by 
main.
	* Makefile.am (SUBDIRS): Add m4.
	(ACLOCAL_AMFLAGS): New variable.
	(EXTRA_DIST): New variable.
	* configure.in (AC_CONFIG_FILES): Add po/Makefile.in,
	* gettext: added gettext functionality

1 files changed, 32 insertions, 32 deletions

diff --git a/src/message.h b/src/message.h
index cfbeca10..ebe0ef45 100644
--- a/src/message.h
+++ b/src/message.h
@@ -24,39 +24,39 @@
 
 #include "common.h"
 
-#define MSG_DOWNLOAD_COMPLETED "CUID#%d - The download for one segment completed successfully."
-#define MSG_NO_SEGMENT_AVAILABLE "CUID#%d - No segment available."
-#define MSG_CONNECTING_TO_SERVER "CUID#%d - Connecting to %s:%d"
-#define MSG_SEGMENT_CHANGED "CUID#%d - The segment changed. We send the request again with new Range header."
-#define MSG_REDIRECT "CUID#%d - Redirecting to %s"
-#define MSG_SENDING_REQUEST "CUID#%d - Requesting:\n%s"
-#define MSG_RECEIVE_RESPONSE "CUID#%d - Response received:\n%s"
-#define MSG_DOWNLOAD_ABORTED "CUID#%d - Download aborted."
-#define MSG_RESTARTING_DOWNLOAD "CUID#%d - Restarting the download."
-#define MSG_MAX_TRY "CUID#%d - %d times attempted, but no success. Download aborted."
-#define MSG_UNREGISTER_CUID "CUID#%d - Unregistering cuid from segmentManager."
+#define MSG_DOWNLOAD_COMPLETED _("CUID#%d - The download for one segment completed successfully.")
+#define MSG_NO_SEGMENT_AVAILABLE _("CUID#%d - No segment available.")
+#define MSG_CONNECTING_TO_SERVER _("CUID#%d - Connecting to %s:%d")
+#define MSG_SEGMENT_CHANGED _("CUID#%d - The segment changed. We send the request again with new Range header.")
+#define MSG_REDIRECT _("CUID#%d - Redirecting to %s")
+#define MSG_SENDING_REQUEST _("CUID#%d - Requesting:\n%s")
+#define MSG_RECEIVE_RESPONSE _("CUID#%d - Response received:\n%s")
+#define MSG_DOWNLOAD_ABORTED _("CUID#%d - Download aborted.")
+#define MSG_RESTARTING_DOWNLOAD _("CUID#%d - Restarting the download.")
+#define MSG_MAX_TRY _("CUID#%d - %d times attempted, but no success. Download aborted.")
+#define MSG_UNREGISTER_CUID _("CUID#%d - Unregistering cuid from segmentManager.")
 
-#define MSG_SEGMENT_FILE_EXISTS "The segment file %s exists."
-#define MSG_SEGMENT_FILE_DOES_NOT_EXIST "The segment file %s does not exist."
-#define MSG_SAVING_SEGMENT_FILE "Saving the segment file %s"
-#define MSG_SAVED_SEGMENT_FILE "The segment file was saved successfully."
-#define MSG_LOADING_SEGMENT_FILE "Loading the segment file %s."
-#define MSG_LOADED_SEGMENT_FILE "The segment file was loaded successfully."
+#define MSG_SEGMENT_FILE_EXISTS _("The segment file %s exists.")
+#define MSG_SEGMENT_FILE_DOES_NOT_EXIST _("The segment file %s does not exist.")
+#define MSG_SAVING_SEGMENT_FILE _("Saving the segment file %s")
+#define MSG_SAVED_SEGMENT_FILE _("The segment file was saved successfully.")
+#define MSG_LOADING_SEGMENT_FILE _("Loading the segment file %s.")
+#define MSG_LOADED_SEGMENT_FILE _("The segment file was loaded successfully.")
 
-#define EX_TIME_OUT "Timeout."
-#define EX_INVALID_CHUNK_SIZE "Invalid chunk size."
-#define EX_TOO_LARGE_CHUNK "Too large chunk. size = %d"
-#define EX_INVALID_HEADER "Invalid header."
-#define EX_INVALID_RESPONSE "Invalid response."
-#define EX_NO_HEADER "No header found."
-#define EX_NO_STATUS_HEADER "No status header."
-#define EX_PROXY_CONNECTION_FAILED "Proxy connection failed."
-#define EX_CONNECTION_FAILED "Connection failed."
-#define EX_FILENAME_MISMATCH "The requested filename and the previously registered one are not same. %s != %s"
-#define EX_BAD_STATUS "The response status is not successful. status = %d"
-#define EX_TOO_LARGE_FILE "Too large file size. size = %lld"
-#define EX_TRANSFER_ENCODING_NOT_SUPPORTED "Transfer encoding %s is not supported."
-#define EX_SSL_INIT_FAILURE "SSL initialization failed."
-#define EX_SIZE_MISMATCH "Size mismatch %lld != %lld"
+#define EX_TIME_OUT _("Timeout.")
+#define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")
+#define EX_TOO_LARGE_CHUNK _("Too large chunk. size = %d")
+#define EX_INVALID_HEADER _("Invalid header.")
+#define EX_INVALID_RESPONSE _("Invalid response.")
+#define EX_NO_HEADER _("No header found.")
+#define EX_NO_STATUS_HEADER _("No status header.")
+#define EX_PROXY_CONNECTION_FAILED _("Proxy connection failed.")
+#define EX_CONNECTION_FAILED _("Connection failed.")
+#define EX_FILENAME_MISMATCH _("The requested filename and the previously registered one are not same. %s != %s")
+#define EX_BAD_STATUS _("The response status is not successful. status = %d")
+#define EX_TOO_LARGE_FILE _("Too large file size. size = %lld")
+#define EX_TRANSFER_ENCODING_NOT_SUPPORTED _("Transfer encoding %s is not supported.")
+#define EX_SSL_INIT_FAILURE _("SSL initialization failed.")
+#define EX_SIZE_MISMATCH _("Size mismatch %lld != %lld")
 
 #endif // _D_MESSAGE_H_