mention FrOSCon as an example (although it's not working at the moment, cf. #32)

diff --git a/README b/README
index 242ea507c4e238dd9739e63df95f384ea4f82810..51ade6c8c858a25634b80aa5f435ccee4edb5958 100644 (file)
--- a/README
+++ b/README
@@ -11,8 +11,8 @@ location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 At the moment ConfClerk is able to import schedules in XML format created by
-the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and
-the CCC.
+the PentaBarf conference management system used by e.g. FOSDEM, DebConf,
+FrOSCon, and the CCC.
 
 ConfClerk is targetted at mobile devices like the Nokia N810 and N900 but
 works on any sytem running Qt.
@@ -128,3 +128,4 @@ Tested pentabarf instances:
 - DebConf (2010): http://penta.debconf.org/dc10_schedule/schedule.en.xml
 - DebConf (2011): http://penta.debconf.org/dc11_schedule/schedule.en.xml
 - 27C3: http://events.ccc.de/congress/2010/Fahrplan/schedule.en.xml
+- FrOSCon (2011): http://programm.froscon.org/2011/schedule.xml

diff --git a/data/confclerk.pod b/data/confclerk.pod
index 664c348661e6b028c51588eb1f48c29e38919bc7..2e5bbd3f566ccf78571654a5348c826ea6fd8d9c 100644 (file)
--- a/data/confclerk.pod
+++ b/data/confclerk.pod
@@ -16,9 +16,9 @@ from various views, support searches on various items (speaker, speech topic,
 location, etc.) and enables you to select favorite events and create your own
 schedule.
 
-At the moment B<ConfClerk> is able to import schedules in XML format created by
-the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and
-the CCC.
+At the moment B<ConfClerk> is able to import schedules in XML format created
+by the PentaBarf conference management system used by e.g. FOSDEM, DebConf,
+FrOSCon, and the CCC.
 
 ConfClerk is targetted at mobile devices like the Nokia N810 and N900 but
 works on any sytem running Qt.

diff --git a/src/gui/about.ui b/src/gui/about.ui
index a812c93e4b3014a455c14f40258d78c0e1aa7544..95b5fc08a9dd5c10c54f6f64826861fabb93107c 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -131,7 +131,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">ConfClerk</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Successor of FOSDEM schedule<br /></span>Version %1</p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.toastfreeware.priv.at/confclerk/"><span style=" text-decoration: underline; color:#0057ae;">http://www.toastfreeware.priv.at/confclerk/</span></a></p>
-<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ConfClerk is an application written in Qt, which makes conference schedules available offline.  It displays the conference schedule from various views, support searches on various items (speaker, speech topic, location, etc.) and enables you to select favorite events and create your own schedule. At the moment ConfClerk is able to import schedules in XML format created by the PentaBarf conference management system used by e.g. FOSDEM, DebConf, and the CCC.</p>
+<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ConfClerk is an application written in Qt, which makes conference schedules available offline.  It displays the conference schedule from various views, support searches on various items (speaker, speech topic, location, etc.) and enables you to select favorite events and create your own schedule. At the moment ConfClerk is able to import schedules in XML format created by the PentaBarf conference management system used by e.g. FOSDEM, DebConf, FrOSCon, and the CCC.</p>
 <p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Developers</span></p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol, Pavelka Pavol, Timko Marek, Uzak Matus, Fortes Francisco, Philipp Spitzer, gregor herrmann</p>
 <p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Copyright and license</span></p>