ubuntu-touch-coreapps-reviewers team mailing list archive

Thread
Date

[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app

To: mp+284365@xxxxxxxxxxxxxxxxxx
From: Alan Pope  <alan@xxxxxxxxxx>
Date: Thu, 28 Jan 2016 23:11:24 -0000
Reply-to: mp+284365@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Alan Pope  has proposed merging lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app.

Commit message:
Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix/+merge/284365

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app.

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2015-07-11 02:18:03 +0000
+++ AgendaView.qml	2016-01-28 23:10:48 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "dateExt.js" as DateExt
 
@@ -57,7 +57,6 @@
 
     head.actions: [
         calendarTodayAction,
-        commonHeaderActions.newEventAction,
         commonHeaderActions.showCalendarAction,
         commonHeaderActions.reloadAction,
         commonHeaderActions.syncCalendarAction,

=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2015-08-07 06:20:23 +0000
+++ AllDayEventComponent.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 

=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2015-05-28 13:56:12 +0000
+++ CalendarChoicePopup.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtOrganizer 5.0

=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml	2015-05-28 13:58:30 +0000
+++ CalendarListButtonDelegate.qml	2016-01-28 23:10:48 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {

=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml	2015-04-14 19:52:04 +0000
+++ ColorPickerDialog.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml	2015-05-14 03:36:22 +0000
+++ ContactChoicePopup.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Themes.Ambiance 1.0

=== modified file 'DayView.qml'
--- DayView.qml	2015-11-23 07:15:20 +0000
+++ DayView.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
@@ -46,7 +46,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -56,7 +55,7 @@
         contents: Label {
             id:monthYear
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
             font.capitalization: Font.Capitalize
         }

=== modified file 'Defines.js'
--- Defines.js	2014-10-22 14:03:01 +0000
+++ Defines.js	2016-01-28 23:10:48 +0000
@@ -44,7 +44,7 @@
 function getWeekLabels(){
     var object = Qt.createQmlObject('\
         import QtQuick 2.3;\
-        import Ubuntu.Components 1.1;\
+        import Ubuntu.Components 1.3;\
         QtObject {\
             property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
                                     Qt.locale().dayName(1,Locale.NarrowFormat),\

=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ DeleteConfirmationDialog.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ EditEventConfirmationDialog.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {

=== modified file 'EventActions.qml'
--- EventActions.qml	2015-07-11 02:18:03 +0000
+++ EventActions.qml	2016-01-28 23:10:48 +0000
@@ -17,13 +17,15 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SyncMonitor 0.1
 
 Item {
     id: actionPool
 
-    property alias newEventAction: _newEventAction
+    //removing till following bug is resolved
+    //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
+    //property alias newEventAction: _newEventAction
     property alias showCalendarAction: _showCalendarAction
     property alias syncCalendarAction: _syncCalendarAction
     property alias settingsAction: _settingsAction

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2015-11-29 03:17:30 +0000
+++ EventBubble.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 Item{

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2015-08-03 04:47:59 +0000
+++ EventDetails.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Popups 1.0
@@ -271,7 +271,7 @@
                 Label{
                     id: titleLabel
                     objectName: "titleLabel"
-                    fontSize: "x-large"
+                    fontSize: "large"
                     width: parent.width
                     wrapMode: Text.WordWrap
                     color: "white"

=== modified file 'EventReminder.qml'
--- EventReminder.qml	2015-07-12 03:39:07 +0000
+++ EventReminder.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page{

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2015-07-11 11:33:00 +0000
+++ EventRepetition.qml	2016-01-28 23:10:48 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0

=== modified file 'EventUtils.qml'
--- EventUtils.qml	2014-10-04 04:37:34 +0000
+++ EventUtils.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 import "Defines.js" as Defines
 import "Recurrence.js" as Recurrence

=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml	2015-05-14 13:03:02 +0000
+++ HeaderDateComponent.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2015-11-23 07:15:20 +0000
+++ MonthComponent.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
@@ -35,7 +35,7 @@
 
     property string dayLabelFontSize: "medium"
     property string dateLabelFontSize: "large"
-    property string monthLabelFontSize: "x-large"
+    property string monthLabelFontSize: "large"
     property string yearLabelFontSize: "large"
 
     property alias dayLabelDelegate : dayLabelRepeater.delegate

=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-09-05 05:30:23 +0000
+++ MonthComponentDateDelegate.qml	2016-01-28 23:10:48 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item{
     id: dateRootItem

=== modified file 'MonthView.qml'
--- MonthView.qml	2015-11-23 07:15:20 +0000
+++ MonthView.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
@@ -45,7 +45,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -54,7 +53,7 @@
 
         contents: Label {
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             // TRANSLATORS: this is a time formatting string,
             // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
             // It's used in the header of the month and week views

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-08-24 05:08:46 +0000
+++ NewEvent.qml	2016-01-28 23:10:48 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0

=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml	2015-02-17 05:53:42 +0000
+++ NewEventEntryField.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Label {
     id: root

=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml	2015-03-28 11:31:47 +0000
+++ OnlineAccountsHelper.qml	2016-01-28 23:10:48 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 

=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml	2014-10-17 05:42:34 +0000
+++ RecurrenceLabelDefines.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 QtObject {
     property var recurrenceLabel:[i18n.tr("Once"),

=== modified file 'Scroller.qml'
--- Scroller.qml	2014-09-20 10:45:35 +0000
+++ Scroller.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 
 Item {

=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-11-29 05:15:13 +0000
+++ TimeLineBackground.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Column {
     width: parent.width

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-08-20 12:27:59 +0000
+++ TimeLineBase.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 import "dateExt.js" as DateExt

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-10-31 18:47:23 +0000
+++ TimeLineBaseComponent.qml	2016-01-28 23:10:48 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.3
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeader.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 
 import "ViewType.js" as ViewType

=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeaderComponent.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 

=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml	2014-12-11 20:29:27 +0000
+++ TimeLineTimeScale.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Flickable{
     id: timeFlickble

=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2014-11-29 09:40:53 +0000
+++ ViewHeader.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Item{
     id: header
@@ -26,7 +26,7 @@
     property int month;
     property int year;
 
-    property string monthLabelFontSize: "x-large"
+    property string monthLabelFontSize: "large"
     property string yearLabelFontSize: "large"
 
     Label{

=== modified file 'WeekView.qml'
--- WeekView.qml	2015-10-28 02:12:50 +0000
+++ WeekView.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
@@ -50,7 +50,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -60,7 +59,7 @@
         contents: Label {
             id:monthYear
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
             font.capitalization: Font.Capitalize
         }

=== modified file 'YearView.qml'
--- YearView.qml	2015-11-23 07:15:20 +0000
+++ YearView.qml	2016-01-28 23:10:48 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 import "dateExt.js" as DateExt
 Page {
@@ -48,7 +48,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -57,7 +56,7 @@
         contents: Label {
             id:year
             objectName:"yearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: i18n.tr("Year %1").arg(currentYear)
         }
     }

=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml	2015-11-23 07:15:20 +0000
+++ YearViewDelegate.qml	2016-01-28 23:10:48 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 GridView{
     id: yearView

=== modified file 'calendar.qml'
--- calendar.qml	2015-11-23 07:15:20 +0000
+++ calendar.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 import Qt.labs.settings 1.0
@@ -27,8 +27,6 @@
 
     property bool displayWeekNumber: false;
 
-    useDeprecatedToolbar: false
-
     // Work-around until this branch lands:
     // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
     //property bool windowActive: typeof window != 'undefined'

=== modified file 'calendarTests.qml'
--- calendarTests.qml	2014-09-20 10:45:35 +0000
+++ calendarTests.qml	2016-01-28 23:10:48 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MainView {
     width: units.gu(20)

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-11-23 07:15:20 +0000
+++ po/com.ubuntu.calendar.pot	2016-01-28 23:10:48 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
+"POT-Creation-Date: 2015-11-01 10:45+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -19,25 +19,25 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
-#: ../WeekView.qml:44 ../YearView.qml:42
+#: ../WeekView.qml:44 ../YearView.qml:36
 msgid "Today"
 msgstr ""
 
-#: ../AgendaView.qml:93
+#: ../AgendaView.qml:92
 msgid "No upcoming events"
 msgstr ""
 
-#: ../AgendaView.qml:96
+#: ../AgendaView.qml:95
 msgid "You have no calendars enabled"
 msgstr ""
 
-#: ../AgendaView.qml:106
+#: ../AgendaView.qml:105
 msgid "Enable calendars"
 msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
 #. while the second one (%2) refers to the end time
-#: ../AgendaView.qml:169 ../EventBubble.qml:133
+#: ../AgendaView.qml:168 ../EventBubble.qml:133
 #, qt-format
 msgid "%1 - %2"
 msgstr ""
@@ -46,34 +46,34 @@
 #. on a given day. "Ev." is short form for "Events".
 #. Please keep the translation of "Ev." to 3 characters only, as the week view
 #. where it's shown has limited space
-#: ../AllDayEventComponent.qml:126
+#: ../AllDayEventComponent.qml:123
 #, qt-format
 msgid "%1 ev."
 msgstr ""
 
 #. TRANSLATORS: the argument refers to the number of all day events
-#: ../AllDayEventComponent.qml:130
+#: ../AllDayEventComponent.qml:127
 #, qt-format
 msgid "%1 all day event"
 msgid_plural "%1 all day events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
 msgid "Calendars"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
+#: ../CalendarChoicePopup.qml:37
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: Please translate this string  to 15 characters only.
 #. Currently ,there is no way we can increase width of action menu currently.
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Sync"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Syncing"
 msgstr ""
 
@@ -101,7 +101,7 @@
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
 #. It's used in the header of the month and week views
-#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64
+#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
 msgid "MMMM yyyy"
 msgstr ""
 
@@ -136,7 +136,7 @@
 msgid "Delete"
 msgstr ""
 
-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
 msgid "Edit Event"
 msgstr ""
 
@@ -154,14 +154,10 @@
 msgid "Edit this"
 msgstr ""
 
-#: ../EventActions.qml:51 ../NewEvent.qml:325
+#: ../EventActions.qml:50 ../NewEvent.qml:324
 msgid "New Event"
 msgstr ""
 
-#: ../EventActions.qml:72 ../Settings.qml:28
-msgid "Settings"
-msgstr ""
-
 #. TRANSLATORS: the first argument (%1) refers to a time for an event,
 #. while the second one (%2) refers to title of event
 #: ../EventBubble.qml:144 ../EventBubble.qml:149
@@ -169,7 +165,7 @@
 msgid "%1 <b>%2</b>"
 msgstr ""
 
-#: ../EventDetails.qml:43 ../NewEvent.qml:436
+#: ../EventDetails.qml:43 ../NewEvent.qml:435
 msgid "Event Details"
 msgstr ""
 
@@ -193,11 +189,11 @@
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:354 ../NewEvent.qml:538
+#: ../EventDetails.qml:354 ../NewEvent.qml:537
 msgid "Guests"
 msgstr ""
 
-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635
+#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
 msgid "Reminder"
 msgstr ""
 
@@ -220,7 +216,7 @@
 #. TRANSLATORS: this refers to how often a recurrent event repeats
 #. and it is shown as the header of the option selector to choose
 #. its repetition
-#: ../EventRepetition.qml:242 ../NewEvent.qml:619
+#: ../EventRepetition.qml:242 ../NewEvent.qml:618
 msgid "Repeats"
 msgstr ""
 
@@ -263,10 +259,6 @@
 msgid "After Date"
 msgstr ""
 
-#: ../MonthComponent.qml:260
-msgid "Wk"
-msgstr ""
-
 #: ../NewEvent.qml:84
 msgid "Save"
 msgstr ""
@@ -275,43 +267,43 @@
 msgid "End time can't be before start time"
 msgstr ""
 
-#: ../NewEvent.qml:335
+#: ../NewEvent.qml:334
 msgid "Error"
 msgstr ""
 
-#: ../NewEvent.qml:337
+#: ../NewEvent.qml:336
 msgid "OK"
 msgstr ""
 
-#: ../NewEvent.qml:390
+#: ../NewEvent.qml:389
 msgid "From"
 msgstr ""
 
-#: ../NewEvent.qml:403
+#: ../NewEvent.qml:402
 msgid "To"
 msgstr ""
 
-#: ../NewEvent.qml:420
+#: ../NewEvent.qml:419
 msgid "All day event"
 msgstr ""
 
-#: ../NewEvent.qml:449
+#: ../NewEvent.qml:448
 msgid "Event Name"
 msgstr ""
 
-#: ../NewEvent.qml:467
+#: ../NewEvent.qml:466
 msgid "Description"
 msgstr ""
 
-#: ../NewEvent.qml:485
+#: ../NewEvent.qml:484
 msgid "Location"
 msgstr ""
 
-#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
+#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
 msgid "Calendar"
 msgstr ""
 
-#: ../NewEvent.qml:542
+#: ../NewEvent.qml:541
 msgid "Add Guest"
 msgstr ""
 
@@ -398,10 +390,6 @@
 msgid "2 weeks"
 msgstr ""
 
-#: ../Settings.qml:60
-msgid "Show week numbers"
-msgstr ""
-
 #: ../TimeLineBase.qml:73
 msgid "Untitled"
 msgstr ""
@@ -416,35 +404,35 @@
 msgid "All Day"
 msgstr ""
 
-#: ../YearView.qml:61
+#: ../YearView.qml:54
 #, qt-format
 msgid "Year %1"
 msgstr ""
 
-#: ../calendar.qml:47
+#: ../calendar.qml:45
 msgid ""
 "Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
 "eventid. They will be managed by system. See the source for a full comment "
 "about them"
 msgstr ""
 
-#: ../calendar.qml:455
+#: ../calendar.qml:354
 msgid "Year"
 msgstr ""
 
-#: ../calendar.qml:462
+#: ../calendar.qml:388
 msgid "Month"
 msgstr ""
 
-#: ../calendar.qml:469
+#: ../calendar.qml:421
 msgid "Week"
 msgstr ""
 
-#: ../calendar.qml:476
+#: ../calendar.qml:459
 msgid "Day"
 msgstr ""
 
-#: ../calendar.qml:483
+#: ../calendar.qml:491
 msgid "Agenda"
 msgstr ""

Follow ups

[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: noreply, 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Jenkins Bot, 2016-01-29
[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Alan Pope , 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Renato Araujo Oliveira Filho, 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Jenkins Bot, 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Jenkins Bot, 2016-01-29
[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Alan Pope , 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Renato Araujo Oliveira Filho, 2016-01-29
[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Alan Pope , 2016-01-29
[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Alan Pope , 2016-01-29
[Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Alan Pope , 2016-01-29
Re: [Merge] lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app
From: Dan Chapman , 2016-01-29