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
1=== modified file 'po/po.pot'
2--- po/po.pot 2015-07-12 18:55:53 +0000
3+++ po/po.pot 2018-07-31 19:31:56 +0000
4@@ -97,9 +97,16 @@
5 msgid "About"
6 msgstr ""
7
8+<<<<<<< TREE
9 #: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:315
10 #: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarwindow.py:95
11 msgid "Are you sure you want to revove this event?"
12+=======
13+#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarindicator_temp.py:302
14+#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarwindow.py:91
15+#: /home/atareao_r/Dropbox/tp/raring/calendar-indicator/src/calendarindicator.py:302
16+msgid "Are you sure you want to remove this event?"
17+>>>>>>> MERGE-SOURCE
18 msgstr ""
19
20 #: /home/atareao/Copy/PROGRAMACION/Python/trusty/calendar-indicator/src/calendarindicator.py:336
21
22=== modified file 'src/calendarindicator.py'
23--- src/calendarindicator.py 2015-07-12 18:55:53 +0000
24+++ src/calendarindicator.py 2018-07-31 19:31:56 +0000
25@@ -312,7 +312,7 @@
26 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
27 type = Gtk.MessageType.ERROR,
28 buttons = Gtk.ButtonsType.OK_CANCEL,
29- message_format = _('Are you sure you want to revove this event?'))
30+ message_format = _('Are you sure you want to remove this event?'))
31 if md.run() == Gtk.ResponseType.OK:
32 md.destroy()
33 event = widget.get_event()
34
35=== modified file 'src/calendarwindow.py'
36--- src/calendarwindow.py 2014-04-13 18:36:53 +0000
37+++ src/calendarwindow.py 2018-07-31 19:31:56 +0000
38@@ -92,7 +92,7 @@
39 flags = Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
40 type = Gtk.MessageType.ERROR,
41 buttons = Gtk.ButtonsType.OK_CANCEL,
42- message_format = _('Are you sure you want to revove this event?'))
43+ message_format = _('Are you sure you want to remove this event?'))
44 if md.run() == Gtk.ResponseType.OK:
45 md.destroy()
46 if self.googlecalendar.remove_event(aevent['calendar_id'],aevent['id']):

Subscribers

People subscribed via source and target branches