Changeset 5544 for trunk/expressoMail1_2

Timestamp:

02/24/12 13:25:07 (12 years ago)

Author:

thiago

Message:

Ticket #2486 - Traducao e ajustes na exibição dos labels nas mensagens.

Location:

trunk/expressoMail1_2

Files:

• js/draw_api.js (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -343 +343 @@
         .append("<div class='my-labels'>" +
                                 "<img src='../prototype/modules/mail/img/tag.png'/>" +
-                                "<a class='title-my-labels' tabindex='0' role='button' aria-expanded='false' title='Meus marcadores'>Meus marcadores</a>" +
+                                "<a class='title-my-labels' tabindex='0' role='button' aria-expanded='false' title='"+get_lang("My markers")+"'>"+get_lang("My markers")+"</a>" +
                                 
                                 "<span class='status-list-labels ui-icon ui-icon-triangle-1-s'></span>" +
@@ -3053 +3053 @@
                         backgroundColor = labels[i].label.backgroundColor;
                         nameLabel = labels[i].label.name;
-                        markers.innerHTML+= "<div  style='width: 130px; height: 15px; background:"+backgroundColor+"; float: left; -webkit-border-radius: 3px; -moz-border-radius: 3px; margin:0 0 5px 5px; border: 1px solid "+borderColor+"'><span style='color: "+fontColor+"; margin: 5px;'>"+nameLabel+"</a></div>";
+                        markers.innerHTML+= "<div  style='width: 130px; height: 15px; background:"+backgroundColor+"; float: left; -webkit-border-radius: 3px; -moz-border-radius: 3px; margin:0 0 1px 1px; border: 1px solid "+borderColor+"'><span style='color: "+fontColor+"; margin: 5px;'>"+nameLabel+"</a></div>";
                         
                 }

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -142 +142 @@
 Edit filters    expressoMail1_2 pt-br   Editar Filtros
 Edit folders    expressoMail1_2 pt-br   Editar Pastas
+Labels  expressoMail1_2 pt-br   Marcadores
+Follow up       expressoMail1_2 pt-br   Acompanhamento
 E-mail rule     expressoMail1_2 pt-br   regra do email
 Emails of the account   expressoMail1_2 pt-br   Emails da conta
@@ -202 +204 @@
 Friday  expressoMail1_2 pt-br   Sexta-feira
 From:   expressoMail1_2 pt-br   De:
+Labels:         expressoMail1_2 pt-br   Marcadores:
 From    expressoMail1_2 pt-br   De
 Global Catalog  expressoMail1_2 pt-br   Catálogo Geral
@@ -772 +775 @@
 Thie folder is already in this place    expressoMail1_2 pt-br   A pasta já esta neste local
 Delete/move subfolders first    expressoMail1_2 pt-br   Delete/mova suas subpastas primeiro
+My markers      expressoMail1_2 pt-br   Meus marcadores 
+Basic   expressoMail1_2 pt-br   Básico 
+Label name      expressoMail1_2 pt-br    Nome do marcador 
+Marker Color    expressoMail1_2 pt-br   Cor do marcador 
+Default expressoMail1_2 pt-br   Padrão 
+Coala   expressoMail1_2 pt-br   Coala 
+Tomato  expressoMail1_2 pt-br   Tomate 
+Lemon   expressoMail1_2 pt-br   Limão 
+high Contrast   expressoMail1_2 pt-br   Alto contraste 
+Custom  expressoMail1_2 pt-br   Personalizado 
+Text color      expressoMail1_2 pt-br   Cor do texto 
+Border color    expressoMail1_2 pt-br   Cor da borda 
+Add Label       expressoMail1_2 pt-br   Adicionar Marcador 
+Delete  expressoMail1_2 pt-br   Excluir 
+Undo    expressoMail1_2 pt-br   Desfazer 
+Save    expressoMail1_2 pt-br   Salvar 
+Close   expressoMail1_2 pt-br   Fechar
+Flag as expressoMail1_2 pt-br   Sinalizar como
+Alarm   expressoMail1_2 pt-br   Alarme
+Conclusion      expressoMail1_2 pt-br   Conclusão
+Flag color      expressoMail1_2 pt-br   Cor do sinalizador
+Color   expressoMail1_2 pt-br   Cor
+Apply   expressoMail1_2 pt-br   Aplicar
+Cancel  expressoMail1_2 pt-br   Cancelar
+Color   expressoMail1_2 pt-br   Cor
+