# Generated by Makefile. Do not edit.

commit 85699a5d5562f12ff5944f3568a5f8013ae1860b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Aug 28 16:47:49 2010 +0200

    Update README File. fix #627538

 README |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit f83f08a80ef90daa8e5d421c30290419c6504a6e
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   Fri Aug 20 12:09:59 2010 +0200

    Updated French translation

 po/fr.po |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

commit 550c9c6a02540406dff7d51ef23faec99f82e90f
Author: Yinghua Wang <wantinghard@gmail.com>
Date:   Sat Aug 14 21:14:03 2010 +0800

    Add Simplified Chinese translation.

 po/LINGUAS  |    1 +
 po/zh_CN.po | 1073 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1074 insertions(+), 0 deletions(-)

commit 5c7fbc70207cf3439e301c221f459c777249eb7b
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Mon Jul 19 14:47:00 2010 +0200

    Updated Slovenian translation

 po/sl.po |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

commit 1db17291e68aa58f1e5bdfabfe0fbf1862185e83
Author: Yannis Kaskamanidis <kiolalis@gmail.com>
Date:   Thu Jul 1 01:00:26 2010 +0300

    Added Greek documentation translation for nanny

 help/Makefile.am |    2 +-
 help/el/el.po    |  504 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 505 insertions(+), 1 deletions(-)

commit 3fdbf7102206ffbff821725c73586ea77357e074
Author: Yannis Kaskamanidis <kiolalis@gmail.com>
Date:   Thu Jul 1 00:58:06 2010 +0300

    Added Greek translation

 po/LINGUAS |    1 +
 po/el.po   | 1104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1105 insertions(+), 0 deletions(-)

commit 8396822bd71b45732650ce8876083fc5134c5ecb
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Jun 21 11:00:02 2010 +0200

    Updated Galician translations

 po/gl.po |  128 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 84 insertions(+), 44 deletions(-)

commit 35128599e7ac9b728919e24a8a042a71592d18b7
Author: Djavan Fagundes <djavan@comum.org>
Date:   Sun Jun 13 19:53:59 2010 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 1051 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 942 insertions(+), 109 deletions(-)

commit a794a846fa676e54e0e4d4cb54b8520bb1290d01
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue May 25 17:42:25 2010 +0200

    Updated German translation

 po/de.po |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

commit 4efe0203d868255a9e16a436fcd86a976c4d679f
Author: Petr Kovar <pknbe@volny.cz>
Date:   Mon May 17 00:27:08 2010 +0200

    Update Czech translation by Marek Cernocky

 po/cs.po |   70 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 47 insertions(+), 23 deletions(-)

commit a7dff89dd7585fc58500b933ad81e1620c794bea
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun May 16 20:16:22 2010 +0200

    Update News a configure with 2.29.4 info

 NEWS         |   32 ++++++++++++++++++++++++++++++++
 configure.ac |    2 +-
 2 files changed, 33 insertions(+), 1 deletions(-)

commit b48e459cc1c97f391e893c227fd66dd58c2c73a4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun May 16 20:09:07 2010 +0200

    clean file distcheck fail

 daemon/data/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 1455e7c47a9aec7504833ecd55d0069e3f858c21
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun May 16 20:02:28 2010 +0200

    Fix mandriva distcheck fail

 daemon/data/init.d/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7d38c55059fbd25f6ba5d3fb5815086245222cfb
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun May 16 19:21:00 2010 +0200

    RedHat init script updated

 daemon/data/init.d/redhat/nanny |   91 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 87 insertions(+), 4 deletions(-)

commit 9ca33145aeebd155b8f5627ed6b962552f6a54c9
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri May 14 22:44:30 2010 +0200

    Fix gregexp bug with bad-formed utf8 strings

 daemon/src/gregexmodule.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit 2a0eb1ac19c6b810b292784911d8ea6c893f9896
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed May 12 12:42:29 2010 +0200

    Chrono session control Consolekit based

 daemon/src/Chrono.py      |   33 ++++++++++++++++++++++++++-------
 daemon/src/QuarterBack.py |    2 ++
 2 files changed, 28 insertions(+), 7 deletions(-)

commit 9211a9187800de6ea5eebe392fd83d0f4d640e74
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Fri May 14 20:19:21 2010 +0200

    Updated Slovenian translation

 po/sl.po |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

commit 1e1fc6790b837640f0436dc1b158bc453d48541e
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 20:18:21 2010 +0200

    Fix unsensitive bug at spinbuttons

 client/gnome/admin/src/AdminConsole.py |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

commit b0f3a63195f9d6cad1ad226b7ef66bfd21c792f4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 20:00:05 2010 +0200

    Update spanish translation

 po/es.po |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

commit e772ac93338d6de5f5981825a950b5924cf157f8
Merge: eaa5f54 9c7fdca
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 19:43:42 2010 +0200

    Merge branch 'console-kit'

commit 9c7fdcac18e38a0efe383089671445bdfba88f64
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 19:42:13 2010 +0200

    Hide info label in desktop blocker re-show

 .../gnome/admin/data/ui/nanny_desktop_blocker.ui   |    2 +-
 client/gnome/admin/src/DesktopBlocker.py           |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

commit eb0d8ffca7cd94cad6312c693535bca7caf8fb7e
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 19:31:08 2010 +0200

    Add desktop blocker killers

 daemon/src/LinuxSessionCKFiltering.py |   40 ++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 3 deletions(-)

commit cf935b291fb8781119b914c093d6597da6c91726
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 17:07:01 2010 +0200

    Add desktop-blocker to POTFILES.in

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6a95a0872dd3537864654547ce5f336045752baa
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue May 11 16:52:52 2010 +0200

    Get correct lang var from user-space

 daemon/src/LinuxSessionCKFiltering.py |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

commit eaa5f5490306a87bf2704dd9220db546856576ae
Author: Claude Paroz <claude@2xlibre.net>
Date:   Mon Apr 26 09:50:33 2010 +0200

    Updated French translation
    
    Contributed by Olivier Banus, Laurent Coudeur and Claude Paroz

 po/fr.po |  865 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 489 insertions(+), 376 deletions(-)

commit 81ac2f05411913c55d9d7c14facf7d2ed6e980b4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Apr 1 06:06:31 2010 +0200

    Remove lang file code of nanny-systray

 client/gnome/systray/nanny-systray |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

commit f0663a5396556bcd1b599eb65a6bed8c6bb8c0c4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Apr 1 06:05:09 2010 +0200

    Add desktop-blocker launcher to LinuxSessionCK

 daemon/src/LinuxSessionCKFiltering.py |   45 +++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 5 deletions(-)

commit 1972d00c11a2b7eaa1c1162e78e3ba6164c8b523
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Apr 1 04:51:25 2010 +0200

    Save LANG env-var when start nanny-systray

 client/gnome/systray/nanny-systray |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit 47d98f84765c185a44e5e44a131ecc451660dd7e
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Apr 1 04:09:45 2010 +0200

    Added nanny-desktop-blocker

 client/gnome/admin/Makefile.am                     |    4 +-
 client/gnome/admin/data/ui/Makefile.am             |    3 +-
 .../gnome/admin/data/ui/nanny_desktop_blocker.ui   |  111 +++++++++++++++++++
 client/gnome/admin/nanny-desktop-blocker           |   37 +++++++
 client/gnome/admin/src/DesktopBlocker.py           |  112 ++++++++++++++++++++
 client/gnome/admin/src/Makefile.am                 |    3 +-
 client/gnome/admin/src/__init__.py.in              |    1 +
 7 files changed, 267 insertions(+), 4 deletions(-)

commit d3ebb6a1058f022f76712f01b3121332e40c237a
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Mar 31 16:56:20 2010 +0200

    Detecting user sessions using ConsoleKit

 daemon/src/LinuxSessionCKFiltering.py |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

commit 6f09240dda1efaa7adacf7d95ac1ace6c8028255
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Mar 31 16:25:04 2010 +0200

    Add initial support of Consolekit

 daemon/src/LinuxSessionCKFiltering.py |  116 +++++++++++++++++++++++++++++++++
 daemon/src/Makefile.am                |    3 +-
 daemon/src/QuarterBack.py             |    2 +-
 3 files changed, 119 insertions(+), 2 deletions(-)

commit 9d28dc50840b8b937500d3baf6bdc7c9c659423b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Mar 17 19:35:22 2010 +0100

    Fix https filtering

 daemon/src/LinuxFiltering.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 109094d89e83e4740d896b845c011edc066dc245
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sun Mar 21 08:47:26 2010 +0100

    Updated Slovenian translation

 po/sl.po |  110 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 62 insertions(+), 48 deletions(-)

commit fbd5145b8c2eb4dcb504f5b9ba3261dc3683ce5f
Author: Wolfgang Stöggl <c72578@yahoo.de>
Date:   Sat Mar 20 22:03:10 2010 +0100

    Updated German translation

 po/de.po |  104 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 60 insertions(+), 44 deletions(-)

commit 664abbb68c7864b905dfb57a9c3da35035570919
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Tue Mar 16 18:23:23 2010 +0100

    Fixed bug in ScheduleCalendar while dragging

 client/gnome/admin/src/ScheduleCalendar.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit e33c7102eee6d499da37ff96d367e0783316f3b6
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Mar 16 16:59:39 2010 +0100

    Added italian help translation

 help/Makefile.am |    2 +-
 help/it/it.po    |  461 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 462 insertions(+), 1 deletions(-)

commit 674557ea80b3a8a0374bcf7d29cc41a6cd68db79
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Mar 16 16:59:27 2010 +0100

    Updated spanish translation

 po/es.po |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

commit 61d3335a7e9c5c393f84cf72628391ce8531b9cf
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Mar 16 16:48:28 2010 +0100

    Fix string in nbm_pbl_dialog.ui

 client/gnome/admin/data/ui/nbm_pbl_dialog.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 092c764160aaec6ebeb627fec6165668387b8d6b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Mar 15 19:06:33 2010 +0100

    Updated Spanish translation

 po/es.po |   95 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 59 insertions(+), 36 deletions(-)

commit 145fe49cff36e75acdad669fd9b89a8aba8bf341
Author: Petr Kovar <pknbe@volny.cz>
Date:   Mon Mar 15 01:20:47 2010 +0100

    Update Czech translation by Marek Cernocky

 po/cs.po |   98 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 59 insertions(+), 39 deletions(-)

commit 37433a7738aa0700cea820c7f764657a5feeea91
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Mar 14 16:39:52 2010 +0100

    Fix string in nanny-admin-console.ui

 client/gnome/admin/data/ui/nanny_admin_console.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2d8bd3f6cf7cc2bb76dde3ac96d02892b7cfc96d
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Mar 14 12:54:35 2010 +0100

    Fix get_name bug in lucid pygtk [ui_magic]

 client/common/src/Utils.py |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

commit 40975b37111a9b43fe5f4560ff719e61f0f8d163
Merge: 09eb60d 10c1a29
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Mar 14 12:29:27 2010 +0100

    Merge branch 'policy-kit'

commit 10c1a2987fb103cb01298603ef0fb200a2db1d6a
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 22:40:57 2010 +0100

    Add policy to POTFILES.in

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 958c0af9cc67b52210db45768e92fe1d19943592
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 22:21:18 2010 +0100

    NannySystray -> nanny-systray

 client/gnome/systray/Makefile.am                |    4 +-
 client/gnome/systray/NannySystray               |   34 -----------------------
 client/gnome/systray/data/nanny-systray.desktop |    2 +-
 client/gnome/systray/nanny-systray              |   34 +++++++++++++++++++++++
 4 files changed, 37 insertions(+), 37 deletions(-)

commit 0530877e78d084f3484a053e9b8777ff265510ed
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 22:19:52 2010 +0100

    Change sbin names

 client/gnome/admin/Makefile.am                     |    4 +-
 client/gnome/admin/NannyAdminConsole               |   41 --------------------
 client/gnome/admin/NannyBlacklistManager           |   37 ------------------
 .../admin/data/nanny-admin-console.desktop.in      |    2 +-
 .../admin/data/nanny-blacklist-manager.desktop.in  |    2 +-
 client/gnome/admin/data/ui/nbm_pbl_dialog.ui       |    4 +-
 client/gnome/admin/nanny-admin-console             |   41 ++++++++++++++++++++
 client/gnome/admin/nanny-blacklist-manager         |   37 ++++++++++++++++++
 8 files changed, 84 insertions(+), 84 deletions(-)

commit 84443bc8a4e815580a443514940a8db1003867bc
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 22:12:42 2010 +0100

    Add Unlock policy-kit based to BlacklistManager

 client/gnome/admin/src/BlacklistManager.py |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

commit 6dcf6ef269bbc7f14d88d1fc6b04b4dcf04e9500
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 22:03:57 2010 +0100

    And Unlock policykit bases to AdminConsole

 client/gnome/admin/src/AdminConsole.py |   38 ++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

commit d385bbe4adcebd4c96b0640d3d762bb13a860f26
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 21:56:44 2010 +0100

    Add IsUnLocked and UnLock bindings to client side

 client/common/src/DBusClient.py |   56 +++++----------------------------------
 1 files changed, 7 insertions(+), 49 deletions(-)

commit 08131203a486a78932541a492453358c371f4a81
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 21:55:21 2010 +0100

    Remove other dbg message

 daemon/src/NannyDBus.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit eb5ca00a57ec015e08a4015ed2c3d8bee094f44e
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 21:51:56 2010 +0100

    Remove dbg message

 client/common/src/Utils.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 09a6d56b83c59ba7a8221695eaff33fbf9199c66
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 21:49:52 2010 +0100

    Caching pid process auth==ok server side

 daemon/src/NannyDBus.py |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

commit 09eb60dd0cfb8f1daf17d393f5be863d2c560018
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date:   Sat Mar 13 21:24:03 2010 +0100

    Update Galician translation

 po/gl.po |  361 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 181 insertions(+), 180 deletions(-)

commit 842dac84d407b63022b69e582f456635f37221c0
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 17:49:54 2010 +0100

    Add unlock buttons to dialogs

 client/common/src/Utils.py                        |   11 +-
 client/gnome/admin/data/ui/nanny_admin_console.ui |  608 +++++++++++----------
 client/gnome/admin/data/ui/nbm_pbl_dialog.ui      |   64 ++-
 3 files changed, 393 insertions(+), 290 deletions(-)

commit b12da15c09bb2666bbd4f1c03c5848ac052d1e37
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 16:48:19 2010 +0100

    Add check_policy at server side

 daemon/src/NannyDBus.py |  125 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 100 insertions(+), 25 deletions(-)

commit 5cda0d77f67c59330758de734c2d98012ea5ed8b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 15:40:46 2010 +0100

    Add check_policy and obtain_auth dbus client side

 client/common/src/DBusClient.py |   50 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

commit c60a8ca205b33dd74f9b000ffad42b9166ff65cb
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 15:34:17 2010 +0100

    Add policy-kit policy

 daemon/data/Makefile.am               |    7 +++++++
 daemon/data/org.gnome.nanny.policy.in |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 0 deletions(-)

commit f591cbab976d89871423b7881012e6f54e810f27
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Mar 13 15:13:35 2010 +0100

    Add policykit detection

 configure.ac |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit b9a57a757fc94c4b75419cd2106b3ecb82efe164
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Tue Mar 9 11:56:05 2010 +0100

    Updated Polish translation

 po/LINGUAS |    1 +
 po/pl.po   | 1049 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1050 insertions(+), 0 deletions(-)

commit 60002d8429539a6b6506aa5dc9714c1732dfb135
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 21:32:06 2010 +0100

    Conditional support fo hachoir_regexp

 configure.ac           |    5 +++--
 daemon/src/Makefile.am |    8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

commit 9f00637f4f2e9599c5706f546745f9a19636be6a
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 17:33:02 2010 +0100

    Support for Mandriva/CaixaMagica
    
    This patch adds support for Mandriva and Caixa Magica Linux.
    This is 100% compatible with Mandriva.
    
    Provided by Luis medinas <lmedinas at gnome.org>

 README                                  |    2 +-
 configure.ac                            |   13 ++++-
 daemon/data/init.d/mandriva/Makefile.am |    9 +++
 daemon/data/init.d/mandriva/nanny       |   89 +++++++++++++++++++++++++++++++
 4 files changed, 110 insertions(+), 3 deletions(-)

commit 24ade25ada1c32c20c61e374655ef77d8a67ea2f
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 11:32:33 2010 +0100

    Refresh info when anything change

 client/gnome/systray/src/SystrayNanny.py |    5 -----
 daemon/src/QuarterBack.py                |    1 +
 2 files changed, 1 insertions(+), 5 deletions(-)

commit 0d9170cdd184c0a360df4c8abfb29b1efe9511a8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 11:16:38 2010 +0100

    Dbus client class now is tolerant to daemon restarts

 client/common/src/DBusClient.py |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

commit 1c7e7ea552a9de445753a5ab0b95546e8b4bd86c
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 10:49:41 2010 +0100

    Hide/show systray if information is available or not

 client/gnome/systray/src/SystrayNanny.py |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

commit 8dd42665e099d8042d3d5bf0962b98eada418263
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 10:13:55 2010 +0100

    Add python-gtop as build depends

 configure.ac |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

commit 0b815e7682f8693c67feb78b6141d7023e29a4ab
Author: Miguel Anxo Bouzada <mbouzada@gmail.com>
Date:   Fri Mar 5 01:00:52 2010 +0100

    Add Galician translation

 po/LINGUAS |    1 +
 po/gl.po   | 1056 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1057 insertions(+), 0 deletions(-)

commit 8ed839d166c81e04bd1dafa58dfb384c92e3fb5b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Mar 5 00:18:30 2010 +0100

    Updated Italian translations

 po/LINGUAS |    1 +
 po/it.po   | 1043 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1044 insertions(+), 0 deletions(-)

commit f8823339c6cbc3a041e42451c8e090b22751a12c
Author: Wolfgang Stöggl <c72578@yahoo.de>
Date:   Mon Mar 1 10:09:48 2010 +0100

    Updated German translation

 po/de.po |  983 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 893 insertions(+), 90 deletions(-)

commit 7b1fc7a9e60df0eadfd6702708a75137b353f638
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Tue Feb 23 18:52:20 2010 +0100

    Added German doc translation

 help/Makefile.am |    2 +-
 help/de/de.po    |  409 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 410 insertions(+), 1 deletions(-)

commit f9eeaa82971cdbefa7ff2c2b91eb4e321a63a901
Author: Marek Černocký <marek@manet.cz>
Date:   Mon Feb 22 15:02:24 2010 +0100

    Add Czech Screenshots

 help/cs/figures/nanny-add-forbidden-site.png       |  Bin 0 -> 40567 bytes
 help/cs/figures/nanny-select-file-to-import.png    |  Bin 0 -> 52483 bytes
 help/cs/figures/nanny-session.png                  |  Bin 0 -> 58083 bytes
 .../nanny-web-content-filter-blacklists.png        |  Bin 0 -> 79781 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

commit a8f7bd08fcd096700ef8f54139a29e27a11c2f29
Author: Marek Černocký <marek@manet.cz>
Date:   Mon Feb 22 14:47:46 2010 +0100

    Add Czech translation

 help/Makefile.am |    2 +-
 help/cs/cs.po    |  462 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 463 insertions(+), 1 deletions(-)

commit 4878411d2a9fe8f64f30132ddce5d148d68f6cc0
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Feb 21 20:02:15 2010 +0100

    Using yelp instead xdg-open

 client/gnome/admin/src/AdminConsole.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 3abd3c645332ba137b1a3295fc3e98cb31541df6
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Feb 21 19:54:37 2010 +0100

    Fix help crash in jaunty

 client/gnome/admin/src/AdminConsole.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit bfe050816b4cd0da590b7d4c9ba556090c700b00
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Feb 21 15:36:02 2010 +0100

    Updated to 2.29.3 version NEWS and configure.ac

 NEWS         |   20 ++++++++++++++++++++
 configure.ac |    2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)

commit 8c591a68f2a9984087dd34190d2235221bc7f6b8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Feb 21 15:23:33 2010 +0100

    Remove DeferredFilesystemLock from TwistedProxy.py

 daemon/src/proxy/TwistedProxy.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit eba4e67080c1a40f1589c9ed48c53f35cbd9b118
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Feb 21 15:12:01 2010 +0100

    Updated Spanish translation

 help/es/es.po                                      |   46 ++++++++++----------
 help/es/figures/nanny-add-forbidden-site.png       |  Bin 0 -> 30622 bytes
 help/es/figures/nanny-select-file-to-import.png    |  Bin 0 -> 28514 bytes
 help/es/figures/nanny-session.png                  |  Bin 0 -> 40274 bytes
 .../nanny-web-content-filter-blacklists.png        |  Bin 0 -> 60436 bytes
 5 files changed, 23 insertions(+), 23 deletions(-)

commit 3754ecb624c59ca76babfca9f4330aa297bb061d
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sat Feb 20 22:24:31 2010 +0100

    Updated Slovenian translation

 po/sl.po |   72 +++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 46 insertions(+), 26 deletions(-)

commit 8221104c4f28446ed15ad465f639299bf2fafb9d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Wed Feb 17 21:25:36 2010 +0100

    Updated Spanish translation

 help/es/es.po |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

commit 645f5e50fb73c708c1d174b3673ab6bd00a7bb3e
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Wed Feb 17 12:52:36 2010 +0100

    Updated Slovenian translation

 po/sl.po |  126 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 61 insertions(+), 65 deletions(-)

commit 00cb7a54e7ca89cc4a70217e506e79a41a00c6d8
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Feb 16 18:39:01 2010 +0100

    Added es to DOC_LINGUAS

 help/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2c009704b698547b8518e7aad94c2d83a1dcc1f9
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Feb 16 18:38:48 2010 +0100

    Added initial Spanish translation

 help/es/es.po |  408 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 408 insertions(+), 0 deletions(-)

commit 3f6412c48ea6cfc239fb10f4ff9152f5e4f24c6e
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Feb 16 18:38:32 2010 +0100

    Updated Spanish translation

 po/es.po |   85 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 43 insertions(+), 42 deletions(-)

commit 1d727dbad0e13a8371d12d108c61614ee02ba2ac
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Feb 16 17:12:03 2010 +0100

    Add client/gnome/__init__.py.in  to POTFILES

 po/POTFILES.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2bf4fdd10839e0d1a73a1f48bf945c67cd6fc175
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Feb 13 22:04:33 2010 +0100

    Fix gettext bug in NannySystray

 client/gnome/__init__.py.in           |   36 +++++++++++++++++++++++++++++++++
 client/gnome/admin/src/__init__.py.in |   10 ---------
 configure.ac                          |    1 +
 3 files changed, 37 insertions(+), 10 deletions(-)

commit bc9f66c1c268a4583a9ff1b8ccd8756b58c04e12
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Feb 13 17:49:17 2010 +0100

    Update release number and README, NEWS files

 NEWS         |   25 +++++++++++++++++++++++++
 README       |    1 +
 configure.ac |    2 +-
 3 files changed, 27 insertions(+), 1 deletions(-)

commit 5dce87955cc01011284f2826d62b3e719a782cce
Author: Marek Černocký <marek@manet.cz>
Date:   Sat Feb 13 00:31:19 2010 +0100

    Update Czech translation

 po/cs.po |   89 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 40 insertions(+), 49 deletions(-)

commit cb685386864e8f2e066606ed0c98efbd8dfb3361
Author: Petr Kovar <pknbe@volny.cz>
Date:   Thu Feb 11 02:44:46 2010 +0100

    Update Czech translation by Marek Cernocky

 po/cs.po |  922 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 859 insertions(+), 63 deletions(-)

commit 1939b449b0d53b1023a2ef3074fd384329e78988
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 04:04:18 2010 +0100

    Fix some help DTD failures

 help/C/nanny.xml |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

commit 93fa2476b6cf0eb0825af197f27beb5e7efc4e86
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 03:56:52 2010 +0100

    Add desktop.in to EXTRA_DIST

 client/gnome/admin/data/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b7ff85608ec1d646655e0e68249ffe95b4850cb7
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 03:11:27 2010 +0100

    Updated spanish translation

 po/es.po |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit c32c03d9898350c73ed71fd5e5dcb5fb110edd43
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 03:09:41 2010 +0100

    "Import..." label translatable

 client/gnome/admin/data/ui/nbm_pbl_dialog.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 912b5c3459d9086b26fd3010655d97d033ea15be
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 03:04:54 2010 +0100

    Updated Spanish translation

 po/es.po |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

commit 88ef123ff964f625f706b6af368ef5b7dcb014a5
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 02:50:41 2010 +0100

    Add gettext support to .desktop files

 .../admin/data/nanny-admin-console.desktop.in      |    4 ++--
 .../admin/data/nanny-blacklist-manager.desktop.in  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 778a7a3103a3f2e2cdfc4781b2d060db07e1d6de
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 02:40:00 2010 +0100

    Updated Spanish translation

 po/es.po |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 6334095cf8d0b13333e2105fefb1c9cb7cdda7f4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 02:38:56 2010 +0100

    Update Spanish translation

 po/es.po |  943 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 849 insertions(+), 94 deletions(-)

commit 8dbe30ba67c8cb0d90c0295b73c4c13de6422d39
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 02:35:21 2010 +0100

    Some i18n gtk.Builder bugfixes

 client/common/src/Categories.py       |    6 +++---
 client/common/src/Utils.py            |   32 ++++++++++++++++++++++----------
 client/gnome/admin/src/__init__.py.in |   13 ++++++++-----
 configure.ac                          |    2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

commit cca48ad6160c5cc3a29d7d8cfd1d11cbe7901d84
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 10 01:50:40 2010 +0100

    Rename glade files to ui files

 client/common/src/Utils.py                         |    4 +-
 client/gnome/admin/data/Makefile.am                |    2 +-
 client/gnome/admin/data/glade/Makefile.am          |    8 -
 client/gnome/admin/data/glade/nac_wcf_dialog.glade |  304 ----------
 .../admin/data/glade/nac_wcf_edit_dialog.glade     |  161 ------
 .../admin/data/glade/nanny_admin_console.glade     |  589 --------------------
 client/gnome/admin/data/glade/nbm_pbl_dialog.glade |   99 ----
 .../admin/data/glade/nbm_pbl_edit_dialog.glade     |   73 ---
 client/gnome/admin/data/ui/Makefile.am             |    8 +
 client/gnome/admin/data/ui/nac_wcf_dialog.ui       |  304 ++++++++++
 client/gnome/admin/data/ui/nac_wcf_edit_dialog.ui  |  161 ++++++
 client/gnome/admin/data/ui/nanny_admin_console.ui  |  589 ++++++++++++++++++++
 client/gnome/admin/data/ui/nbm_pbl_dialog.ui       |   99 ++++
 client/gnome/admin/data/ui/nbm_pbl_edit_dialog.ui  |   73 +++
 client/gnome/admin/src/AdminConsole.py             |    4 +-
 client/gnome/admin/src/BlacklistManager.py         |    8 +-
 client/gnome/admin/src/ConfigureProxyDialog.py     |    8 +-
 client/gnome/admin/src/__init__.py.in              |    2 +-
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |   11 +-
 20 files changed, 1255 insertions(+), 1254 deletions(-)

commit 534cfbec92f11f9852f1cb030f652aa308a93e8a
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sat Feb 6 15:56:35 2010 +0100

    Updated Slovenian translation

 po/sl.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit c4fe7a25b0cfdead09e2868ba71e81834bd7a2a7
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sat Feb 6 15:54:50 2010 +0100

    Updated Slovenian translation

 po/sl.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b152399c9f973124c56801ce779817acc2157fe8
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sat Feb 6 15:53:27 2010 +0100

    Updated Slovenian translation

 po/sl.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 5c49a4e451d93b46b86a0bbbb374b197068f739f
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Sat Feb 6 15:52:16 2010 +0100

    Updated Slovenian translation

 po/sl.po |  903 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 828 insertions(+), 75 deletions(-)

commit 55a2e5737a82c0e40bbb7ac22e8bdfbc22a7ec16
Author: Claude Paroz <claude@2xlibre.net>
Date:   Fri Feb 5 21:15:08 2010 +0100

    Specify no-python-format for a string containing the percent sign
    
    The no-python-format comment is meant to instruct xgettext to not
    consider percent signs in a string as string formatters. Without this
    the msgfmt program raises an error when checking a translation which
    does not contain the same formatting sequence. See the gettext manual,
    chapter 3 for more information on this.

 client/common/src/Categories.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 1c37e6ec3e745cf24189c3c8b6ec0c53324d57c1
Author: Claude Paroz <claude@2xlibre.net>
Date:   Fri Feb 5 20:49:53 2010 +0100

    Delete trailing spaces in POTFILES.in

 po/POTFILES.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit fcf41378e03f698d6078b98d4198d9c6df608164
Author: Daniel Nylander <po@danielnylander.se>
Date:   Fri Feb 5 19:30:42 2010 +0100

    Updated Swedish translation

 po/sv.po |  897 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 827 insertions(+), 70 deletions(-)

commit 6e0a1e8b0f5bdcae3505b4ca4a33b0556e974c47
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Feb 5 17:15:13 2010 +0100

    Add some missing manual files

 help/C/figures/nanny-add-forbidden-site.png        |  Bin 0 -> 37733 bytes
 help/C/figures/nanny-select-file-to-import.png     |  Bin 0 -> 29092 bytes
 .../nanny-web-content-filter-blacklists.png        |  Bin 0 -> 56174 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

commit 1cff62d1e38ef85d80e22b8b71b0575496c71641
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Feb 5 17:11:26 2010 +0100

    Update nanny user manual

 help/C/figures/nanny-session.png |  Bin 38165 -> 41029 bytes
 help/C/nanny.xml                 |  117 ++++++++++++++-----------------------
 help/Makefile.am                 |   14 +++--
 3 files changed, 53 insertions(+), 78 deletions(-)

commit 47fbcad718ad6c000c044e8a2fcc4199a9d0207a
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Feb 5 14:25:54 2010 +0100

    Add translators comments to Categories.py

 client/common/src/Categories.py |  222 ++++++++++++++++++++++++++-------------
 1 files changed, 148 insertions(+), 74 deletions(-)

commit 0c213c3cfe0d5321bb768444697c099798c5a872
Author: Claude Paroz <claude@2xlibre.net>
Date:   Fri Feb 5 09:41:22 2010 +0100

    Added partial French translation
    
    Contributed by Laurent Coudeur and Claude Paroz

 po/LINGUAS |    1 +
 po/fr.po   |  955 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 956 insertions(+), 0 deletions(-)

commit 8b369452adbc4eb7f80f5572d17ad4e56573d815
Author: Claude Paroz <claude@2xlibre.net>
Date:   Fri Feb 5 09:24:48 2010 +0100

    Removing markup from translatable strings

 client/common/src/DBusClient.py                |    2 +-
 client/gnome/admin/src/AdminConsole.py         |    4 ++--
 client/gnome/admin/src/ConfigureProxyDialog.py |   12 ++++++------
 client/gnome/systray/src/SystrayNanny.py       |   21 +++++++++------------
 4 files changed, 18 insertions(+), 21 deletions(-)

commit 7e21586e23fda1f9eadedbe3067c71f1adcfcd66
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Feb 4 19:12:20 2010 +0100

    Fix <b></b> ui bug in Systray tooltip

 client/gnome/systray/src/SystrayNanny.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit d0a904e272a84cf5612bd5890c8e2f3968452cc3
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Feb 4 18:29:29 2010 +0100

    Use plural forms in SystrayNanny

 client/gnome/systray/src/SystrayNanny.py |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

commit ca9c32fb10662138a65270e0ee4710a5eddbbb26
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Feb 4 17:48:00 2010 +0100

    Fix correct licenses

 client/gnome/admin/src/__init__.py.in   |   34 ++++++++++++++++++------------
 client/gnome/systray/src/__init__.py.in |   25 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 14 deletions(-)

commit 35954ea78ec6c66d51537ccc68f39e652fc9dad6
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Feb 4 17:35:17 2010 +0100

    Add .desktop to blacklist-manager

 client/gnome/admin/data/Makefile.am                |    2 +-
 .../admin/data/nanny-blacklist-manager.desktop.in  |   10 ++++++++++
 po/POTFILES.in                                     |    2 ++
 3 files changed, 13 insertions(+), 1 deletions(-)

commit 8a94b66724bd7f242d0753e3e2261cc6b0e1e577
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Thu Feb 4 15:52:35 2010 +0100

    Added a new app for manage the blacklists (install, remove and update)

 client/common/src/DBusClient.py                    |    4 +-
 client/gnome/admin/Makefile.am                     |    4 +-
 client/gnome/admin/NannyBlacklistManager           |   37 ++++
 client/gnome/admin/data/glade/Makefile.am          |    4 +-
 client/gnome/admin/data/glade/nbm_pbl_dialog.glade |   99 +++++++++++
 .../admin/data/glade/nbm_pbl_edit_dialog.glade     |   73 ++++++++
 client/gnome/admin/src/BlacklistManager.py         |  187 ++++++++++++++++++++
 client/gnome/admin/src/Makefile.am                 |    1 +
 client/gnome/admin/src/__init__.py.in              |    1 +
 po/POTFILES.in                                     |    3 +
 10 files changed, 408 insertions(+), 5 deletions(-)

commit f8c26bc77b58d71d9ca811e6a848db2316ff43a2
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Thu Feb 4 12:52:44 2010 +0100

    Add translator comments

 client/gnome/systray/src/SystrayNanny.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 5bbcd3e7c1e97996d187b3e1b510afcb60fffb65
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 21:06:20 2010 +0100

    Add help handlers

 client/gnome/admin/src/AdminConsole.py |    2 +-
 help/nanny.omf.in                      |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

commit d75e6e6cc22d7ca1701c536f369e3ba6ced7b2a8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 20:50:39 2010 +0100

    Change string in AdminConsole Dialog

 client/gnome/admin/src/AdminConsole.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b9df2bfbfc70358a473fc0ab1f7ad9966dd2971c
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 20:33:09 2010 +0100

    remove some files from POTFILES.in

 po/POTFILES.in |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 528c8f2955d462495f0a83c862185718eac1ba1b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 20:29:44 2010 +0100

    Update (c) year

 client/common/src/Categories.py                |    2 +-
 client/common/src/DBusClient.py                |    2 +-
 client/common/src/Singleton.py                 |    2 +-
 client/common/src/Utils.py                     |    2 +-
 client/common/src/__init__.py                  |    2 +-
 client/gnome/admin/src/AdminConsole.py         |    2 +-
 client/gnome/admin/src/ConfigureProxyDialog.py |    2 +-
 client/gnome/admin/src/ScheduleCalendar.py     |    2 +-
 client/gnome/systray/src/SystrayNanny.py       |    2 +-
 daemon/src/BlockingDeferred.py                 |    2 +-
 daemon/src/Chrono.py                           |    2 +-
 daemon/src/Daemon.py                           |    2 +-
 daemon/src/DansGuardianImporter.py             |    2 +-
 daemon/src/FilterManager.py                    |    2 +-
 daemon/src/LinuxFiltering.py                   |    2 +-
 daemon/src/LinuxSessionFiltering.py            |    2 +-
 daemon/src/LinuxUsersManager.py                |    2 +-
 daemon/src/LinuxWebContentFiltering.py         |    2 +-
 daemon/src/NannyDBus.py                        |    2 +-
 daemon/src/QuarterBack.py                      |    2 +-
 daemon/src/__init__.py                         |    2 +-
 daemon/src/gregexmodule.c                      |    2 +-
 daemon/src/proxy/Controllers.py                |    2 +-
 daemon/src/proxy/Importer.py                   |    2 +-
 daemon/src/proxy/Proxy.py                      |    2 +-
 daemon/src/proxy/TwistedProxy.py               |    2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

commit 9c23411de4a464a2b736ff1f536888c45bcf4807
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 20:18:48 2010 +0100

    Update GPL licenses

 client/common/src/Categories.py          |   25 +++++++++++++++++++++++++
 client/common/src/DBusClient.py          |   21 ++++++++++-----------
 client/common/src/Singleton.py           |   24 ++++++++++++------------
 client/common/src/Utils.py               |   24 ++++++++++++------------
 client/common/src/__init__.py            |   25 +++++++++++++++++++++++++
 client/gnome/admin/src/AdminConsole.py   |   24 ++++++++++++------------
 client/gnome/systray/src/SystrayNanny.py |   21 ++++++++++-----------
 daemon/src/DansGuardianImporter.py       |   29 ++++++++++++++++-------------
 daemon/src/LinuxUsersManager.py          |   26 +++++++++++++-------------
 daemon/src/__init__.py                   |   25 +++++++++++++++++++++++++
 daemon/src/gregexmodule.c                |   22 ++++++++++++++++++++++
 11 files changed, 182 insertions(+), 84 deletions(-)

commit 2ae86614acedc33ae069d6ae100534eebc724fbe
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 19:52:43 2010 +0100

    Remove old daemon code

 configure.ac                   |    1 -
 daemon/src/Makefile.am         |    2 +-
 daemon/src/contrib/Makefile.am |    3 -
 daemon/src/contrib/__init__.py |    1 -
 daemon/src/contrib/daemon.py   |  183 ----------------------------------------
 5 files changed, 1 insertions(+), 189 deletions(-)

commit 055dd2414e0823555c7ccaa14ad5cb4f45ed0938
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 19:41:38 2010 +0100

    Add some files to POTFILES.in

 po/POTFILES.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 8b7fd8fdefaa01175bad38a710ac1e8d915aa9fd
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 19:37:08 2010 +0100

    Add checke urls with the new sys

 daemon/src/FilterManager.py |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

commit 5f259a075884bd06097b45eb0c4682eec2cb66a4
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 19:19:20 2010 +0100

    Check domains and urls with the new checker sys

 daemon/src/FilterManager.py            |   46 ++++++++++++----
 daemon/src/LinuxWebContentFiltering.py |    2 +-
 daemon/src/proxy/TwistedProxy.py       |   89 ++++----------------------------
 3 files changed, 45 insertions(+), 92 deletions(-)

commit 133b283b38db78ffbecda07806889bee423b086b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 16:26:16 2010 +0100

    Update nanny doc (gnome-style)

 Makefile.am                                    |    2 +-
 configure.ac                                   |    3 +
 help/C/figures/nanny-add-web-to-filter.png     |  Bin 0 -> 11498 bytes
 help/C/figures/nanny-browser.png               |  Bin 0 -> 42047 bytes
 help/C/figures/nanny-session.png               |  Bin 0 -> 38165 bytes
 help/C/figures/nanny-web-content-filtering.png |  Bin 0 -> 13535 bytes
 help/C/legal.xml                               |   76 ++++++
 help/C/nanny.xml                               |  307 ++++++++++++++++++++++++
 help/Makefile.am                               |   14 +-
 help/nanny-add-web-to-filter.png               |  Bin 11498 -> 0 bytes
 help/nanny-browser.png                         |  Bin 42047 -> 0 bytes
 help/nanny-session.png                         |  Bin 38165 -> 0 bytes
 help/nanny-web-content-filtering.png           |  Bin 13535 -> 0 bytes
 help/nanny.xml                                 |  269 ---------------------
 14 files changed, 400 insertions(+), 271 deletions(-)

commit 45f75036aa5ba71839449bca1ae953305e0797d2
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Feb 3 16:15:58 2010 +0100

    Bugfixing in dansguardian importer

 daemon/src/DansGuardianImporter.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 6c7d203c28916071a92ea40d59489b92c35cea8e
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Wed Feb 3 16:07:06 2010 +0100

    Fix a bug with the category selection

 client/gnome/admin/src/ConfigureProxyDialog.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 8e1179edeecc54d8c4c0e7fd91f073771ffd4175
Author: Marek Černocký <marek@manet.cz>
Date:   Tue Feb 2 13:31:33 2010 +0100

    Update Czech translation

 po/cs.po |   76 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 43 insertions(+), 33 deletions(-)

commit d42a930f8c6e51e0d3ce4f8ad0f28b62c179bae0
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 23:29:50 2010 +0100

    May_url_blocked fixed

 daemon/src/DansGuardianImporter.py |    6 +++---
 daemon/src/FilterManager.py        |   14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

commit 423450006b0eb4aa7b795971e6a3074bef3432fb
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Mon Feb 1 23:26:58 2010 +0100

    Changes in the add/remove/update packaged filters API

 client/gnome/admin/src/ConfigureProxyDialog.py |    2 +
 daemon/src/FilterManager.py                    |   53 +++++++++++++++--------
 daemon/src/NannyDBus.py                        |    6 +-
 3 files changed, 39 insertions(+), 22 deletions(-)

commit d5f79fa00d787a563078154ffde8ba17fd2d574a
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 22:15:48 2010 +0100

    Add CheckDomain method

 daemon/src/DansGuardianImporter.py |    2 +-
 daemon/src/FilterManager.py        |  100 +++++++++++++++++++++++++++++++++---
 daemon/src/NannyDBus.py            |    5 ++
 3 files changed, 99 insertions(+), 8 deletions(-)

commit 9dcf1dc5c9fa2e9499706b229a98cd0c5cfd5db7
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 19:29:27 2010 +0100

    Fix unicode error importing from Dansguadian

 daemon/src/DansGuardianImporter.py |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

commit e751f37555285e8ff8f6bdad43cc8cf8998b1935
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Mon Feb 1 21:40:03 2010 +0100

    Added i18n-ed packaged filters categories

 client/common/src/Categories.py                |   80 ++++++++++++++++++++++++
 client/common/src/Makefile.am                  |    1 +
 client/common/src/__init__.py                  |    1 +
 client/gnome/admin/src/ConfigureProxyDialog.py |    6 ++-
 4 files changed, 87 insertions(+), 1 deletions(-)

commit 9fdc31f1edb803e04542b887693a570f068d735d
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Mon Feb 1 20:16:19 2010 +0100

    Finished the configuration for packaged filters

 client/gnome/admin/src/ConfigureProxyDialog.py |   45 ++++++++++++++++++++++--
 daemon/src/FilterManager.py                    |    1 -
 2 files changed, 42 insertions(+), 4 deletions(-)

commit e01d43fb14328bfe7d15f0fe34caec7b3e7f6ef6
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Mon Feb 1 18:52:15 2010 +0100

    First code for the packaged filters configuration

 client/common/src/DBusClient.py                    |   24 ++++++
 client/gnome/admin/data/glade/nac_wcf_dialog.glade |   45 ++++++++++-
 client/gnome/admin/src/ConfigureProxyDialog.py     |   79 +++++++++++++++++++-
 daemon/src/FilterManager.py                        |   16 +++-
 daemon/src/NannyDBus.py                            |   12 ++--
 5 files changed, 156 insertions(+), 20 deletions(-)

commit 059cf06b9f1feba03744a846f11e377fc430fa89
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 18:38:18 2010 +0100

    Monitoring external filters db

 daemon/src/FilterManager.py |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

commit 1b1f79eceed4b143da876b77052ab258bff17c41
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 16:49:30 2010 +0100

    Detect pkg_db's added or removed at startup

 daemon/src/FilterManager.py |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

commit 66602db164f3a0a7442d45e7f9708512fe73fce0
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 16:18:05 2010 +0100

    RemovePkgFilter exported to dbus

 daemon/src/FilterManager.py |   13 ++++++++++++-
 daemon/src/NannyDBus.py     |    5 +++++
 2 files changed, 17 insertions(+), 1 deletions(-)

commit 03552aaa3264217e39dd179ecfb24b9bf9a776de
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 15:57:47 2010 +0100

    UpdatePkgFilter exported to dbus

 daemon/src/FilterManager.py |   26 +++++++++++++++++++++++---
 daemon/src/NannyDBus.py     |    5 +++++
 2 files changed, 28 insertions(+), 3 deletions(-)

commit 908a97c78487c6128a327476bda41b311c244955
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 15:32:07 2010 +0100

    Get|SetPkgFilterMetadata exported to Dbus

 daemon/src/FilterManager.py |   38 +++++++++++++++++++++++++++-----------
 daemon/src/NannyDBus.py     |   12 +++++++++++-
 2 files changed, 38 insertions(+), 12 deletions(-)

commit 7e8393ecd00b3556f3813d0032dbb3e57925d2b1
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 14:51:10 2010 +0100

    set|get_pkg_filter_user_categories verify categories

 daemon/src/FilterManager.py |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

commit eed75e9cc92a74b732a92c6447e23ed3a8363ef3
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 14:26:59 2010 +0100

    ListPkgFilters report name, description, ro

 daemon/src/FilterManager.py |   35 ++++++++++++++++++++++++++++++-----
 daemon/src/NannyDBus.py     |    4 ++--
 2 files changed, 32 insertions(+), 7 deletions(-)

commit 57a5188e9bfa483943c67222a423edd170ef06f8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 13:59:53 2010 +0100

    AddPkgFilter exported to Dbus

 daemon/src/FilterManager.py |   49 ++++++++++++++++++++++++++++++++++++++----
 daemon/src/NannyDBus.py     |    6 +++++
 2 files changed, 50 insertions(+), 5 deletions(-)

commit 3c39c2a9b7fd59d8f492a31e2bfb4fecab90c919
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Feb 1 12:47:44 2010 +0100

    [Get|Set]PkgFilterUserCategories exported to DBUS

 daemon/src/FilterManager.py |   99 ++++++++++++++++++++++++++++++++++++++++--
 daemon/src/NannyDBus.py     |   29 ++++++++----
 2 files changed, 113 insertions(+), 15 deletions(-)

commit fa716cbef517e9c57f2ef2dc39e87e26ec71021d
Author: Cesar Garcia Tapia <cesar.garcia.tapia@openshine.com>
Date:   Mon Feb 1 11:26:51 2010 +0100

    New dialog for update custom filters. Check empty fields in custom filters.

 client/common/src/DBusClient.py                    |   16 +-
 client/gnome/admin/data/glade/nac_wcf_dialog.glade |   95 ++++++-
 .../admin/data/glade/nac_wcf_edit_dialog.glade     |   60 ++---
 client/gnome/admin/src/ConfigureProxyDialog.py     |  298 ++++++++++++--------
 daemon/src/FilterManager.py                        |    2 +-
 daemon/src/NannyDBus.py                            |   18 +-
 6 files changed, 309 insertions(+), 180 deletions(-)

commit 58ccad5708278a3470b4274af514303ce5deb2ca
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 15:34:36 2010 +0100

    Update Custom Filter exported to NannyDbus

 daemon/src/FilterManager.py |   17 +++++++++++++++--
 daemon/src/NannyDBus.py     |   10 +++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

commit eacf30b392908668c12134cc9cdef372f470e791
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 15:07:38 2010 +0100

    Some sql fixes in FilterManager

 daemon/src/FilterManager.py |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

commit 7b490f330b5c92ea09edd0a2ff9bdc97dc66f189
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 14:52:52 2010 +0100

    Export *_custom_filte to NannyDbus

 daemon/src/FilterManager.py |   26 ++++++++++++++++++++------
 daemon/src/NannyDBus.py     |   20 +++++++++++++++++---
 2 files changed, 37 insertions(+), 9 deletions(-)

commit 3469d6a2dbd53ef3a261923fb8785eb2931b9882
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 14:46:27 2010 +0100

    Add FilterManager to QuarterBack

 daemon/src/FilterManager.py |    3 ++-
 daemon/src/QuarterBack.py   |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

commit 7dda52da68a1fd1cf44aa1d5664aeb417dfe7b43
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 14:43:34 2010 +0100

    Add initial FilterManager

 daemon/src/BlockingDeferred.py |   71 +++++++++++++++++++++++++
 daemon/src/FilterManager.py    |  112 ++++++++++++++++++++++++++++++++++++++++
 daemon/src/Makefile.am         |    2 +
 3 files changed, 185 insertions(+), 0 deletions(-)

commit 0f64c4265229c9e374d043ac27b18a7b8e0331df
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sun Jan 31 13:01:42 2010 +0100

    Importer emit progress signal

 daemon/src/DansGuardianImporter.py |   77 +++++++++++++++++++++++-------------
 1 files changed, 49 insertions(+), 28 deletions(-)

commit 8c20e346e69147e1396c9003601ecfe44b5549fb
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Sat Jan 30 17:41:15 2010 +0100

    Some performances in DansGuardian Importer

 daemon/src/DansGuardianImporter.py |   85 ++++++++++++++++++++++++++----------
 1 files changed, 61 insertions(+), 24 deletions(-)

commit 9bd50505e28154beae322075371aaf6914ba65c5
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Jan 29 04:26:56 2010 +0100

    Add initial DansGuardianImporter

 daemon/src/DansGuardianImporter.py |  223 ++++++++++++++++++++++++++++++++++++
 daemon/src/Makefile.am             |   19 ++--
 2 files changed, 233 insertions(+), 9 deletions(-)

commit 017190e3364d32130ab9764a2e43d80ba7464a8b
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Jan 29 00:52:14 2010 +0100

    Add glib regex wrapper python module

 daemon/src/Makefile.am    |   11 +++++++++++
 daemon/src/gregexmodule.c |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)

commit b9b9955209972eff4275016c3db8fb87582d3ed5
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Fri Jan 29 00:47:34 2010 +0100

    Add hachoir-regex and glib depends

 configure.ac |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

commit 5de622cf2d8729c6a0e00136308931316459a4f6
Author: Petr Kovar <pknbe@volny.cz>
Date:   Tue Jan 12 00:14:43 2010 +0100

    Add Czech translation by Marek Cernocky

 po/LINGUAS |    1 +
 po/cs.po   |  277 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+), 0 deletions(-)

commit 8da689390f14a3dcddc964f0abd35297ec9f84b4
Author: Mario Blättermann <mariobl@gnome.org>
Date:   Wed Jan 6 21:06:28 2010 +0100

    Added German translation

 po/LINGUAS |    1 +
 po/de.po   |  281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 282 insertions(+), 0 deletions(-)

commit c9f921b9ea5a3281d1681daf8c37bb5d83f5dd18
Author: Juan Jesús Ojeda <jojeda@gnome.org>
Date:   Wed Jan 6 13:18:03 2010 +0100

    Updated Spanish translation

 po/es.po |  180 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 95 insertions(+), 85 deletions(-)

commit 3b1654c9171af7675a900e0f84f5fd48edd765ae
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Jan 5 17:35:57 2010 +0100

    Added sl for Slovenian translation

 po/LINGUAS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit f996484e7a08e6ca140e9f798ec7331306a247b6
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Tue Jan 5 17:35:50 2010 +0100

    Updated Slovenian translation

 po/sl.po |  279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 279 insertions(+), 0 deletions(-)

commit 97c48cd9cd7824f33b2ff29ccf5bea39751555a7
Author: Daniel Nylander <po@danielnylander.se>
Date:   Mon Dec 28 10:52:47 2009 +0100

    Added Swedish translation

 po/LINGUAS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 13af830f6c82e830e7b867e0630b536ec084c319
Author: Daniel Nylander <po@danielnylander.se>
Date:   Mon Dec 28 10:52:22 2009 +0100

    Updated Swedish translation

 po/sv.po |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 274 insertions(+), 0 deletions(-)

commit 1d5a267018ec1f0edf9b86b251e50bd6eb543eed
Author: Enrico Nicoletto <liverig@gmail.com>
Date:   Sat Dec 26 23:54:09 2009 -0200

    Added Brazilian Portuguese translation

 po/LINGUAS  |    1 +
 po/pt_BR.po |  277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 278 insertions(+), 0 deletions(-)

commit 9ebff2a2649cdac40d5cd226746532cb3cc657eb
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:   Fri Dec 25 10:19:50 2009 +0100

    Added LowGerman translation

 po/LINGUAS |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit b6d3a6005046e267f3692f9941a219fa4db82691
Author: Nils-Christoph Fiedler <fiedler@medienkompanie.de>
Date:   Fri Dec 25 10:19:44 2009 +0100

    Added LowGerman translation

 po/nds.po |  269 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 269 insertions(+), 0 deletions(-)

commit 90ecb38fc96baa52ae1d955f269808923656f50b
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:   Fri Dec 25 00:56:27 2009 +0700

    vi.po: added Vietnamese translation

 configure.ac |    2 +-
 po/vi.po     |  275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+), 1 deletions(-)

commit f6896e37d2f113432e1cee174ebd6dd499b04e47
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:40:49 2009 +0100

    Don't allow to normal users access to admin dbus api

 daemon/data/dbus/nanny-daemon.conf |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

commit 29dd596c66938fe5ec090c81fc66f38856a7d885
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:11:20 2009 +0100

    admin console use nanny icon

 .../admin/data/nanny-admin-console.desktop.in      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit da9cf4804c663d724bc11fc9d27ce3d195e6808d
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 01:06:01 2009 +0100

    Some debian lintian fixes

 debian/control   |   16 +++++++++-------
 debian/copyright |    3 ---
 2 files changed, 9 insertions(+), 10 deletions(-)

commit b9b70ee798c590185b6f76f975cb8d368dfcb622
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:43:07 2009 +0100

    Add some nanny icons to msg dialogs

 client/gnome/admin/src/AdminConsole.py         |    3 +++
 client/gnome/admin/src/ConfigureProxyDialog.py |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

commit 1de266faac2d1f9411a4fda95f8e3051466bccff
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:32:43 2009 +0100

    Add nanny icon to config proxy windows

 client/gnome/admin/src/ConfigureProxyDialog.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit dc6599a335265eda2a918fc44e5c01830f777d50
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:21:55 2009 +0100

    Destroy add_filter_dialogs after dbusclient send msg

 client/gnome/admin/src/ConfigureProxyDialog.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit c5635860eb01c8dee222f909c8252de9407af76f
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Wed Dec 23 00:10:16 2009 +0100

    Fix remove filter UI Freeze

 client/common/src/DBusClient.py                |    2 +-
 client/gnome/admin/src/ConfigureProxyDialog.py |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

commit a846bebdfe3e799aead3392d47a6a1f11e71aeff
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:42:49 2009 +0100

    Hide edit button for the moment in nac_wcf

 client/gnome/admin/data/glade/nac_wcf_dialog.glade |    2 --
 client/gnome/admin/src/ConfigureProxyDialog.py     |    3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 7cc7ff2fca6561850beb9677c2adb4333a5c08bb
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:34:47 2009 +0100

    Some fixes in add_custom_filter

 daemon/src/proxy/Controllers.py |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

commit 484d86e29151e9b8851dee9f022b21cf8d212813
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Tue Dec 22 23:01:54 2009 +0100

    Some SQL optimizations

 client/common/src/DBusClient.py  |    2 +-
 daemon/nanny.tap                 |    5 ++
 daemon/src/proxy/Controllers.py  |   36 +++++++++--
 daemon/src/proxy/TwistedProxy.py |  126 +++++++++++++++++++++++++++++++-------
 4 files changed, 141 insertions(+), 28 deletions(-)

commit 32cbb113a5e3f41d91a9dfb7f64e3b4275f4dd93
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 02:14:59 2009 +0100

    Changes in i18n

 configure.ac |    2 +-
 po/es.po     |  264 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+), 1 deletions(-)

commit f1b3e4aabe56595cce86bd2e75e51a07d5eb66f8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 02:05:53 2009 +0100

    Add files to POTFILES.in

 po/POTFILES.in |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

commit f41c09b77311c06dc072a9a8d50cd25442c848ca
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:57:35 2009 +0100

    Update News

 NEWS |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit a8d0e9b2c2611bce69b0cb05798aeaec6cab4fb9
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:52:16 2009 +0100

    Add git ChangeLog dist-hook

 Makefile.am |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

commit a9e2d28b9eb93948b466292eeddd5e6ce472e558
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:37:45 2009 +0100

    Fix UsersManager in daemon/src/__init__.py

 daemon/src/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 910970d3e7d64656d9320747f602be81ef801ef8
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:30:30 2009 +0100

    Fix some automake stuff

 client/gnome/admin/Makefile.am   |    2 ++
 client/gnome/systray/Makefile.am |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

commit 6bb7e652e6f16ec94c09b4b03e829a8a0ba0bef6
Author: Roberto Majadas <roberto.majadas@openshine.com>
Date:   Mon Dec 21 01:13:35 2009 +0100

    First Commit

 .gitignore                                         |   67 ++
 AUTHORS                                            |    3 +
 COPYING                                            |  280 +++++
 ChangeLog                                          |    2 +
 INSTALL                                            |  302 +++++
 Makefile.am                                        |   26 +
 README                                             |   35 +
 autogen.sh                                         |   21 +
 client/Makefile.am                                 |    4 +
 client/common/Makefile.am                          |    1 +
 client/common/icons/16x16/Makefile.am              |   11 +
 client/common/icons/16x16/nanny.png                |  Bin 0 -> 915 bytes
 client/common/icons/22x22/Makefile.am              |   11 +
 client/common/icons/22x22/nanny.png                |  Bin 0 -> 1386 bytes
 client/common/icons/24x24/Makefile.am              |   11 +
 client/common/icons/24x24/nanny.png                |  Bin 0 -> 1563 bytes
 client/common/icons/256x256/Makefile.am            |   11 +
 client/common/icons/256x256/nanny.png              |  Bin 0 -> 39626 bytes
 client/common/icons/32x32/Makefile.am              |   11 +
 client/common/icons/32x32/nanny.png                |  Bin 0 -> 2303 bytes
 client/common/icons/48x48/Makefile.am              |   11 +
 client/common/icons/48x48/nanny.png                |  Bin 0 -> 4126 bytes
 client/common/icons/Makefile.am                    |   14 +
 client/common/icons/scalable/Makefile.am           |   11 +
 client/common/icons/scalable/nanny.svg             | 1154 ++++++++++++++++++++
 client/common/src/DBusClient.py                    |  143 +++
 client/common/src/Makefile.am                      |    5 +
 client/common/src/Singleton.py                     |   37 +
 client/common/src/Utils.py                         |   39 +
 client/common/src/__init__.py                      |    3 +
 client/gnome/Makefile.am                           |    4 +
 client/gnome/admin/Makefile.am                     |    3 +
 client/gnome/admin/NannyAdminConsole               |   41 +
 client/gnome/admin/data/Makefile.am                |    8 +
 client/gnome/admin/data/glade/Makefile.am          |    6 +
 client/gnome/admin/data/glade/nac_wcf_dialog.glade |  192 ++++
 .../admin/data/glade/nac_wcf_edit_dialog.glade     |  173 +++
 .../admin/data/glade/nanny_admin_console.glade     |  589 ++++++++++
 client/gnome/admin/data/icons/Makefile.am          |    7 +
 client/gnome/admin/data/icons/apps.png             |  Bin 0 -> 2877 bytes
 client/gnome/admin/data/icons/button-green.png     |  Bin 0 -> 297 bytes
 client/gnome/admin/data/icons/button-red.png       |  Bin 0 -> 307 bytes
 client/gnome/admin/data/icons/clock.png            |  Bin 0 -> 3322 bytes
 client/gnome/admin/data/icons/internet.png         |  Bin 0 -> 3716 bytes
 .../admin/data/nanny-admin-console.desktop.in      |   10 +
 client/gnome/admin/src/AdminConsole.py             |  354 ++++++
 client/gnome/admin/src/ConfigureProxyDialog.py     |  320 ++++++
 client/gnome/admin/src/Makefile.am                 |    5 +
 client/gnome/admin/src/ScheduleCalendar.py         |  358 ++++++
 client/gnome/admin/src/__init__.py.in              |   37 +
 client/gnome/systray/Makefile.am                   |    3 +
 client/gnome/systray/NannySystray                  |   34 +
 client/gnome/systray/data/Makefile.am              |    4 +
 client/gnome/systray/data/nanny-systray.desktop    |   15 +
 client/gnome/systray/src/Makefile.am               |    3 +
 client/gnome/systray/src/SystrayNanny.py           |  132 +++
 client/gnome/systray/src/__init__.py.in            |   11 +
 configure.ac                                       |  199 ++++
 daemon/Makefile.am                                 |    7 +
 daemon/data/Makefile.am                            |    1 +
 daemon/data/applists/Makefile.am                   |    4 +
 daemon/data/applists/browsers                      |    3 +
 daemon/data/applists/email                         |    2 +
 daemon/data/applists/im                            |    3 +
 daemon/data/dbus/Makefile.am                       |    4 +
 daemon/data/dbus/nanny-daemon.conf                 |   25 +
 daemon/data/init.d/Makefile.am                     |    1 +
 daemon/data/init.d/debian/Makefile.am              |   10 +
 daemon/data/init.d/debian/nanny                    |   74 ++
 daemon/data/init.d/redhat/Makefile.am              |    9 +
 daemon/data/init.d/redhat/nanny                    |   10 +
 daemon/data/init.d/suse/Makefile.am                |    9 +
 daemon/data/init.d/suse/nanny                      |   13 +
 daemon/nanny-no-daemon.sh                          |   10 +
 daemon/nanny.tap                                   |   26 +
 daemon/src/Chrono.py                               |  109 ++
 daemon/src/Daemon.py                               |   40 +
 daemon/src/LinuxFiltering.py                       |  118 ++
 daemon/src/LinuxSessionFiltering.py                |  158 +++
 daemon/src/LinuxUsersManager.py                    |   57 +
 daemon/src/LinuxWebContentFiltering.py             |  115 ++
 daemon/src/Makefile.am                             |   12 +
 daemon/src/NannyDBus.py                            |  131 +++
 daemon/src/QuarterBack.py                          |  417 +++++++
 daemon/src/__init__.py                             |    9 +
 daemon/src/contrib/Makefile.am                     |    3 +
 daemon/src/contrib/__init__.py                     |    1 +
 daemon/src/contrib/daemon.py                       |  183 +++
 daemon/src/proxy/Controllers.py                    |  298 +++++
 daemon/src/proxy/Importer.py                       |   91 ++
 daemon/src/proxy/Makefile.am                       |    6 +
 daemon/src/proxy/Proxy.py                          |   45 +
 daemon/src/proxy/TwistedProxy.py                   |  283 +++++
 debian/changelog                                   |    5 +
 debian/compat                                      |    1 +
 debian/control                                     |   17 +
 debian/copyright                                   |   36 +
 debian/dirs                                        |    2 +
 debian/docs                                        |    2 +
 debian/init.d                                      |   74 ++
 debian/nanny-default                               |   10 +
 debian/postinst                                    |   46 +
 debian/postrm                                      |   40 +
 debian/prerm                                       |   14 +
 debian/rules                                       |   27 +
 help/Makefile.am                                   |    5 +
 help/nanny-add-web-to-filter.png                   |  Bin 0 -> 11498 bytes
 help/nanny-browser.png                             |  Bin 0 -> 42047 bytes
 help/nanny-session.png                             |  Bin 0 -> 38165 bytes
 help/nanny-web-content-filtering.png               |  Bin 0 -> 13535 bytes
 help/nanny.xml                                     |  269 +++++
 nanny.doap                                         |   23 +
 112 files changed, 7579 insertions(+), 0 deletions(-)
