Calendar-Indicator

Merge lp:~jflaker/calendar-indicator/BugFix1315361 into lp:calendar-indicator

  1. BugFix1315361
  2. Merge into trunk
Proposed by Jeffrey Flaker
Status: Needs review
Proposed branch: lp:~jflaker/calendar-indicator/BugFix1315361
Merge into: lp:calendar-indicator
Diff against target: 46 lines (+9/-2) (has conflicts)
3 files modified
po/po.pot (+7/-0)
src/calendarindicator.py (+1/-1)
src/calendarwindow.py (+1/-1)
Text conflict in po/po.pot
To merge this branch: bzr merge lp:~jflaker/calendar-indicator/BugFix1315361
Reviewer Review Type Date Requested Status
Lorenzo Carbonell Pending
Review via email: mp+351932@code.launchpad.net

This proposal supersedes a proposal from 2014-09-01.

Commit message

Spelling error "revove" fixed. Should be "remove"

Description of the change

Spelling error "revove" fixed. Should be "remove"

To post a comment you must log in.

Unmerged revisions

45. By Jeffrey Flaker

Fixing bug 1315361 spelling error of remove (was revove)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/po.pot'
--- po/po.pot 2015-07-12 18:55:53 +0000
+++ po/po.pot 2018-07-31 19:31:56 +0000
@@ -97,9 +97,16 @@
97msgid "About"97msgid "About"
98msgstr ""98msgstr ""
9999
100<<<<<<< TREE
100#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:315101#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:315
101#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarwindow.py:95102#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarwindow.py:95
102msgid "Are you sure you want to revove this event?"103msgid "Are you sure you want to revove this event?"
104=======
105#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarindicator_temp.py:302
106#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarwindow.py:91
107#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarindicator.py:302
108msgid "Are you sure you want to remove this event?"
109>>>>>>> MERGE-SOURCE
103msgstr ""110msgstr ""
104111
105#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:336112#: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:336
106113
=== modified file 'src/calendarindicator.py'
--- src/calendarindicator.py 2015-07-12 18:55:53 +0000
+++ src/calendarindicator.py 2018-07-31 19:31:56 +0000
@@ -312,7 +312,7 @@
312 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,312 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
313 type = Gtk.MessageType.ERROR,313 type = Gtk.MessageType.ERROR,
314 buttons = Gtk.ButtonsType.OK_CANCEL,314 buttons = Gtk.ButtonsType.OK_CANCEL,
315 message_format = _('Are you sure you want to revove this event?'))315 message_format = _('Are you sure you want to remove this event?'))
316 if md.run() == Gtk.ResponseType.OK:316 if md.run() == Gtk.ResponseType.OK:
317 md.destroy() 317 md.destroy()
318 event = widget.get_event()318 event = widget.get_event()
319319
=== modified file 'src/calendarwindow.py'
--- src/calendarwindow.py 2014-04-13 18:36:53 +0000
+++ src/calendarwindow.py 2018-07-31 19:31:56 +0000
@@ -92,7 +92,7 @@
92 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,92 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
93 type = Gtk.MessageType.ERROR,93 type = Gtk.MessageType.ERROR,
94 buttons = Gtk.ButtonsType.OK_CANCEL,94 buttons = Gtk.ButtonsType.OK_CANCEL,
95 message_format = _('Are you sure you want to revove this event?'))95 message_format = _('Are you sure you want to remove this event?'))
96 if md.run() == Gtk.ResponseType.OK:96 if md.run() == Gtk.ResponseType.OK:
97 md.destroy() 97 md.destroy()
98 if self.googlecalendar.remove_event(aevent['calendar_id'],aevent['id']):98 if self.googlecalendar.remove_event(aevent['calendar_id'],aevent['id']):

Subscribers

People subscribed via source and target branches