diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index eb8f8fac0..ad0472525 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -44,6 +44,9 @@
"Expand" = "Expand";
"Reduce" = "Reduce";
+/* tooltip */
+"Refresh" = "Refresh";
+
/* generic.js */
"Unable to subscribe to that folder!"
= "Unable to subscribe to that folder!";
diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings
index 5fb97a780..a77d73904 100644
--- a/UI/Common/French.lproj/Localizable.strings
+++ b/UI/Common/French.lproj/Localizable.strings
@@ -44,6 +44,9 @@
"Expand" = "Agrandir";
"Reduce" = "Réduire";
+/* tooltip */
+"Refresh" = "Rafraîchir";
+
/* generic.js */
"Unable to subscribe to that folder!"
= "Impossible de s'abonner à ce dossier.";
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 9edf491f9..c23d55f77 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -445,6 +445,8 @@
"Back" = "Back";
"Copy messages" = "Copy messages";
"More messages options" = "More messages options";
+"Flag" = "Flag";
+"Unflag" = "Unflag";
"Mark as Unread" = "Mark as Unread";
"Mark as Read" = "Mark as Read";
"Closing Window ..." = "Closing Window ...";
@@ -458,6 +460,8 @@
"Your email has been sent" = "Your email has been sent";
"Folder compacted" = "Folder compacted";
+"More Options" = "More Options";
+
"New draft" = "New draft";
"Create new draft with this template" = "Create new draft with this template";
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index e215fd906..48cf8ca5b 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -445,6 +445,8 @@
"Back" = "Retour";
"Copy messages" = "Copier les messages";
"More messages options" = "Options messages avancées";
+"Flag" = "Marquer";
+"Unflag" = "Démarquer";
"Mark as Unread" = "Marquer comme non-lu";
"Mark as Read" = "Marquer comme lu";
"Closing Window ..." = "Fermer la fenêtre...";
@@ -458,6 +460,8 @@
"Your email has been sent" = "Votre courriel a été envoyé";
"Folder compacted" = "Dossier compressé";
+"More Options" = "Plus d'Options";
+
"New draft" = "Nouveau message";
"Create new draft with this template" = "Créer un nouveau message à partir de ce modèle";
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 5b2c5df3d..e73ec47aa 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -250,8 +250,8 @@
{{addressbook.selectedFolder.name}}
-
+
+
sort
@@ -300,7 +300,8 @@
-
+
+
refresh
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index a621e6562..a82ccf588 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -76,6 +76,7 @@
+
filter_list
@@ -110,8 +111,8 @@
-
+
+
sort
@@ -135,7 +136,7 @@
{{ mailbox.sortedBy('size') ? 'check' : null }}
-
+
{{ mailbox.sortedBy('arrival') ? 'check' : null }}
@@ -152,6 +153,7 @@
+
refresh
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 1b8a832f6..06c3d6594 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -33,11 +33,15 @@
+
+
{{ viewer.message.isflagged ? 'star' : 'star_border' }}
+
+
@@ -79,6 +83,7 @@
+
more_vert
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index cd78944bf..6f484034b 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -20,18 +20,26 @@
var:aria-label="yesterdayName"
var:date="prevDayQueryParameters.day"
ng-click="calendar.changeDate($event)"
- md-no-ink="md-no-ink">chevron_left
+ md-no-ink="md-no-ink">
+
+ chevron_left
+
chevron_right
+ md-no-ink="md-no-ink">
+
+ chevron_right
+
+ sg-datepicker-readonly-input="true">
+
+
-
+
+
view_day
+ ng-click="calendar.changeView($event, 'day')">
+
+ view_day
+
view_week
+ ng-click="calendar.changeView($event, 'week')">
+
+ view_week
+
view_module
+ ng-click="calendar.changeView($event, 'month')">
+
+ view_module
+
view_array
+ ng-click="calendar.changeView($event, 'multicolumnday')">
+
+ view_array
+
print
+ ng-click="calendar.printView(centerIsClose, list.componentType)">
+
+ print
+
-
+
+
filter_list
@@ -263,8 +263,8 @@
-
+
+
sort
@@ -333,6 +333,7 @@
+
refresh
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index 5595a3212..97f688d5f 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -20,12 +20,18 @@
label:aria-label="Previous Month"
var:date="prevMonthQueryParameters.day"
ng-click="calendar.changeDate($event)"
- md-no-ink="md-no-ink">chevron_left
+ md-no-ink="md-no-ink">
+
+ chevron_left
+
chevron_right
+ md-no-ink="md-no-ink">
+
+ chevron_right
+
-
+
+
view_day
+ ng-disabled="true"
+ ng-click="calendar.changeView($event, 'day')">
+
+ view_day
+
view_week
+ ng-click="calendar.changeView($event, 'week')">
+
+ view_week
+
view_module
+ ng-click="calendar.changeView($event, 'month')">
+
+ view_module
+
view_array
+ ng-click="calendar.changeView($event, 'multicolumnday')">
+
+ view_array
+
print
+ ng-click="calendar.printView(centerIsClose, list.componentType)">
+
+ print
+
diff --git a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
index 0d2734dcc..deeadc821 100644
--- a/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
@@ -20,12 +20,18 @@
var:aria-label="yesterdayName"
var:date="prevDayQueryParameters.day"
ng-click="calendar.changeDate($event)"
- md-no-ink="md-no-ink">chevron_left
+ md-no-ink="md-no-ink">
+
+ chevron_left
+
chevron_right
+ md-no-ink="md-no-ink">
+
+ chevron_right
+
-
+
+
view_day
+ ng-disabled="true"
+ ng-click="calendar.changeView($event, 'day')">
+
+ view_day
+
view_week
+ ng-click="calendar.changeView($event, 'week')">
+
+ view_week
+
view_module
+ ng-click="calendar.changeView($event, 'month')">
+
+ view_module
+
view_array
+ ng-click="calendar.changeView($event, 'multicolumnday')">
+
+ view_array
+
print
+ ng-click="calendar.printView(centerIsClose, list.componentType)">
+
+ print
+
chevron_left
+ md-no-ink="md-no-ink">
+
+ chevron_left
+
chevron_right
+ md-no-ink="md-no-ink">
+
+ chevron_right
+
-
+
+
view_day
+ ng-disabled="true"
+ ng-click="calendar.changeView($event, 'day')">
+
+ view_day
+
view_week
+ ng-click="calendar.changeView($event, 'week')">
+
+ view_week
+
view_module
+ ng-click="calendar.changeView($event, 'month')">
+
+ view_module
+
view_array
+ ng-click="calendar.changeView($event, 'multicolumnday')">
+
+ view_array
+
print
+ ng-click="calendar.printView(centerIsClose, list.componentType)">
+
+ print
+