Index: trunk/prototype/modules/mail/js/followupflag.js
===================================================================
--- trunk/prototype/modules/mail/js/followupflag.js	(revision 5711)
+++ trunk/prototype/modules/mail/js/followupflag.js	(revision 5738)
@@ -71,5 +71,4 @@
 						},
 						select: function( event, ui ) {
-							winElement.find('.menu-configure-followupflag .save').button("enable");
 							ui.item.option.selected = true;
 							self._trigger( "selected", event, {
@@ -333,4 +332,5 @@
 	winElement.find('.time').timepicker({});
 	winElement.find('[name="name"]').combobox();
+	winElement.find('.ui-corner-right.ui-button-icon').attr('title', get_lang('Show All Items'));
 
 	winElement.find('[name="alarmDate"],[name="alarmTime"]').attr("disabled","disabled");
@@ -416,5 +416,5 @@
 		{
 			attrDeadline: 'doneDeadline', 
-			caption: {singular:'Você tem uma mensagem concluindo hoje:', plural:"Você tem %1 mensagens concluindo hoje:"},
+			caption: {singular:'You have one undone message today:', plural:"You have %1 undone messages today:"},
 			onOk: function(event){
 				if($(event.target).parents('.doneDeadline').find('[name="stopAlert"]').is(':checked')){
@@ -426,5 +426,5 @@
 		{
 			attrDeadline: 'alarmDeadline',
-			caption: {singular:'Você tem uma mensagem sinalizada para hoje:', plural:'Você tem %1 mensagens sinalizadas para hoje:'},
+			caption: {singular:'You have a follow up due for today:', plural:'You have %1 follow ups due for today:'},
 			onOk: function(event){
 				if($(event.target).parents('.alarmDeadline').find('[name="stopAlert"]').is(':checked')){
Index: trunk/prototype/modules/mail/templates/followupflag_configure.ejs
===================================================================
--- trunk/prototype/modules/mail/templates/followupflag_configure.ejs	(revision 5676)
+++ trunk/prototype/modules/mail/templates/followupflag_configure.ejs	(revision 5738)
@@ -2,5 +2,5 @@
 <%
 	if (data.messages.length == 1) {
-		var followupflagged = data.messages[0].followupflagged ? data.messages[0].followupflagged : followupflagged = { followupflag: {} };
+		var followupflagged = data.messages[0].followupflagged ? data.messages[0].followupflagged : { followupflag: {id: 1} };
 		if (followupflagged.doneDeadline)
 			followupflagged.doneDeadline = Date.parseExact(followupflagged.doneDeadline, 'yyyy-MM-dd hh:mm:ss');
@@ -10,5 +10,5 @@
 	} else if (data.messages.length > 1) {
 		var followupflagged = {
-			followupflag: {name: true},
+			followupflag: {name: true, id: 1},
 			isDone: true,
 			doneDeadline: true,
@@ -21,5 +21,5 @@
 		for(var i=0; i<data.messages.length; i++){
 			if (!data.messages[i].followupflagged) {
-				followupflagged = { followupflag: {} };
+				followupflagged = { followupflag: {name: false, id: false} };
 				break;
 			}
@@ -28,4 +28,7 @@
 			followupflagged.followupflag.name = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflag.name == data.messages[i-1].followupflagged.followupflag.name) ?
 				data.messages[i].followupflagged.followupflag.name : false;
+				
+			followupflagged.followupflag.id = (followupflagged.followupflag.id && data.messages[i].followupflagged.followupflag.id == data.messages[i-1].followupflagged.followupflag.id) ?
+				data.messages[i].followupflagged.followupflag.id : false;
 				
 			followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged.isDone == data.messages[i-1].followupflagged.isDone) ?
@@ -58,6 +61,8 @@
 			<select name="name">
 				<% for(var i=0; i<data.followupflags.length; i++) {  %>
-					<% var selected = (data.followupflags[i].name == followupflagged.followupflag.name  ) ? 'selected="selected"' : '' %> 
-					<option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option>
+					<% var selected = (data.followupflags[i].id == followupflagged.followupflag.id ) ? 'selected="selected"' : '' %>
+					<% if(data.followupflags[i].id >= 1 && data.followupflags[i].id <= 6){ var innerOption = get_lang(data.followupflags[i].name)
+					}else{var innerOption = data.followupflags[i].name}%>
+					<option value="<%= data.followupflags[i].id %>" <%= selected %>><%= innerOption %></option>
 				<% } %>
 			</select>
Index: trunk/prototype/modules/mail/templates/followupflag_alarm_list.ejs
===================================================================
--- trunk/prototype/modules/mail/templates/followupflag_alarm_list.ejs	(revision 5705)
+++ trunk/prototype/modules/mail/templates/followupflag_alarm_list.ejs	(revision 5738)
@@ -5,9 +5,13 @@
 for(var i=0; i<data.alarmInRange.length; i++){
 	var openMessageScript = "cExecute('$this.imap_functions.get_info_msg&msg_number="+data.alarmInRange[i].messageNumber+"&msg_folder="+data.alarmInRange[i].folderName+"&alarm=true', show_msg);";
-	
+	if(data.alarmInRange[i].followupflag.id < 7){
+		var nameFollowupflag = get_lang(data.alarmInRange[i].followupflag.name);
+	}else{
+		var nameFollowupflag = data.alarmInRange[i].followupflag.name;
+	}
 %>
 	<li class="message-item">
 		<a onclick="<%=openMessageScript%>">
-			<%= (it.attrDeadline == 'alarmDeadline') ? data.alarmInRange[i].alarmDeadline : data.alarmInRange[i].doneDeadline %> - <%= data.alarmInRange[i].followupflag.name %> - <%= data.alarmInRange[i].message.headers.subject %>
+			<%= (it.attrDeadline == 'alarmDeadline') ? data.alarmInRange[i].alarmDeadline : data.alarmInRange[i].doneDeadline %> - <%= nameFollowupflag %> - <%= data.alarmInRange[i].message.headers.subject %>
 		</a>
 	</li>
@@ -18,4 +22,4 @@
 
 <fieldset class="alert-options">
-	<input type="checkbox" name="stopAlert"> <label>Não mostrar essa janela por hoje.</label>
+	<input type="checkbox" name="stopAlert"> <label><%= get_lang("Don't show this window anymore today.")%></label>
 </fieldset>
