diff --git a/debian/changelog b/debian/changelog index 940c5b2..6865b47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ lubuntu-artwork (0.9) UNRELEASED; urgency=low * plymouth theme: - Update logo color. + - Sync with ubuntu-logo.script. * usr/share/icons: - Add Lubuntu icon theme, which inherits from elementary-monochrome. * debian/control: diff --git a/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script b/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script index d3a51f8..f8f577d 100644 --- a/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script +++ b/lib/plymouth/themes/lubuntu-logo/lubuntu-logo.script @@ -696,6 +696,7 @@ fun update_progress_label (progress) { label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current); label = StringReplace (label, "%2$d", global.counter.total); label = StringReplace (label, "%3$d", progress_label.progress); + label = StringReplace (label, "%%", "%"); progress_label = get_fsck_label (label, 0); #progress_label.progress = progress; @@ -959,10 +960,10 @@ fun update_status_callback (status) { device = update_strings[1]; progress = update_strings[2]; status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)" + if (!status_string[0]) + status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)"; - if ((device != "") && - (progress != "") && - (status_string[0] != "")) { + if ((device != "") && (progress != "")) { progress = StringToInteger (progress); # Make sure that the fsck_queue is initialised