Changeset 61

Timestamp:

08/22/07 10:08:31 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoMail1_2

Files:

• js/draw_api.js (modified) (1 diff)
• js/filter.js (modified) (1 diff)
• js/filters.js (modified) (1 diff)
• js/main.js (modified) (2 diffs)
• js/preferences.js (modified) (4 diffs)
• js/search.js (modified) (1 diff)
• js/wfolders.js (modified) (2 diffs)
• preferences.php (modified) (2 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoMail1_2/js/draw_api.js

@@ -1191 +1191 @@
         if ((preferences.save_in_folder == '-1') || (preferences.save_in_folder == '')){
                 var option_send                 = '<span class="message_options" onclick=send_message("'+ID+'","null","null");>'+get_lang("Send")+'</span> | ';
-                var option_send_and_file= '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","send_and_file");>'+get_lang("Send and Store")+'</span> | ';
+                var option_send_and_file= '<span class="message_options" onclick=wfolders.makeWindow("'+ID+'","send_and_file");>'+get_lang("Send and file")+'</span> | ';
         }
         else{

trunk/expressoMail1_2/js/filter.js

@@ -259 +259 @@
                                                  "</tr><tr><td colspan='3'><hr size='1' width='100%'></td></tr><tr><td colspan='3'>"+get_lang('With the following message')+".:</td>"+
                                                  "</tr><tr><td colspan='3'><textarea id='field8' rows='3' cols='50'></textarea></td></tr></table></div>"+
-                                                 "<span align='right'><input type='button' value="+get_lang("to go back")+" onclick='filter.form_m()'></span>"+
+                                                 "<span align='right'><input type='button' value="+get_lang("Go back")+" onclick='filter.form_m()'></span>"+
                                                  "<span align='right'><input type='button' value="+get_lang("Save")+" onclick='filter.saved_rules()'></span>";                                           
                 return form;

trunk/expressoMail1_2/js/filters.js

@@ -159 +159 @@
                         div.style.position = "absolute";
                         div.style.zIndex = "10000";                     
-                        var title = ':: ' + get_lang('Filters management') + ' - ' + get_lang('filters maintenance') + ':: ';
+                        var title = ':: ' + get_lang('Filters management') + ' - ' + get_lang('Filters maintenance') + ':: ';
                         var wHeight = div.offsetHeight + "px";
                         var wWidth =  div.offsetWidth   + "px";

trunk/expressoMail1_2/js/main.js

@@ -190 +190 @@
                 }
                 if (data.msgs_number.length == 1)
-                        write_msg(get_lang("The message was moved to %1.", data.new_folder_name));
+                        write_msg(get_lang("The message was moved to %1 folder.", data.new_folder_name));
                 else
-                        write_msg(get_lang("The messages were moved to %1.", data.new_folder_name));
+                        write_msg(get_lang("The messages were moved to %1 folder.", data.new_folder_name));
 
                 if (data.border_ID != '' && data.border_ID != 'null'){
@@ -742 +742 @@
                         write_msg(get_lang('ERROR emptying your Trash folder.'));
         }
-        var realyEmptyTrash=confirm(get_lang('Do you realy want to empty your trash folder?'));
+        var realyEmptyTrash=confirm(get_lang('Do you really want to empty your trash folder?'));
         if (realyEmptyTrash)
                 cExecute ("$this.imap_functions.empty_trash", handler_empty_trash);

trunk/expressoMail1_2/js/preferences.js

@@ -24 +24 @@
                         form.innerHTML =        "<table border='0' cellpading='0' cellspacing='0'>"+
                                 "<tr><td colspan='2'><center>" + get_lang('Config for expressoMail1_2') + "</center></td></tr>"+
-                                "<tr><td nowrap> - " + get_lang('Max number of e-mails per page') + "</td>"+
+                                "<tr><td nowrap> - " + get_lang('Max number of e-mails for page') + "</td>"+
                                 "<td>&nbsp;<select id='sel_num_max' name='sel_num_max'>"+
                                 "<option value='25'>25</option>"+
@@ -37 +37 @@
                                 "<tr><td nowrap> - " + get_lang('Delete trash messages after how many days?') + "</td>"+
                                 "<td>&nbsp;<select id='sel_del_men' name='sel_del_men'>"+
-                                "<option value='0'>" + get_lang('Not use') + "</option>"+
+                                "<option value='0'>" + get_lang('None') + "</option>"+
                                 "<option value='1'>1 dia</option>"+
                                 "<option value='2'>2 dias</option>"+                                                                                                            
@@ -48 +48 @@
                                 "<td><input type='checkBox' id='check_show_previous' name='check_show_previous'></td>"+
                                 "</tr>"+
-                                "<tr><td nowrap> - " + get_lang('Do you want to receive an alert for new messages?') + "</td>"+
+                                "<tr><td nowrap> - " + get_lang('Do you wanna receive an alert for new messages?') + "</td>"+
                                 "<td><input type='checkBox' id='check_alert' name='check_alert'></td>"+
                                 "</tr>"+
@@ -54 +54 @@
                                 "<td><input type='checkBox' id='check_view' name='check_view'></td>"+
                                 "</tr>"+
-                                "<tr><td nowrap> - " + get_lang('Auto-save sent messages in folder:') + "</td>"+                                
+                                "<tr><td nowrap> - " + get_lang('Save sent messages in folder:') + "</td>"+                             
                                 "<td>&nbsp;<select style='width:125px' id='sel_name_box' name='sel_name_box'></select></td>"+
                                 "</tr>"+

trunk/expressoMail1_2/js/search.js

@@ -123 +123 @@
                                                      "<table border='0' cellpading='0' cellspacing='0'>"+
                                                      "<tr>"+
-                                                     "<td colspan='3' valign='top'>&nbsp;<b>" + get_lang('Searche the messages in these folders') + " :</b></td>"+
+                                                     "<td colspan='3' valign='top'>&nbsp;<b>" + get_lang('Search the messages in these folders') + " :</b></td>"+
                                                      "</tr>"+
                                                      "<tr>"+

trunk/expressoMail1_2/js/wfolders.js

@@ -38 +38 @@
                                 butt.value = get_lang('Save'); 
                 else if (type == 'send_and_file')
-                butt.value = get_lang('Send and File'); 
+                butt.value = get_lang('Send and file'); 
                 else if (type == 'move_to')
                         butt.value = get_lang('Move');
@@ -64 +64 @@
                 };
                 if (type == 'save')
-                        butt.value = 'Salvar';
+                        butt.value = get_lang('Save');
                 else if (type == 'send_and_file')
-                        butt.value = 'Enviar e Salvar';
+                        butt.value = get_lang('Send and file');
 
                 var space = document.createElement('SPAN');

trunk/expressoMail1_2/preferences.php

@@ -142 +142 @@
         $GLOBALS['phpgw']->template->set_var('lang_max_emails_per_page',lang('Max number of e-mails for page'));
         $GLOBALS['phpgw']->template->set_var('lang_save_deleted_msg',lang('Save deleted messages in trash folder?'));
-        $GLOBALS['phpgw']->template->set_var('lang_delete_trash_messages_after_n_days',lang('Delete trash messages after n days?'));
+        $GLOBALS['phpgw']->template->set_var('lang_delete_trash_messages_after_n_days',lang('Delete trash messages after how many days?'));
         $GLOBALS['phpgw']->template->set_var('lang_delete_and_show_previous_message',lang('Show previous message, after delete actual message?'));
         $GLOBALS['phpgw']->template->set_var('lang_alert_new_msg',lang('Do you wanna receive an alert for new messages?'));
         $GLOBALS['phpgw']->template->set_var('lang_hook_home',lang('Show default view on main screen'));
-        $GLOBALS['phpgw']->template->set_var('lang_save_in_folder',lang('save sent messages in folder named below'));
+        $GLOBALS['phpgw']->template->set_var('lang_save_in_folder',lang('Save sent messages in folder:'));
         $GLOBALS['phpgw']->template->set_var('lang_hide_menu',lang('Hide Menu Folders'));
         $GLOBALS['phpgw']->template->set_var('lang_line_height',lang('Padding Email List'));
@@ -166 +166 @@
                 $save_in_folder_selected = "INBOX".$_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']."Enviados";
         }
-        $o_folders = "<option value='-1' ".(!$save_in_folder_selected ? 'selected' : '' ).">".lang("The user select")."</option>";
+        $o_folders = "<option value='-1' ".(!$save_in_folder_selected ? 'selected' : '' ).">".lang("Select on send")."</option>";
         foreach($imap -> get_folders_list() as $id => $folder)
                 $o_folders.= "<option value='".$folder['folder_id']."' ".($save_in_folder_selected == $folder['folder_id'] ? 'selected' : '' ).">".$folder['folder_name']."</option>";