Merge lp:~jsjgruber/lernid/lernid-proposed into lp:lernid

[John S. Gruber]

Please see the changelog for all of the changes.

[lp:~jsjgruber/lernid/lernid-proposed]

231. By John S. Gruber on 2012-08-19

* Merge lernid-proposed
* Merge translations
* Disable all plugins through webkit settings so they won't crash
  lernid. Future webkit releases may run plugins in a separate
  process allowing us to reconsider this eventually.
  lernid/widgets/Browser.py . Closes LP: #995695.
* Don't add irc logs for future events in lernid/widgets/Schedule.py
* Change version number and create new version of .pot files
* Fix scrolling case when there are no sessions in the schedule timeframe.
* Underline Irclog entries to make it apparent that they are clickable.
* Change version number and create new version of .pot files
* Get rid of slide error message more quickly, and when a new attempt
  is made to download slides.
* Don't release the nick--it causes the server to change previous
  signons elsewhere to Guestn.
* Add calendar override option for use in testing.
* Create irclog lines for current and future sessions, too.
* If there are no future sessions, scroll to the bottom of the calendar.
* Add the --no-update command line option to supress lernid's
  scheduled schedule updates.
* Scramble the calendar domain name before every calendar download
* At disconnect time, be sure schedule _update handle is removed. Don't
  let an initial calendar load ending after an event is disconnected
  produce schedule the update chain.
* Ignore callbacks from cancelled messages
* Select time to trigger calendar updates from a list. At :06 after
  the hour and half hour. Other times are :01, :11, :21, :31, :41, :51
* Add remarks about the schedule buttons in the lernid man page.
* Clean up some corner cases when events are terminated. Schedule._event
  is now None when there is no event active. Rename irclog click callback.
* Remove event interrupted message when the next connection is made.
* When a new slide load attempt is made, stop outstanding I/O and retries.
* Add a schedule refresh button
* Clean up and simplify calendar reload scheduling. Only load it every
  ten minutes and once a night to produce a new irclog entry in the
  schedule.
* Be sure we don't pre-announce the same session twice in a row.
* Make server disconnections more robust
* New version number; new .pot file. Clear lintian errors
* Depend on python version 2.6 as lernid uses the io module
* Don't reparse calendar unless it has changed. Simplify
  _calendar_refresh parameters.
* Don't scroll schedule unless we have just connected to an event.`
* Increment release version by .1. Adjust version number in package.
  Make python-support a straight build dependency for now to avoid
  bug 594916 in launchpad's builder.
* Correct problem using non-existent event preferences setting; advance
  version by .1
* Set up new release
* Create new translation .pot file
* Merge translations
* Use nick from connect dialog when reconnecting
* Make nick used in irc rooms reflect the nick assigned by the server and
  display a status message when it is changed
* Correct message insertion into irc text buffers.
* Fix traceback when issuing error message for attempt at irc command
  (LP: #925702)
* Add clasebot to list of classbot names. (LP: #916629)
* Time out the join message after 10 seconds. (LP: #806801)
* Time out various additional status messages. Avoid initial "learning
  material" message. (LP: #806805)
* Disconnect channel signal handlers, if any, when the server connection
  is closed. Prevents messages from being repeated after multiple
  disconnects and connects.
* Correct default events (classrooms). Use a temporary file to allow the
  configparser to read the default config as a utf-8 encoded string --
  matching how it reads all other configs from disk or web.
* Simplify nickname handling somewhat. Use version as fullname in initial
  sign-on. (LP: #850419, LP: #838557)
* Remove "Question:" unicode space marking.
* Change copyright format-spec: line to current format: line and
  update standards to 3.9.3.1
* Convert to debhelper7 from cdbs
* Use dh_python2 for build if available; use python-support if not
  (Removes need for python-central). Thanks to Monty Taylor for
  the conditional code. (LP: #801281)

* Remove desktopcouch configuration saving as Ubuntu One doesn't support
  it. (LP: #893738, LP: #795492)
* In connect dialog default to last event chosen. (LP: #838505)
* Expose the event icalurl in two ways, to the clipboard, and opened using
    the default method for the url. Also replace the slide opening function
    with the same gtk.show_uri function, removing the need for webbrowser.
    Also eliminate the gtk.viewport, tree views are scrollable so this
    is redundant (and I think, should have been a child of the scrolling
    window, not its parent, if I read the documentation correctly).
    (LP: #530054).
* Slide.py have poppler render to a cairo surface and use a trick to
  get that into the pixmap. (LP: #972069)
  (Technique from diogodivision's "BlingSwitcher" through
  http://www.mikedesjardins.net. Thank you.)
* Dynamically load the schedule each minute at 5 seconds past the minute
  Addresses LP: #925756, LP: #835806
* Try to reload slides three times at random intervals
* Add a lernid man page and another to describe classroom config files and
  calendar event (session) description fields.
* Insert references to irc logs. New config setting logstring provides
  the skeleton uri for the logs. LP: #794124

=== modified file 'bin/lernid'
--- bin/lernid	2011-08-28 13:38:22 +0000
+++ bin/lernid	2012-05-07 00:49:19 +0000
@@ -54,7 +54,7 @@
     fullPath = os.getcwd()
 sys.path.insert(0, os.path.dirname(fullPath))
 
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 from lernid.LernidOptions import Options
 from lernid import AboutLernidDialog, PreferencesLernidDialog
 from lernid.lernidconfig import get_data_path, save_cache_path
@@ -137,8 +137,12 @@
         self.TAB_SESSION = 0
         self.TAB_SCHEDULE = 1
         self.TAB_TERMINAL = 2
+        self.ignore_initial_tab_change = True
 
         def highlight_session_tab(w, url=None):
+            if self.ignore_initial_tab_change:
+                self.ignore_initial_tab_change = False
+                return
             if self._tabs.get_current_page() != self.TAB_SESSION:
                  eye_catcher = u"<span color='red'>●</span><span color='yellow'>●</span><span color='blue'>●</span>"
                  self._session_label.set_label(eye_catcher + ' %s' % _('_Session'))
@@ -159,7 +163,7 @@
             except:
                 logging.error("Notification failed to show for Interrupted Event Message")
             Statusbar.push_message(_('Event Connection Interrupted -- '
-            'Please reestablish your Internet connection and reconnect to the event'))
+            'Please reestablish your Internet connection and reconnect to the event'), 'interrupt_message')
             self.emit('event-disconnect', event)
 
         self._browser.connect('page-changed', highlight_session_tab)
@@ -209,6 +213,7 @@
 
         self._eventman.connect('event-interrupted', event_interrupted)
         def event_connected(self, event):
+            Statusbar.pop_message('interrupt_message')
             glib.timeout_add_seconds( 12, event_message, self)
             return False
 
@@ -508,13 +513,17 @@
                        help=_('Override chatroom channel'))
     Options.add_option('--config', action='store', default=None,
                        help=_('Filename or URL to Lernid config file'))
+    Options.add_option('--no-update', action='store_true', default=False,
+                       help=_("Don't automatically reload the schedule"))
     Options.add_option('--web-chat', action='store_true', default=False,
                        help=_('Use web chat widget instead of the native one'))
     Options.add_option('--unsafe-override', action='store_true', default=False,
                        help=_('Unsafe testing option'))
     Options.add_option('--avoid-desktopcouch', action='store_true', default=False,
-                       help=_('Debugging option to avoid desktopcouch'),
+                       help=_('Unused debugging option to avoid desktopcouch'),
                        dest = 'avoid_desktopcouch')
+    Options.add_option('--calendar', action='store', default=None,
+                       help=_('Override calendar location'))
     Options.parse_args()
 
     # Set the logging level to show debug messages

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-03 19:34:22 +0000
+++ debian/changelog	2012-05-07 00:49:19 +0000
@@ -1,3 +1,215 @@
+lernid (0.8.4.9) precise; urgency=low
+
+  * Disable all plugins through webkit settings so they won't crash
+    lernid. Future webkit releases may run plugins in a separate
+    process allowing us to reconsider this eventually.
+    lernid/widgets/Browser.py . Closes LP: #995695.
+
+ -- John S Gruber <[e-mail]>  Sun, 06 May 2012 20:38:42 -0400
+
+lernid (0.8.4.8) precise; urgency=low
+
+  * Don't add irc logs for future events in lernid/widgets/Schedule.py
+
+ -- John S Gruber <[e-mail]>  Thu, 03 May 2012 21:14:55 -0400
+
+lernid (0.8.4.7) precise; urgency=low
+
+  * Change version number and create new version of .pot files
+
+  * Fix scrolling case when there are no sessions in the schedule timeframe.
+
+  * Underline Irclog entries to make it apparent that they are clickable.
+
+ -- John S Gruber <[e-mail]>  Sat, 28 Apr 2012 00:12:17 -0400
+
+lernid (0.8.4.6) precise; urgency=low
+
+  * Change version number and create new version of .pot files
+
+  * Get rid of slide error message more quickly, and when a new attempt
+    is made to download slides.
+
+ -- John S Gruber <[e-mail]>  Mon, 23 Apr 2012 15:10:53 -0400
+
+lernid (0.8.4.5) precise; urgency=low
+
+  * Don't release the nick--it causes the server to change previous
+    signons elsewhere to Guestn.
+
+  * Add calendar override option for use in testing.
+
+  * Create irclog lines for current and future sessions, too.
+
+  * If there are no future sessions, scroll to the bottom of the calendar.
+
+  * Add the --no-update command line option to supress lernid's
+    scheduled schedule updates.
+
+  * Scramble the calendar domain name before every calendar download
+
+  * At disconnect time, be sure schedule _update handle is removed. Don't
+    let an initial calendar load ending after an event is disconnected
+    produce schedule the update chain.
+
+  * Ignore callbacks from cancelled messages
+
+  * Select time to trigger calendar updates from a list. At :06 after
+    the hour and half hour. Other times are :01, :11, :21, :31, :41, :51
+
+  * Add remarks about the schedule buttons in the lernid man page.
+
+  * Clean up some corner cases when events are terminated. Schedule._event
+    is now None when there is no event active. Rename irclog click callback.
+
+  * Remove event interrupted message when the next connection is made.
+
+  * When a new slide load attempt is made, stop outstanding I/O and retries.
+
+  * Add a schedule refresh button
+
+  * Clean up and simplify calendar reload scheduling. Only load it every
+    ten minutes and once a night to produce a new irclog entry in the
+    schedule.
+
+  * Be sure we don't pre-announce the same session twice in a row.
+
+  * Make server disconnections more robust
+
+ -- John S Gruber <[e-mail]>  Sun, 22 Apr 2012 20:03:52 -0400
+
+lernid (0.8.4.4) precise; urgency=low
+
+  * New version number; new .pot file. Clear lintian errors
+
+ -- John S Gruber <[e-mail]>  Sun, 15 Apr 2012 22:29:02 -0400
+
+lernid (0.8.4.3) precise; urgency=low
+
+  * Depend on python version 2.6 as lernid uses the io module
+
+  * Don't reparse calendar unless it has changed. Simplify
+    _calendar_refresh parameters.
+
+  * Don't scroll schedule unless we have just connected to an event.`
+
+ -- John S Gruber <[e-mail]>  Sun, 15 Apr 2012 20:23:07 -0400
+
+lernid (0.8.4.2) precise; urgency=low
+
+  * Increment release version by .1. Adjust version number in package.
+    Make python-support a straight build dependency for now to avoid
+    bug 594916 in launchpad's builder.
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 22:39:02 -0400
+
+lernid (0.8.4.1) precise; urgency=low
+
+  * Correct problem using non-existent event preferences setting; advance
+    version by .1
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 20:56:03 -0400
+
+lernid (0.8.4) precise; urgency=low
+
+  * Set up new release
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 13:20:03 -0400
+
+lernid (0.8.2.7) precise; urgency=low
+
+  * Create new translation .pot file
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 13:17:05 -0400
+
+lernid (0.8.2.6) precise; urgency=low
+
+  * Merge translations
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 13:10:28 -0400
+
+lernid (0.8.2.5) precise; urgency=low
+
+  * Use nick from connect dialog when reconnecting
+
+  * Make nick used in irc rooms reflect the nick assigned by the server and
+    display a status message when it is changed
+
+ -- John S Gruber <[e-mail]>  Wed, 11 Apr 2012 12:31:11 -0400
+
+lernid (0.8.2.4) precise; urgency=low
+
+  * Correct message insertion into irc text buffers.
+
+ -- John S Gruber <[e-mail]>  Tue, 10 Apr 2012 19:26:25 -0400
+
+lernid (0.8.2.3) precise; urgency=low
+
+  [ Mohammad AbuShady ]
+  * Fix traceback when issuing error message for attempt at irc command
+    (LP: #925702)
+
+  * Add clasebot to list of classbot names. (LP: #916629)
+
+  * Time out the join message after 10 seconds. (LP: #806801)
+
+  [ John S Gruber]
+  * Time out various additional status messages. Avoid initial "learning
+    material" message. (LP: #806805)
+
+  * Disconnect channel signal handlers, if any, when the server connection
+    is closed. Prevents messages from being repeated after multiple
+    disconnects and connects.
+
+  * Correct default events (classrooms). Use a temporary file to allow the
+    configparser to read the default config as a utf-8 encoded string --
+    matching how it reads all other configs from disk or web.
+
+  * Simplify nickname handling somewhat. Use version as fullname in initial
+    sign-on. (LP: #850419, LP: #838557)
+
+  * Remove "Question:" unicode space marking.
+
+  * Change copyright format-spec: line to current format: line and
+    update standards to 3.9.3.1
+
+  * Convert to debhelper7 from cdbs
+
+  * Use dh_python2 for build if available; use python-support if not
+    (Removes need for python-central). Thanks to Monty Taylor for
+    the conditional code. (LP: #801281)
+  
+  * Remove desktopcouch configuration saving as Ubuntu One doesn't support
+    it. (LP: #893738, LP: #795492)
+
+  * In connect dialog default to last event chosen. (LP: #838505)
+
+  * Expose the event icalurl in two ways, to the clipboard, and opened using
+      the default method for the url. Also replace the slide opening function
+      with the same gtk.show_uri function, removing the need for webbrowser.
+      Also eliminate the gtk.viewport, tree views are scrollable so this
+      is redundant (and I think, should have been a child of the scrolling
+      window, not its parent, if I read the documentation correctly).
+      (LP: #530054).
+
+  * Slide.py have poppler render to a cairo surface and use a trick to
+    get that into the pixmap. (LP: #972069)
+    (Technique from diogodivision's "BlingSwitcher" through 
+    http://www.mikedesjardins.net. Thank you.)
+
+  * Dynamically load the schedule each minute at 5 seconds past the minute
+    Addresses LP: #925756, LP: #835806
+
+  * Try to reload slides three times at random intervals
+
+  * Add a lernid man page and another to describe classroom config files and
+    calendar event (session) description fields.
+
+  * Insert references to irc logs. New config setting logstring provides
+    the skeleton uri for the logs. LP: #794124
+
+ -- John S Gruber <[e-mail]>  Sat, 07 Apr 2012 19:34:43 -0400
+
 lernid (0.8.2.2) natty; urgency=low
 
   * Ready for release

=== modified file 'debian/control'
--- debian/control	2011-06-27 23:02:17 +0000
+++ debian/control	2012-05-07 00:49:19 +0000
@@ -1,18 +1,17 @@
 Source: lernid
 Section: net
 Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 6),
- python,
- python-central (>= 0.6.11),
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ python (>= 2.6),
+ python-support 
 Build-Depends-Indep: python-distutils-extra (>= 2.10)
 Maintainer: John S Gruber <[e-mail]>
-Standards-Version: 3.9.1
-XS-Python-Version: current
+Standards-Version: 3.9.3.1
+X-Python-Version: >=2.6
 
 Package: lernid
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
  telepathy-idle,
@@ -20,13 +19,11 @@
  python-telepathy,
  python-webkit,
  python-dbus,
- python-desktopcouch-records,
  python-notify,
  python-gobject,
  python-vobject,
  python-gtk2,
  python-poppler,
- desktopcouch
 Recommends:
  python-vte,
  python-appindicator

=== modified file 'debian/copyright'
--- debian/copyright	2011-06-27 15:06:48 +0000
+++ debian/copyright	2012-05-07 00:49:19 +0000
@@ -1,12 +1,11 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: lernid
-Upstream-Maintainer: John S Gruber <[e-mail]>
 Upstream-Source: https://launchpad.net/lernid
 
 Files: *
 Copyright: (C) 2009 <Jono Bacon> <[e-mail]>
 Copyright: (C) 2010 Michael Budde <[e-mail]>
-Copyright (c) 2011 John S Gruber <[e-mail]>
+Copyright: (C) 2011 John S Gruber <[e-mail]>
 License: GPL-3+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

=== modified file 'debian/rules'
--- debian/rules	2011-05-17 03:12:45 +0000
+++ debian/rules	2012-05-07 00:49:19 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM := pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-binary-fixup/lernid::
-	find debian/lernid/usr/share/ -type d -empty -delete
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+
+%:
+	dh $@ ${WITH_PYTHON2}
+
+override_dh_installdocs:
+	dh_installdocs ./AUTHORS

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-05-07 00:49:19 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== modified file 'etc/lernid-classrooms.d/ubuntu-charlas'
--- etc/lernid-classrooms.d/ubuntu-charlas	2011-08-28 13:38:22 +0000
+++ etc/lernid-classrooms.d/ubuntu-charlas	2012-05-07 00:49:19 +0000
@@ -3,4 +3,5 @@
 classroom: ubuntu-charlas
 Chat:ubuntu-charlas-chat
 locale: es.ES
+logstring: http://irclogs.ubuntu.com/%04d/%02d/%02d/%%23ubuntu-charlas.html
 icalurl: http://www.google.com/calendar/ical/q16aejpuv5kgmoa7b6ridenkpk%40group.calendar.google.com/public/basic.ics

=== modified file 'etc/lernid-classrooms.d/ubuntu-classroom'
--- etc/lernid-classrooms.d/ubuntu-classroom	2011-08-25 20:00:48 +0000
+++ etc/lernid-classrooms.d/ubuntu-classroom	2012-05-07 00:49:19 +0000
@@ -2,4 +2,5 @@
 homepage: https://wiki.ubuntu.com/Classroom
 classroom: ubuntu-classroom
 chat: ubuntu-classroom-chat
+logstring: http://irclogs.ubuntu.com/%04d/%02d/%02d/%%23ubuntu-classroom.html
 icalurl: http://www.google.com/calendar/ical/[e-mail]/public/basic.ics

=== added file 'lernid-classroom.5'
--- lernid-classroom.5	1970-01-01 00:00:00 +0000
+++ lernid-classroom.5	2012-05-07 00:49:19 +0000
@@ -0,0 +1,99 @@
+.TH lernid-classroom 5 "April 7, 2012" ""
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+
+.SH NAME
+lernid-classroom \- lernid-classroom configuration files
+
+.SH DESCRIPTION
+This manual page explains the
+lernid-classroom configuraiton files.
+Each has an arbitrary name and uses the config file syntax.
+Each is located in /etc/lernid-classrooms.d
+.PP
+It is recommended to name each file after the classroom described.
+.PP
+The fields are described below. 
+.PP
+
+.SH SECTION NAME
+The section name ("[some name]") beginning the file is the name of the classroom described.
+
+.SH FIELDS
+.br
+Each field is followed by a colon, a space, and a value.
+.B
+.IP "homepage"
+The initial page that should be displayed by Lernid's web browser.
+.B
+.IP "classroom"
+The IRC room name of the classroom.
+.B
+.IP chat
+The IRC room name of the room for class discussion and questions.
+.B
+.IP "icalurl"
+The url of the calendar containing this classroom's sessions.
+.B
+.IP question_token
+The token that should be used in this classroom to mark questions of the session's
+instructor.
+.B
+.IP "locale"
+The locale for sessions for the classroom.
+.B
+.IP logstring
+The string used to create the url for accessing the classroom logs. The year,
+month and day of the month are inserted (in that order).
+.B
+.IP "server"
+IRC server containing the above classrooms.
+.br
+.P
+question_token overrides the default value selected by the locale field. If neither is provided
+the default question_token is "QUESTION:"
+.SH FILES
+vcal calendars contain classroom session names, times, and description items.
+
+The vcal calendar event description may contain the following fields:
+.br
+Each field is followed by a colon, a space, and a value.
+.B
+.IP description
+The description of the session.
+.B
+.IP instructors
+The IRC nicknames of the instructor or instructors of the session.
+.B
+.IP "helpers (optional)"
+The IRC nicknames of those who may assist with the session and may help
+control it.
+.B
+.IP "slides (optional)"
+The url of a .pdf file containing the slides to be used. Each is a page of the pdf.
+.B
+.IP "event (optional)"
+The event of which this session is a part.
+.B
+.IP "locale (optional)"
+The locale for the session.
+.B
+.IP "question_token (optional)"
+The token that should be used in this classroom to mark questions of the session's
+instructor.
+.P
+The session's locale and question_token values override those specified for the
+classroom as a whole, above, and again the question_token value overrides the value
+implied by the locale.
+.SH EXAMPLE
+[#ubuntu-classroom -- In English] 
+.br
+homepage: https://wiki.ubuntu.com/Classroom
+.br
+classroom: ubuntu-classroom
+.br
+chat: ubuntu-classroom-chat
+.br
+logstring: http://irclogs.ubuntu.com/%04d/%02d/%02d/%%23ubuntu-classroom.html
+.br
+icalurl: http://www.google.com/calendar/ical/[e-mail]/public/basic.ics

=== added file 'lernid.1'
--- lernid.1	1970-01-01 00:00:00 +0000
+++ lernid.1	2012-05-07 00:49:19 +0000
@@ -0,0 +1,82 @@
+.TH lernid 1 "April 7, 2012" ""
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+
+.SH NAME
+lernid \- program for participating in Ubuntu learning events
+
+.SH SYNOPSIS
+.B lernid
+.RI [ options ]
+.br
+
+.SH DESCRIPTION
+This manual page explains the
+.B lernid
+program. This program allows you to easily participate in Ubuntu Learning events. It connects to the IRC classroom and classroom-chat sessions simultaneously, displaying web pages and slides the instructor presents. You can discuss the class and ask questions in the classroom-chat window.  Use the message box, at the bottom right of the screen, to send your input to the
+class.
+.PP
+You can ask questions to be answered by the instructor as part of the class by
+preceding it with the tag "QUESTION:". Checking the checkbox near the message box will do that for you automatically. If the class is being taught in a language other
+than English the token may change to match.
+.PP
+In Preferences, two layouts are available, horizontal and vertical, which switch whether the browser and slides (if any) are on top or on the left of the classroom and chatroom panes. Choose whichever best matches your screen, and your convenience. Other preferences may be set as well.
+.PP
+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.
+.PP
+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.
+.SH OPTIONS
+.B
+.IP " -v,  --verbose"
+Show debug messages
+.B
+.IP "-d, --debug"
+Show debug and classroom management messages
+.B
+.IP "--classroom"
+Use alternate classroom
+.B
+.IP "--chatroom"
+Use alternate chatroom
+.B
+.IP "--config"
+Use alternate configuration at this url. If desired, can be specified as, for example,  file:///x/y/z . Used for testing.
+.B
+.IP "--calendar"
+Use an alternate calendar at this url. If desired, can be specified as, for example,  file:///x/y/z . Used for testing.
+.B
+.IP "--no-update"
+Only update the schedule when connecting to an event, or when the refresh button
+is pressed
+.B
+.IP "--web-chat"
+Use web browser to connect to IRC chatrooms.
+.B
+.IP "--unsafe-override"
+Allow anyone sending messages to the classroom to provide slides and web pages to your session. Normally only those authorized to present sessions are allowed to control these features of Lernid.
+
+.SH FILES
+/etc/lernid-classroom.d/ config files
+.P
+vcal files
+
+.SH DIRECTIVES
+As you follow a class, assuming the speaker is listed in the schedule, the
+browser will follow URL's he or she posts. If slides are being used you may
+also see the following commands used:
+.B
+.IP "[slide n]"
+This directive from the speaker will cause the slide to change to page 
+.I n
+.B
+.IP "[slidefile URL]"
+This directive will cause lernid to load the PDF at that URL as a set of slides.
+.B
+.IP "[slidefile URL n]"
+This directive will cause lernid to load the PDF at that URL and switch to
+page
+.I n
+.SH "SEE ALSO"
+.B
+lernid-classroom(5)
+config files

=== modified file 'lernid/ConnectDialog.py'
--- lernid/ConnectDialog.py	2010-03-01 19:51:16 +0000
+++ lernid/ConnectDialog.py	2012-05-07 00:49:19 +0000
@@ -56,8 +56,10 @@
 
         store = gtk.ListStore(gobject.TYPE_STRING)
         eventman = EventManager.get_instance()
+        self._eventlist=[]
         for s in eventman.get_available_events():
             store.append([s])
+            self._eventlist += [unicode(s),]
 
         self.event_combo = self.builder.get_object("event_combo")
         self.event_combo.set_model(store)
@@ -98,6 +100,12 @@
     def get_event(self):
         return self.builder.get_object('event_combo').get_active_text()
 
+    def set_event(self, event):
+        if not event in self._eventlist:
+            return False
+        index = self._eventlist.index(event)
+        return self.builder.get_object('event_combo').set_active(index)
+
     def get_password(self):
         return self.builder.get_object('password').get_text()
 

=== modified file 'lernid/Event.py'
--- lernid/Event.py	2011-08-18 00:53:17 +0000
+++ lernid/Event.py	2012-05-07 00:49:19 +0000
@@ -23,7 +23,7 @@
     def __init__(self, **kwargs):
         for k, v in kwargs.iteritems():
             if k in ('name', 'nick', 'homepage', 'icalurl', 'classroom',
-                     'chat', 'eventstart', 'eventend', 'locale',
+                     'chat', 'eventstart', 'eventend', 'locale', 'logstring',
                      'question_token', 'server'):
                 setattr(self, '_'+k, v)
 
@@ -41,7 +41,10 @@
 
     @property
     def icalurl(self):
-        return self._icalurl
+        if self._icalurl.upper().startswith("HTTPS"):
+            return self._icalurl[0:4] + self._icalurl[5:]
+        else:
+            return self._icalurl
 
     @property
     def classroom(self):
@@ -56,6 +59,10 @@
         return self._locale
 
     @property
+    def logstring(self):
+        return self._logstring
+
+    @property
     def server(self):
         return self._server
 

=== modified file 'lernid/EventManager.py'
--- lernid/EventManager.py	2011-08-27 22:20:55 +0000
+++ lernid/EventManager.py	2012-05-07 00:49:19 +0000
@@ -19,6 +19,7 @@
 ### END LICENSE
 
 import os
+import tempfile
 import gtk
 import glib
 import gobject
@@ -31,7 +32,7 @@
 from lernid.PasswordDialog import PasswordDialog
 from lernid.lernidconfig import save_cache_path
 from lernid.lernidconfig import __lernid_data_directory__
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 from lernid.Event import Event
 from lernid.LernidOptions import Options
 from lernid.Statusbar import Statusbar
@@ -66,29 +67,33 @@
         self._passworddialog = None
         self._widgets = {}
         self._config = ConfigParser.ConfigParser()
-        self._defaultconfig = u"""[All Ubuntu Classroom Sessions] 
+        self._defaultconfig = u"""[#ubuntu-classroom -- In English] 
 homepage: https://wiki.ubuntu.com/Classroom
 classroom: ubuntu-classroom
 chat: ubuntu-classroom-chat
 icalurl: http://www.google.com/calendar/ical/[e-mail]/public/basic.ics
 
-[Ubuntu Classes in Spanish]
+[#ubuntu-charlas -- En Español]
 homepage: https://wiki.ubuntu.com/Classroom
-classroom: ubuntu-classroom-es
-Chat: ubuntu-classroom-chat-es
+classroom: ubuntu-charlas
+Chat:ubuntu-charlas-chat
 locale: es.ES
-icalurl: http://www.google.com/calendar/ical/[e-mail]/public/basic.ics
+icalurl: http://www.google.com/calendar/ical/q16aejpuv5kgmoa7b6ridenkpk%40group.calendar.google.com/public/basic.ics
 """
 
 # Make sure that these names are lower case
-        self.classbotnames = ['classbot', 'classroombot']
+        self.classbotnames = ['classbot', 'classroombot', 'clasebot']
         if Options.get('config'):
             try:
                 self._configtext = self._read_config()
             except IOError:
                 Statusbar.push_message(_('Cannot retrieve configuration'))
                 self._configtext = self._defaultconfig
-            self._config.readfp(io.StringIO(unicode(self._configtext)))
+            tf = tempfile.TemporaryFile()
+            tf.write(self._configtext)
+            tf.seek(0)
+            self._config.readfp(tf)
+            tf.close()
         else:
             if __lernid_data_directory__.startswith('/'):
                 path = '/etc/lernid-classrooms.d'
@@ -134,6 +139,8 @@
             icalurl = self._config.get(event, 'icalurl')
         except:
             icalurl = "http://www.google.com/calendar/ical/[e-mail]/public/basic.ics"
+        if Options.get('calendar'):
+            icalurl = Options.get('calendar')
         try:
             classroom = self._config.get(event, 'classroom')
             if classroom[0] not in '#&!+':
@@ -147,6 +154,10 @@
         except:
             chat = "#ubuntu-classroom-chat"
         try:
+            logstring= self._config.get(event, 'logstring')
+        except:
+            logstring = None
+        try:
             locale = self._config.get(event, 'locale')
         except:
             locale = None
@@ -170,6 +181,7 @@
             eventend=eventend,
             locale = locale,
             question_token = question_token,
+            logstring = logstring,
             server = server
         )
         logging.debug('connecting to event {0}'.format(event))
@@ -181,7 +193,7 @@
         server = Server.get_server('irc.freenode.net', nick, self)
         identifier = server.identify_nick(password)
         def update_statusbar(obj):
-            Statusbar.push_message(_('Your nickname is now identified'), duration=60)
+            Statusbar.push_message(_('Your nickname is now identified'), duration=15)
         identifier.connect('identified', update_statusbar)
         def retry(obj):
             if not self._passworddialog:
@@ -198,6 +210,9 @@
             self._connectdialog = ConnectDialog.NewConnectDialog()
             self._connectdialog.set_transient_for(parent)
             self._connectdialog.connect('response', self._connect_dialog_first_response)
+            config_event = Preferences.get('event')
+            if config_event:
+                self._connectdialog.set_event(config_event[1:-1])
             self._connectdialog.set_nick(Preferences.get('nick'))
             self._connectdialog.set_transient_for(widget)
         self._connectdialog.show()
@@ -209,6 +224,7 @@
 
     def _connect_dialog_response(self, dialog, response):
         event = self._connectdialog.get_event()
+        Preferences.set('event', '"%s"' % event)
         nick = self._connectdialog.get_nick()
         Preferences.set('nick', nick)
         self._connect_event(event, nick)

=== modified file 'lernid/IrcBackend.py'
--- lernid/IrcBackend.py	2011-08-27 23:01:16 +0000
+++ lernid/IrcBackend.py	2012-05-07 00:49:19 +0000
@@ -31,6 +31,8 @@
 
 import logging
 from lernid.LernidOptions import Options
+from lernid.lernidconfig import VERSION
+from lernid.Statusbar import Statusbar
 
 DBUS_PROPERTIES = dbus.PROPERTIES_IFACE
 
@@ -59,6 +61,7 @@
         gobject.GObject.__init__(self)
         self._eventman = eventman
         self._nick = nick
+        self._temp_nick = nick[0:9] + str(random.randint(0,999999))
         self._server = server
         self._channels = {}
         self._private_channels = {}
@@ -68,7 +71,7 @@
         self._unconnected_private_channels = {}
         self._nickidentifier = None
         self._load_manager()
-        self._request_connection(server, nick)
+        self._request_connection(server, self._temp_nick)
         self._conn_timeout = None
 
     @property
@@ -86,7 +89,7 @@
         if server in _server_instances:
             server_obj = _server_instances[server]
             server_obj.nick = nick
-            server_obj._request_connection(server, nick)
+            server_obj._request_connection(server, server_obj._temp_nick)
             return server_obj
         else:
             obj = cls(server, nick, eventman)
@@ -131,7 +134,7 @@
         if self._state == self.DISCONNECTED:
             self._state = self.CONNECTING
             self._cm[CONNECTION_MANAGER].RequestConnection('irc',
-                {'account': nick, 'server': server},
+                {'account': nick, 'server': server, 'fullname': VERSION},
                 reply_handler=self._got_connection,
                 error_handler=self.error)
         else:
@@ -142,6 +145,7 @@
         self._conn = telepathy.client.Connection(
             bus_name, object_path,
             ready_handler=self._ready)
+        self._conn._acquired_nick = ''
         self._conn[CONNECTION].connect_to_signal('StatusChanged',
                                                  self._status_changed)
         self._conn[CONNECTION].Connect(reply_handler=ignore,
@@ -153,6 +157,9 @@
     def _ready(self, connection):
         logging.debug('server ready')
         self._state = self.CONNECTED
+        self._conn[CONNECTION_INTERFACE_RENAMING].RequestRename(self._nick)
+        logging.debug('nick potentially changed in _ready handler to %s' % \
+            self._nick)
         glib.source_remove(self._conn_timeout)
         self._conn_timeout = None
         for channel in self._unconnected_channels.keys():
@@ -196,7 +203,11 @@
             self.emit('connected')
         elif status == CONNECTION_STATUS_DISCONNECTED:
             logging.debug('disconnected from server')
+            if self._conn_timeout:
+                glib.source_remove(self._conn_timeout)
+                self._conn_timeout = None
             for chan in self._channels.values():
+                chan._c_disconnect()
                 self._unconnected_channels[chan] = True
             for chan in self._private_channels.values():
                 self._unconnected_private_channels[chan] = True
@@ -210,9 +221,6 @@
                 self._nick = '{0}{1}'.format(self._nick, random.randint(10, 99))
                 self._request_connection(self._server, self._nick)
             if reason == CONNECTION_STATUS_REASON_NETWORK_ERROR:
-                if self._conn_timeout:
-                    glib.source_remove(self._conn_timeout)
-                    self._conn_timeout = None
                 self._eventman.emit('event-interrupted', self._eventman._event)
 
     def disconnect(self):
@@ -222,8 +230,13 @@
             logging.debug("Server Disconnect Done")
         def disconnect_error_cb(error):
             pass
+        if self._conn_timeout:
+            glib.source_remove(self._conn_timeout)
+            self._conn_timeont = None
         self._conn[CONNECTION].Disconnect(reply_handler=disconnect_cb,
                                           error_handler=disconnect_error_cb)
+        self._state = self.DISCONNECTED
+        self._conn = None
         self._nickidentifier = None
 
     def error(self, e):
@@ -231,7 +244,7 @@
         self._state = self.DISCONNECTED
         if e.get_dbus_name() == 'org.freedesktop.DBus.Error.ServiceUnknown':
             self._load_manager()
-            self._request_connection(self._server, self._nick)
+            self._request_connection(self._server, self._temp_nick)
         else:
             self.disconnect()
 
@@ -262,6 +275,8 @@
         logging.debug('channel created')
         gobject.GObject.__init__(self)
         self._name = name
+        self._signal_matches = []
+        self._my_handle = None
 
     def do_connect(self, connection, object_path, properties):
         """Should only be called by Server"""
@@ -300,19 +315,40 @@
     def _ready(self, channel):
         """We have joined the channel."""
         logging.debug('connected channel %s' % self.name)
-        self._chan[CHANNEL_INTERFACE_GROUP].connect_to_signal('MembersChanged',
-                                                              self._members_changed)
+        match = self._chan[CHANNEL_INTERFACE_GROUP].connect_to_signal('MembersChanged',
+                                     self._members_changed)
+        self._signal_matches.append(match)
         self._chan[CHANNEL_INTERFACE_GROUP].GetMembers(reply_handler=self._update_members,
                                                        error_handler=self._conn.error)
-        self._chan[CHANNEL_TYPE_TEXT].connect_to_signal('Received', self._received_message)
+        match = self._chan[CHANNEL_TYPE_TEXT].connect_to_signal('Received', self._received_message)
+        self._signal_matches.append(match)
         self.emit('joined')
 
+    def _c_disconnect(self):
+        for match in self._signal_matches:
+            match.remove()
+        self._signal_matches = []
+
     def _update_members(self, handles):
         def update_cb(ids):
             self._members.update(zip(handles, ids))
             if Options.get('more_verbose'):
                 logging.debug('members updated')
             self.emit('members-changed', self.get_members())
+            if self._my_handle:
+                try:
+                    my_alias = self._members[self._my_handle]
+                except:
+                    return
+                if not my_alias == self._conn._acquired_nick:
+                    self._conn._acquired_nick = my_alias
+                    Statusbar.push_message(_('Nick assigned by server: %s' % my_alias), duration=20)
+                    logging.debug('Nick assigned by server: %s' % my_alias)
+        def update_my_handle(handle):
+            self._my_handle = handle
+        # If this first call doesn't return before the Aliases come back
+        # we can set our alias name the next time membership in a room changes
+        self._my_handle = self._conn[CONNECTION].GetSelfHandle(reply_handler=update_my_handle, error_handler=lambda x: None)
         self._conn[CONNECTION_INTERFACE_ALIASING].RequestAliases(
              handles,
              reply_handler=update_cb,
@@ -397,8 +433,7 @@
         self.emit('joined')
 
     def _received_message(self, id, timestamp, sender_handle, msgtype, flags, text):
-        if Options.get('more_verbose'):
-            logging.debug('private message received by %s' % self.target)
+        logging.debug('private message by %s is %s' % (self.target,text))
         self.emit('message-received', self.target, text)
 
 
@@ -437,6 +472,11 @@
     def _msg_received(self, chan, sender, msg):
         if msg.startswith('You are now identified'):
             logging.debug('identified nick')
+            handle = self._conn[CONNECTION].GetSelfHandle()
+            logging.debug('our handle before the rename is %s' %  self._conn[CONNECTION_INTERFACE_ALIASING].RequestAliases([handle])[0])
+            self._conn[CONNECTION_INTERFACE_RENAMING].RequestRename(self._nick)
+            logging.debug('nick potentially changed in ident. handler to %s'% \
+                self._nick)
             self.emit('identified')
         elif msg.startswith('Invalid password'):
             logging.debug('invalid password')

=== renamed file 'lernid/CouchDBPreferences.py' => 'lernid/LernidPreferences.py'
--- lernid/CouchDBPreferences.py	2011-08-28 13:38:22 +0000
+++ lernid/LernidPreferences.py	2012-05-07 00:49:19 +0000
@@ -18,8 +18,6 @@
 ### END LICENSE
 
 
-from desktopcouch.records.server import CouchDatabase
-from desktopcouch.records.record import Record
 from ConfigParser import RawConfigParser
 from lernid.lernidconfig import save_cache_path
 from lernid.LernidOptions import Options
@@ -31,24 +29,12 @@
     _instance = None
 
     def __init__(self):
-        self._db_name = 'lernid'
         self._parser = RawConfigParser()
-        self._parser.add_section(self._db_name)
-        try:
-            self._database = CouchDatabase(self._db_name, create=True)
-        except:
-            self._database = False
-            logging.debug('desktopcouch not available')
-        if Options.get('avoid_desktopcouch'):
-            logging.info('avoiding desktopcouch')
-            self._database = False
-        self._record_type = "http://wiki.ubuntu.com/Quickly/RecordTypes/Lernid/Preferences"
-        self._key = None
+        self._parser.add_section('lernid')
         self._load_preferences()
 
     def _load_preferences(self):
         self._preferences = {
-            'record_type': self._record_type,
             'vertical': False,
             'show_appindicator': True,
             'main_window_maximize': False,
@@ -58,52 +44,77 @@
             'links_in_default_browser': False
 
         }
-        if self._database:
-            results = self._database.get_records(record_type=self._record_type, create_view=True)
-            if len(results.rows) == 0:
-                #no preferences have ever been saved
-                #save them before returning
-                self._key = self._database.put_record(Record(self._preferences))
+        file_name = save_cache_path('lernid')+'/config'
+        try:
+            config_file = open(file_name, 'r')
+        except: 
+            return
+        self._parser.readfp(config_file)
+        config_file.close()
+        for item in self._parser.items('lernid'):
+            if item[0] == 'width':
+                if 'main_window_size' not in self._preferences:
+                    self._preferences['main_window_size'] = dict()
+                self._preferences['main_window_size']['width'] = int(item[1])
+                continue
+            if item[0] == 'height':
+                if 'main_window_size' not in self._preferences:
+                    self._preferences['main_window_size'] = dict()
+                self._preferences['main_window_size']['height'] = int(item[1])
+                continue
+            if item[0] == 'hpanesmain':
+                if 'hpanes' not in self._preferences:
+                    self._preferences['hpanes'] = dict()
+                self._preferences['hpanes']['main'] = int(item[1])
+                continue
+            if item[0] == 'hpanessub':
+                if 'hpanes' not in self._preferences:
+                    self._preferences['hpanes'] = dict()
+                self._preferences['hpanes']['sub'] = int(item[1])
+                continue
+            if item[0] == 'vpanesmain':
+                if 'vpanes' not in self._preferences:
+                    self._preferences['vpanes'] = dict()
+                self._preferences['vpanes']['main'] = int(item[1])
+                continue
+            if item[0] == 'vpanessub':
+                if 'vpanes' not in self._preferences:
+                    self._preferences['vpanes'] = dict()
+                self._preferences['vpanes']['sub'] = int(item[1])
+                continue
+            if item[1].startswith('{'):        # remove old style unused options
+                r = self._parser.remove_option('lernid', item[0])
+                continue
+            elif item[1] == "True":
+                self._preferences[item[0]] = True
+            elif item[1] == "False":
+                self._preferences[item[0]] = False
             else:
-                prefs = results.rows[0].value
-                self._preferences.update(prefs)
-                self._key = prefs["_id"]
-                self._database.update_fields(self._key, self._preferences)
-        else:
-            file_name = save_cache_path('lernid')+'/config'
-            try:
-                config_file = open(file_name, 'r')
-            except: 
-                return
-            self._parser.readfp(config_file)
-            config_file.close()
-            for item in self._parser.items(self._db_name):
-                if item[1].startswith('{'):
-                    continue
-                elif item[1] == "True":
-                    self._preferences[item[0]] = True
-                elif item[1] == "False":
-                    self._preferences[item[0]] = False
-                else:
-                    self._preferences[item[0]] = item[1]
+                self._preferences[item[0]] = item[1]
 
     def _update(self, prefs):
-        if '_id' in prefs: del prefs['_id']
-        if '_rev' in prefs: del prefs['_rev']
         self._preferences.update(prefs)
-        if self._database:
-            self._database.update_fields(self._key, prefs)
 
     def _flush(self):
        for item in self._preferences:
-           if item == '_id':
-               continue
-           if item == '_rev':
-               continue
-           if item == 'record_type':
-               continue
-           self._parser.set(self._db_name, item, self._preferences[item])
-       
+           if item == 'hpanes':
+               self._parser.set('lernid', 'hpanesmain',
+                   self._preferences[item]['main'])
+               self._parser.set('lernid', 'hpanessub',
+                   self._preferences[item]['sub'])
+           elif item == 'vpanes':
+               self._parser.set('lernid', 'vpanesmain',
+                   self._preferences[item]['main'])
+               self._parser.set('lernid', 'vpanessub',
+                   self._preferences[item]['sub'])
+           elif item == 'main_window_size':
+               self._parser.set('lernid', 'width',
+                   self._preferences[item]['width'])
+               self._parser.set('lernid', 'height',
+                   self._preferences[item]['height'])
+           else:
+               self._parser.set('lernid', item, self._preferences[item])
+
        config_file = open(save_cache_path('lernid')+'/config', 'w')
        self._parser.write(config_file)
        config_file.close()

=== modified file 'lernid/PreferencesLernidDialog.py'
--- lernid/PreferencesLernidDialog.py	2010-03-08 06:06:05 +0000
+++ lernid/PreferencesLernidDialog.py	2012-05-07 00:49:19 +0000
@@ -20,7 +20,7 @@
 import gtk
 
 from lernid.lernidconfig import get_data_path
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 
 class PreferencesLernidDialog(gtk.Dialog):
     __gtype_name__ = "PreferencesLernidDialog"

=== modified file 'lernid/Sessions.py'
--- lernid/Sessions.py	2011-08-27 22:20:55 +0000
+++ lernid/Sessions.py	2012-05-07 00:49:19 +0000
@@ -25,9 +25,10 @@
 
 import lernid.DateTime as dt
 import io
+import gio, glib
 from datetime import timedelta
 
-one_week = timedelta(days=7)
+half_year = timedelta(days = 183)
 
 class Session(object):
 
@@ -35,8 +36,15 @@
 
     def __init__(self, **kwargs):
         for k, v in kwargs.iteritems():
-            if k in ('title', 'description', 'instructors', 'helpers', 'local_start', 'local_end', 'slides', 'event', 'locale', 'question_token'):
-                setattr(self, '_'+k, v)
+            if k in ('uid', 'title', 'description', 'instructors', 
+               'helpers', 'local_start', 'local_end', 'slides', 
+               'event', 'locale', 
+               'question_token'):
+                    setattr(self, '_'+k, v)
+
+    @property
+    def uid(self):
+        return self._uid
 
     @property
     def title(self):
@@ -103,9 +111,13 @@
         if now > end:
             return self.PAST
 
+def start_read_ical(url, when_done_cb, cancellable, data):
+    gfile = gio.File(uri=url)
+    r = gfile.load_contents_async(when_done_cb, cancellable=cancellable,
+        user_data=data)
 
-def parse_ical(event):
-    """Parse iCal schedule for event and generate a list of Session objects"""
+def read_ical(gfile,result,userdata):
+    event, old_ical = userdata
     default_cal_error = (
 u"""BEGIN:VCALENDAR
 BEGIN:VEVENT
@@ -115,7 +127,42 @@
 SUMMARY: """ +   _('Unable to load calendar %s\n') + 
 u"""END:VEVENT
 END:VCALENDAR""")   % event.icalurl
-    default_cal_error2 = (
+
+    try:
+        
+        ical = unicode(gfile.load_contents_finish(result)[0])
+        icf = io.StringIO(ical)
+        ical_output = io.StringIO()
+        # DTSTAMP is changed for each calendar entry each time, but isn't
+        # significant--remove them
+        for i in icf.readlines():
+            if i[0:8] != u'DTSTAMP:':
+                ical_output.write(i)
+        ical = ical_output.getvalue()
+        icf.close()
+        ical_output.close()
+    except gio.Error, information:
+        if information.code == gio.ERROR_CANCELLED:
+            logging.debug('Ignoring the completion of a cancelled cal. load')
+            return ''
+        logging.error('Unable to open calendar %s' % gfile.get_uri())
+        logging.error(information)
+        if old_ical:
+            ical = old_ical
+        else:
+            ical = default_cal_error
+    except glib.GError, information:
+        logging.error('Unable to open calendar %s' % gfile.get_uri())
+        logging.error(information)
+        if old_ical:
+            ical = old_ical
+        else:
+            ical = default_cal_error
+    return ical
+
+
+def parse_ical(event, ical):
+    default_cal_error = (
 u"""BEGIN:VCALENDAR
 BEGIN:VEVENT
 DTSTART:20100101T000000Z
@@ -124,16 +171,12 @@
 SUMMARY: """ + _('Unable to parse calendar %s\n') + 
 u"""END:VEVENT
 END:VCALENDAR""") % event.icalurl
-    try:
-        ical = urllib2.urlopen(event.icalurl, None, 30)
-    except IOError:
-        logging.error('Unable to open calendar %s' % event.icalurl)
-        ical = io.StringIO(default_cal_error)
-    try:
-        cal = vobject.readOne(ical)
+
+    try:
+        cal = vobject.readOne(io.StringIO(ical))
     except:
         logging.critical('Error parsing calendar at %s' % event.icalurl)
-        cal = vobject.readOne(io.StringIO(default_cal_error2))
+        cal = vobject.readOne(io.StringIO(default_cal_error))
 
     sessions = []
 
@@ -158,12 +201,17 @@
             summary = session.summary.value
         else:
             summary = _('Missing Session Name')
+        if hasattr(session, "uid"):
+            uid = session.uid
+        else:
+            uid = 0
         if eventstart_local <= local_start <= eventend_local:
-            if local_start > dt.now_local() - one_week:
+            if local_start > dt.now_local() - half_year:
                 sessions.append(Session(
                     title = summary,
                     local_start = local_start,
                     local_end = local_end,
+                    uid = uid,
                     **session_data))
 
     # reverse the list to get the events in chronological order

=== modified file 'lernid/lernidconfig.py'
--- lernid/lernidconfig.py	2011-09-03 19:34:22 +0000
+++ lernid/lernidconfig.py	2012-05-07 00:49:19 +0000
@@ -31,7 +31,7 @@
 
 def _(message): return message
 
-VERSION = '0.8.2.2'
+VERSION = '0.8.4.7'
 DESCRIPTION = _('Connect to a world of online tutorials quickly and easily.')
 WEBSITE = 'http://wiki.ubuntu.com/Lernid'
 CONTRIBUTORS = [

=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2011-08-27 22:15:03 +0000
+++ lernid/widgets/Browser.py	2012-05-07 00:49:19 +0000
@@ -28,7 +28,7 @@
 from lernid.LernidOptions import Options
 from urlparse import urlparse
 from lernid.lernidconfig import get_data_path, VERSION
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 
 class Browser(Widget):
 
@@ -58,6 +58,7 @@
         parts=useragent.split(' ')
         parts[-1]='lernid/'+VERSION
         browser_settings.set_property('user-agent', ' '.join(parts))
+        browser_settings.set_property('enable-plugins', False)
         self._browser.set_settings(browser_settings)
         
         scroll = builder.get_object('browser_scroll')
@@ -205,7 +206,7 @@
             self.set_location(url)
 
     def _classroom_msg_received(self, classroom, chan, sender, text):
-        if not Options.get('unsafe-override') and not chan.is_moderated() and not self._on_faculty(sender):
+        if not Options.get('unsafe-override') and not self._on_faculty(sender):
             return
         load, ignore = self._parse_urls(text)
         if load and not self._paused:

=== modified file 'lernid/widgets/Classroom.py'
--- lernid/widgets/Classroom.py	2011-08-27 22:06:13 +0000
+++ lernid/widgets/Classroom.py	2012-05-07 00:49:19 +0000
@@ -23,7 +23,7 @@
 import pango
 import time
 
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 from lernid.widgets.IrcWidget import IrcWidget
 
 from lernid import IrcBackend
@@ -78,8 +78,9 @@
         if channelname[0] not in '#&!+':
             channelname = '#' + channelname
         classchan = self._server.get_channel(channelname)
+        self._chan = classchan  # Save for IRC widget use
         def joined(server):
-            Statusbar.push_message(_('Joined classroom'))
+            Statusbar.push_message(_('Joined classroom'),  duration=10)
             self._textview.set_sensitive(True)
         self.event_connect_signal(classchan, 'joined', joined)
         self.event_connect_signal(classchan, 'message-received', self._message_received)

=== modified file 'lernid/widgets/IrcWidget.py'
--- lernid/widgets/IrcWidget.py	2011-08-13 02:05:14 +0000
+++ lernid/widgets/IrcWidget.py	2012-05-07 00:49:19 +0000
@@ -24,7 +24,7 @@
 import re
 
 from lernid.widgets.Widget import Widget
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 
 from lernid import IrcBackend
 
@@ -77,17 +77,21 @@
         else:
             if sender:
                 self._buffer.insert_with_tags_by_name(iend, '<%s> ' % sender, 'gray')
-            start_pos = iend.get_offset()
-            if self._nick in text and sender != self._nick:
-                self._buffer.insert_with_tags_by_name(iend, text, 'highlight')
-            elif self._on_faculty(sender):
-                self._buffer.insert_with_tags_by_name(iend, text, 'highlight')
-            elif sender.lower() in self._classbotnames:
-                self._buffer.insert_with_tags_by_name(iend, text, 'italicize')
+                start_pos = iend.get_offset()
+                my_nick = self._chan._conn._acquired_nick
+                if my_nick in text and sender != my_nick:
+                    self._buffer.insert_with_tags_by_name(iend, text, 'highlight')
+                elif self._on_faculty(sender):
+                    self._buffer.insert_with_tags_by_name(iend, text, 'highlight')
+                elif sender.lower() in self._classbotnames:
+                    self._buffer.insert_with_tags_by_name(iend, text, 'italicize')
+                else: self._buffer.insert(iend, text)
             else:
                 self._buffer.insert(iend, text)
 
-        for url in re.finditer(r"https?://\S+", unicode(text, 'utf-8')):
+        if type(text)!=unicode:
+            text=unicode(text, 'utf-8')
+        for url in re.finditer(r"https?://\S+", text):
             self._buffer.apply_tag_by_name('hyperlink',
                 self._buffer.get_iter_at_offset(start_pos + url.start()),
                 self._buffer.get_iter_at_offset(start_pos + url.end()))

=== modified file 'lernid/widgets/NativeChatroom.py'
--- lernid/widgets/NativeChatroom.py	2011-08-27 22:06:13 +0000
+++ lernid/widgets/NativeChatroom.py	2012-05-07 00:49:19 +0000
@@ -25,7 +25,7 @@
 import pango
 import time
 
-from lernid.CouchDBPreferences import Preferences
+from lernid.LernidPreferences import Preferences
 from lernid.widgets.IrcWidget import IrcWidget
 
 from lernid import IrcBackend
@@ -83,6 +83,7 @@
         if channelname[0] not in '#&!+':
             channelname = '#' + channelname
         self._chatchan = self._server.get_channel(channelname)
+        self._chan = self._chatchan   # Save for IRC widget use
         schedule = eventman.get_widget_by_name('schedule')
         self._get_question_token = schedule.get_question_token
 #TRANSLATORS: Future versions will need translations of this word as plugins to match the locale of the target classroom session. The word will prefix questions asked in the chatroom of the instructor
@@ -181,7 +182,7 @@
             self._append_to_buffer(_('IRC commands are not yet supported.'))
         elif self._questioncheckbox.get_active():
             self._questioncheckbox.set_active(False)
-            self._chatchan.send_message(self._get_question_token() + u' ' + u'\u200b\u2006' +  unicode(text))
+            self._chatchan.send_message(self._get_question_token() + u' ' + unicode(text))
         else:
             self._chatchan.send_message(text)
         self._input.set_text('')
@@ -191,7 +192,7 @@
 
     def _message_sent(self, chan, text):
         self._adjust.value = self._adjust.upper - self._adjust.page_size
-        self._append_to_buffer(text, self._nick)
+        self._append_to_buffer(text, chan._conn._acquired_nick)
 
     def _scroll(self, textview, alloc):
         if self._at_bottom is None:

=== modified file 'lernid/widgets/Schedule.py'
--- lernid/widgets/Schedule.py	2011-08-28 14:16:52 +0000
+++ lernid/widgets/Schedule.py	2012-05-07 00:49:19 +0000
@@ -21,8 +21,11 @@
 import glib
 import gobject
 import gtk
+import gio
 import os
 import time
+import urlparse
+import random
 import pynotify
 import logging
 from datetime import timedelta
@@ -30,7 +33,8 @@
 import lernid.DateTime as dt
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import get_data_path
-from lernid.Sessions import Session, parse_ical
+from lernid.Sessions import Session, parse_ical, read_ical, start_read_ical
+from lernid.LernidOptions import Options
 
 
 class Schedule(Widget):
@@ -46,20 +50,31 @@
         ),
     }
 
-    COL_ICON, COL_DATE, COL_START, COL_END, COL_TITLE, COL_SESSION = range(6)
+    COL_ICON, COL_DATE, COL_START, COL_END, COL_TITLE, COL_SESSION, \
+    COL_DATETIME = range(7)
 
     def __init__(self):
         Widget.__init__(self, 'schedule')
-        viewport = gtk.Viewport()
+        vbox = gtk.VBox()
+        self.add(vbox)
         scroll = gtk.ScrolledWindow()
         scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        viewport.set_shadow_type(gtk.SHADOW_NONE)
-        viewport.add(scroll)
-        self.add(viewport)
+        vbox.pack_start(scroll, expand=True)
+        hbuttonbox = gtk.HBox(False, 0)
+        vbox.pack_start(hbuttonbox, expand=False)
+        self._copy_button = gtk.Button()
+        self._open_button = gtk.Button()
+        self._refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
+        self._refresh_button.set_expand(False)
+        hbuttonbox.pack_start(self._copy_button, True, True, 0)
+        hbuttonbox.pack_start(self._open_button, True, True, 0)
+        hbuttonbox.pack_start(self._refresh_button, True, True, 0)
+        self._button_setup(self._copy_button, self._open_button,
+            self._refresh_button)
 
         self._treeview = gtk.TreeView()
         scroll.add(self._treeview)
-        self._model = gtk.ListStore(str, str, str, str, str, object)
+        self._model = gtk.ListStore(str, str, str, str, str, object, object)
         self._treeview.set_model(self._model)
         self._treeview.set_search_column(self.COL_TITLE)
         def search_equal_func(model, column, key, iter):
@@ -67,6 +82,25 @@
                 return False
             return True
         self._treeview.set_search_equal_func(search_equal_func)
+        def session_clicked_cb(tv, event, self):
+            if not self._event:
+                logging.error('Schedule clicked with no event connected')
+                return
+            logstring = self._event.logstring
+            if not logstring:
+                logging.debug('Schedule clicked, but no event logging'
+                ' specified')
+                return
+            i = tv.get_path_at_pos(int(event.x), int(event.y))
+            if not i:
+                return
+            row = tv.get_model()[i[0][0]]
+            if not row[self.COL_DATETIME]:
+                return
+            date_time = row[self.COL_DATETIME]
+            url = logstring % (date_time.year, date_time.month, date_time.day)
+            gtk.show_uri(None, url, gtk.gdk.CURRENT_TIME)
+        self._treeview.connect('button-release-event', session_clicked_cb, self)
         self._treeview.set_headers_visible(False)
 
         column = gtk.TreeViewColumn()
@@ -116,11 +150,114 @@
         self._schedule = None
         self._current_session = None
         self._update_handle = None
+        self._ical = None
+        self._icalurl = None
+        self._connected = False
+        self._ircdate = (dt.now_utc() - timedelta(minutes=70)).date()
+        self._cancellable = None
+        self._event = None
 
         self.show_all()
 
+    def _scramble_case(self, string):
+        if '@' in string:
+            pstring = string.split('@')
+            newstring = pstring[0] + '@'
+            string = pstring[1]
+        else:
+            newstring = ''
+        random.seed()
+        for s in string:
+            if random.random() >= .5:
+               newstring += s.upper()
+            else:
+               newstring += s.lower()
+        return newstring
+        # scramble the case of the url for this event connection.
+        # Avoids occasional problem with gvfsd-http wedging 
+        # particular url's after loss of connectivity
+
     def do_event_connect(self, event_man, event):
         self._event = event_man.current_event()
+        self._connected = True
+        self._last_upcoming_announce = None
+        def finished_initial_ical_load_cb(gfile, result, unused):
+            ical = read_ical(gfile, result, (event,self._ical))
+            if ical == '': 
+                return # Do nothing for cancelled I/O Operation
+            self._ical = ical
+            logging.debug('Finished initial ical load')
+            if not (gfile.get_uri() == self._icalurl): # Sanity Check
+                logging.debug('Old I/O completion ignored')
+                return
+            self._cancellable = None
+            if not self._connected or not self._event:
+                return
+            self._update(event, self._ical, initial=True)
+            secs = time.localtime().tm_sec
+            self._update_handle = glib.timeout_add_seconds(65-secs, self._calendar_refresh, event)
+        parsed = [j for j in urlparse.urlparse(event.icalurl)]
+        parsed[1]= self._scramble_case(parsed[1])
+        self._icalurl = urlparse.urlunparse(parsed)
+        cancellable = gio.Cancellable()
+        start_read_ical(self._icalurl, finished_initial_ical_load_cb,
+            cancellable, (None, None))
+        self._cancellable = cancellable
+        logging.debug('Started initial ical load %s' % self._icalurl)
+
+    def _calendar_refresh(self, event, force_update=False):
+        def finished_refresh_ical_load_cb(gfile, result, data):
+            force_reload, irclog_force = data
+            ical = read_ical(gfile, result, (event, self._ical))
+            if ical == '':
+                return # Do nothing for a cancelled calendar read
+            if not (gfile.get_uri() == self._icalurl): # Sanity Check
+                logging.debug('Old I/O completion ignored')
+                return
+            self._cancellable = None
+            logging.debug('Finished ical load')
+            if not self._connected or not self._event:
+                return
+            if ical == self._ical and not irclog_force:
+                logging.debug('Skipping Update--Calendar Unchanged')
+                self._update_currency()
+            else:
+                self._ical = ical
+                logging.debug('Updating Schedule')
+                self._update(event, self._ical)
+            secs = time.localtime().tm_sec
+            self._update_handle = glib.timeout_add_seconds(65-secs, self._calendar_refresh, event)
+            return
+
+        self._update_handle = None
+        irc_force = False
+        now = dt.now_utc()
+        trigger_time = now.minute in [1, 6, 11, 21, 31, 36, 41, 51]
+        trigger_time = trigger_time and not Options.get('no-update')
+        # Trigger in time to be done at :50, :00, :20, and :30 so that session
+        # announcements will be made on time (bearing in mind low bandwidth
+        # connections and the large calendar size
+        ircdate = (now - timedelta(minutes=71)).date()
+        if ircdate != self._ircdate and trigger_time:
+            self._ircdate = ircdate
+            irc_force = True
+            logging.debug('Daily full calendar update %s' % now)
+        if irc_force or force_update or trigger_time:
+            parsed = [j for j in urlparse.urlparse(event.icalurl)]
+            parsed[1]= self._scramble_case(parsed[1])
+            self._icalurl = urlparse.urlunparse(parsed)
+            cancellable = gio.Cancellable()
+            start_read_ical(self._icalurl, finished_refresh_ical_load_cb, 
+                cancellable, (force_update, irc_force))
+            self._cancellable = cancellable
+            logging.debug('Started ical load')
+        else:
+            self._update_currency()
+            secs = time.localtime().tm_sec
+            self._update_handle = glib.timeout_add_seconds(65-secs, self._calendar_refresh, event) 
+        return False
+
+    def _update(self, event, ical, initial=False):
         def quote(text):
             quote_table = {
                  '<' : '&lt;',
@@ -133,11 +270,40 @@
             for l in text:
                 return_value= return_value + quote_table.get(l,l)
             return return_value
+        def insert_log_line(date, session):
+            difference =  dt.now_utc() - date
+            if difference < timedelta(minutes=70):
+                return # There may not be a log yet
+            sessionrow = ['', '', '', '']
+            formatted_date = date.strftime('%x')
+            localtime = dt.as_local(date)
+            formatted_local = localtime.strftime('%H:00')
+            formatted = \
+            _('<u>Irc Logs for UTC %s </u><i>(Starting at %s local time)</i>') \
+            % (formatted_date, formatted_local)
+            sessionrow.append(formatted)
+            sessionrow.append(session)
+            sessionrow.append(date)
+            self._model.append(sessionrow)
+        
+        def insert_blank_lines(number):
+            for i in range(number):
+                sessionrow = ['', '', '', '', '', None, None]
+                self._model.append(sessionrow)
 
-        self._schedule = parse_ical(event)
+        self._schedule = parse_ical(event, ical)
         self._model.clear()
         self._scroll_to = None
+        self._last_date = None
+        current_row = False
         for session in self._schedule:
+            utc_starttime = dt.as_utc(session.start_datetime)
+            utc_date= dt.datetime(utc_starttime.year, utc_starttime.month,
+                utc_starttime.day, tzinfo=utc_starttime.tzinfo)
+            if (not utc_date == self._last_date):
+                self._last_date = utc_date
+                if event.logstring:
+                    insert_log_line(utc_date, session)
             sessionrow = []
             sessionrow.append('')
             sessionrow.append(session.start_local_date)
@@ -150,39 +316,47 @@
             else:
                 sessionrow.append(title + '<small>' + instructors + '</small>')
             sessionrow.append(session)
+            sessionrow.append(None)
             current_row = self._model.append(sessionrow)
             if not self._scroll_to and session.state in (session.FUTURE, session.NOW):
                 self._scroll_to = self._model.get_path(current_row)
-
-        self._update()
-
-        if self._scroll_to:
+        if not self._scroll_to and current_row:
+            self._scroll_to = self._model.get_path(current_row)
+        self._update_currency()
+
+        insert_blank_lines(40)
+
+        if initial and self._scroll_to:
             self._treeview.scroll_to_cell(self._scroll_to, use_align=True, row_align=.2)
 
-        def set_timeout():
-            self._update_handle = glib.timeout_add_seconds(60, self._update)
-        # Wait at least one minute before updating again,
-        # to avoid duplicate notifications.
-        secs = time.localtime().tm_sec
-        glib.timeout_add_seconds(65-secs, set_timeout)
 
         self._treeview.set_headers_visible(True)
 
     def do_event_disconnect(self, event_man, event):
+        self._connected = False
         self._schedule = []
         self._current_session = None
         self._model.clear()
         if self._update_handle:
             glib.source_remove(self._update_handle)
+            self._update_handle = None
+        if self._cancellable:
+            self._cancellable.cancel()
+            self._cancellable = None
         self._treeview.set_headers_visible(False)
+        self._event = None
 
-    def _update(self):
+    def _update_currency(self):
         ended = False
         if self._current_session and self._current_session.state == Session.PAST:
             ended = True
             self._current_session = None
         for i, row in enumerate(self._model):
             session = row[self.COL_SESSION]
+            if session == None:
+                continue
+            if self._current_session and self._current_session.uid == session.uid:
+                self._current_session = session  
             if session.state == Session.NOW:
                 row[self.COL_ICON] = gtk.STOCK_GO_FORWARD
                 if session != self._current_session:
@@ -201,9 +375,11 @@
             if session.state == Session.FUTURE:
                 row[self.COL_ICON] = None
                 if timedelta(minutes=9) < session.start_datetime - dt.now_local() < timedelta(minutes=10):
-                    self.show_notification(
-                        _('Session upcoming'),
-                        _('The session "{0}" will begin in 10 minutes.').format(session.title)
+                    if not self._last_upcoming_announce == session.uid:
+                        self._last_upcoming_announce = session.uid
+                        self.show_notification(
+                            _('Session upcoming'),
+                            _('The session "{0}" will begin in 10 minutes.').format(session.title)
                     )
             if session.state == Session.PAST:
                 row[self.COL_ICON] = gtk.STOCK_NO
@@ -228,10 +404,7 @@
                     return 'PREGUNTA:'
                 else:
                     return 'QUESTIION:'
-        try:
-            event = self._event
-        except:
-            event = None # Called when no event is opened
+        event = self._event
         if event and event.question_token:
             return event.question_token
         if event and event.locale:
@@ -246,3 +419,32 @@
             n.show()
         except:
             logging.debug("Notification failed from Schedule Widget")
+
+    def _button_setup(self, copy_button, open_button, refresh_button):
+        copy_button.set_label(_("Copy Calendar ICAL URL to Clipboard"))
+        open_button.set_label(_("Open Calendar ICAL URL Using Your Browser"))
+        copy_button.connect("clicked", self._copy_button_clicked)
+        open_button.connect("clicked", self._open_button_clicked)
+        refresh_button.connect("clicked", self._refresh_button_clicked)
+
+    def _copy_button_clicked(self, widget):
+        clipboard = gtk.Clipboard()
+        event = self._event
+        if not event:
+            return
+        clipboard.set_text(event.icalurl)
+
+    def _open_button_clicked(self, widget):
+        event = self._event
+        if not event:
+            return
+        gtk.show_uri(None, event.icalurl, gtk.gdk.CURRENT_TIME)
+
+    def _refresh_button_clicked(self, widget):
+        event = self._event
+        if not event:
+            return
+        if self._update_handle:
+           glib.source_remove(self._update_handle)
+           self._update_handle = None
+           self._calendar_refresh(event, force_update=True)

=== modified file 'lernid/widgets/Slide.py'
--- lernid/widgets/Slide.py	2011-08-22 03:14:02 +0000
+++ lernid/widgets/Slide.py	2012-05-07 00:49:19 +0000
@@ -25,7 +25,10 @@
 import re
 import logging
 import gio
-import webbrowser
+import cairo
+import StringIO
+import glib
+import random
 
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import save_cache_path
@@ -87,6 +90,8 @@
         viewport.set_shadow_type(gtk.SHADOW_NONE)
         self._master_slide = None
         self._session_slide_downloaded = False
+        self._cancellable = None
+        self._slide_retry = None
 
         self.connect('expose-event', self._resize)
         self.set_no_show_all(False)
@@ -108,22 +113,28 @@
             self._slidebutton.disconnect(self._slidebutton_cb)
             self._slidebutton_cb = None
         Statusbar.pop_message('slidesession')
+        if self._slide_retry:
+            glib.source_remove(self._slide_retry)
+            self._slide_retry = None
+        if self._cancellable:
+            self._cancellable.cancel()
+            self._cancellable = None
         self.event_disconnect_signals()
 
     def _classroom_msg_received(self, classroom, chan, sender, text):
         matches = re.search(r'\[(?i)SLIDE\s+(\d+).*\]', text)
         if matches and self._session_slide_downloaded:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._change_slide_page(int(matches.groups()[0]))
                 return
         matches = re.search(r'\[(?i)SLIDEFILE\s+(\S+)\s+(\d+).*\]', text)
         if matches:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._download_slides(matches.groups()[0], int(matches.groups()[1]))
                 return
         matches = re.search(r'\[(?i)SLIDEFILE\s+(\S+).*\]', text)
         if matches:
-            if chan.is_moderated() or self._on_faculty(sender):
+            if self._on_faculty(sender):
                 self._download_slides(matches.groups()[0], 1)
                 return
 
@@ -137,10 +148,21 @@
                 return
             page = pdf.get_page(int(pagenumber) - 1)
             w, h = page.get_size()
-            pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, int(w), int(h))
-            page.render_to_pixbuf(0,0,int(w),int(h),1,0, pixbuf)
+            w, h = (int(w), int(h))
+            surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, w, h)
+            context = cairo.Context(surface)
+            page.render(context)
+            # technique from diogodivision's "BlingSwitcher",
+            # through http://www.mikedesjardins.net
+            temp = StringIO.StringIO()
+            surface.write_to_png(temp)
+            temp.seek(0)
+            loader = gtk.gdk.PixbufLoader()
+            loader.write(temp.getvalue())
+            loader.close()
+            pixbuf = loader.get_pixbuf()
         except:
-            Statusbar.push_message(_('An error was encountered while trying to load slide number {0}'.format(pagenumber)), duration=120)
+            Statusbar.push_message(_('An error was encountered while trying to load slide number {0}'.format(pagenumber)), 'slidesession', duration=15)
             logging.debug("Something went wrong when loading slide %s" % pagenumber)
             return
         self._master_slide = pixbuf
@@ -173,8 +195,27 @@
             self._image.set_from_pixbuf(newpb)
             self._image.show()
 
+    @staticmethod
+    def _retry(n): # retry generator
+        for i in range(n):
+            yield random.randint(30,120) # random delay until retry
+        while 1: yield False
+
     def _download_slides(self, slideurl, page):
+        if self._slide_retry:
+            glib.source_remove(self._slide_retry)
+            self._slide_retry = None
+        if self._cancellable:
+            self._cancellable.cancel()
+            self._cancellable = None
+        self._retries = self._retry(3).next # retry generator obj. next method
+        self._download_slides_attempt(slideurl, page)
+
+    def _download_slides_attempt(self, slideurl, page):
+        self._slide_retry = None
+        Statusbar.pop_message('slidesession')
         path = os.path.join(save_cache_path('lernid'), 'slides.pdf')
+        cancellable = gio.Cancellable()
         try:
             logging.debug('downloading slides from %s' % slideurl)
             slidefile = gio.File(slideurl)
@@ -187,16 +228,27 @@
             def reporthook(done_so_far, size):
                 Statusbar.pop_message('slidesession')
                 msg = _('Downloading session slides (%i%% of %i KB)...') % (100*(float(done_so_far) / float(size)), float(size)/float(1024))
-                Statusbar.push_message(msg, 'slidesession')
-            def download_done(giofile, result, self):
+                Statusbar.push_message(msg, 'slidesession', duration=3)
+            def download_done(giofile, result, stuff):
+                    self, slideurl, page, cancellable = stuff
                     try:
                         giofile.copy_finish(result)
+                        self._cancellable = None
                     except gio.Error, information:
-                        Statusbar.push_message(_('An error was encountered while downloading slides'), 'slidesession')
+                        Statusbar.push_message(_('An error was encountered while downloading slides'), 'slidesession', duration=120)
                         logging.debug('Error when downloading slides from %s;  %s' % (slideurl, information))
+                        secs = self._retries()
+                        if secs and not cancellable.is_cancelled():
+                            logging.error( \
+                               'Retrying slide download in %i secs' % secs)
+                            self._slide_retry = glib.timeout_add_seconds(secs,
+                                self._download_slides_attempt, slideurl,
+                                    page) 
+                        else:
+                            logging.error('Slide downloading failed')
                         return
-                    logging.debug('slide download completed')
-                    Statusbar.push_message(_('Slides have been downloaded'), 'slidesession')
+                    logging.debug('Slide download completed')
+                    Statusbar.push_message(_('Slides have been downloaded'), 'slidesession', duration=10)
                     self._session_slide_downloaded = True
                     self.emit('slides-downloaded')
                     self._top.set_tooltip_text(slideurl)
@@ -206,12 +258,19 @@
                         self._open_slides_in_browser,
                         slideurl)
                     self._change_slide_page(page)
-            slidefile.copy_async(destfile, download_done, reporthook, user_data=self, flags=gio.FILE_COPY_OVERWRITE)
+            slidefile.copy_async(destfile, download_done, reporthook, cancellable=cancellable, user_data=(self, slideurl, page, cancellable), flags=gio.FILE_COPY_OVERWRITE)
+            self._cancellable = cancellable
         except gio.Error, information:
-            Statusbar.push_message(_('An error was encountered while downloading slides'), 'slidesession')
+            Statusbar.push_message(_('An error was encountered while downloading slides'), 'slidesession', duration=120)
             logging.debug('Error when downloading slides from %s;  %s' % (slideurl, information))
 
     def _session_changed(self, schedule, session):
+        if self._slide_retry:
+            glib.source_remove(self._slide_retry)
+            self._slide_retry = None
+        if self._cancellable:
+            self._cancellable.cancel()
+            self._cancellable = None
         Statusbar.pop_message('slidesession')
         if session.slides:
             self._download_slides(session.slides, 1)
@@ -222,9 +281,15 @@
             if self._slidebutton_cb:
                 self._slidebutton.disconnect(self._slidebutton_cb)
                 self._slidebutton_cb = None
-            Statusbar.push_message(_('This session does not use slides'), 'slidesession')
+            Statusbar.push_message(_('This session does not use slides'), 'slidesession', duration=10)
 
     def _session_ended(self, schedule):
+        if self._slide_retry:
+            glib.source_remove(self._slide_retry)
+            self._slide_retry = None
+        if self._cancellable:
+            self._cancellable.cancel()
+            self._cancellable = None
         self._image.clear()
         self.hide()
         Statusbar.pop_message('slidesession')
@@ -234,4 +299,4 @@
             self._slidebutton_cb = None
 
     def _open_slides_in_browser(self, widget, url):
-        webbrowser.open_new_tab(url)
+        gtk.show_uri(None, url, gtk.gdk.CURRENT_TIME)

=== modified file 'po/af.po'
--- po/af.po	2010-08-30 04:10:04 +0000
+++ po/af.po	2012-05-07 00:49:19 +0000
@@ -8,21 +8,22 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-29 13:53+0000\n"
-"Last-Translator: Andre Hugo <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 11:37+0000\n"
+"Last-Translator: John S. Gruber <[e-mail]>\n"
 "Language-Team: Afrikaans <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-30 04:10+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Andre Hugo https://launchpad.net/~cortexhugo"
+"  Andre Hugo https://launchpad.net/~cortexhugo\n"
+"  John S. Gruber https://launchpad.net/~jsjgruber"
 
 #: ../data/ui/PasswordDialog.ui.h:1
 msgid "Invalid password"

=== modified file 'po/ar.po'
--- po/ar.po	2010-08-03 03:57:01 +0000
+++ po/ar.po	2012-05-07 00:49:19 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 16:46+0000\n"
+"PO-Revision-Date: 2011-06-04 11:31+0000\n"
 "Last-Translator: Michael Budde <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  MaXo https://launchpad.net/~mahmood-188\n"
-"  Majd Aldin Almontaser https://launchpad.net/~ttmtt-team\n"
+"  Magd Addin M. Almuntaser https://launchpad.net/~ttmtt-team\n"
 "  Michael Budde https://launchpad.net/~mbudde\n"
 "  Yazin Alhamdi https://launchpad.net/~yazin-alhamdi\n"
 "  m.ayad https://launchpad.net/~m-ayad"

=== modified file 'po/da.po'
--- po/da.po	2010-09-07 05:01:51 +0000
+++ po/da.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-09-06 15:36+0000\n"
-"Last-Translator: AJenbo <[e-mail]>\n"
+"PO-Revision-Date: 2011-07-06 08:46+0000\n"
+"Last-Translator: Michael Budde <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-07 05:01+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-07-07 04:52+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -219,7 +219,7 @@
 
 #: ../data/ui/BrowserWidget.ui.h:1
 msgid "Stop browser from changing page"
-msgstr ""
+msgstr "Stop browser fra at skifte side"
 
 #: ../lernid/widgets/Classroom.py:78
 msgid "Joined classroom"
@@ -311,6 +311,18 @@
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "<b>Ressourcer</b>"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "Klasseværelse"
+
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "Chatrum"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "Kursus-plan"
+
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 

=== modified file 'po/de.po'
--- po/de.po	2011-05-17 19:55:17 +0000
+++ po/de.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-10-24 13:24+0000\n"
+"PO-Revision-Date: 2011-06-04 12:11+0000\n"
 "Last-Translator: cmdrhenner <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-25 04:46+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -24,14 +24,15 @@
 "Launchpad Contributions:\n"
 "  AnSc https://launchpad.net/~spam2-anschitech\n"
 "  Bernd Schlapsi https://launchpad.net/~bernd-sch\n"
-"  BuZZ-dEE https://launchpad.net/~buzz-dee\n"
 "  Dennis Lichtenthäler https://launchpad.net/~pvbcharon\n"
 "  Jakob Kramer https://launchpad.net/~jakobk\n"
 "  Johannes Möller https://launchpad.net/~jojo-moeller\n"
 "  Michael Keppler https://launchpad.net/~bananeweizen\n"
-"  MixCool https://launchpad.net/~mixcool\n"
 "  Nico Gulden https://launchpad.net/~ngulden\n"
+"  Sebastian Schlatow https://launchpad.net/~buzz-dee\n"
+"  SpaceCafé https://launchpad.net/~spacecafe\n"
 "  Tobias Baldauf https://launchpad.net/~technopagan\n"
+"  cmdrhenner https://launchpad.net/~cmdrhenner\n"
 "  mogli https://launchpad.net/~patrick-kohan\n"
 "  sebastian-s https://launchpad.net/~sebastian-s"
 
@@ -365,6 +366,12 @@
 #~ msgid "Browser"
 #~ msgstr "Browser"
 
+#~ msgid "Use vertical window layout"
+#~ msgstr "Benutze vertikales Fensterlayout"
+
+#~ msgid "Nick can not contain other characters that A-Z"
+#~ msgstr "Spitzname kann keine anderen Zeichen als A-Z enthalten"
+
 #~ msgid "Even_t"
 #~ msgstr "_Veranstaltung"
 

=== modified file 'po/en_AU.po'
--- po/en_AU.po	2009-12-28 04:53:45 +0000
+++ po/en_AU.po	2012-05-07 00:49:19 +0000
@@ -7,126 +7,324 @@
 msgstr ""
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-23 02:11-0800\n"
-"PO-Revision-Date: 2009-12-27 06:11+0000\n"
-"Last-Translator: Martin Alderson <[e-mail]>\n"
+"POT-Creation-Date: 2010-08-02 16:11+0200\n"
+"PO-Revision-Date: 2011-08-01 05:00+0000\n"
+"Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-28 04:53+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2011-08-02 04:47+0000\n"
+"X-Generator: Launchpad (build 13552)\n"
+
+#: ../data/ui/AboutLernidDialog.ui.h:1
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Colin Dean https://launchpad.net/~colindean\n"
+"  Daniel Bell https://launchpad.net/~danielbell\n"
+"  Jared Norris https://launchpad.net/~jarednorris\n"
+"  Martin Alderson https://launchpad.net/~martinalderson\n"
+"  Steve Garton https://launchpad.net/~sheepeatingtaz"
+
+#: ../data/ui/PasswordDialog.ui.h:1
+msgid "Invalid password"
+msgstr "Invalid password"
+
+#: ../data/ui/PasswordDialog.ui.h:2
+msgid ""
+"The NickServ password you entered was invalid.\n"
+"Please enter the correct password:"
+msgstr ""
+"The NickServ password you entered was invalid.\n"
+"Please enter the correct password:"
+
+#. Translators: Local time representation
+#: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
+#: ../lernid/Sessions.py:60
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:1
+msgid ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgstr ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:2
+msgid "Show an icon in the notification area"
+msgstr "Show an icon in the notification area"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:3
+msgid "Show time in classroom and chatroom"
+msgstr "Show time in classroom and chatroom"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:4
+msgid "Use vertical layout"
+msgstr "Use vertical layout"
+
+#: ../lernid/EventManager.py:96
+msgid "Connecting to event"
+msgstr "Connecting to event"
+
+#: ../lernid/EventManager.py:104
+msgid "Your nickname is now identified"
+msgstr "Your nickname is now identified"
+
+#: ../lernid/EventManager.py:139
+msgid "Disconnecting from event"
+msgstr "Disconnecting from event"
+
+#: ../lernid/widgets/Slide.py:109
+msgid "An error was encountered while trying to load slide number {0}"
+msgstr "An error was encountered while trying to load slide number {0}"
+
+#: ../lernid/widgets/Slide.py:148
+#, python-format
+msgid "Downloading session slides ({0} % of {1:.1} MB)..."
+msgstr "Downloading session slides ({0} % of {1:.1} MB)..."
+
+#: ../lernid/widgets/Slide.py:151
+msgid "Slides have been downloaded"
+msgstr "Slides have been downloaded"
+
+#: ../lernid/widgets/Slide.py:156
+msgid "An error was encountered while downloading slides"
+msgstr "An error was encountered while downloading slides"
+
+#: ../lernid/widgets/Slide.py:168
+msgid "This session does not use slides"
+msgstr "This session does not use slides"
 
 #: ../data/ui/LernidWindow.ui.h:1
-msgid "Browser"
-msgstr "Browser"
+msgid "Classroom"
+msgstr "Classroom"
 
 #: ../data/ui/LernidWindow.ui.h:2
-msgid "Chatroom"
-msgstr "Chatroom"
+msgid "Enter the address you would like to open in the browser:"
+msgstr "Enter the address you would like to open in the browser:"
 
 #: ../data/ui/LernidWindow.ui.h:3
-msgid "Classroom"
-msgstr "Classroom"
+msgid "Eve_nt"
+msgstr "Eve_nt"
 
-#: ../data/ui/LernidWindow.ui.h:4 ../lernid.desktop.in.h:1
+#: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
+#: ../lernid.desktop.in.h:1
 msgid "Lernid"
 msgstr "Lernid"
 
 #: ../data/ui/LernidWindow.ui.h:5
-msgid "Not Connected."
-msgstr "Not Connected."
+msgid "Open _URL..."
+msgstr "Open _URL..."
 
 #: ../data/ui/LernidWindow.ui.h:6
-msgid "Session"
-msgstr "Session"
+msgid "Tweet current session"
+msgstr "Tweet current session"
 
 #: ../data/ui/LernidWindow.ui.h:7
-msgid "_Event"
-msgstr "_Event"
+msgid "_Chatroom"
+msgstr "_Chatroom"
 
 #: ../data/ui/LernidWindow.ui.h:8
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../data/ui/LernidWindow.ui.h:9
+msgid "_Fullscreen"
+msgstr "_Fullscreen"
+
+#: ../data/ui/LernidWindow.ui.h:10
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/ui/AboutLernidDialog.ui.h:1
-msgid "Connect to a world of online tutorials quickly and easily."
-msgstr "Connect to a world of online tutorials quickly and easily."
-
-#: ../data/ui/AboutLernidDialog.ui.h:2
-msgid ""
-"Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License version 3, as published by "
-"the Free Software Foundation.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but  WITHOUT "
-"ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-"SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along  "
-"with this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-"Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License version 3, as published by "
-"the Free Software Foundation.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but  WITHOUT "
-"ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-"SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along  "
-"with this program.  If not, see <http://www.gnu.org/licenses/>."
-
-#: ../data/ui/AboutLernidDialog.ui.h:8
-msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Colin Dean https://launchpad.net/~colindean\n"
-"  Martin Alderson https://launchpad.net/~martinalderson\n"
-"  Steve Garton https://launchpad.net/~sheepeatingtaz"
-
-#: ../lernid.desktop.in.h:2
-msgid "Participate in online learning events"
-msgstr "Participate in online learning events"
+#: ../data/ui/LernidWindow.ui.h:11
+msgid "_Statusbar"
+msgstr "_Statusbar"
+
+#: ../data/ui/LernidWindow.ui.h:12
+msgid "_View"
+msgstr "_View"
+
+#: ../bin/lernid.py:141 ../bin/lernid.py:144 ../bin/lernid.py:199
+msgid "_Session"
+msgstr "_Session"
+
+#: ../bin/lernid.py:208
+msgid "Sche_dule"
+msgstr "Sche_dule"
+
+#: ../bin/lernid.py:215
+msgid "_Terminal"
+msgstr "_Terminal"
+
+#: ../bin/lernid.py:226
+msgid "({0} user)"
+msgid_plural "({0} users)"
+msgstr[0] "({0} user)"
+msgstr[1] "({0} users)"
+
+#: ../bin/lernid.py:290
+msgid "_Show Lernid"
+msgstr "_Show Lernid"
+
+#: ../bin/lernid.py:333
+msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
+msgstr "The session \"{0}\" has started in #ubuntu-classroom on freenode."
+
+#: ../bin/lernid.py:424
+msgid "Show debug messages"
+msgstr "Show debug messages"
+
+#: ../bin/lernid.py:426
+msgid "Override classroom channel"
+msgstr "Override classroom channel"
+
+#: ../bin/lernid.py:428
+msgid "Filename or URL to Lernid config file"
+msgstr "Filename or URL to Lernid config file"
+
+#: ../bin/lernid.py:430
+msgid "Use web chat widget instead of the native one"
+msgstr "Use web chat widget instead of the native one"
+
+#: ../lernid/widgets/Schedule.py:80
+msgid "Date"
+msgstr "Date"
+
+#: ../lernid/widgets/Schedule.py:88
+msgid "Starts"
+msgstr "Starts"
+
+#: ../lernid/widgets/Schedule.py:96
+msgid "Ends"
+msgstr "Ends"
+
+#: ../lernid/widgets/Schedule.py:104 ../lernid/widgets/Schedule.py:109
+msgid "Title"
+msgstr "Title"
+
+#: ../lernid/widgets/Schedule.py:163
+msgid "Session started"
+msgstr "Session started"
+
+#: ../lernid/widgets/Schedule.py:164
+msgid "The session \"{0}\" has started."
+msgstr "The session \"{0}\" has started."
+
+#: ../lernid/widgets/Schedule.py:173
+msgid "Session upcoming"
+msgstr "Session upcoming"
+
+#: ../lernid/widgets/Schedule.py:174
+msgid "The session \"{0}\" will begin in 10 minutes."
+msgstr "The session \"{0}\" will begin in 10 minutes."
+
+#: ../data/ui/BrowserWidget.ui.h:1
+msgid "Stop browser from changing page"
+msgstr "Stop browser from changing page"
+
+#: ../lernid/widgets/Classroom.py:78
+msgid "Joined classroom"
+msgstr "Joined classroom"
 
 #: ../data/ui/ConnectDialog.ui.h:1
+msgid "Advanced options"
+msgstr "Advanced options"
+
+#: ../data/ui/ConnectDialog.ui.h:2
 msgid "Choose an event"
 msgstr "Choose an event"
 
-#: ../data/ui/ConnectDialog.ui.h:2
-msgid "Event"
-msgstr "Event"
-
 #: ../data/ui/ConnectDialog.ui.h:3
-msgid "Nickname"
-msgstr "Nickname"
-
-#. Translators: this is in strftime format. See http://docs.python.org/library/time.html#time.strftime
-#. This is the format of the displayed date.
-#. The month name is localized: it defaults to something like "15 June 2010" for 'en' or "15 Juin 2009" for 'fr', etc.
-#: ../bin/lernid.py:205
+msgid "Event:"
+msgstr "Event:"
+
+#: ../data/ui/ConnectDialog.ui.h:4
+msgid "NickServ password:"
+msgstr "NickServ password:"
+
+#: ../data/ui/ConnectDialog.ui.h:5
+msgid "Nickname:"
+msgstr "Nickname:"
+
+#: ../lernid.desktop.in.h:2
+msgid "Participate in online learning events"
+msgstr "Participate in online learning events"
+
+#. Translators: Local date representation
+#: ../lernid/Sessions.py:50
 msgid "%d %B %Y"
-msgstr ""
-
-#: ../bin/lernid.py:244
-msgid "' session is starting..."
-msgstr "' session is starting..."
-
-#: ../bin/lernid.py:364 ../bin/lernid.py:365
-msgid "Connected to "
-msgstr "Connected to "
-
-#: ../bin/lernid.py:394
-msgid "Disconnecting from "
-msgstr "Disconnecting from "
-
-#: ../bin/lernid.py:486
-msgid "Show debug messages"
-msgstr "Show debug messages"
+msgstr "%d %B %Y"
+
+#: ../lernid/ConnectDialog.py:111
+msgid "Nick can not be blank"
+msgstr "Nick can not be blank"
+
+#: ../lernid/ConnectDialog.py:115
+#, python-format
+msgid "Nick can not begin with: %s"
+msgstr "Nick can not begin with: %s"
+
+#: ../lernid/ConnectDialog.py:119
+msgid "Nick can not contain blank spaces."
+msgstr "Nick can not contain blank spaces."
+
+#: ../lernid/ConnectDialog.py:119
+#, python-format
+msgid "Nick can not contain: %s"
+msgstr "Nick can not contain: %s"
+
+#: ../lernid/ConnectDialog.py:122
+msgid "Nick can only contain English alphabet characters"
+msgstr "Nick can only contain English alphabet characters"
+
+#: ../lernid/lernidconfig.py:33
+msgid "Connect to a world of online tutorials quickly and easily."
+msgstr "Connect to a world of online tutorials quickly and easily."
+
+#: ../lernid/widgets/NativeChatroom.py:164
+msgid "IRC commands are not yet supported."
+msgstr "IRC commands are not yet supported."
+
+#~ msgid "Not Connected."
+#~ msgstr "Not Connected."
+
+#~ msgid "_Event"
+#~ msgstr "_Event"
+
+#~ msgid "Nickname"
+#~ msgstr "Nickname"
+
+#~ msgid ""
+#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
+#~ "This program is free software: you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License version 3, as published by "
+#~ "the Free Software Foundation.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
+#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
+#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
+#~ "General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along  "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
+#~ "This program is free software: you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License version 3, as published by "
+#~ "the Free Software Foundation.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
+#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
+#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
+#~ "General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along  "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#~ msgid "Event"
+#~ msgstr "Event"
 
 #~ msgid "Lernid application"
 #~ msgstr "Lernid application"
@@ -137,8 +335,38 @@
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "<b>Resources</b>"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "<b>Classroom</b>"
+
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "<b>Chatroom</b>"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "<b>Schedule</b>"
+
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 
+#~ msgid "Connected to "
+#~ msgstr "Connected to "
+
+#~ msgid "Disconnecting from "
+#~ msgstr "Disconnecting from "
+
+#~ msgid "Chatroom"
+#~ msgstr "Chatroom"
+
+#~ msgid "Browser"
+#~ msgstr "Browser"
+
 #~ msgid "Schedule"
 #~ msgstr "Schedule"
+
+#~ msgid "Session"
+#~ msgstr "Session"
+
+#~ msgid "' session is starting..."
+#~ msgstr "' session is starting..."

=== modified file 'po/en_CA.po'
--- po/en_CA.po	2010-09-04 04:57:57 +0000
+++ po/en_CA.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-09-03 11:40+0000\n"
-"Last-Translator: Ken Sharp <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 11:44+0000\n"
+"Last-Translator: John S. Gruber <[e-mail]>\n"
 "Language-Team: English (Canada) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -24,6 +24,7 @@
 "Launchpad Contributions:\n"
 "  Colin Dean https://launchpad.net/~colindean\n"
 "  Daniel Bell https://launchpad.net/~danielbell\n"
+"  John S. Gruber https://launchpad.net/~jsjgruber\n"
 "  Jono Bacon https://launchpad.net/~jonobacon\n"
 "  Ken Sharp https://launchpad.net/~kennybobs\n"
 "  Luke Hollins https://launchpad.net/~lwh\n"
@@ -340,6 +341,18 @@
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "<b>Resources</b>"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "<b>Classroom</b>"
+
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "<b>Chatroom</b>"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "<b>Schedule</b>"
+
 #~ msgid "Connected to "
 #~ msgstr "Connected to "
 

=== modified file 'po/es.po'
--- po/es.po	2010-10-18 05:03:19 +0000
+++ po/es.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-10-17 12:37+0000\n"
-"Last-Translator: DiegoJ <[e-mail]>\n"
+"PO-Revision-Date: 2011-09-12 10:01+0000\n"
+"Last-Translator: Fitoschido <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-13 04:56+0000\n"
+"X-Generator: Launchpad (build 13910)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -27,20 +27,18 @@
 "  DiegoJ https://launchpad.net/~diegojromerolopez\n"
 "  EdwinCartagenaH https://launchpad.net/~edwincartagenah\n"
 "  Emilien Klein https://launchpad.net/~emilien-klein\n"
-"  Hector Louzao https://launchpad.net/~hhlp\n"
+"  Fitoschido https://launchpad.net/~fitoschido\n"
 "  Hollman Enciso https://launchpad.net/~hollman\n"
-"  Ilan https://launchpad.net/~ilan\n"
 "  Jono Bacon https://launchpad.net/~jonobacon\n"
 "  Jose Ernesto Davila https://launchpad.net/~josernestodavila\n"
-"  Julián Alarcón https://launchpad.net/~alarconj\n"
 "  Kamus https://launchpad.net/~kamus\n"
 "  Leandro Gómez https://launchpad.net/~leogg\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
-"  fgp https://launchpad.net/~komakino"
+"  hhlp https://launchpad.net/~hhlp"
 
 #: ../data/ui/PasswordDialog.ui.h:1
 msgid "Invalid password"
-msgstr "Contraseña incorrecta"
+msgstr "Contraseña no válida"
 
 #: ../data/ui/PasswordDialog.ui.h:2
 msgid ""
@@ -60,7 +58,7 @@
 msgid ""
 "<i>You need to restart Lernid for some of the changes to take effect.</i>"
 msgstr ""
-"<i>Ha de reiniciar Lernid para que algunos de los cambios surtan efecto.</i>"
+"<i>Debe reiniciar Lernid para que algunos de los cambios surtan efecto.</i>"
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:2
 msgid "Show an icon in the notification area"
@@ -93,7 +91,7 @@
 #: ../lernid/widgets/Slide.py:148
 #, python-format
 msgid "Downloading session slides ({0} % of {1:.1} MB)..."
-msgstr ""
+msgstr "Descargando diapositivas de sesión ({0} % de {1:.1} MB)..."
 
 #: ../lernid/widgets/Slide.py:151
 msgid "Slides have been downloaded"
@@ -296,84 +294,3 @@
 #: ../lernid/widgets/NativeChatroom.py:164
 msgid "IRC commands are not yet supported."
 msgstr "Las órdenes del IRC todavía no están soportadas."
-
-#~ msgid "Event"
-#~ msgstr "Evento"
-
-#~ msgid "Nickname"
-#~ msgstr "Apodo"
-
-#~ msgid "_Event"
-#~ msgstr "_Evento"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
-
-#~ msgid "Lernid application"
-#~ msgstr "Aplicación Lernid"
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-cancel"
-
-#~ msgid "Not Connected."
-#~ msgstr "No conectado."
-
-#~ msgid "Chat Room"
-#~ msgstr "Salón de Charla"
-
-#~ msgid "Schedule"
-#~ msgstr "Horario"
-
-#~ msgid "Connected to "
-#~ msgstr "Conectado a "
-
-#~ msgid "Disconnecting from "
-#~ msgstr "Desconectando de "
-
-#~ msgid "David Planella <[e-mail]>"
-#~ msgstr "David Planella <[e-mail]>"
-
-#~ msgid "Chatroom"
-#~ msgstr "Sala de Chat"
-
-#~ msgid ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "This program is free software: you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License version 3, as published by "
-#~ "the Free Software Foundation.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-#~ "General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License along  "
-#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
-#~ msgstr ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "Este programa es libre: puedes distribuirlo y/o modificarlo bajo los "
-#~ "términos de la licencia GNU General Public version 3, como fue publicado por "
-#~ "la Free Software Foundation.\n"
-#~ "\n"
-#~ "Este programa es distruibuido con la esperanza que será útil, pero SIN "
-#~ "NINGUNA GARANTIA;  sin siquiera la garantía implícita \n"
-#~ "de comerciabilidad, calidad de satisfacción, o apto para un propósito en "
-#~ "particular. Vea la licencia GNU General para obtener más detalles.\n"
-#~ "\n"
-#~ "Debería haber recibido una copia de la licencia GNU General Public junto con "
-#~ "este programa. De lo contrario, vea <http://www.gnu.org/licenses/>."
-
-#~ msgid "Browser"
-#~ msgstr "Navegador"
-
-#~ msgid "Participate in online Ubuntu learning events"
-#~ msgstr "Participar en eventos de aprendizaje en línea de Ubuntu"
-
-#~ msgid "Session"
-#~ msgstr "Sesión"
-
-#~ msgid "' session is starting..."
-#~ msgstr "' la sesión está empezando..."
-
-#~ msgid "Downloading session slides..."
-#~ msgstr "Descargando diapositivas de la sesión..."

=== modified file 'po/eu.po'
--- po/eu.po	2010-08-03 03:57:01 +0000
+++ po/eu.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: Oier Mees <[e-mail]>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 15:51+0000\n"
-"Last-Translator: Michael Budde <[e-mail]>\n"
+"PO-Revision-Date: 2011-06-05 13:52+0000\n"
+"Last-Translator: Oier Mees <Unknown>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-06 04:47+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -251,7 +251,7 @@
 #. Translators: Local date representation
 #: ../lernid/Sessions.py:50
 msgid "%d %B %Y"
-msgstr "%d %B %Y"
+msgstr "%Y(e)ko %Bk %d"
 
 #: ../lernid/ConnectDialog.py:111
 msgid "Nick can not be blank"
@@ -283,5 +283,38 @@
 msgid "IRC commands are not yet supported."
 msgstr "IRC komandoak oraindik ez dira onartzen."
 
+#~ msgid ""
+#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
+#~ "This program is free software: you can redistribute it and/or modify it "
+#~ "under the terms of the GNU General Public License version 3, as published by "
+#~ "the Free Software Foundation.\n"
+#~ "\n"
+#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
+#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
+#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
+#~ "General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License along  "
+#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
+#~ "Programa hau software librea da: birbanatzea edo/eta aldatzea daukazuFree "
+#~ "Software Foundation-ek argitaratutako GNU General Public License-ren "
+#~ "3bertsioaren baldintzenpean.\n"
+#~ "\n"
+#~ "Programa hau erabilgarri izango delakoan banatzen dugu, baina INONGO "
+#~ "BERMERIK GABE; ezta ere hurrengo berme implizitukin MERKATURATZETASUNA, "
+#~ "KALITATE EGOKIA, edo INTENTZIO JAKIN BATERAKO EGOKITASUNA.  Ikusi GNU "
+#~ "General Public License xehetasun gehiagorentzat.\n"
+#~ "\n"
+#~ "GNU General Public License-eren kopia bat jaso beharko zenuke "
+#~ "programahonekin batera.  Ezezkoan, ikusi <http://www.gnu.org/licenses/>."
+
+#~ msgid "Even_t"
+#~ msgstr "Ekitaldia_t"
+
+#~ msgid "_Hide Lernid"
+#~ msgstr "_Ezkutatu Lernid"
+
 #~ msgid "Downloading session slides..."
 #~ msgstr "Saioko gardenkiak jaisten..."

=== modified file 'po/he.po'
--- po/he.po	2010-08-03 03:57:01 +0000
+++ po/he.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 16:01+0000\n"
-"Last-Translator: Ilan <[e-mail]>\n"
+"PO-Revision-Date: 2011-06-08 06:46+0000\n"
+"Last-Translator: Yaron <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-09 04:43+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -25,17 +25,21 @@
 "  Ddorda https://launchpad.net/~ddorda\n"
 "  Ilan https://launchpad.net/~ilan\n"
 "  SB https://launchpad.net/~sonny-benshimon\n"
-"  Uri Shabtay https://launchpad.net/~uri.shabtay"
+"  Uri Shabtay https://launchpad.net/~uri.shabtay\n"
+"  Yaron https://launchpad.net/~sh-yaron\n"
+"  serfus https://launchpad.net/~serfus"
 
 #: ../data/ui/PasswordDialog.ui.h:1
 msgid "Invalid password"
-msgstr "הסיסמה שגויה"
+msgstr "הססמה שגויה"
 
 #: ../data/ui/PasswordDialog.ui.h:2
 msgid ""
 "The NickServ password you entered was invalid.\n"
 "Please enter the correct password:"
 msgstr ""
+"ססמת ה־NickServ שהוזנה אינה תקנית.\n"
+"נא להזין את הססמה הנכונה:"
 
 #. Translators: Local time representation
 #: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
@@ -46,52 +50,52 @@
 #: ../data/ui/PreferencesLernidDialog.ui.h:1
 msgid ""
 "<i>You need to restart Lernid for some of the changes to take effect.</i>"
-msgstr ""
+msgstr "עליך להפעיל את Lernid מחדש כדי שחלק מהשינויים יכנסו לתוקף."
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:2
 msgid "Show an icon in the notification area"
-msgstr ""
+msgstr "הצגת סמל באזור הדיווחים"
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:3
 msgid "Show time in classroom and chatroom"
-msgstr ""
+msgstr "הצגת השעה בכיתה ובחדר הצ׳אט"
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:4
 msgid "Use vertical layout"
-msgstr ""
+msgstr "שימוש בסידור אנכי"
 
 #: ../lernid/EventManager.py:96
 msgid "Connecting to event"
-msgstr ""
+msgstr "בהתחברות לאירוע"
 
 #: ../lernid/EventManager.py:104
 msgid "Your nickname is now identified"
-msgstr ""
+msgstr "הכינוי שלך מזוהה כעת"
 
 #: ../lernid/EventManager.py:139
 msgid "Disconnecting from event"
-msgstr ""
+msgstr "בניתוק מאירוע"
 
 #: ../lernid/widgets/Slide.py:109
 msgid "An error was encountered while trying to load slide number {0}"
-msgstr ""
+msgstr "אירעה שגיאה במהלך הניסיון לטעינת שקופית מספר {0}"
 
 #: ../lernid/widgets/Slide.py:148
 #, python-format
 msgid "Downloading session slides ({0} % of {1:.1} MB)..."
-msgstr ""
+msgstr "שקופיות המפגש מתקבלות ({0} % oמתוך {1:.1} מ״ב)..."
 
 #: ../lernid/widgets/Slide.py:151
 msgid "Slides have been downloaded"
-msgstr ""
+msgstr "הורדת השקופיות הושלמה"
 
 #: ../lernid/widgets/Slide.py:156
 msgid "An error was encountered while downloading slides"
-msgstr ""
+msgstr "אירעה שגיאה במהלך הורדת השקופיות"
 
 #: ../lernid/widgets/Slide.py:168
 msgid "This session does not use slides"
-msgstr ""
+msgstr "מפגש זה אינו דורש שימוש בשקופיות"
 
 #: ../data/ui/LernidWindow.ui.h:1
 msgid "Classroom"
@@ -99,11 +103,11 @@
 
 #: ../data/ui/LernidWindow.ui.h:2
 msgid "Enter the address you would like to open in the browser:"
-msgstr ""
+msgstr "נא להזין את הכתובת אותה ברצונך לפתוח בדפדפן:"
 
 #: ../data/ui/LernidWindow.ui.h:3
 msgid "Eve_nt"
-msgstr ""
+msgstr "_אירוע"
 
 #: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
 #: ../lernid.desktop.in.h:1
@@ -112,19 +116,19 @@
 
 #: ../data/ui/LernidWindow.ui.h:5
 msgid "Open _URL..."
-msgstr ""
+msgstr "פתיחת _כתובת...."
 
 #: ../data/ui/LernidWindow.ui.h:6
 msgid "Tweet current session"
-msgstr ""
+msgstr "ציוץ המפגש הנוכחי"
 
 #: ../data/ui/LernidWindow.ui.h:7
 msgid "_Chatroom"
-msgstr ""
+msgstr "_חדר צ׳אט"
 
 #: ../data/ui/LernidWindow.ui.h:8
 msgid "_Edit"
-msgstr "_ערוך"
+msgstr "ע_ריכה"
 
 #: ../data/ui/LernidWindow.ui.h:9
 msgid "_Fullscreen"
@@ -148,25 +152,25 @@
 
 #: ../bin/lernid.py:208
 msgid "Sche_dule"
-msgstr ""
+msgstr "לוח _זמנים"
 
 #: ../bin/lernid.py:215
 msgid "_Terminal"
-msgstr "_מסוף"
+msgstr "מ_סוף"
 
 #: ../bin/lernid.py:226
 msgid "({0} user)"
 msgid_plural "({0} users)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(משתמש {0})"
+msgstr[1] "({0} משתמשים)"
 
 #: ../bin/lernid.py:290
 msgid "_Show Lernid"
-msgstr ""
+msgstr "ה_צגת Lernid"
 
 #: ../bin/lernid.py:333
 msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
-msgstr ""
+msgstr "השיעור \"{0}\" החל בערוץ ‎#ubuntu-classroom בשרת freenode."
 
 #: ../bin/lernid.py:424
 msgid "Show debug messages"
@@ -174,15 +178,15 @@
 
 #: ../bin/lernid.py:426
 msgid "Override classroom channel"
-msgstr ""
+msgstr "עקיפת ערוץ הכיתה"
 
 #: ../bin/lernid.py:428
 msgid "Filename or URL to Lernid config file"
-msgstr ""
+msgstr "שם הקובץ או הכתובת לקובץ ההגדרות של Lernid"
 
 #: ../bin/lernid.py:430
 msgid "Use web chat widget instead of the native one"
-msgstr ""
+msgstr "שימוש בחלונית צ׳אט במקום במובנה"
 
 #: ../lernid/widgets/Schedule.py:80
 msgid "Date"
@@ -202,27 +206,27 @@
 
 #: ../lernid/widgets/Schedule.py:163
 msgid "Session started"
-msgstr ""
+msgstr "המפגש החל"
 
 #: ../lernid/widgets/Schedule.py:164
 msgid "The session \"{0}\" has started."
-msgstr ""
+msgstr "המפגש \"{0}\" החל"
 
 #: ../lernid/widgets/Schedule.py:173
 msgid "Session upcoming"
-msgstr ""
+msgstr "מפגשים בהמשך"
 
 #: ../lernid/widgets/Schedule.py:174
 msgid "The session \"{0}\" will begin in 10 minutes."
-msgstr ""
+msgstr "המפגש \"{0}\" יתחיל בעוד 10 דקות."
 
 #: ../data/ui/BrowserWidget.ui.h:1
 msgid "Stop browser from changing page"
-msgstr ""
+msgstr "מניעת אפשרות העברת העמוד מהדפדפן"
 
 #: ../lernid/widgets/Classroom.py:78
 msgid "Joined classroom"
-msgstr ""
+msgstr "הצטרפת למפגש"
 
 #: ../data/ui/ConnectDialog.ui.h:1
 msgid "Advanced options"
@@ -230,15 +234,15 @@
 
 #: ../data/ui/ConnectDialog.ui.h:2
 msgid "Choose an event"
-msgstr "בחרו אירוע"
+msgstr "נא לבחור באירוע"
 
 #: ../data/ui/ConnectDialog.ui.h:3
 msgid "Event:"
-msgstr ""
+msgstr "אירוע:"
 
 #: ../data/ui/ConnectDialog.ui.h:4
 msgid "NickServ password:"
-msgstr ""
+msgstr "ססמת ה־NickServ:"
 
 #: ../data/ui/ConnectDialog.ui.h:5
 msgid "Nickname:"
@@ -246,42 +250,42 @@
 
 #: ../lernid.desktop.in.h:2
 msgid "Participate in online learning events"
-msgstr ""
+msgstr "השתתפות באירועי למידה מקוונים"
 
 #. Translators: Local date representation
 #: ../lernid/Sessions.py:50
 msgid "%d %B %Y"
-msgstr "%d %B %Y"
+msgstr "%d ב%B %Y"
 
 #: ../lernid/ConnectDialog.py:111
 msgid "Nick can not be blank"
-msgstr "הכינוי לא יכול להשאר ריק"
+msgstr "כינוי לא יכול להישאר ריק"
 
 #: ../lernid/ConnectDialog.py:115
 #, python-format
 msgid "Nick can not begin with: %s"
-msgstr "הכינוי לא יכול להתחיל עם: %s"
+msgstr "כינוי לא יכול להתחיל ב־: %s"
 
 #: ../lernid/ConnectDialog.py:119
 msgid "Nick can not contain blank spaces."
-msgstr "הכינוי לא יכול להכיל רווחים."
+msgstr "כינוי לא יכול להכיל רווחים."
 
 #: ../lernid/ConnectDialog.py:119
 #, python-format
 msgid "Nick can not contain: %s"
-msgstr "הכינוי לא יכול להכיל: %s"
+msgstr "כינוי לא יכול להכיל: %s"
 
 #: ../lernid/ConnectDialog.py:122
 msgid "Nick can only contain English alphabet characters"
-msgstr ""
+msgstr "כינוי יכול להכיל אותיות לטיניות (באנגלית) בלבד"
 
 #: ../lernid/lernidconfig.py:33
 msgid "Connect to a world of online tutorials quickly and easily."
-msgstr "התחברו לעולם של מדריכים מקוונים בקלות ובמהירות."
+msgstr "התחברות לעולם של מדריכים מקוונים בקלות ובמהירות."
 
 #: ../lernid/widgets/NativeChatroom.py:164
 msgid "IRC commands are not yet supported."
-msgstr ""
+msgstr "פקודות IRC עדיין לא נתמכות."
 
 #~ msgid "Not Connected."
 #~ msgstr "לא מחובר"
@@ -304,6 +308,18 @@
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "<b>מקורות</b>"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "<b>כיתה</b>"
+
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "<b>חדר שיחה</b>"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "<b>לוח זמנים</b>"
+
 #~ msgid "Event"
 #~ msgstr "אירוע"
 

=== modified file 'po/hr.po'
--- po/hr.po	2010-08-03 03:57:01 +0000
+++ po/hr.po	2012-05-07 00:49:19 +0000
@@ -8,21 +8,22 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 15:52+0000\n"
-"Last-Translator: nafterburner <[e-mail]>\n"
+"PO-Revision-Date: 2012-04-06 19:24+0000\n"
+"Last-Translator: gogo <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2012-04-07 05:00+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  gogo https://launchpad.net/~trebelnik-stefina\n"
 "  nafterburner https://launchpad.net/~nafterburner"
 
 #: ../data/ui/PasswordDialog.ui.h:1
@@ -170,7 +171,7 @@
 
 #: ../bin/lernid.py:424
 msgid "Show debug messages"
-msgstr "Prikaži debug poruke"
+msgstr "Prikaži poruke otklanjanja greške"
 
 #: ../bin/lernid.py:426
 msgid "Override classroom channel"
@@ -282,60 +283,3 @@
 #: ../lernid/widgets/NativeChatroom.py:164
 msgid "IRC commands are not yet supported."
 msgstr "IRC naredbe još uvijek nisu podržane."
-
-#~ msgid "Chatroom"
-#~ msgstr "Chatroom"
-
-#~ msgid "Session"
-#~ msgstr "Sesija"
-
-#~ msgid "Browser"
-#~ msgstr "Preglednik"
-
-#~ msgid "Nickname"
-#~ msgstr "Nadimak"
-
-#~ msgid "_Event"
-#~ msgstr "_Događaj"
-
-#~ msgid "Event"
-#~ msgstr "Događaj"
-
-#~ msgid "Connected to "
-#~ msgstr "Priključen na "
-
-#~ msgid "Disconnecting from "
-#~ msgstr "Prekidanje veze s "
-
-#~ msgid "Not Connected."
-#~ msgstr "Nije Povezan."
-
-#~ msgid "' session is starting..."
-#~ msgstr "' sesija započinje..."
-
-#~ msgid ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "This program is free software: you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License version 3, as published by "
-#~ "the Free Software Foundation.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-#~ "General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License along  "
-#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
-#~ msgstr ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "Ovaj program je slobodan softver: možete ga redistribuirati i/ili "
-#~ "modificirati pod uvjetima GNU General Public License version 3(Opće Javne "
-#~ "Licence verzije 3) kao što je objavio Free Software Foundation.\n"
-#~ "\n"
-#~ "Ovaj program se distribuira u nadi da će biti koristan, ali BEZ BILO KOJE "
-#~ "GARANCIJE; čak i bez impliciranih jamstava PRODAJE, ZADOVOLJAVAJUĆE "
-#~ "KVALITETE ILI PRIKLADNOSTI ZA ODREĐENU NAMJENU. Pogledajte GNU General "
-#~ "Public License (Sveopću Narodnu Dozvolu) za više detalja.\n"
-#~ "\n"
-#~ "Trebali biste dobiti primjerak GNU (Sveopće Narodne Dozvole) zajedno sa ovim "
-#~ "programom. Ako ne, pogledajte <http://www.gnu.org/licenses/>."

=== modified file 'po/it.po'
--- po/it.po	2010-08-18 07:07:31 +0000
+++ po/it.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-17 08:08+0000\n"
-"Last-Translator: Paolo Sammicheli <[e-mail]>\n"
+"PO-Revision-Date: 2011-10-06 20:30+0000\n"
+"Last-Translator: Milo Casagrande <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-18 07:07+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-10-07 04:42+0000\n"
+"X-Generator: Launchpad (build 14085)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -26,9 +26,9 @@
 "  Giampaolo Bozzali https://launchpad.net/~g.bozzali\n"
 "  Milo Casagrande https://launchpad.net/~milo\n"
 "  Paolo Sammicheli https://launchpad.net/~xdatap1\n"
-"  Riccardo Angelino https://launchpad.net/~rikyinformation\n"
-"  fullo https://launchpad.net/~ffullone\n"
-"  giorgio130 https://launchpad.net/~gm89"
+"  Riccardo Angelino https://launchpad.net/~riccardoangelino\n"
+"  William Bottini https://launchpad.net/~karminio\n"
+"  fullo https://launchpad.net/~ffullone"
 
 #: ../data/ui/PasswordDialog.ui.h:1
 msgid "Invalid password"
@@ -284,90 +284,8 @@
 
 #: ../lernid/lernidconfig.py:33
 msgid "Connect to a world of online tutorials quickly and easily."
-msgstr "Connette ad un mondo di lezioni in linea velocemente e facilmente."
+msgstr "Connette velocemente e facilmente a un mondo di lezioni in linea."
 
 #: ../lernid/widgets/NativeChatroom.py:164
 msgid "IRC commands are not yet supported."
 msgstr "Comandi IRC non sono ancora supportati."
-
-#~ msgid "Not Connected."
-#~ msgstr "Non connesso."
-
-#~ msgid "_Event"
-#~ msgstr "_Evento"
-
-#~ msgid "Lernid application"
-#~ msgstr "Applicazione Lernid"
-
-#~ msgid "Event"
-#~ msgstr "Evento"
-
-#~ msgid "Nickname"
-#~ msgstr "Soprannome"
-
-#~ msgid ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "This program is free software: you can redistribute it and/or modify it "
-#~ "under the terms of the GNU General Public License version 3, as published by "
-#~ "the Free Software Foundation.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful, but  WITHOUT "
-#~ "ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-#~ "SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-#~ "General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License along  "
-#~ "with this program.  If not, see <http://www.gnu.org/licenses/>."
-#~ msgstr ""
-#~ "Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-#~ "Questo programma è Software Libero: potete distribuirlo e modificarlo sotto "
-#~ "i termini della GNU General Public License versione 3, come pubblicato dalla "
-#~ "Free Software Foundation.\n"
-#~ "\n"
-#~ "Questo programma è distribuito nella speranza che possa essere utile, ma "
-#~ "SENZA NESSUNA GARANZIA, anche senza la garanzia implicita di VENDIBILITÀ, "
-#~ "QUALITÀ SODDISFACENTE, o di ADEGUATEZZA AD UN QUALSIASI USO. Per ulteriori "
-#~ "dettagli consultare la GNU General Public License.\n"
-#~ "\n"
-#~ "La traduzione di questa nota è soltanto a titolo esplicativo e non ha valore "
-#~ "legale. Consultate l'originale in Inglese all'indirizzo "
-#~ "<http://www.gnu.org/licenses/>."
-
-#~ msgid "Chat Room"
-#~ msgstr "Stanza"
-
-#~ msgid "Connected to "
-#~ msgstr "Connesso a "
-
-#~ msgid "Disconnecting from "
-#~ msgstr "Disconnessione da "
-
-#~ msgid "Schedule"
-#~ msgstr "Pianificazione"
-
-#~ msgid "Browser"
-#~ msgstr "Browser web"
-
-#~ msgid "David Planella <[e-mail]>"
-#~ msgstr "Paolo Sammicheli <[e-mail]>"
-
-#~ msgid "Participate in online Ubuntu learning events"
-#~ msgstr "Partecipa agli eventi di apprendimento online di Ubuntu"
-
-#~ msgid "Chatroom"
-#~ msgstr "Area di discussione"
-
-#~ msgid "Session"
-#~ msgstr "Sessione"
-
-#~ msgid "' session is starting..."
-#~ msgstr "sessione in avvio..."
-
-#~ msgid "_Hide Lernid"
-#~ msgstr "_Nascondi Lernid"
-
-#~ msgid "Even_t"
-#~ msgstr "Even_to"
-
-#~ msgid "Downloading session slides..."
-#~ msgstr "Recupero delle diapositive della sessione..."

=== modified file 'po/lernid.pot'
--- po/lernid.pot	2010-08-02 14:13:24 +0000
+++ po/lernid.pot	2012-05-07 00:49:19 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-02 16:11+0200\n"
+"POT-Creation-Date: 2012-05-06 20:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,19 +32,29 @@
 "Please enter the correct password:"
 msgstr ""
 
+#. TRANSLATORS: Future versions will need translations of this word as plugins to match the locale of the target classroom session. The word will prefix questions asked in the chatroom of the instructor
+#: ../data/ui/ChatWidget.ui.h:1 ../lernid/widgets/NativeChatroom.py:90
+msgid "QUESTION:"
+msgstr ""
+
+#: ../data/ui/ChatWidget.ui.h:2
+msgid ""
+"\"QUESTION:\" directs your question to the classroom for an answer from the "
+"instructor"
+msgstr ""
+
 #. Translators: Local time representation
-#: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
-#: ../lernid/Sessions.py:60
+#: ../lernid/widgets/IrcWidget.py:68 ../lernid/Sessions.py:81
+#: ../lernid/Sessions.py:86
 msgid "%H:%M"
 msgstr ""
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:1
-msgid ""
-"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgid "Show an icon in the notification area"
 msgstr ""
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:2
-msgid "Show an icon in the notification area"
+msgid "Use vertical layout"
 msgstr ""
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:3
@@ -51,77 +62,95 @@
 msgstr ""
 
 #: ../data/ui/PreferencesLernidDialog.ui.h:4
-msgid "Use vertical layout"
-msgstr ""
-
-#: ../lernid/EventManager.py:96
+msgid "Open presentation links in default browser"
+msgstr ""
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:5
+msgid ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgstr ""
+
+#: ../lernid/EventManager.py:90
+msgid "Cannot retrieve configuration"
+msgstr ""
+
+#: ../lernid/EventManager.py:188
 msgid "Connecting to event"
 msgstr ""
 
-#: ../lernid/EventManager.py:104
+#: ../lernid/EventManager.py:196
 msgid "Your nickname is now identified"
 msgstr ""
 
-#: ../lernid/EventManager.py:139
+#: ../lernid/EventManager.py:239
 msgid "Disconnecting from event"
 msgstr ""
 
-#: ../lernid/widgets/Slide.py:109
+#: ../lernid/widgets/Slide.py:83
+msgid "Click to Open in External Browser"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:86
+msgid ""
+"Click to open the slides in your browser. From there you can browse, "
+"bookmark, or save them."
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:165
 msgid "An error was encountered while trying to load slide number {0}"
 msgstr ""
 
-#: ../lernid/widgets/Slide.py:148
+#: ../lernid/widgets/Slide.py:230
 #, python-format
-msgid "Downloading session slides ({0} % of {1:.1} MB)..."
-msgstr ""
-
-#: ../lernid/widgets/Slide.py:151
+msgid "Downloading session slides (%i%% of %i KB)..."
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:238 ../lernid/widgets/Slide.py:264
+msgid "An error was encountered while downloading slides"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:251
 msgid "Slides have been downloaded"
 msgstr ""
 
-#: ../lernid/widgets/Slide.py:156
-msgid "An error was encountered while downloading slides"
-msgstr ""
-
-#: ../lernid/widgets/Slide.py:168
+#: ../lernid/widgets/Slide.py:284
 msgid "This session does not use slides"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:1
-msgid "Classroom"
+msgid "<b>Classroom</b>"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:2
-msgid "Enter the address you would like to open in the browser:"
+msgid "<b>_Chatroom</b>"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:3
 msgid "Eve_nt"
 msgstr ""
 
-#: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
-#: ../lernid.desktop.in.h:1
-msgid "Lernid"
+#: ../data/ui/LernidWindow.ui.h:4
+msgid "Open _URL in Lernid..."
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:5
-msgid "Open _URL..."
+msgid "Tweet current session"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:6
-msgid "Tweet current session"
+msgid "_Edit"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:7
-msgid "_Chatroom"
+msgid "_View"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:8
-msgid "_Edit"
+msgid "_Fullscreen"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:9
-msgid "_Fullscreen"
+msgid "_Statusbar"
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:10
@@ -129,105 +158,187 @@
 msgstr ""
 
 #: ../data/ui/LernidWindow.ui.h:11
-msgid "_Statusbar"
-msgstr ""
-
-#: ../data/ui/LernidWindow.ui.h:12
-msgid "_View"
-msgstr ""
-
-#: ../bin/lernid.py:141 ../bin/lernid.py:144 ../bin/lernid.py:199
+msgid "Enter the address you would like to open in the browser:"
+msgstr ""
+
+#: ../lernid/IrcBackend.py:345
+#, python-format
+msgid "Nick assigned by server: %s"
+msgstr ""
+
+#: ../bin/lernid.py:148 ../bin/lernid.py:152 ../bin/lernid.py:263
 msgid "_Session"
 msgstr ""
 
-#: ../bin/lernid.py:208
+#: ../bin/lernid.py:149
+msgid "Select the Session tab to see classroom learning material"
+msgstr ""
+
+#: ../bin/lernid.py:160
+msgid "Event Connection Interrupted"
+msgstr ""
+
+#: ../bin/lernid.py:160
+msgid ""
+"Please reestablish your Internet connection\n"
+"and reconnect to the event"
+msgstr ""
+
+#: ../bin/lernid.py:165
+msgid ""
+"Event Connection Interrupted -- Please reestablish your Internet connection "
+"and reconnect to the event"
+msgstr ""
+
+#: ../bin/lernid.py:223
+msgid "You can interact with classes held in the classroom"
+msgstr ""
+
+#: ../bin/lernid.py:226
+#, python-format
+msgid ""
+"Add \"%s\" to the beginning of your query  to direct it to the classroom "
+"instructor."
+msgstr ""
+
+#: ../bin/lernid.py:272
 msgid "Sche_dule"
 msgstr ""
 
-#: ../bin/lernid.py:215
+#: ../bin/lernid.py:279
 msgid "_Terminal"
 msgstr ""
 
-#: ../bin/lernid.py:226
+#: ../bin/lernid.py:290
 msgid "({0} user)"
 msgid_plural "({0} users)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../bin/lernid.py:290
+#: ../bin/lernid.py:313 ../bin/lernid.py:317
+msgid "Classroom"
+msgstr ""
+
+#. TRANSLATORS: The underscore marks this as a mnemonic accelerator
+#: ../bin/lernid.py:315 ../bin/lernid.py:318
+msgid "_Chatroom"
+msgstr ""
+
+#: ../bin/lernid.py:374
 msgid "_Show Lernid"
 msgstr ""
 
-#: ../bin/lernid.py:333
+#: ../bin/lernid.py:417
 msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
 msgstr ""
 
-#: ../bin/lernid.py:424
+#: ../bin/lernid.py:508
 msgid "Show debug messages"
 msgstr ""
 
-#: ../bin/lernid.py:426
+#: ../bin/lernid.py:509
+msgid "Show debug and classroom management messages"
+msgstr ""
+
+#: ../bin/lernid.py:511
 msgid "Override classroom channel"
 msgstr ""
 
-#: ../bin/lernid.py:428
+#: ../bin/lernid.py:513
+msgid "Override chatroom channel"
+msgstr ""
+
+#: ../bin/lernid.py:515
 msgid "Filename or URL to Lernid config file"
 msgstr ""
 
-#: ../bin/lernid.py:430
+#: ../bin/lernid.py:517
+msgid "Don't automatically reload the schedule"
+msgstr ""
+
+#: ../bin/lernid.py:519
 msgid "Use web chat widget instead of the native one"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:80
+#: ../bin/lernid.py:521
+msgid "Unsafe testing option"
+msgstr ""
+
+#: ../bin/lernid.py:523
+msgid "Unused debugging option to avoid desktopcouch"
+msgstr ""
+
+#: ../bin/lernid.py:526
+msgid "Override calendar location"
+msgstr ""
+
+#: ../lernid/widgets/Schedule.py:115
 msgid "Date"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:88
+#: ../lernid/widgets/Schedule.py:123
 msgid "Starts"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:96
+#: ../lernid/widgets/Schedule.py:131
 msgid "Ends"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:104 ../lernid/widgets/Schedule.py:109
+#: ../lernid/widgets/Schedule.py:139 ../lernid/widgets/Schedule.py:144
 msgid "Title"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:163
+#: ../lernid/widgets/Schedule.py:282
+#, python-format
+msgid "<u>Irc Logs for UTC %s </u><i>(Starting at %s local time)</i>"
+msgstr ""
+
+#: ../lernid/widgets/Schedule.py:364
+msgid "Please keep the Session tab selected to see session learning materials."
+msgstr ""
+
+#: ../lernid/widgets/Schedule.py:368
 msgid "Session started"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:164
-msgid "The session \"{0}\" has started."
+#: ../lernid/widgets/Schedule.py:369
+msgid "The session \"{0}\" has started. "
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:173
+#: ../lernid/widgets/Schedule.py:381
 msgid "Session upcoming"
 msgstr ""
 
-#: ../lernid/widgets/Schedule.py:174
+#: ../lernid/widgets/Schedule.py:382
 msgid "The session \"{0}\" will begin in 10 minutes."
 msgstr ""
 
+#: ../lernid/widgets/Schedule.py:424
+msgid "Copy Calendar ICAL URL to Clipboard"
+msgstr ""
+
+#: ../lernid/widgets/Schedule.py:425
+msgid "Open Calendar ICAL URL Using Your Browser"
+msgstr ""
+
 #: ../data/ui/BrowserWidget.ui.h:1
 msgid "Stop browser from changing page"
 msgstr ""
 
-#: ../lernid/widgets/Classroom.py:78
+#: ../lernid/widgets/Classroom.py:83
 msgid "Joined classroom"
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:1
-msgid "Advanced options"
+msgid "Choose an event"
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:2
-msgid "Choose an event"
+msgid "Event:"
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:3
-msgid "Event:"
+msgid "Nickname:"
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:4
@@ -235,7 +346,15 @@
 msgstr ""
 
 #: ../data/ui/ConnectDialog.ui.h:5
-msgid "Nickname:"
+msgid "Advanced options"
+msgstr ""
+
+#: ../data/ui/ConnectDialog.ui.h:6
+msgid "Connecting to the classroom may take up to one minute"
+msgstr ""
+
+#: ../lernid.desktop.in.h:1
+msgid "Lernid"
 msgstr ""
 
 #: ../lernid.desktop.in.h:2
@@ -243,36 +362,58 @@
 msgstr ""
 
 #. Translators: Local date representation
-#: ../lernid/Sessions.py:50
+#: ../lernid/Sessions.py:76
 msgid "%d %B %Y"
 msgstr ""
 
-#: ../lernid/ConnectDialog.py:111
+#: ../lernid/Sessions.py:127
+#, python-format
+msgid "Unable to load calendar %s\n"
+msgstr ""
+
+#: ../lernid/Sessions.py:171
+#, python-format
+msgid "Unable to parse calendar %s\n"
+msgstr ""
+
+#: ../lernid/Sessions.py:203
+msgid "Missing Session Name"
+msgstr ""
+
+#: ../lernid/ConnectDialog.py:119
 msgid "Nick can not be blank"
 msgstr ""
 
-#: ../lernid/ConnectDialog.py:115
+#: ../lernid/ConnectDialog.py:123
 #, python-format
 msgid "Nick can not begin with: %s"
 msgstr ""
 
-#: ../lernid/ConnectDialog.py:119
+#: ../lernid/ConnectDialog.py:127
 msgid "Nick can not contain blank spaces."
 msgstr ""
 
-#: ../lernid/ConnectDialog.py:119
+#: ../lernid/ConnectDialog.py:127
 #, python-format
 msgid "Nick can not contain: %s"
 msgstr ""
 
-#: ../lernid/ConnectDialog.py:122
+#: ../lernid/ConnectDialog.py:130
 msgid "Nick can only contain English alphabet characters"
 msgstr ""
 
-#: ../lernid/lernidconfig.py:33
+#: ../lernid/lernidconfig.py:35
 msgid "Connect to a world of online tutorials quickly and easily."
 msgstr ""
 
-#: ../lernid/widgets/NativeChatroom.py:164
+#. TRANSLATORS: %s will be a token from the locale of the target classroom session rather than the student's locale
+#: ../lernid/widgets/NativeChatroom.py:94
+#, python-format
+msgid ""
+"\"%s\" directs your question to the classroom for an answer from the "
+"instructor"
+msgstr ""
+
+#: ../lernid/widgets/NativeChatroom.py:182
 msgid "IRC commands are not yet supported."
 msgstr ""

=== modified file 'po/ms.po'
--- po/ms.po	2009-12-12 04:46:46 +0000
+++ po/ms.po	2012-05-07 00:49:19 +0000
@@ -7,105 +7,278 @@
 msgstr ""
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-10 08:57-0800\n"
-"PO-Revision-Date: 2009-12-11 06:43+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<[e-mail]>\n"
+"POT-Creation-Date: 2010-08-02 16:11+0200\n"
+"PO-Revision-Date: 2011-08-06 02:59+0000\n"
+"Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-12 04:46+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2011-08-07 04:39+0000\n"
+"X-Generator: Launchpad (build 13613)\n"
+
+#: ../data/ui/AboutLernidDialog.ui.h:1
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  abuyop https://launchpad.net/~abuyop"
+
+#: ../data/ui/PasswordDialog.ui.h:1
+msgid "Invalid password"
+msgstr "Kata laluan tidak sah"
+
+#: ../data/ui/PasswordDialog.ui.h:2
+msgid ""
+"The NickServ password you entered was invalid.\n"
+"Please enter the correct password:"
+msgstr ""
+"Kata laluan NickServ yang anda masukkan tidak sah.\n"
+"Sila masukkan kata laluan yang betul:"
+
+#. Translators: Local time representation
+#: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
+#: ../lernid/Sessions.py:60
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:1
+msgid ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgstr ""
+"<i>Anda perlu mulakan semula Lernid supaya beberapa perubahan berkesan.<i>"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:2
+msgid "Show an icon in the notification area"
+msgstr "Papar ikon didalam ruang pemberitahuan"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:3
+msgid "Show time in classroom and chatroom"
+msgstr "Papar masa didalam kelas dan bilik sembang"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:4
+msgid "Use vertical layout"
+msgstr "Guna bentangan menegak"
+
+#: ../lernid/EventManager.py:96
+msgid "Connecting to event"
+msgstr "Menyambung ke acara"
+
+#: ../lernid/EventManager.py:104
+msgid "Your nickname is now identified"
+msgstr "Gelaran anda kini dikenalpasti"
+
+#: ../lernid/EventManager.py:139
+msgid "Disconnecting from event"
+msgstr "Putuskan dari acara"
+
+#: ../lernid/widgets/Slide.py:109
+msgid "An error was encountered while trying to load slide number {0}"
+msgstr "Ralat berlaku semasa cuba memuatkan slaid bernombor {0}"
+
+#: ../lernid/widgets/Slide.py:148
+#, python-format
+msgid "Downloading session slides ({0} % of {1:.1} MB)..."
+msgstr "Memuat turun sesi slaid ({0} % dari {1:.1} MB)..."
+
+#: ../lernid/widgets/Slide.py:151
+msgid "Slides have been downloaded"
+msgstr "Slaid telah dimuat turun"
+
+#: ../lernid/widgets/Slide.py:156
+msgid "An error was encountered while downloading slides"
+msgstr "Ralat berlaku semasa memuat turun slaid"
+
+#: ../lernid/widgets/Slide.py:168
+msgid "This session does not use slides"
+msgstr "Sesi ini tidak menggunakan slaid"
 
 #: ../data/ui/LernidWindow.ui.h:1
-msgid "Browser"
-msgstr ""
+msgid "Classroom"
+msgstr "Kelas"
 
 #: ../data/ui/LernidWindow.ui.h:2
-msgid "Chatroom"
-msgstr ""
+msgid "Enter the address you would like to open in the browser:"
+msgstr "Masukkan alamat yang anda ingin buka didalam pelayar:"
 
 #: ../data/ui/LernidWindow.ui.h:3
-msgid "Classroom"
-msgstr ""
+msgid "Eve_nt"
+msgstr "A_cara"
 
-#: ../data/ui/LernidWindow.ui.h:4 ../lernid.desktop.in.h:1
+#: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
+#: ../lernid.desktop.in.h:1
 msgid "Lernid"
 msgstr "Lernid"
 
 #: ../data/ui/LernidWindow.ui.h:5
-msgid "Not Connected."
-msgstr "Tiada Sambungan"
+msgid "Open _URL..."
+msgstr "Buka _URL..."
 
 #: ../data/ui/LernidWindow.ui.h:6
-msgid "Schedule"
-msgstr ""
+msgid "Tweet current session"
+msgstr "Tweet sesi semasa"
 
 #: ../data/ui/LernidWindow.ui.h:7
-msgid "_Event"
-msgstr "_Event"
+msgid "_Chatroom"
+msgstr "_Bilik Sembang"
 
 #: ../data/ui/LernidWindow.ui.h:8
+msgid "_Edit"
+msgstr "_Sunting"
+
+#: ../data/ui/LernidWindow.ui.h:9
+msgid "_Fullscreen"
+msgstr "_Skrin Penuh"
+
+#: ../data/ui/LernidWindow.ui.h:10
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ../data/ui/AboutLernidDialog.ui.h:1
-msgid "Connect to a world of online tutorials quickly and easily."
-msgstr ""
-
-#: ../data/ui/AboutLernidDialog.ui.h:2
-msgid ""
-"Copyright (C) 2009 <Jono Bacon> <[e-mail]>\n"
-"This program is free software: you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License version 3, as published by "
-"the Free Software Foundation.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but  WITHOUT "
-"ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, "
-"SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-"General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along  "
-"with this program.  If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
-
-#: ../data/ui/AboutLernidDialog.ui.h:8
-msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Khairul Aizat Kamarudzzaman https://launchpad.net/~fenris"
-
-#: ../lernid.desktop.in.h:2
-msgid "Lernid application"
-msgstr ""
+#: ../data/ui/LernidWindow.ui.h:11
+msgid "_Statusbar"
+msgstr "Palang _Status"
+
+#: ../data/ui/LernidWindow.ui.h:12
+msgid "_View"
+msgstr "_Lihat"
+
+#: ../bin/lernid.py:141 ../bin/lernid.py:144 ../bin/lernid.py:199
+msgid "_Session"
+msgstr "_Sesi"
+
+#: ../bin/lernid.py:208
+msgid "Sche_dule"
+msgstr "Ja_dual"
+
+#: ../bin/lernid.py:215
+msgid "_Terminal"
+msgstr "_Terminal"
+
+#: ../bin/lernid.py:226
+msgid "({0} user)"
+msgid_plural "({0} users)"
+msgstr[0] "({0} pengguna)"
+msgstr[1] "({0} pengguna)"
+
+#: ../bin/lernid.py:290
+msgid "_Show Lernid"
+msgstr "_Papar Lernid"
+
+#: ../bin/lernid.py:333
+msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
+msgstr "Sesi \"{0}\" telah dimulakan dalam #ubuntu-classroom di freenode."
+
+#: ../bin/lernid.py:424
+msgid "Show debug messages"
+msgstr "Papar mesej nyahpepijat"
+
+#: ../bin/lernid.py:426
+msgid "Override classroom channel"
+msgstr "Batalkan saluran kelas"
+
+#: ../bin/lernid.py:428
+msgid "Filename or URL to Lernid config file"
+msgstr "Nama fail atau URL ke fail konfig Lernid"
+
+#: ../bin/lernid.py:430
+msgid "Use web chat widget instead of the native one"
+msgstr "Guna widget sembang sesawang selain dari yang ada"
+
+#: ../lernid/widgets/Schedule.py:80
+msgid "Date"
+msgstr "Tarikh"
+
+#: ../lernid/widgets/Schedule.py:88
+msgid "Starts"
+msgstr "Mula"
+
+#: ../lernid/widgets/Schedule.py:96
+msgid "Ends"
+msgstr "Tamat"
+
+#: ../lernid/widgets/Schedule.py:104 ../lernid/widgets/Schedule.py:109
+msgid "Title"
+msgstr "Tajuk"
+
+#: ../lernid/widgets/Schedule.py:163
+msgid "Session started"
+msgstr "Sesi bermula"
+
+#: ../lernid/widgets/Schedule.py:164
+msgid "The session \"{0}\" has started."
+msgstr "Sesi \"{0}\" telah bermula."
+
+#: ../lernid/widgets/Schedule.py:173
+msgid "Session upcoming"
+msgstr "Sesi akan datang"
+
+#: ../lernid/widgets/Schedule.py:174
+msgid "The session \"{0}\" will begin in 10 minutes."
+msgstr "Sesi \"{0}\" akan dimulakan dalam tempoh 10 minit."
+
+#: ../data/ui/BrowserWidget.ui.h:1
+msgid "Stop browser from changing page"
+msgstr "Henti pelayar dari mengubah halaman"
+
+#: ../lernid/widgets/Classroom.py:78
+msgid "Joined classroom"
+msgstr "Sertai kelas"
 
 #: ../data/ui/ConnectDialog.ui.h:1
+msgid "Advanced options"
+msgstr "Pilihan lanjutan"
+
+#: ../data/ui/ConnectDialog.ui.h:2
 msgid "Choose an event"
 msgstr "Pilih Acara"
 
-#: ../data/ui/ConnectDialog.ui.h:2
-msgid "Event"
-msgstr "Acara"
-
 #: ../data/ui/ConnectDialog.ui.h:3
-msgid "Nickname"
-msgstr "Nama Panggilan"
-
-#: ../bin/lernid.py:295 ../bin/lernid.py:296
-msgid "Connected to "
-msgstr ""
-
-#: ../bin/lernid.py:325
-msgid "Disconnecting from "
-msgstr ""
-
-#: ../bin/lernid.py:416
-msgid "Show debug messages"
-msgstr ""
-
-#~ msgid "gtk-cancel"
-#~ msgstr "gtk-batal"
-
-#~ msgid "gtk-ok"
-#~ msgstr "gtk-ok"
+msgid "Event:"
+msgstr "Acara:"
+
+#: ../data/ui/ConnectDialog.ui.h:4
+msgid "NickServ password:"
+msgstr "Kata laluan NickServ"
+
+#: ../data/ui/ConnectDialog.ui.h:5
+msgid "Nickname:"
+msgstr "Gelaran:"
+
+#: ../lernid.desktop.in.h:2
+msgid "Participate in online learning events"
+msgstr "Sertai acara pembelajaran atas-talian"
+
+#. Translators: Local date representation
+#: ../lernid/Sessions.py:50
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../lernid/ConnectDialog.py:111
+msgid "Nick can not be blank"
+msgstr "Gelaran tidak boleh kosong"
+
+#: ../lernid/ConnectDialog.py:115
+#, python-format
+msgid "Nick can not begin with: %s"
+msgstr "Gelaran tidak boleh dimulakan dengan: %s"
+
+#: ../lernid/ConnectDialog.py:119
+msgid "Nick can not contain blank spaces."
+msgstr "Gelaran tidak boleh mengandungi ruang kosong."
+
+#: ../lernid/ConnectDialog.py:119
+#, python-format
+msgid "Nick can not contain: %s"
+msgstr "Gelaran tidak boleh mengandungi: %s"
+
+#: ../lernid/ConnectDialog.py:122
+msgid "Nick can only contain English alphabet characters"
+msgstr "Gelaran hanya boleh mengandungi aksara abjad Inggeris"
+
+#: ../lernid/lernidconfig.py:33
+msgid "Connect to a world of online tutorials quickly and easily."
+msgstr "Sambung ke dunia tutorial atas-talian yang pantas dan mudah."
+
+#: ../lernid/widgets/NativeChatroom.py:164
+msgid "IRC commands are not yet supported."
+msgstr "Perintah IRC belum lagi disokong."

=== modified file 'po/nb.po'
--- po/nb.po	2011-05-01 05:07:06 +0000
+++ po/nb.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2011-04-30 18:21+0000\n"
-"Last-Translator: Hans Joachim Desserud <Unknown>\n"
+"PO-Revision-Date: 2011-06-04 12:27+0000\n"
+"Last-Translator: John S. Gruber <[e-mail]>\n"
 "Language-Team: Norwegian Bokmal <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-05-01 05:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -24,6 +24,7 @@
 "Launchpad Contributions:\n"
 "  Fredrik Fallang https://launchpad.net/~fredrik-fallang\n"
 "  Hans Joachim Desserud https://launchpad.net/~hjd\n"
+"  John S. Gruber https://launchpad.net/~jsjgruber\n"
 "  Lars Åge Kamfjord https://launchpad.net/~laaknor\n"
 "  Michael Budde https://launchpad.net/~mbudde"
 

=== modified file 'po/nl.po'
--- po/nl.po	2010-10-08 04:47:59 +0000
+++ po/nl.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-10-05 20:12+0000\n"
+"PO-Revision-Date: 2011-06-04 12:29+0000\n"
 "Last-Translator: Sense Hofstede <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-05 04:50+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"

=== added file 'po/oc.po'
--- po/oc.po	1970-01-01 00:00:00 +0000
+++ po/oc.po	2012-05-07 00:49:19 +0000
@@ -0,0 +1,284 @@
+# Occitan (post 1500) translation for lernid
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the lernid package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lernid\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 16:11+0200\n"
+"PO-Revision-Date: 2011-10-16 16:31+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <[e-mail]>\n"
+"Language-Team: Occitan (post 1500) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2011-10-17 04:51+0000\n"
+"X-Generator: Launchpad (build 14155)\n"
+
+#: ../data/ui/AboutLernidDialog.ui.h:1
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary"
+
+#: ../data/ui/PasswordDialog.ui.h:1
+msgid "Invalid password"
+msgstr "Senhal invalid"
+
+#: ../data/ui/PasswordDialog.ui.h:2
+msgid ""
+"The NickServ password you entered was invalid.\n"
+"Please enter the correct password:"
+msgstr ""
+"Lo senhal NickServ qu'avètz picat es invalid.\n"
+"Picatz lo bon senhal :"
+
+#. Translators: Local time representation
+#: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
+#: ../lernid/Sessions.py:60
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:1
+msgid ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgstr ""
+"<i>Vos cal reaviar Lernid per que d'unes cambiaments prengan efièch.</i>"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:2
+msgid "Show an icon in the notification area"
+msgstr "Afichar una icòna dins la zòna de notificacion"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:3
+msgid "Show time in classroom and chatroom"
+msgstr "Afichar l'ora dins la sala de classa e de discussion"
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:4
+msgid "Use vertical layout"
+msgstr "Utilizar la mesa en pagina verticala"
+
+#: ../lernid/EventManager.py:96
+msgid "Connecting to event"
+msgstr "Connexion a l'eveniment"
+
+#: ../lernid/EventManager.py:104
+msgid "Your nickname is now identified"
+msgstr "Vòstre escais es ara identificat"
+
+#: ../lernid/EventManager.py:139
+msgid "Disconnecting from event"
+msgstr "Desconnexion de l'eveniment"
+
+#: ../lernid/widgets/Slide.py:109
+msgid "An error was encountered while trying to load slide number {0}"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:148
+#, python-format
+msgid "Downloading session slides ({0} % of {1:.1} MB)..."
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:151
+msgid "Slides have been downloaded"
+msgstr "Las diapositivas son estadas telecargadas"
+
+#: ../lernid/widgets/Slide.py:156
+msgid "An error was encountered while downloading slides"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:168
+msgid "This session does not use slides"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:1
+msgid "Classroom"
+msgstr "Sala de classa"
+
+#: ../data/ui/LernidWindow.ui.h:2
+msgid "Enter the address you would like to open in the browser:"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:3
+msgid "Eve_nt"
+msgstr "Eve_niment"
+
+#: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
+#: ../lernid.desktop.in.h:1
+msgid "Lernid"
+msgstr "Lernid"
+
+#: ../data/ui/LernidWindow.ui.h:5
+msgid "Open _URL..."
+msgstr "Dobrir l'_URL..."
+
+#: ../data/ui/LernidWindow.ui.h:6
+msgid "Tweet current session"
+msgstr "Tweetar la sesilha correnta"
+
+#: ../data/ui/LernidWindow.ui.h:7
+msgid "_Chatroom"
+msgstr "Salon de _chat"
+
+#: ../data/ui/LernidWindow.ui.h:8
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../data/ui/LernidWindow.ui.h:9
+msgid "_Fullscreen"
+msgstr "Ecran _complet"
+
+#: ../data/ui/LernidWindow.ui.h:10
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../data/ui/LernidWindow.ui.h:11
+msgid "_Statusbar"
+msgstr "Barra d'e_stat"
+
+#: ../data/ui/LernidWindow.ui.h:12
+msgid "_View"
+msgstr "_Afichatge"
+
+#: ../bin/lernid.py:141 ../bin/lernid.py:144 ../bin/lernid.py:199
+msgid "_Session"
+msgstr "_Sesilha"
+
+#: ../bin/lernid.py:208
+msgid "Sche_dule"
+msgstr "Emplec _del temps"
+
+#: ../bin/lernid.py:215
+msgid "_Terminal"
+msgstr "_Terminal"
+
+#: ../bin/lernid.py:226
+msgid "({0} user)"
+msgid_plural "({0} users)"
+msgstr[0] "({0} utilizaire)"
+msgstr[1] "({0} utilizaires)"
+
+#: ../bin/lernid.py:290
+msgid "_Show Lernid"
+msgstr "Afichar Lernid"
+
+#: ../bin/lernid.py:333
+msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
+msgstr "La sesilha  « {0} » a començat dins #ubuntu-classroom sus freenode."
+
+#: ../bin/lernid.py:424
+msgid "Show debug messages"
+msgstr "Afichar los messatges de desbugatge"
+
+#: ../bin/lernid.py:426
+msgid "Override classroom channel"
+msgstr "Otrapassar lo canal IRC de la sala de classa"
+
+#: ../bin/lernid.py:428
+msgid "Filename or URL to Lernid config file"
+msgstr "Nom o URL del fichièr de configuracion de Lernid"
+
+#: ../bin/lernid.py:430
+msgid "Use web chat widget instead of the native one"
+msgstr "Utilizar lo widget de chat web al luòc del client natiu"
+
+#: ../lernid/widgets/Schedule.py:80
+msgid "Date"
+msgstr "Data"
+
+#: ../lernid/widgets/Schedule.py:88
+msgid "Starts"
+msgstr "Comença"
+
+#: ../lernid/widgets/Schedule.py:96
+msgid "Ends"
+msgstr "S'acaba lo"
+
+#: ../lernid/widgets/Schedule.py:104 ../lernid/widgets/Schedule.py:109
+msgid "Title"
+msgstr "Títol"
+
+#: ../lernid/widgets/Schedule.py:163
+msgid "Session started"
+msgstr "Sesilha aviada"
+
+#: ../lernid/widgets/Schedule.py:164
+msgid "The session \"{0}\" has started."
+msgstr "La sesilha \"{0}\" a comencat."
+
+#: ../lernid/widgets/Schedule.py:173
+msgid "Session upcoming"
+msgstr "Sesilha venenta"
+
+#: ../lernid/widgets/Schedule.py:174
+msgid "The session \"{0}\" will begin in 10 minutes."
+msgstr "La sesilha \"{0}\" començarà dins 10 minutas."
+
+#: ../data/ui/BrowserWidget.ui.h:1
+msgid "Stop browser from changing page"
+msgstr "Empachar lo navigador de cambiar de pagina"
+
+#: ../lernid/widgets/Classroom.py:78
+msgid "Joined classroom"
+msgstr "Avètz rejunt la sala de classa"
+
+#: ../data/ui/ConnectDialog.ui.h:1
+msgid "Advanced options"
+msgstr "Opcions avançadas"
+
+#: ../data/ui/ConnectDialog.ui.h:2
+msgid "Choose an event"
+msgstr "Causir un eveniment"
+
+#: ../data/ui/ConnectDialog.ui.h:3
+msgid "Event:"
+msgstr "Eveniment :"
+
+#: ../data/ui/ConnectDialog.ui.h:4
+msgid "NickServ password:"
+msgstr "Senhal NickServ :"
+
+#: ../data/ui/ConnectDialog.ui.h:5
+msgid "Nickname:"
+msgstr "Escais :"
+
+#: ../lernid.desktop.in.h:2
+msgid "Participate in online learning events"
+msgstr "Prene part a d'eveniments de formacion en linha"
+
+#. Translators: Local date representation
+#: ../lernid/Sessions.py:50
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../lernid/ConnectDialog.py:111
+msgid "Nick can not be blank"
+msgstr "L'escais pòt pas èsser void"
+
+#: ../lernid/ConnectDialog.py:115
+#, python-format
+msgid "Nick can not begin with: %s"
+msgstr ""
+
+#: ../lernid/ConnectDialog.py:119
+msgid "Nick can not contain blank spaces."
+msgstr ""
+
+#: ../lernid/ConnectDialog.py:119
+#, python-format
+msgid "Nick can not contain: %s"
+msgstr ""
+
+#: ../lernid/ConnectDialog.py:122
+msgid "Nick can only contain English alphabet characters"
+msgstr ""
+
+#: ../lernid/lernidconfig.py:33
+msgid "Connect to a world of online tutorials quickly and easily."
+msgstr ""
+
+#: ../lernid/widgets/NativeChatroom.py:164
+msgid "IRC commands are not yet supported."
+msgstr ""

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2010-08-03 03:57:01 +0000
+++ po/pt_BR.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 16:39+0000\n"
-"Last-Translator: Daniel Tiecher <[e-mail]>\n"
+"PO-Revision-Date: 2011-06-29 18:22+0000\n"
+"Last-Translator: André Gondim <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-06-30 04:47+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -84,7 +84,7 @@
 #: ../lernid/widgets/Slide.py:148
 #, python-format
 msgid "Downloading session slides ({0} % of {1:.1} MB)..."
-msgstr ""
+msgstr "Baixando apresetação da sessão ({0} % de {1:.1} MB)..."
 
 #: ../lernid/widgets/Slide.py:151
 msgid "Slides have been downloaded"
@@ -345,6 +345,18 @@
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "Recursos"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "Sala de aula"
+
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "Sala de bate-papo"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "Agenda"
+
 #~ msgid "Connected to "
 #~ msgstr "Conectado a "
 

=== modified file 'po/sv.po'
--- po/sv.po	2010-08-03 03:57:01 +0000
+++ po/sv.po	2012-05-07 00:49:19 +0000
@@ -8,15 +8,15 @@
 "Project-Id-Version: lernid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-02 16:11+0200\n"
-"PO-Revision-Date: 2010-08-02 16:23+0000\n"
+"PO-Revision-Date: 2011-07-26 11:20+0000\n"
 "Last-Translator: Daniel Nylander <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-03 03:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-07-27 04:38+0000\n"
+"X-Generator: Launchpad (build 13405)\n"
 
 #: ../data/ui/AboutLernidDialog.ui.h:1
 msgid "translator-credits"
@@ -38,6 +38,8 @@
 "The NickServ password you entered was invalid.\n"
 "Please enter the correct password:"
 msgstr ""
+"Lösenordet för NickServ som du angav är ogiltigt.\n"
+"Ange det korrekta lösenordet:"
 
 #. Translators: Local time representation
 #: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
@@ -64,19 +66,19 @@
 
 #: ../lernid/EventManager.py:96
 msgid "Connecting to event"
-msgstr ""
+msgstr "Ansluter till aktivitet"
 
 #: ../lernid/EventManager.py:104
 msgid "Your nickname is now identified"
-msgstr ""
+msgstr "Ditt smeknamn är nu identifierat"
 
 #: ../lernid/EventManager.py:139
 msgid "Disconnecting from event"
-msgstr ""
+msgstr "Kopplar från aktivitet"
 
 #: ../lernid/widgets/Slide.py:109
 msgid "An error was encountered while trying to load slide number {0}"
-msgstr ""
+msgstr "Ett fel inträffade vid försök att läsa in bild nummer {0}"
 
 #: ../lernid/widgets/Slide.py:148
 #, python-format
@@ -85,15 +87,15 @@
 
 #: ../lernid/widgets/Slide.py:151
 msgid "Slides have been downloaded"
-msgstr ""
+msgstr "Bilderna har hämtats"
 
 #: ../lernid/widgets/Slide.py:156
 msgid "An error was encountered while downloading slides"
-msgstr ""
+msgstr "Ett fel inträffade vid hämtning av bilder"
 
 #: ../lernid/widgets/Slide.py:168
 msgid "This session does not use slides"
-msgstr ""
+msgstr "Denna session använder inte bilder"
 
 #: ../data/ui/LernidWindow.ui.h:1
 msgid "Classroom"
@@ -101,11 +103,11 @@
 
 #: ../data/ui/LernidWindow.ui.h:2
 msgid "Enter the address you would like to open in the browser:"
-msgstr ""
+msgstr "Skriv adressen som du vill öppna i webbläsaren:"
 
 #: ../data/ui/LernidWindow.ui.h:3
 msgid "Eve_nt"
-msgstr ""
+msgstr "Eve_nemang"
 
 #: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
 #: ../lernid.desktop.in.h:1
@@ -118,7 +120,7 @@
 
 #: ../data/ui/LernidWindow.ui.h:6
 msgid "Tweet current session"
-msgstr ""
+msgstr "Twittra aktuell lektion"
 
 #: ../data/ui/LernidWindow.ui.h:7
 msgid "_Chatroom"
@@ -146,11 +148,11 @@
 
 #: ../bin/lernid.py:141 ../bin/lernid.py:144 ../bin/lernid.py:199
 msgid "_Session"
-msgstr ""
+msgstr "_Lektion"
 
 #: ../bin/lernid.py:208
 msgid "Sche_dule"
-msgstr ""
+msgstr "Sche_ma"
 
 #: ../bin/lernid.py:215
 msgid "_Terminal"
@@ -168,7 +170,7 @@
 
 #: ../bin/lernid.py:333
 msgid "The session \"{0}\" has started in #ubuntu-classroom on freenode."
-msgstr ""
+msgstr "Lektionen \"{0}\" har börjat i #ubuntu-classroom på freenode."
 
 #: ../bin/lernid.py:424
 msgid "Show debug messages"
@@ -176,15 +178,15 @@
 
 #: ../bin/lernid.py:426
 msgid "Override classroom channel"
-msgstr ""
+msgstr "Åsidosätt klassrummets kanal"
 
 #: ../bin/lernid.py:428
 msgid "Filename or URL to Lernid config file"
-msgstr ""
+msgstr "Filnamn eller URL till konfigurationsfilen för Lernid"
 
 #: ../bin/lernid.py:430
 msgid "Use web chat widget instead of the native one"
-msgstr ""
+msgstr "Använd widget för webbchatt istället för den inbyggda"
 
 #: ../lernid/widgets/Schedule.py:80
 msgid "Date"
@@ -204,15 +206,15 @@
 
 #: ../lernid/widgets/Schedule.py:163
 msgid "Session started"
-msgstr ""
+msgstr "Lektionen har börjat"
 
 #: ../lernid/widgets/Schedule.py:164
 msgid "The session \"{0}\" has started."
-msgstr ""
+msgstr "Lektionen \"{0}\" har börjat."
 
 #: ../lernid/widgets/Schedule.py:173
 msgid "Session upcoming"
-msgstr ""
+msgstr "Kommande lektion"
 
 #: ../lernid/widgets/Schedule.py:174
 msgid "The session \"{0}\" will begin in 10 minutes."
@@ -220,7 +222,7 @@
 
 #: ../data/ui/BrowserWidget.ui.h:1
 msgid "Stop browser from changing page"
-msgstr ""
+msgstr "Stoppa webbläsaren från att byta sida"
 
 #: ../lernid/widgets/Classroom.py:78
 msgid "Joined classroom"
@@ -232,15 +234,15 @@
 
 #: ../data/ui/ConnectDialog.ui.h:2
 msgid "Choose an event"
-msgstr "Välj en händelse"
+msgstr "Välj en aktivitet"
 
 #: ../data/ui/ConnectDialog.ui.h:3
 msgid "Event:"
-msgstr ""
+msgstr "Aktivitet:"
 
 #: ../data/ui/ConnectDialog.ui.h:4
 msgid "NickServ password:"
-msgstr ""
+msgstr "Lösenord för NickServ:"
 
 #: ../data/ui/ConnectDialog.ui.h:5
 msgid "Nickname:"
@@ -284,7 +286,7 @@
 
 #: ../lernid/widgets/NativeChatroom.py:164
 msgid "IRC commands are not yet supported."
-msgstr ""
+msgstr "IRC-kommandon stöds ännu inte."
 
 #~ msgid "Not Connected."
 #~ msgstr "Inte ansluten."
@@ -341,12 +343,24 @@
 #~ msgid "David Planella <[e-mail]>"
 #~ msgstr "David Planella <[e-mail]>"
 
+#~ msgid "<b>Resources</b>"
+#~ msgstr "<b>Resurser</b>"
+
+#~ msgid "<b>Classroom</b>"
+#~ msgstr "<b>klassrum</b>"
+
+#~ msgid "<b>Schedule</b>"
+#~ msgstr "<b>Schema</b>"
+
 #~ msgid "Connected to "
 #~ msgstr "Ansluten till "
 
 #~ msgid "Disconnecting from "
 #~ msgstr "Kopplar från "
 
+#~ msgid "<b>Chatroom</b>"
+#~ msgstr "<b>Chatlokal</b>"
+
 #~ msgid "Lernid application"
 #~ msgstr "Lernid-tillämpning"
 

=== added file 'po/tr.po'
--- po/tr.po	1970-01-01 00:00:00 +0000
+++ po/tr.po	2012-05-07 00:49:19 +0000
@@ -0,0 +1,280 @@
+# Turkish translation for lernid
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the lernid package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lernid\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 16:11+0200\n"
+"PO-Revision-Date: 2011-09-01 07:54+0000\n"
+"Last-Translator: Launchpad Translations Administrators "
+"<[e-mail]>\n"
+"Language-Team: Turkish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2011-09-02 04:50+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#: ../data/ui/AboutLernidDialog.ui.h:1
+msgid "translator-credits"
+msgstr ""
+
+#: ../data/ui/PasswordDialog.ui.h:1
+msgid "Invalid password"
+msgstr ""
+
+#: ../data/ui/PasswordDialog.ui.h:2
+msgid ""
+"The NickServ password you entered was invalid.\n"
+"Please enter the correct password:"
+msgstr ""
+
+#. Translators: Local time representation
+#: ../lernid/widgets/IrcWidget.py:57 ../lernid/Sessions.py:55
+#: ../lernid/Sessions.py:60
+msgid "%H:%M"
+msgstr ""
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:1
+msgid ""
+"<i>You need to restart Lernid for some of the changes to take effect.</i>"
+msgstr ""
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:2
+msgid "Show an icon in the notification area"
+msgstr ""
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:3
+msgid "Show time in classroom and chatroom"
+msgstr ""
+
+#: ../data/ui/PreferencesLernidDialog.ui.h:4
+msgid "Use vertical layout"
+msgstr ""
+
+#: ../lernid/EventManager.py:96
+msgid "Connecting to event"
+msgstr ""
+
+#: ../lernid/EventManager.py:104
+msgid "Your nickname is now identified"
+msgstr ""
+
+#: ../lernid/EventManager.py:139
+msgid "Disconnecting from event"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:109
+msgid "An error was encountered while trying to load slide number {0}"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:148
+#, python-format
+msgid "Downloading session slides ({0} % of {1:.1} MB)..."
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:151
+msgid "Slides have been downloaded"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:156
+msgid "An error was encountered while downloading slides"
+msgstr ""
+
+#: ../lernid/widgets/Slide.py:168
+msgid "This session does not use slides"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:1
+msgid "Classroom"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:2
+msgid "Enter the address you would like to open in the browser:"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:3
+msgid "Eve_nt"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:4 ../bin/lernid.py:128 ../bin/lernid.py:130
+#: ../lernid.desktop.in.h:1
+msgid "Lernid"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:5
+msgid "Open _URL..."
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:6
+msgid "Tweet current session"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:7
+msgid "_Chatroom"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:8
+msgid "_Edit"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:9
+msgid "_Fullscreen"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:10
+msgid "_Help"
+msgstr ""
+
+#: ../data/ui/LernidWindow.ui.h:11
+msgid "_Statusbar"