ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #09015
[Merge] lp:~bfiller/ubuntu-calendar-app/allow-predictive-text into lp:ubuntu-calendar-app
Bill Filler has proposed merging lp:~bfiller/ubuntu-calendar-app/allow-predictive-text into lp:ubuntu-calendar-app.
Commit message:
allow predictive text for event name field
Requested reviews:
Ubuntu Calendar Developers (ubuntu-calendar-dev)
For more details, see:
https://code.launchpad.net/~bfiller/ubuntu-calendar-app/allow-predictive-text/+merge/289836
allow predictive text for event name field
--
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~bfiller/ubuntu-calendar-app/allow-predictive-text into lp:ubuntu-calendar-app.
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2016-03-21 19:45:40 +0000
+++ NewEvent.qml 2016-03-22 19:56:44 +0000
@@ -494,7 +494,6 @@
margins: units.gu(2)
}
- inputMethodHints: Qt.ImhNoPredictiveText
placeholderText: i18n.tr("Event Name")
onFocusChanged: {
if(titleEdit.focus) {
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2016-03-21 14:40:17 +0000
+++ po/com.ubuntu.calendar.pot 2016-03-22 19:56:44 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-21 20:06+0530\n"
+"POT-Creation-Date: 2016-03-22 15:30-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -85,12 +85,26 @@
msgid "Add online Calendar"
msgstr ""
+#: ../CalendarChoicePopup.qml:166
+msgid "Unable to deselect"
+msgstr ""
+
+#: ../CalendarChoicePopup.qml:167
+msgid ""
+"In order to create new events you must have at least one writable calendar "
+"selected"
+msgstr ""
+
+#: ../CalendarChoicePopup.qml:169
+msgid "Ok"
+msgstr ""
+
#: ../ColorPickerDialog.qml:25
msgid "Select Color"
msgstr ""
#: ../ColorPickerDialog.qml:55 ../DeleteConfirmationDialog.qml:60
-#: ../EditEventConfirmationDialog.qml:53 ../NewEvent.qml:354
+#: ../EditEventConfirmationDialog.qml:53 ../NewEvent.qml:341
msgid "Cancel"
msgstr ""
@@ -140,11 +154,11 @@
msgid "Delete this"
msgstr ""
-#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:361
+#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:348
msgid "Delete"
msgstr ""
-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:349
+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:336
msgid "Edit Event"
msgstr ""
@@ -173,7 +187,7 @@
msgid "%1 - %2"
msgstr ""
-#: ../EventDetails.qml:37 ../NewEvent.qml:497
+#: ../EventDetails.qml:37 ../NewEvent.qml:484
msgid "Event Details"
msgstr ""
@@ -181,32 +195,32 @@
msgid "Edit"
msgstr ""
-#: ../EventDetails.qml:162 ../TimeLineHeader.qml:66
+#: ../EventDetails.qml:164 ../TimeLineHeader.qml:66
msgid "All Day"
msgstr ""
-#: ../EventDetails.qml:334 ../NewEvent.qml:563
+#: ../EventDetails.qml:336 ../NewEvent.qml:550
#: com.ubuntu.calendar_calendar.desktop.in.in.h:1
msgid "Calendar"
msgstr ""
-#: ../EventDetails.qml:367
+#: ../EventDetails.qml:369
msgid "Not Attending"
msgstr ""
-#: ../EventDetails.qml:371
+#: ../EventDetails.qml:373
msgid "Attending"
msgstr ""
-#: ../EventDetails.qml:375
+#: ../EventDetails.qml:377
msgid "No Reply"
msgstr ""
-#: ../EventDetails.qml:398 ../NewEvent.qml:529
+#: ../EventDetails.qml:400 ../NewEvent.qml:516
msgid "Description"
msgstr ""
-#: ../EventDetails.qml:416 ../EventReminder.qml:35 ../NewEvent.qml:725
+#: ../EventDetails.qml:418 ../EventReminder.qml:36 ../NewEvent.qml:712
msgid "Reminder"
msgstr ""
@@ -229,7 +243,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:240 ../NewEvent.qml:699
+#: ../EventRepetition.qml:240 ../NewEvent.qml:686
msgid "Repeats"
msgstr ""
@@ -283,51 +297,51 @@
msgid "%1 %2"
msgstr ""
-#: ../NewEvent.qml:182
+#: ../NewEvent.qml:179
msgid "End time can't be before start time"
msgstr ""
-#: ../NewEvent.qml:349 ../NewEventBottomEdge.qml:53
+#: ../NewEvent.qml:336 ../NewEventBottomEdge.qml:53
msgid "New Event"
msgstr ""
-#: ../NewEvent.qml:378
+#: ../NewEvent.qml:365
msgid "Save"
msgstr ""
-#: ../NewEvent.qml:389
+#: ../NewEvent.qml:376
msgid "Error"
msgstr ""
-#: ../NewEvent.qml:391
+#: ../NewEvent.qml:378
msgid "OK"
msgstr ""
+#: ../NewEvent.qml:438
+msgid "From"
+msgstr ""
+
#: ../NewEvent.qml:451
-msgid "From"
-msgstr ""
-
-#: ../NewEvent.qml:464
msgid "To"
msgstr ""
-#: ../NewEvent.qml:481
+#: ../NewEvent.qml:468
msgid "All day event"
msgstr ""
-#: ../NewEvent.qml:511
+#: ../NewEvent.qml:498
msgid "Event Name"
msgstr ""
-#: ../NewEvent.qml:548
+#: ../NewEvent.qml:535
msgid "Location"
msgstr ""
-#: ../NewEvent.qml:603
+#: ../NewEvent.qml:590
msgid "Guests"
msgstr ""
-#: ../NewEvent.qml:612
+#: ../NewEvent.qml:599
msgid "Add Guest"
msgstr ""
Follow ups