typo fix (Reinout van Schouwen)

git-svn-id: http://svn.mandriva.com/svn/soft/draksnapshot/trunk@239841 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94

18 files changed, 55 insertions, 22 deletions

diff --git a/draksnapshot-applet b/draksnapshot-applet
index ce95772..7ffe75e 100755
--- a/draksnapshot-applet
+++ b/draksnapshot-applet
@@ -56,7 +56,7 @@ my %state = (
 		     },
 	     disk_found => {
 		      menu => [ 'configure' ],
-		      tt => [ N_("USB discs are availlable for backups") ]
+		      tt => [ N_("USB discs are available for backups") ]
 		     },
 	     config_in_progress => {
 		      menu => [],
@@ -96,7 +96,22 @@ Gtk2->main;
 
 ugtk2::exit(0);
 
-my $config_pid;
+my ($config_pid, $checker_pid);
+
+
+my %comm_codes = (
+    discs => {
+        code => 2,
+        status => 'locked',
+        log => N_("urpmi database locked") . ", skipping updating urpmi database",
+    },
+    nothing => {
+        code => 3,
+        status => 'critical',
+        log => N_("Error updating media"),
+    },
+);
+
 
 # Signal management 
 sub harvester {
@@ -111,6 +126,14 @@ sub harvester {
             # we should better check it has really been configured indeed.
             setAutoStart('FALSE');
             ugtk2::exit(0);
+        } elsif ($checker_pid && $checker_pid == $childpid) {
+            undef $checker_pid;
+            my $status = $? >> 8;
+            my ($state) = grep { $_->{code} eq $status } values %comm_codes;
+            if ($state) {
+                logIt($state->{log});
+                go2State($state->{status});
+            }
         }
         push @pids, $childpid;
         WIFEXITED($?) and refresh_gui(1);
@@ -145,9 +168,19 @@ sub silentCheck() {
     my $w = $::main_window ? $::main_window->window : undef;
     gtkset_mousecursor_wait($w);
 
-    # force refreshing cache:
-    detect_devices::probeall_update_cache();
-    @discs = grep { $_->{usb_bus} && detect_devices::may_be_a_hd($_) } detect_devices::getSCSI();
+    $checker_pid = fork();
+    if (defined $checker_pid) {
+        return if $checker_pid; # parent
+
+        # immediate exit, else forked gtk+ object destructors will badly catch up parent applet
+        my $_safe = before_leaving { POSIX::_exit(0) };
+
+        # force refreshing cache:
+        
+        detect_devices::probeall_update_cache();
+        @discs = grep { $_->{usb_bus} && detect_devices::may_be_a_hd($_) } detect_devices::getSCSI();
+    }
+
     go2State('okay') if !@discs;
 
     # are there any updates ?
diff --git a/po/cs.po b/po/cs.po
index 0064392..95d1d56 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB disky jsou připraveny pro zálohy"
 
 #: ../draksnapshot-applet:64
diff --git a/po/cy.po b/po/cy.po
index b4cb686..b12099e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -15,7 +15,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Mae disgiau USB ar gael ar gyfer copiau wrth gefn"
 
 #: ../draksnapshot-applet:64
diff --git a/po/da.po b/po/da.po
index 505cd00..fd59279 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB diske er tilgængelige til sikkerhedskopiering"
 
 #: ../draksnapshot-applet:64
diff --git a/po/draksnapshot.pot b/po/draksnapshot.pot
index 0db7e61..73eff73 100644
--- a/po/draksnapshot.pot
+++ b/po/draksnapshot.pot
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr ""
 
 #: ../draksnapshot-applet:64
diff --git a/po/el.po b/po/el.po
index dbd1305..2081029 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Οι USB δίσκοι είναι διαθέσιμοι για την αποθήκευση αντιγράφων ασφαλείας"
 
 #: ../draksnapshot-applet:64
diff --git a/po/et.po b/po/et.po
index ba0cab3..7b427c1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Varukoopiaid saab teha USB-ketastele"
 
 #: ../draksnapshot-applet:64
diff --git a/po/eu.po b/po/eu.po
index 21d368a..790c458 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB diskoak babeskopientzako eskuragarri daude"
 
 #: ../draksnapshot-applet:64
diff --git a/po/fr.po b/po/fr.po
index 12f1171..49b9193 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Disques USB disponibles pour les sauvegardes"
 
 #: ../draksnapshot-applet:64
diff --git a/po/he.po b/po/he.po
index 6e297f8..a8ee3a4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "כונני USB זמינים לגיבוי"
 
 #: ../draksnapshot-applet:64
diff --git a/po/hu.po b/po/hu.po
index 75a7594..6734654 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Az USB meghajtón lévő mentések"
 
 #: ../draksnapshot-applet:64
diff --git a/po/ja.po b/po/ja.po
index 25c6830..cc3262d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB ディスクがバックアップに使えます"
 
 #: ../draksnapshot-applet:64
diff --git a/po/nl.po b/po/nl.po
index 26382ba..653527d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Er zijn USB-schijven beschikbaar voor reservekopiëen"
 
 #: ../draksnapshot-applet:64
diff --git a/po/nn.po b/po/nn.po
index 77b3b70..c71c255 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -17,7 +17,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB-diskar er tilgjengeleg for reservekopiering"
 
 #: ../draksnapshot-applet:64
diff --git a/po/pl.po b/po/pl.po
index 0f1daa1..8f94f99 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,7 +16,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Napędy USB są dostępne dla kopii zapasowych"
 
 #: ../draksnapshot-applet:64
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c44aa74..6d9bdeb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Discos USB estão disponíveis para backups"
 
 #: ../draksnapshot-applet:64
diff --git a/po/ru.po b/po/ru.po
index bace0a3..999df1c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "Для резервного копирования доступны USB-диски"
 
 #: ../draksnapshot-applet:64
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 88d7476..c1bdf03 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,7 +15,7 @@ msgstr ""
 
 #: ../draksnapshot-applet:59
 #, c-format
-msgid "USB discs are availlable for backups"
+msgid "USB discs are available for backups"
 msgstr "USB 磁碟可以用來備份"
 
 #: ../draksnapshot-applet:64