Merge lp:~coalwater/lernid/fix-808569 into lp:lernid

Proposed by Mohammad AbuShady
Status: Merged
Approved by: John S. Gruber
Approved revision: 228
Merged at revision: 229
Proposed branch: lp:~coalwater/lernid/fix-808569
Merge into: lp:lernid
Diff against target: 27 lines (+3/-3)
2 files modified
bin/lernid (+1/-1)
data/ui/ChatWidget.ui (+2/-2)
To merge this branch: bzr merge lp:~coalwater/lernid/fix-808569
Reviewer Review Type Date Requested Status
John S. Gruber Approve
Review via email: mp+68109@code.launchpad.net

Description of the change

Fixing bug #808569.
ps: removed the .bzrignore file

To post a comment you must log in.
Revision history for this message
Mohammad AbuShady (coalwater) wrote :

so ? :D

Revision history for this message
John S. Gruber (jsjgruber) wrote :

Tests out fine. Thanks for your work on this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/lernid'
--- bin/lernid 2011-06-29 00:23:41 +0000
+++ bin/lernid 2011-07-15 15:41:17 +0000
@@ -212,7 +212,7 @@
212 def event_message():212 def event_message():
213 message1 = _('You can interact with classes held in the classroom')213 message1 = _('You can interact with classes held in the classroom')
214 message2 = _(214 message2 = _(
215 'Add "Question:" to the beginning of your query '215 'Add "QUESTION:" to the beginning of your query '
216 'to direct it to the classroom instructor.')216 'to direct it to the classroom instructor.')
217 notification = pynotify.Notification(message1, message2, 'lernid')217 notification = pynotify.Notification(message1, message2, 'lernid')
218 notification.show()218 notification.show()
219219
=== modified file 'data/ui/ChatWidget.ui'
--- data/ui/ChatWidget.ui 2011-06-24 01:33:12 +0000
+++ data/ui/ChatWidget.ui 2011-07-15 15:41:17 +0000
@@ -62,8 +62,8 @@
62 <object class="GtkLabel" id="questionlabel">62 <object class="GtkLabel" id="questionlabel">
63 <property name="visible">True</property>63 <property name="visible">True</property>
64 <property name="can_focus">False</property>64 <property name="can_focus">False</property>
65 <property name="tooltip_text" translatable="yes">"Question:" directs your question to the classroom for an answer from the instructor</property>65 <property name="tooltip_text" translatable="yes">"QUESTION:" directs your question to the classroom for an answer from the instructor</property>
66 <property name="label" translatable="yes">Question:</property>66 <property name="label" translatable="yes">QUESTION:</property>
67 <property name="selectable">True</property>67 <property name="selectable">True</property>
68 </object>68 </object>
69 <packing>69 <packing>

Subscribers

People subscribed via source and target branches