Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r818 | dmorgan | 2011-04-04 00:30:37 +0100 (Mon, 04 Apr 2011) | 1 line

Add drakguard
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPL according to the relevant rpm spec written by Mandriva
- bin/drakguard: replaced Mandriva by Mageia in "blocked by Mandriva parental control tool"
- Icons in data/icons will need to be replaced

9 files changed, 84 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index d2bedbe..adbead4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = drakguard
-VERSION = 0.7.7
+VERSION = 0.7.8
 
 DESTDIR=
 sbindir=/usr/sbin
diff --git a/NEWS b/NEWS
index dbd0d67..69256e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.7.8:
+- Clean for mageia
+- Add new icons
+
 0.7.7:
 - translation updates
 
diff --git a/bin/drakguard b/bin/drakguard
index 8d987a8..dfa7c3c 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -230,6 +230,8 @@ gtkadd($w->{window},
                                       })),
                                0, gtknew('Button', text => N("Add"), clicked => sub {
                                           my $text = $entry->get_text;
+		   			  my $exec;
+		   			  my $args;
 					  $text =~ s,^[^:]+://,,g; #- strip protocol
 					  if ($url_list->{tab_title} eq N("Block programs")) {
 					      $text =~ s,(\W?)$,,g; #- remove unknown caracters
@@ -242,7 +244,7 @@ gtkadd($w->{window},
 						  $locale = lc($locale->{country});
 						  my @system_name = grep { $_ && m/^GenericName(\[$locale\])?=(.*)\s*/g} chomp_(cat_($text));
 					          foreach (@exec_line){
-						      my ($exec, $text, $args) = /(^Exec=)(\w+)\s*(.*)/;
+						      ($exec, $text, $args) = /(^Exec=)(\w+)\s*(.*)/;
 						      if ($text eq ""){
 						          ($exec, $text, $args) = /(^Exec=)(.*+)\s*(.*)/;}
 					          }
@@ -649,7 +651,7 @@ sub read_program_user_list {
 sub apply_blacklist {
     my @addr = @_;
     my $blacklist_top = "/etc/dansguardian/lists/bannedsitelist";
-    my $blacklist_category = "blocked by Mandriva parental control tool";
+    my $blacklist_category = "blocked by Mageia parental control tool";
     output_p($blacklist_url_file, map { $_ . "\n" }
                qq(#listcategory: "$blacklist_category"), @addr);
     include_guardian_file($blacklist_top, $blacklist_url_file);
diff --git a/data/icons/drakguard.png b/data/icons/drakguard.png
index 640c4e4..9dd9cf8 100644
--- a/data/icons/drakguard.png
+++ b/data/icons/drakguard.png
diff --git a/data/icons/drakguard_128.png b/data/icons/drakguard_128.png
index 73188b7..584e653 100644
--- a/data/icons/drakguard_128.png
+++ b/data/icons/drakguard_128.png
diff --git a/po/eu.po b/po/eu.po
index ccf2319..043bd0c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakguard\n"
 "POT-Creation-Date: 2010-05-25 09:22-0300\n"
-"PO-Revision-Date: 2010-05-10 22:26+0200\n"
+"PO-Revision-Date: 2010-06-29 13:31+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -201,7 +201,7 @@ msgstr "Laguntza"
 #: ../bin/drakguard:299 ../bin/drakguard:309 ../bin/drakguard:317
 #, c-format
 msgid "Warning"
-msgstr ""
+msgstr "Abisua"
 
 #: ../bin/drakguard:299
 #, c-format
@@ -210,16 +210,19 @@ msgid ""
 "Block programs feature.\n"
 "Do you want to enable it now?"
 msgstr ""
+"Atzipen Kontrol Zerrendentzako euskarria gaitu behar da Eragotzi programak "
+"ezaugarria erabili ahal izateko.\n"
+"Orain gaitu nahi duzu?"
 
 #: ../bin/drakguard:309
 #, c-format
 msgid "The support for Access Control Lists was enabled."
-msgstr ""
+msgstr "Atzipen Kontrol Zerrendentzako euskarria gaitu da."
 
 #: ../bin/drakguard:309 ../bin/drakguard:317
 #, c-format
 msgid "It is necessary to restart your computer to activate it."
-msgstr ""
+msgstr "Zure konputagailua berrabiatu beharra dago hori aktibatzeko."
 
 #: ../bin/drakguard:317
 #, c-format
@@ -227,8 +230,12 @@ msgid ""
 "The support for Access Control Lists, required by the Block programs "
 "feature, is enabled, but not yet activated."
 msgstr ""
+"Atzipen Kontrol Zerrendentzako euskarria, Eragotzi programak ezaugarriak "
+"beharrezko duena, gaituta dago, baino oraindik aktibatu gabe."
 
 #: ../bin/drakguard:422
 #, c-format
 msgid "Please wait"
 msgstr "Itxoin mesedez"
+
+
diff --git a/po/fr.po b/po/fr.po
index be26d38..ad3b615 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakguard-fr\n"
 "POT-Creation-Date: 2010-05-25 09:22-0300\n"
-"PO-Revision-Date: 2010-05-13 19:39+0100\n"
-"Last-Translator: Christophe Berthelé <berthy@mandriva.org>\n"
+"PO-Revision-Date: 2010-08-29 10:49+0100\n"
+"Last-Translator: Stephane Flavigny <megastorage@hotmail.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +127,7 @@ msgstr "Bloquer tout trafic réseau"
 #: ../bin/drakguard:156
 #, c-format
 msgid "Obscenity sensibility"
-msgstr "Niveau de contrôle"
+msgstr "Sensibilité d'obscénité"
 
 #: ../bin/drakguard:165
 #, c-format
@@ -202,7 +202,7 @@ msgstr "Aide"
 #: ../bin/drakguard:299 ../bin/drakguard:309 ../bin/drakguard:317
 #, c-format
 msgid "Warning"
-msgstr ""
+msgstr "Attention"
 
 #: ../bin/drakguard:299
 #, c-format
@@ -211,16 +211,19 @@ msgid ""
 "Block programs feature.\n"
 "Do you want to enable it now?"
 msgstr ""
+"Le support des Listes de Contrôle d'Accés (ACL) doit être validé pour "
+"utiliser la fonction de Blocage des applications.\n"
+"Voulez-vous le valider maintenant ?"
 
 #: ../bin/drakguard:309
 #, c-format
 msgid "The support for Access Control Lists was enabled."
-msgstr ""
+msgstr "Le support des Listes de Contrôle d'Accés (ACL) a été validé."
 
 #: ../bin/drakguard:309 ../bin/drakguard:317
 #, c-format
 msgid "It is necessary to restart your computer to activate it."
-msgstr ""
+msgstr "Il est nécessaire de relancer votre ordinateur pour l'activer."
 
 #: ../bin/drakguard:317
 #, c-format
@@ -228,6 +231,8 @@ msgid ""
 "The support for Access Control Lists, required by the Block programs "
 "feature, is enabled, but not yet activated."
 msgstr ""
+"Le support des Listes de Contrôle d'Accés (ACL), requis pour la fonction de "
+"Blocage des applications, est validé mais n'est pas actif."
 
 #: ../bin/drakguard:422
 #, c-format
diff --git a/po/ky.po b/po/ky.po
index ead7fa3..024be9e 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -1,12 +1,12 @@
 # Translation of drakguard.po to Kirghiz language
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009.
+# Ilyas Bakirov <just_ilyas@yahoo.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: drakguard\n"
 "POT-Creation-Date: 2010-05-25 09:22-0300\n"
-"PO-Revision-Date: 2009-01-01 20:28+0600\n"
+"PO-Revision-Date: 2010-09-12 19:14+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz <just_ilyas@yahoo.com>\n"
 "MIME-Version: 1.0\n"
@@ -39,12 +39,15 @@ msgstr "Ата-эне башкаруусу"
 msgid "All users"
 msgstr "Бардык колдонуучулар"
 
-#: ../bin/drakguard:92 ../bin/drakguard:210
+#: ../bin/drakguard:92
+#: ../bin/drakguard:210
 #, c-format
 msgid "Allowed users"
 msgstr "Уруксат берилген колдонуучулар"
 
-#: ../bin/drakguard:98 ../bin/drakguard:218 ../bin/drakguard:221
+#: ../bin/drakguard:98
+#: ../bin/drakguard:218
+#: ../bin/drakguard:221
 #, c-format
 msgid "Blacklist"
 msgstr "«Кара тизмеси»"
@@ -59,7 +62,9 @@ msgstr "Уруксат берилбеген адрестер"
 msgid "Remove from blacklist"
 msgstr "«Кара тизмесинден» алып салуу"
 
-#: ../bin/drakguard:105 ../bin/drakguard:217 ../bin/drakguard:220
+#: ../bin/drakguard:105
+#: ../bin/drakguard:217
+#: ../bin/drakguard:220
 #, c-format
 msgid "Whitelist"
 msgstr "«Ак тизмеси»"
@@ -74,23 +79,31 @@ msgstr "Уруксат берилген адрестер"
 msgid "Remove from whitelist"
 msgstr "«Ак тизмесинден» алып салуу"
 
-#: ../bin/drakguard:112 ../bin/drakguard:203 ../bin/drakguard:219
-#: ../bin/drakguard:223 ../bin/drakguard:226 ../bin/drakguard:228
-#: ../bin/drakguard:234 ../bin/drakguard:258 ../bin/drakguard:259
-#: ../bin/drakguard:268 ../bin/drakguard:269 ../bin/drakguard:274
+#: ../bin/drakguard:112
+#: ../bin/drakguard:203
+#: ../bin/drakguard:219
+#: ../bin/drakguard:223
+#: ../bin/drakguard:226
+#: ../bin/drakguard:228
+#: ../bin/drakguard:234
+#: ../bin/drakguard:258
+#: ../bin/drakguard:259
+#: ../bin/drakguard:268
+#: ../bin/drakguard:269
+#: ../bin/drakguard:274
 #, c-format
 msgid "Block programs"
-msgstr ""
+msgstr "Программаларды блоктоо"
 
 #: ../bin/drakguard:113
 #, c-format
 msgid "Programs with blocked execution"
-msgstr ""
+msgstr "Аткарууга тыйю салынган прогрммалар"
 
 #: ../bin/drakguard:114
-#, fuzzy, c-format
+#, c-format
 msgid "Remove from blocked execution list"
-msgstr "«Кара тизмесинден» алып салуу"
+msgstr "Аткарууга тыйю салынган тизмесинен алып салуу"
 
 #: ../bin/drakguard:144
 #, c-format
@@ -101,12 +114,8 @@ msgstr "Ырастоолор"
 #, c-format
 msgid ""
 "This tool allows to configure parental control.\n"
-"It can block access to web sites and restrict connection during a specified "
-"timeframe."
-msgstr ""
-"Бул аспап балдардан каршы коргонуу үчүн колдонулат. Апаптын жардамы менен "
-"веб-сайттарга жетүү укуктарын белгилөө жана Интернетте көрсөтүлгөн убакыт "
-"графиги менен иштөө укуктарын аныктаса болот."
+"It can block access to web sites and restrict connection during a specified timeframe."
+msgstr "Бул аспап балдардан каршы коргонуу үчүн колдонулат. Апаптын жардамы менен веб-сайттарга жетүү укуктарын белгилөө жана Интернетте көрсөтүлгөн убакыт графиги менен иштөө укуктарын аныктаса болот."
 
 #: ../bin/drakguard:147
 #, c-format
@@ -121,7 +130,7 @@ msgstr "Башкы параметрлер"
 #: ../bin/drakguard:152
 #, c-format
 msgid "Block all network traffic"
-msgstr ""
+msgstr "Бардык тармак трафигин блоктоо"
 
 #: ../bin/drakguard:156
 #, c-format
@@ -154,24 +163,24 @@ msgid "End:"
 msgstr "Аягы:"
 
 #: ../bin/drakguard:206
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked users"
-msgstr "Уруксат берилген колдонуучулар"
+msgstr "Блоктолгон колдонуучулар"
 
 #: ../bin/drakguard:223
 #, c-format
 msgid "Block defined applications"
-msgstr ""
+msgstr "Корсөтүлгөн программаларды блоктоо"
 
 #: ../bin/drakguard:228
 #, c-format
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: ../bin/drakguard:229
 #, c-format
 msgid "Please select the program you want to control"
-msgstr ""
+msgstr "Программаны башкаруу үчүн тандаңыз"
 
 #: ../bin/drakguard:231
 #, c-format
@@ -181,54 +190,57 @@ msgstr "Кошуу"
 #: ../bin/drakguard:258
 #, c-format
 msgid "Error"
-msgstr ""
+msgstr "Ката"
 
 #: ../bin/drakguard:258
 #, c-format
 msgid "Invalid Binary Name"
-msgstr ""
+msgstr "Аткарылуучу программанын аты туура эмес"
 
 #: ../bin/drakguard:275
-#, fuzzy, c-format
+#, c-format
 msgid "Unblock users"
-msgstr "Бардык колдонуучулар"
+msgstr "Колдонуучуларды блоктон алып салуу"
 
 #: ../bin/drakguard:292
 #, c-format
 msgid "Help"
 msgstr "Жардам"
 
-#: ../bin/drakguard:299 ../bin/drakguard:309 ../bin/drakguard:317
+#: ../bin/drakguard:299
+#: ../bin/drakguard:309
+#: ../bin/drakguard:317
 #, c-format
 msgid "Warning"
-msgstr ""
+msgstr "Эскертүү"
 
 #: ../bin/drakguard:299
 #, c-format
 msgid ""
-"The support for Access Control Lists must be enabled in order to use the "
-"Block programs feature.\n"
+"The support for Access Control Lists must be enabled in order to use the Block programs feature.\n"
 "Do you want to enable it now?"
 msgstr ""
+"Программаларды блоктоо үчүн ACL колдоосүн жандыруу керек.\n"
+"Жандырууну каалайсызбы?"
 
 #: ../bin/drakguard:309
 #, c-format
 msgid "The support for Access Control Lists was enabled."
-msgstr ""
+msgstr "ACL колдоосу жандырылды."
 
-#: ../bin/drakguard:309 ../bin/drakguard:317
+#: ../bin/drakguard:309
+#: ../bin/drakguard:317
 #, c-format
 msgid "It is necessary to restart your computer to activate it."
-msgstr ""
+msgstr "Активдештирүү үчүн компьютерды кайрадан баштоо керек."
 
 #: ../bin/drakguard:317
 #, c-format
-msgid ""
-"The support for Access Control Lists, required by the Block programs "
-"feature, is enabled, but not yet activated."
-msgstr ""
+msgid "The support for Access Control Lists, required by the Block programs feature, is enabled, but not yet activated."
+msgstr "Программаларды блоктоо үчүн ACL колдоосу жанык бирок активдүү эмес."
 
 #: ../bin/drakguard:422
 #, c-format
 msgid "Please wait"
 msgstr "Күтө туруңуз"
+
diff --git a/po/uk.po b/po/uk.po
index 336c543..bbdc2a7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # translation of drakguard.po to ukrainian
 # Copyright (C) 2008 Free Software Foundation, Inc.
 #
-# $Id$
+# $Id: uk.po 269706 2010-06-01 11:00:28Z fisher $
 #
 # Taras Boychuk <btr0001@ukr.net>, 2008.
 # Yuri Chornoivan <yurchor@ukr.net>, 2010.