Index: beid-middleware/dialogs/src/dialogsgtk/beid-badpin.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-badpin.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-badpin.c	(working copy)
@@ -60,9 +60,9 @@
 	{
 		int attempts=atoi(argv[1]);
 		if(attempts>1)
-			snprintf(message,sizeof(message)-2,_MSG_(MSG_N_ATTEMPTS_LEFT),attempts);
+			snprintf(message,sizeof(message)-2,(const char*)_MSG_(MSG_N_ATTEMPTS_LEFT),attempts);
 		else
-			snprintf(message,sizeof(message)-2,_MSG_(MSG_LAST_ATTEMPT));
+			snprintf(message,sizeof(message)-2,"%s",_MSG_(MSG_LAST_ATTEMPT));
 	}
 	else
 	{
@@ -70,7 +70,7 @@
 		exit(1);
 	}
 	
-    dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_WARNING,GTK_BUTTONS_OK,message);
+    dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_WARNING,GTK_BUTTONS_OK,"%s",message);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog),GTK_RESPONSE_OK);
     gtk_window_set_title(GTK_WINDOW(dialog),_MSG_(MSG_INCORRECT_PIN_CODE));
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
Index: beid-middleware/dialogs/src/dialogsgtk/beid-spr-changepin.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-spr-changepin.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-spr-changepin.c	(working copy)
@@ -86,7 +86,7 @@
 		exit(1);
 	}
 
-    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,message);
+    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s",message);
 	gtk_dialog_set_default_response(GTK_DIALOG(pindialog.dialog),GTK_RESPONSE_OK);
     gtk_window_set_title(GTK_WINDOW(pindialog.dialog),_MSG_(MSG_CHANGE_PIN_CODE));
     gtk_window_set_position(GTK_WINDOW(pindialog.dialog), GTK_WIN_POS_CENTER);
Index: beid-middleware/dialogs/src/dialogsgtk/beid-askaccess.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-askaccess.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-askaccess.c	(working copy)
@@ -57,7 +57,7 @@
 	// create new message dialog with CANCEL button in standard places, in center of user's screen
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	
-    dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,_MSG_(MSG_ACCESS_CARD_QUESTION));
+    dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL,"%s",_MSG_(MSG_ACCESS_CARD_QUESTION));
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog),GTK_RESPONSE_OK);
     gtk_window_set_title(GTK_WINDOW(dialog),_MSG_(MSG_ACCESS_CARD_TITLE));
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
Index: beid-middleware/dialogs/src/dialogsgtk/beid-askpin.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-askpin.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-askpin.c	(working copy)
@@ -203,7 +203,7 @@
 	// create new message dialog with CANCEL and OK buttons in standard places, in center of user's screen
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	
-    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,_MSG_(MSG_PLEASE_ENTER_PIN));
+    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s", _MSG_(MSG_PLEASE_ENTER_PIN));
 
 	pindialog.cancelbutton=gtk_dialog_add_button(pindialog.dialog,GTK_STOCK_CANCEL,	GTK_RESPONSE_CANCEL);	
 	pindialog.okbutton	  =gtk_dialog_add_button(pindialog.dialog,GTK_STOCK_OK,		GTK_RESPONSE_OK);	
Index: beid-middleware/dialogs/src/dialogsgtk/beid-spr-askpin.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-spr-askpin.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-spr-askpin.c	(working copy)
@@ -85,7 +85,7 @@
 		exit(1);
 	}
 
-    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,message);
+    pindialog.dialog=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s",message);
 	gtk_dialog_set_default_response(GTK_DIALOG(pindialog.dialog),GTK_RESPONSE_OK);
     gtk_window_set_title(GTK_WINDOW(pindialog.dialog),_MSG_(MSG_PIN_CODE_REQUIRED));
     gtk_window_set_position(GTK_WINDOW(pindialog.dialog), GTK_WIN_POS_CENTER);
Index: beid-middleware/dialogs/src/dialogsgtk/beid-changepin.c
===================================================================
--- beid-middleware/dialogs/src/dialogsgtk/beid-changepin.c	(revision 954)
+++ beid-middleware/dialogs/src/dialogsgtk/beid-changepin.c	(working copy)
@@ -154,7 +154,7 @@
 	// create new message dialog with CANCEL and OK buttons in standard places, in center of user's screen
 	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	
-    pindialog.dialog		=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,_MSG_(MSG_PLEASE_ENTER_OLD_AND_NEW_PINS));
+    pindialog.dialog		=gtk_message_dialog_new(NULL,GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,"%s",_MSG_(MSG_PLEASE_ENTER_OLD_AND_NEW_PINS));
 	pindialog.cancelbutton	=gtk_dialog_add_button(pindialog.dialog,GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
     pindialog.okbutton    	=gtk_dialog_add_button(pindialog.dialog,GTK_STOCK_OK,     GTK_RESPONSE_OK);
 
Index: beid-middleware/common/src/mw_util.cpp
===================================================================
--- beid-middleware/common/src/mw_util.cpp	(revision 954)
+++ beid-middleware/common/src/mw_util.cpp	(working copy)
@@ -274,7 +274,7 @@
 
 	if (r != -1 && csTmp != NULL)
 	{
-		r = fprintf(stream, csTmp);
+		r = fprintf(stream, "%s", csTmp);
 		free(csTmp);
 	}
 
@@ -292,7 +292,7 @@
 
 	if (r != -1 && csTmp != NULL)
 	{
-		r = fprintf(stream, csTmp);
+		r = fprintf(stream, "%s", csTmp);
 		free(csTmp);
 	}
 
@@ -308,7 +308,7 @@
 
 	if (r != -1 && csTmp != NULL)
 	{
-		r = fprintf(stream, csTmp);
+		r = fprintf(stream, "%s", csTmp);
 		free(csTmp);
 	}
 
Index: beid-middleware/common/src/util.cpp
===================================================================
--- beid-middleware/common/src/util.cpp	(revision 954)
+++ beid-middleware/common/src/util.cpp	(working copy)
@@ -470,7 +470,7 @@
 
 	if (r != -1 && csTmp != NULL)
 	{
-		r = fprintf(stream, csTmp);
+		r = fprintf(stream, "%s", csTmp);
 		free(csTmp);
 	}
 
@@ -486,7 +486,7 @@
 
 	if (r != -1 && csTmp != NULL)
 	{
-		r = fprintf(stream, csTmp);
+		r = fprintf(stream, "%s", csTmp);
 		free(csTmp);
 	}
 
@@ -503,4 +503,4 @@
     return 0;
 }
 
-#endif
\ No newline at end of file
+#endif