Changeset 3905

Timestamp:

03/24/11 14:54:13 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1686 - Correções de Texto e Tradução no Gerenciador de Filtros

Location:

branches/2.2/expressoMail1_2

Files:

• js/filters.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (3 diffs)

branches/2.2/expressoMail1_2/js/filters.js

@@ -155 +155 @@
                         _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 
                 if (fields[4].length > 0) 
-                        _criteria += "<b>"+get_lang("is to")+"</b>:"+fields[4]; 
+                        _criteria += "<b>&nbsp;"+get_lang("is to")+"</b>:"+fields[4]; 
                 if (fields[5].length > 0) 
-                        _criteria += "<b>"+get_lang("subject is")+"</b>:"+fields[5]; 
+                        _criteria += "<b>&nbsp;"+get_lang("subject is")+"</b>:"+fields[5]; 
                 if (parseInt(fields[11]) >= 0)
                 { 
                         if(fields[8] == "1")
-                                _criteria += "<b>"+get_lang("size is over than")+"</b>:"+fields[11]; 
+                                _criteria += "<b>&nbsp;"+get_lang("size is over than")+"</b>:"+fields[11]; 
                         else 
-                                _criteria += "<b>"+get_lang("size is under than")+"</b>:"+fields[11]; 
+                                _criteria += "<b>&nbsp;"+get_lang("size is under than")+"</b>:"+fields[11]; 
                 } 
                 var _action = " "; 
                 if (fields[6] == 'folder') 
-                        _action = get_lang("Store at")+" "+(fields[7].split("/"))[1]; 
+                        _action = get_lang("Store at")+" "+ lang_folder((fields[7].split("/"))[1]); 
                 else if (fields[6] == 'address') 
                         _action = get_lang("Forward to")+ " "+(fields[7]);
                 else 
                         _action = get_lang(fields[6]); 
-
                 return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("if email") + " </b>" + _criteria + " - <b>" + get_lang("Action") + ":</b> " + _action + "</a>"; 
         } 

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -133 +133 @@
 During  expressoMail1_2 pt-br   Durante
 Edit    expressoMail1_2 pt-br   Editar
-Edit filters    expressoMail1_2 pt-br   Editar filtros
-Edit folders    expressoMail1_2 pt-br   Editar pastas
+Edit filters    expressoMail1_2 pt-br   Editar Filtros
+Edit folders    expressoMail1_2 pt-br   Editar Pastas
 E-mail rule     expressoMail1_2 pt-br   regra do email
 Emails of the account   expressoMail1_2 pt-br   Emails da conta
 Empty Spam Folder       expressoMail1_2 pt-br   Limpar pasta spam
-Empty Trash     expressoMail1_2 pt-br   Limpar lixeira
+Empty Trash     expressoMail1_2 pt-br   Limpar Lixeira
 ENABLED expressoMail1_2 pt-br   Habilitada
 Enable digitally sign/cipher the message?       expressoMail1_2 pt-br   Possibilitar assinar/cifrar digitalmente a mensagem?
@@ -177 +177 @@
 Filters expressoMail1_2 pt-br   Filtros
 Filters maintenance     expressoMail1_2 pt-br   Manutenção de Filtros
-Filters management      expressoMail1_2 pt-br   Gerenciamento de filtros
+Filters management      expressoMail1_2 pt-br   Gerenciamento de Filtros
 First   expressoMail1_2 pt-br   Primeira
 First Name      expressoMail1_2 pt-br   Primeiro Nome
@@ -460 +460 @@
 Shared folders  expressoMail1_2 pt-br   Pastas compartilhadas
 Shared options saved with success       expressoMail1_2 pt-br   Opções de compartilhamento salvas com sucesso.
-Share mailbox   expressoMail1_2 pt-br   Compartilhar pastas
+Share mailbox   expressoMail1_2 pt-br   Compartilhar Pastas
 Show default view on main screen?       expressoMail1_2 pt-br   Exibir resumo do ExpressoMail na tela inicial do Expresso?
 Show images from        expressoMail1_2 pt-br   Mostrar imagens de