Merge branch 'master' into qt5

[toast/confclerk.git] / data / confclerk.pod

diff --git a/data/confclerk.pod b/data/confclerk.pod
index d6b65878a03749a2c2c3b5ecdd7a83677109761a..d9134805ae8e54faec28468104cda37f6f99cc5d 100644 (file)
--- a/data/confclerk.pod
+++ b/data/confclerk.pod
@@ -12,7 +12,7 @@ B<confclerk>
 
 B<ConfClerk> is an application written in Qt, which makes conference
 schedules available offline.  It displays the conference schedule
 
 B<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,
+from various views, supports searches on various items (speaker, speech topic,

 location, etc.) and enables you to select favorite events and create your own
 schedule.
 
 location, etc.) and enables you to select favorite events and create your own
 schedule.
 


@@ -21,7 +21,7 @@ by the PentaBarf conference management system (or frab) used by e.g. FOSDEM,
 DebConf, FrOSCon, Grazer Linuxtage, and the CCC.
 
 ConfClerk is targeted at mobile devices like the Nokia N810 and N900 but
 DebConf, FrOSCon, Grazer Linuxtage, and the CCC.
 
 ConfClerk is targeted at mobile devices like the Nokia N810 and N900 but

-works on any sytem running Qt.
+works on any system running Qt.

 
 =head1 OPTIONS
 
 
 =head1 OPTIONS
 


@@ -65,8 +65,9 @@ F<~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite>.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.
 =head2 Main code
 
     Copyright (C) 2010 Ixonos Plc.

-    Copyright (C) 2011, Philipp Spitzer <philipp@toastfreeware.priv.at>
-    Copyright (C) 2011, gregor herrmann <gregor@toastfreeware.priv.at>
+    Copyright (C) 2011-2015, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2011-2015, gregor herrmann <gregor@toastfreeware.priv.at>
+    Copyright (C) 2011-2015, Stefan Strahl <stefan@toastfreeware.priv.at>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -116,9 +117,10 @@ the following notice (as of 2011-06-24):
     GNOME icon theme is distributed under the terms of either
     GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.
 
     GNOME icon theme is distributed under the terms of either
     GNU LGPL v.3 or Creative Commons BY-SA 3.0 license.
 

-=item src/icons/emblem-new*
+=item src/icons/favourite*, src/icons/alarm*, src/icons/collapse*, src/icons/expand*:

 
 

-    Copyright (C) 2011, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2012, Philipp Spitzer <philipp@toastfreeware.priv.at>
+    Copyright (C) 2012, Stefan Strahl <stefan@toastfreeware.priv.at>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by