Merge lp:~mpounta/lernid/devel into lp:lernid

Proposed by Christos Bountalis
Status: Merged
Merged at revision: 233
Proposed branch: lp:~mpounta/lernid/devel
Merge into: lp:lernid
Diff against target: 25 lines (+3/-1)
2 files modified
data/ui/LernidWindow.ui (+1/-1)
lernid.1 (+2/-0)
To merge this branch: bzr merge lp:~mpounta/lernid/devel
Reviewer Review Type Date Requested Status
John S. Gruber Pending
Review via email: mp+128382@code.launchpad.net

Description of the change

Fixxes bug lp:#794120

First time I am using these tools, and the whole process.
If i have done something wrong, or i could do something better please
feel free to contact me.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/LernidWindow.ui'
2--- data/ui/LernidWindow.ui 2011-08-27 22:06:13 +0000
3+++ data/ui/LernidWindow.ui 2012-10-07 12:01:22 +0000
4@@ -214,7 +214,7 @@
5 <property name="can_focus">False</property>
6 <property name="no_show_all">True</property>
7 <property name="use_action_appearance">False</property>
8- <property name="label" translatable="yes">Tweet current session</property>
9+ <property name="label" translatable="yes">Publicize with Gwibber</property>
10 <property name="use_underline">True</property>
11 <signal name="activate" handler="tweet_session" swapped="no"/>
12 </object>
13
14=== modified file 'lernid.1'
15--- lernid.1 2012-04-23 19:02:19 +0000
16+++ lernid.1 2012-10-07 12:01:22 +0000
17@@ -25,6 +25,8 @@
18 Classroom events depend upon the classroom calendar. Lernid will update its calendar several times an hour. If Lernid doesn't seem to be up-to-date it may be worthwhile to update it yourself using the refresh control on the schedule tab.
19 .PP
20 Many like to keep track of future classroom events. The calendar ical buttons may be helpful to you should you wish to subscribe using your calendar management software or web app.
21+.PP
22+You can easily send a message about the current session, throught all your accounts that you have added to Gwibber, by using the "Publicize with Gwibber" option under the "Events" menu.
23 .SH OPTIONS
24 .B
25 .IP " -v, --verbose"

Subscribers

People subscribed via source and target branches