diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0596555..196db71 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-04 08:17-0300\n"
+"POT-Creation-Date: 2012-05-04 08:35-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: \n"
@@ -18,12 +18,15 @@ msgstr ""
 msgid " Unknown frame type from host"
 msgstr ""
 
-#: actions.c:608 actions.c:620
+#: actions.c:608
+#: actions.c:620
 #, c-format
 msgid "%s action needs a valid id attribute"
 msgstr "Ação %s exige um atributo ID válido"
 
-#: actions.c:483 actions.c:585 actions.c:597
+#: actions.c:483
+#: actions.c:585
+#: actions.c:597
 #, c-format
 msgid "%s action needs a valid toggle name"
 msgstr "Ação %s exige um nome de toggle válido"
@@ -52,7 +55,10 @@ msgstr "%s:%d"
 msgid "- 3270 Emulator for Gtk"
 msgstr "- Emulador 3270 para GTK"
 
-#: screen.c:622 screen.c:647 screen.c:659 screen.c:768
+#: screen.c:622
+#: screen.c:647
+#: screen.c:659
+#: screen.c:768
 #, fuzzy
 msgid "3270 Error"
 msgstr "Erro 3270"
@@ -69,18 +75,34 @@ msgstr "Tela 3270"
 msgid "3270 terminal emulator for GTK+"
 msgstr "Emulador 3270 para GTK+"
 
-#: uiparser/menubar.c:40 uiparser/toolbar.c:49
+#: uiparser/menu.c:43
+#: uiparser/menuitem.c:60
+#: uiparser/separator.c:93
+#: uiparser/toolitem.c:42
+#: uiparser/script.c:43
+#, fuzzy, c-format
+msgid "<%s> is invalid at this context"
+msgstr "<script> é inválido neste contexto"
+
+#: uiparser/accelerator.c:47
+#: uiparser/menu.c:57
+#: uiparser/popup.c:61
 #, c-format
-msgid "<%s> should be on toplevel"
-msgstr ""
+msgid "<%s> requires %s"
+msgstr "<%s> exige %s"
 
-#: uiparser/accelerator.c:41
-msgid "<accelerator> should be on toplevel"
-msgstr ""
+#: uiparser/menuitem.c:74
+#, fuzzy, c-format
+msgid "<%s> requires a %s attribute"
+msgstr "Ação %s precisa do atributo src"
 
-#: uiparser/accelerator.c:47
-msgid "<accelerator> should have an action attribute"
-msgstr ""
+#: uiparser/accelerator.c:41
+#: uiparser/menubar.c:40
+#: uiparser/toolbar.c:49
+#: uiparser/popup.c:45
+#, c-format
+msgid "<%s> should be on toplevel"
+msgstr "<%s> deve estar no primeiro nível"
 
 #: telnet.c:3329
 #, c-format
@@ -99,50 +121,14 @@ msgstr ""
 "<b>Opções válidas:</b>\n"
 "\n"
 
-#: uiparser/menu.c:43
-msgid "<menu> is invalid at this context"
-msgstr "<menu> é inválido nesse contexto"
-
-#: uiparser/menu.c:57
-msgid "<menu> requires a label attribute"
-msgstr ""
-
-#: uiparser/menuitem.c:60
-msgid "<menuitem> is invalid at this context"
-msgstr ""
-
-#: uiparser/menuitem.c:74
-msgid "<menuitem> requires a label attribute"
-msgstr ""
-
 #: uiparser/menuitem.c:43
 msgid "<menuitem> should be inside a <menu>"
-msgstr ""
-
-#: uiparser/popup.c:61
-msgid "<popup> needs a type or group attribute"
-msgstr ""
-
-#: uiparser/popup.c:45
-msgid "<popup> should be on toplevel"
-msgstr ""
-
-#: uiparser/script.c:43
-msgid "<script> is invalid at this context"
-msgstr "<script> é inválido neste contexto"
-
-#: uiparser/separator.c:93
-msgid "<separator> is invalid at this context"
-msgstr ""
+msgstr "<menuitem> deve estar dentro de <menu>"
 
 #: uiparser/separator.c:53
 msgid "<separator> should be inside a <menu> or <toolbar>"
 msgstr "<separator> só é válido dentro de <menu> ou <toolbar>"
 
-#: uiparser/toolitem.c:42
-msgid "<toolitem> is invalid at this context"
-msgstr ""
-
 #: paste.c:265
 msgid "Action failed"
 msgstr "Ação falhou"
@@ -217,7 +203,7 @@ msgstr ""
 #: telnet.c:644
 #, c-format
 msgid "Can't connect to %s:%d"
-msgstr ""
+msgstr "Não foi possível conectar a %s:%d"
 
 #: host.c:315
 msgid "Can't connect to host"
@@ -241,7 +227,9 @@ msgstr "Não foi possível carregar arquivo"
 msgid "Can't open local file"
 msgstr "Não foi possível abrir arquivo local"
 
-#: uiparser/parser.c:241 uiparser/parsefile.c:301 uiparser/parsefile.c:329
+#: uiparser/parser.c:241
+#: uiparser/parsefile.c:301
+#: uiparser/parsefile.c:329
 msgid "Can't parse UI"
 msgstr ""
 
@@ -250,7 +238,8 @@ msgstr ""
 msgid "Can't parse UI description files in %s"
 msgstr ""
 
-#: uiparser/parsefile.c:100 uiparser/parsefile.c:126
+#: uiparser/parsefile.c:100
+#: uiparser/parsefile.c:126
 msgid "Can't parse unnamed element"
 msgstr ""
 
@@ -367,7 +356,8 @@ msgstr "Azul Escuro"
 msgid "Dark Green"
 msgstr "Verde Escuro"
 
-#: ft_cut.c:163 ft_cut.c:171
+#: ft_cut.c:163
+#: ft_cut.c:171
 msgid "Data conversion error"
 msgstr "Erro na conversão de dados"
 
@@ -387,7 +377,8 @@ msgstr ""
 msgid "Empty LU name"
 msgstr "Nome da LU está em branco"
 
-#: host.c:266 host.c:393
+#: host.c:266
+#: host.c:393
 msgid "Empty hostname"
 msgstr "Nome do host em branco"
 
@@ -432,7 +423,7 @@ msgstr ""
 
 #: ft.c:167
 msgid "File transfer is already active"
-msgstr ""
+msgstr "Transferência de arquivos já está ativa"
 
 #: glue.c:327
 msgid "Forces monochrome display"
@@ -440,7 +431,7 @@ msgstr "Força tela monocromática"
 
 #: ui/00default.xml:170
 msgid "Full Screen"
-msgstr ""
+msgstr "Tela cheia"
 
 #: main.c:60
 msgid "GTK Version mismatch"
@@ -466,8 +457,14 @@ msgstr "Host desconectou, transferência cancelada"
 msgid "Host to connect"
 msgstr "Servidor a conectar"
 
-#: host.c:314 host.c:339 host.c:351 host.c:377 host.c:389 host.c:393
-#: host.c:446 host.c:461
+#: host.c:314
+#: host.c:339
+#: host.c:351
+#: host.c:377
+#: host.c:389
+#: host.c:393
+#: host.c:446
+#: host.c:461
 msgid "Hostname syntax error"
 msgstr "Formato inválido no nome do servidor"
 
@@ -477,7 +474,7 @@ msgstr ""
 
 #: ui/00default.xml:185
 msgid "Input method"
-msgstr ""
+msgstr "Método de entrada"
 
 #: colors.c:371
 msgid "Intensified/Protected"
@@ -491,11 +488,6 @@ msgstr "Intensificado/Desprotegido"
 msgid "Invalid (empty) hostname"
 msgstr "Nome do host é invalido (vazio)"
 
-#: uiparser/menubar.c:46 uiparser/toolbar.c:55
-#, fuzzy, c-format
-msgid "Invalid or unexpected action attribute in <%s>"
-msgstr "Atributo "
-
 #: ui/00default.xml:178
 msgid "Keep selected"
 msgstr "Manter selecionado"
@@ -533,7 +525,11 @@ msgstr "Mostarda"
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: telnet.c:374 telnet.c:385 telnet.c:692 telnet.c:704 telnet.c:976
+#: telnet.c:374
+#: telnet.c:385
+#: telnet.c:692
+#: telnet.c:704
+#: telnet.c:976
 msgid "Network startup error"
 msgstr "Erro ao iniciar a rede"
 
@@ -655,7 +651,7 @@ msgstr "Púrpura"
 
 #: ui/00default.xml:103
 msgid "Receive file"
-msgstr ""
+msgstr "Receber arquivo"
 
 #: colors.c:353
 msgid "Red"
@@ -771,12 +767,8 @@ msgid "Set terminal model (screen size)"
 msgstr "Modelo de terminal (tamanho da tela)"
 
 #: glue.c:330
-msgid ""
-"Sets the screen dimensions to be larger than the default for the chosen "
-"model (COLSxROWS)."
-msgstr ""
-"Define que as dimensões da tela serão maiores do que o padrão para o modelo "
-"escolhido (COLSxROWS)."
+msgid "Sets the screen dimensions to be larger than the default for the chosen model (COLSxROWS)."
+msgstr "Define que as dimensões da tela serão maiores do que o padrão para o modelo escolhido (COLSxROWS)."
 
 #: ui/00default.xml:157
 msgid "Settings"
@@ -807,8 +799,7 @@ msgid "Space in LU name"
 msgstr "Espaçõ no nome da LU"
 
 #: glue.c:347
-msgid ""
-"Specifies the terminal name to be transmitted over the telnet connection."
+msgid "Specifies the terminal name to be transmitted over the telnet connection."
 msgstr "Define o nome do terminal a ser transmitido através da conexão telnet."
 
 #: colors.c:343
@@ -834,37 +825,21 @@ msgstr "O nome do arquivo remoto não é válido"
 
 #: dialog.c:526
 msgid ""
-"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.\n"
+"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.\n"
 "\n"
-"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.\n"
+"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.\n"
 "\n"
-"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., 51 "
-"Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
+"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., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA"
 msgstr ""
-"Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo "
-"sob os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  "
-"pela  Free Software Foundation.\n"
+"Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela  Free Software Foundation.\n"
 "\n"
-"Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  "
-"QUALQUER GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  "
-"ADEQUAÇÃO A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública "
-"Geral GNU para obter mais detalhes.\n"
+"Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para obter mais detalhes.\n"
 "\n"
-"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este "
-"programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA, 02111-1307, USA"
+"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA, 02111-1307, USA"
 
 #: host.c:303
 #, c-format
-msgid ""
-"This version of %s was built without support for secure sockets layer (SSL)."
+msgid "This version of %s was built without support for secure sockets layer (SSL)."
 msgstr "Esta versão do %s foi gerada sem suporte para conexões seguras (SSL)."
 
 #: ui/00default.xml:196
@@ -883,7 +858,10 @@ msgstr "Mostrar posição do cursor"
 msgid "Transfer cancelled by host"
 msgstr "Transferência cancelada pelo servidor"
 
-#: ft_cut.c:374 ft_cut.c:468 ft_dft.c:218 ft_dft.c:354
+#: ft_cut.c:374
+#: ft_cut.c:468
+#: ft_dft.c:218
+#: ft_dft.c:354
 msgid "Transfer cancelled by user"
 msgstr "Transferência cancelada pelo usuário"
 
@@ -891,7 +869,8 @@ msgstr "Transferência cancelada pelo usuário"
 msgid "Transmission error"
 msgstr "Erro de transmissão"
 
-#: colors.c:356 colors.c:364
+#: colors.c:356
+#: colors.c:364
 msgid "Turquoise"
 msgstr "Turquesa"
 
@@ -915,9 +894,12 @@ msgstr ""
 msgid "Unable to send file-transfer request"
 msgstr ""
 
+#: uiparser/menubar.c:46
+#: uiparser/toolbar.c:55
 #: uiparser/popup.c:51
-msgid "Unexpected action attribute in <popup>"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unexpected action attribute in <%s>"
+msgstr "Atributo "
 
 #: paste.c:267
 msgid "Unexpected error"
@@ -931,7 +913,7 @@ msgstr ""
 #: actions.c:396
 #, c-format
 msgid "Unexpected or invalid %s attribute: \"%s\""
-msgstr ""
+msgstr "Atributo %s inesperado ou inválido: \"%s\""
 
 #: actions.c:370
 #, c-format
@@ -944,11 +926,8 @@ msgid "Unexpected or invalid src attribute: \"%s\""
 msgstr ""
 
 #: v3270/widget.c:687
-msgid ""
-"Unexpected signature in H3270 object, possible version mismatch in lib3270"
-msgstr ""
-"Assinatura inválida no objeto H3270, possível divergência de versão na "
-"lib3270"
+msgid "Unexpected signature in H3270 object, possible version mismatch in lib3270"
+msgstr "Assinatura inválida no objeto H3270, possível divergência de versão na lib3270"
 
 #: actions.c:305
 #, c-format
@@ -986,7 +965,7 @@ msgstr ""
 #: uiparser/popup.c:76
 #, c-format
 msgid "Unknown popup type \"%s\""
-msgstr ""
+msgstr "Tipo de popup \"%s\" não é conhecido"
 
 #: resolver.c:147
 #, c-format
@@ -1026,7 +1005,9 @@ msgstr ""
 msgid "Windows Western languages (CP1252)"
 msgstr ""
 
-#: v3270/oia.c:387 v3270/oia.c:411 v3270/oia.c:415
+#: v3270/oia.c:387
+#: v3270/oia.c:411
+#: v3270/oia.c:415
 msgid "X"
 msgstr ""
 
@@ -1122,7 +1103,23 @@ msgstr "Conexão _Segura"
 msgid "_View"
 msgstr "_Exibir"
 
-#: telnet.c:3203 telnet.c:3211
+#: uiparser/menu.c:57
+#, fuzzy
+msgid "a label attribute"
+msgstr "Ação %s precisa do atributo src"
+
+#: uiparser/popup.c:61
+#, fuzzy
+msgid "a type or group attribute"
+msgstr "<%s> é inválido sem um atributo tipo ou grupo"
+
+#: uiparser/accelerator.c:47
+#, fuzzy
+msgid "an action attribute"
+msgstr "Ação %s precisa do atributo src"
+
+#: telnet.c:3203
+#: telnet.c:3211
 #, c-format
 msgid "fcntl(%s)"
 msgstr "fcntl(%s)"
@@ -1132,7 +1129,9 @@ msgstr "fcntl(%s)"
 msgid "ioctl(%s)"
 msgstr "ioctl(%s)"
 
-#: telnet.c:584 telnet.c:590 telnet.c:597
+#: telnet.c:584
+#: telnet.c:590
+#: telnet.c:597
 #, c-format
 msgid "setsockopt(%s)"
 msgstr "setsockopt(%s)"
@@ -1150,5 +1149,8 @@ msgstr ""
 msgid "write(%s): %s"
 msgstr "write(%s): %s"
 
+#~ msgid "<menu> is invalid at this context"
+#~ msgstr "<menu> é inválido nesse contexto"
+
 #~ msgid "This version of "
 #~ msgstr "Esta versão de"
diff --git a/src/pw3270/uiparser/accelerator.c b/src/pw3270/uiparser/accelerator.c
index f07fb67..0f2d5b0 100644
--- a/src/pw3270/uiparser/accelerator.c
+++ b/src/pw3270/uiparser/accelerator.c
@@ -38,13 +38,13 @@
  {
  	if(info->element)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<accelerator> should be on toplevel"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "<%s> should be on toplevel"), "accelerator");
 		return NULL;
 	}
 
  	if(!action)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<accelerator> should have an action attribute"));
+		*error = g_error_new(ERROR_DOMAIN,ENOENT, _( "<%s> requires %s"),"accelerator",_( "an action attribute" ) );
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/menu.c b/src/pw3270/uiparser/menu.c
index b7792c1..cdd8c28 100644
--- a/src/pw3270/uiparser/menu.c
+++ b/src/pw3270/uiparser/menu.c
@@ -40,7 +40,7 @@
 
 	if(!(info->element && (GTK_IS_MENU_ITEM(info->element) || GTK_IS_MENU_SHELL(info->element))))
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<menu> is invalid at this context"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> is invalid at this context"),"menu");
 		return NULL;
 	}
 
@@ -54,7 +54,7 @@
 
 		if(!label)
 		{
-			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<menu> requires a label attribute"));
+			*error = g_error_new(ERROR_DOMAIN,ENOENT, _( "<%s> requires %s"),"menu", _( "a label attribute" ) );
 			return NULL;
 		}
 		widget = gtk_menu_item_new_with_mnemonic(gettext(label));
diff --git a/src/pw3270/uiparser/menubar.c b/src/pw3270/uiparser/menubar.c
index 544122a..debc6ce 100644
--- a/src/pw3270/uiparser/menubar.c
+++ b/src/pw3270/uiparser/menubar.c
@@ -43,7 +43,7 @@
 
 	if(action)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "Invalid or unexpected action attribute in <%s>"), "menubar");
+		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "Unexpected action attribute in <%s>"), "menubar");
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/menuitem.c b/src/pw3270/uiparser/menuitem.c
index 3e52766..54ba58e 100644
--- a/src/pw3270/uiparser/menuitem.c
+++ b/src/pw3270/uiparser/menuitem.c
@@ -57,7 +57,7 @@
 
 	if(!(GTK_IS_MENU_ITEM(info->element) || GTK_IS_MENU(info->element)))
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<menuitem> is invalid at this context"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> is invalid at this context"),"menuitem");
 		return NULL;
 	}
 
@@ -71,7 +71,7 @@
 
 		if(!label)
 		{
-			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<menuitem> requires a label attribute"));
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> requires a %s attribute"),"menuitem","label");
 			return NULL;
 		}
 		widget = gtk_menu_item_new_with_mnemonic(gettext(label));
diff --git a/src/pw3270/uiparser/popup.c b/src/pw3270/uiparser/popup.c
index dca7d97..3c250a6 100644
--- a/src/pw3270/uiparser/popup.c
+++ b/src/pw3270/uiparser/popup.c
@@ -42,13 +42,13 @@
 
  	if(info->element)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<popup> should be on toplevel"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "<%s> should be on toplevel"), "popup");
 		return NULL;
 	}
 
 	if(action)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "Unexpected action attribute in <popup>"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "Unexpected action attribute in <%s>"), "popup");
 		return NULL;
 	}
 
@@ -58,7 +58,7 @@
 
 	if(!id)
 	{
-		*error = g_error_new(ERROR_DOMAIN,ENOENT,"%s", _( "<popup> needs a type or group attribute"));
+		*error = g_error_new(ERROR_DOMAIN,ENOENT, _( "<%s> requires %s"),"accelerator",_( "a type or group attribute" ) );
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/script.c b/src/pw3270/uiparser/script.c
index e2e2414..64d66a2 100644
--- a/src/pw3270/uiparser/script.c
+++ b/src/pw3270/uiparser/script.c
@@ -40,7 +40,7 @@
  {
 	if(!(info->element && action))
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<script> is invalid at this context"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> is invalid at this context"),"script");
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/separator.c b/src/pw3270/uiparser/separator.c
index c4fbcb1..677ceec 100644
--- a/src/pw3270/uiparser/separator.c
+++ b/src/pw3270/uiparser/separator.c
@@ -90,7 +90,7 @@
 	}
 	else
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<separator> is invalid at this context"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> is invalid at this context"),"separator");
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/toolbar.c b/src/pw3270/uiparser/toolbar.c
index 50b3841..66a16dd 100644
--- a/src/pw3270/uiparser/toolbar.c
+++ b/src/pw3270/uiparser/toolbar.c
@@ -52,7 +52,7 @@
 
 	if(action)
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "Invalid or unexpected action attribute in <%s>"), "toolbar");
+		*error = g_error_new(ERROR_DOMAIN,EINVAL, _( "Unexpected action attribute in <%s>"), "toolbar");
 		return NULL;
 	}
 
diff --git a/src/pw3270/uiparser/toolitem.c b/src/pw3270/uiparser/toolitem.c
index 633563f..6cbc604 100644
--- a/src/pw3270/uiparser/toolitem.c
+++ b/src/pw3270/uiparser/toolitem.c
@@ -39,7 +39,7 @@
 
 	if(!(info->element && (GTK_IS_TOOLBAR(info->element))))
 	{
-		*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s", _( "<toolitem> is invalid at this context"));
+		*error = g_error_new(ERROR_DOMAIN,EINVAL,_( "<%s> is invalid at this context"),"toolitem");
 		return NULL;
 	}
 
--
libgit2 0.21.2