From aac43f2c868478fe1a1064bd4a4891fc104fccd7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 25 Sep 2009 09:42:16 +0000 Subject: (tar) fix compressing with new tar --- ChangeLog | 741 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- MandrivaUpdate | 27 ++- Rpmdrake/gui.pm | 18 +- Rpmdrake/pkg.pm | 30 ++- gui.lst | 27 ++- po/cs.po | 58 +++-- po/da.po | 59 +++-- po/de.po | 62 +++-- rpmdrake | 20 +- 10 files changed, 945 insertions(+), 99 deletions(-) diff --git a/ChangeLog b/ChangeLog index 862d142c..b7ba1931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,744 @@ +2009-03-30 13:35 Thierry Vignaud + + * po/fr.po: update + +2009-03-30 13:34 Thierry Vignaud + + * po/af.po, po/am.po, po/ar.po, po/az.po, po/be.po, po/bg.po, + po/bn.po, po/br.po, po/bs.po, po/ca.po, po/cs.po, po/cy.po, + po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, + po/eu.po, po/fa.po, po/fi.po, po/fr.po, po/fur.po, po/ga.po, + po/gl.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/hy.po, + po/id.po, po/is.po, po/it.po, po/ja.po, po/ka.po, po/ko.po, + po/ku.po, po/ky.po, po/lt.po, po/ltg.po, po/lv.po, po/mk.po, + po/mn.po, po/ms.po, po/mt.po, po/nb.po, po/nl.po, po/nn.po, + po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, + po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, po/sl.po, + po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, po/tg.po, + po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, + po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: + sync wsith code + +2009-03-27 19:49 Karl Ove Hufthammer + + * po/nn.po: Updated Norwegian Nynorsk translation. + +2009-03-27 04:54 olorin + + * po/nb.po: update for Norwegian Bokmål translation + +2009-03-26 18:45 Thierry Vignaud + + * rpmdrake.pm: (show_urpm_progress) there's a bug since r17036 from + gc on 2003-08-07 + where we display misplaced quotes such as "downloading `foobar + from + 'medium Main Updates'´" + +2009-03-26 18:42 Thierry Vignaud + + * NEWS, rpmdrake.pm: (show_urpm_progress) prevent dialog to enlarge + too much when + displaying downloads of media meta_data (eg: adding or updating + media) + +2009-03-26 11:09 Thierry Vignaud + + * NEWS: list initial bug report in latest commit instead + +2009-03-26 10:29 Thierry Vignaud + + * NEWS, gurpmi.addmedia: fix success message when adding mirrorlist + (#48660) + +2009-03-26 10:20 Thierry Vignaud + + * gurpmi.addmedia: extract message so that the code is clearer + +2009-03-25 15:56 Thierry Vignaud + + * Makefile, NEWS: 5.13 + +2009-03-25 12:10 Thierry Vignaud + + * rpmdrake: (quit) perl_checker cleanup + +2009-03-25 12:09 Thierry Vignaud + + * NEWS, rpmdrake: (run_treeview_dialog) do not use Gtk2::Sexy + anymore (sligthly reduce + memory usage) (needs drakxtools > 12.17.1) + +2009-03-25 12:01 Pavel Maryanov + + * po/ru.po: russian translation updated + +2009-03-24 09:22 Thierry Vignaud + + * NEWS, gui.lst: update GUI package list (#49086) + +2009-03-21 20:18 gustav + + * po/bg.po: update translation for Bulgarian language + +2009-03-21 17:14 Keld Jørn Simonsen + + * po/da.po: updates + +2009-03-20 19:24 Marek Laane + + * po/et.po: Fix stupid typo. + +2009-03-20 16:57 olorin + + * po/nb.po: update for Norwegian Bokmål translation + +2009-03-20 14:55 Thierry Vignaud + + * Makefile, NEWS: 5.12 + +2009-03-20 14:54 Thierry Vignaud + + * NEWS, Rpmdrake/pkg.pm: (get_pkgs) select updates from all media + on cooker instead of only from update media + +2009-03-20 04:03 bedi + + * po/pt_BR.po: updated for pt_BR + +2009-03-19 23:29 Pjetur G. Hjaltason + + * po/is.po: Spelling and updates + +2009-03-19 18:48 olorin + + * po/nb.po: update for Norwegian Bokmål translation + +2009-03-19 15:16 Thierry Vignaud + + * Makefile, NEWS: 5.11.1 + +2009-03-19 15:16 Thierry Vignaud + + * NEWS, Rpmdrake/open_db.pm: (is_it_a_devel_distro) export it (will + be used by mdkapplet) + +2009-03-19 15:11 Thierry Vignaud + + * Rpmdrake/open_db.pm: make export list more readable + +2009-03-19 14:59 Thierry Vignaud + + * Makefile, NEWS: 5.11 + +2009-03-19 14:53 Thierry Vignaud + + * NEWS, Rpmdrake/open_db.pm: (get_update_medias) use new + is_it_a_devel_distro() in order to update + all media on cooker instead of only update media + +2009-03-19 14:49 Thierry Vignaud + + * Rpmdrake/open_db.pm: (is_it_a_devel_distro) introduce it in order + to check whether the + distro is 'cooker' or not + +2009-03-19 14:49 Thierry Vignaud + + * Rpmdrake/open_db.pm, Rpmdrake/pkg.pm: (get_update_medias) move it + from Rpmdrake::pkgs into Rpmdrake::open_db + where resides get_inactive_backport_media() + (more logical place and will be used by mdkapplet) + +2009-03-19 14:47 Thierry Vignaud + + * MandrivaUpdate, NEWS: (run_treeview_dialog) fix width of title by + workarounding Gtk+ (#48259) + +2009-03-19 14:41 Thierry Vignaud + + * NEWS, Rpmdrake/open_db.pm: (get_inactive_backport_media) do not + try to update & parse inactive sources backports media + +2009-03-19 14:36 Thierry Vignaud + + * MandrivaUpdate: (run_treeview_dialog) force width of icon column + to be fixed + +2009-03-18 19:59 Andrea Celli + + * po/it.po: update translation for Italian + +2009-03-18 17:48 bedi + + * po/pt_BR.po: updating translations for pt_br + +2009-03-18 17:45 bedi + + * po/pt_BR.po: updating translations for pt_br + +2009-03-18 15:29 Thierry Vignaud + + * Makefile, NEWS: 5.10 + +2009-03-18 15:09 Thierry Vignaud + + * MandrivaUpdate, NEWS: (run_treeview_dialog) do not harcode column + id and fix it (in + 'toggled' signal handler too) ; + + this means we got the right cell renderer and thus the 'toggled' + signal handler does be connected ; + + this means we stop ignoring selected/unselected packages + (embarassing + bug #29835) + + (this regression was introduced in r242980 on 2008-06-18: + "(refresh_packages_list, run_treeview_dialog) show type of update + in + mandrivaupdate: fix, security, ... (spec 216)") + +2009-03-18 14:22 Thierry Vignaud + + * MandrivaUpdate: (run_treeview_dialog) simplify through using + MDK::Common + +2009-03-18 14:21 Thierry Vignaud + + * MandrivaUpdate: perl_checker cleanups + +2009-03-18 12:09 olorin + + * po/nb.po: update for Norwegian Bokmål translation + +2009-03-13 14:07 olorin + + * po/nb.po: update for Norwegian Bokmål translation + +2009-03-12 21:59 Сергій Рибалченко (Sergey Ribalchenko) + + * po/uk.po: translation update + +2009-03-09 17:36 bedi + + * po/pt_BR.po: Updated translation for brazilian portuguese + +2009-03-08 22:20 Michal Bukovjan + + * po/cs.po: Updated Czech translation. + +2009-03-08 22:19 atilla + + * po/tr.po: updated translation for turkish language + +2009-03-06 16:32 Ilyas Bakirov + + * po/ky.po: update translation for kirghiz language + +2009-03-05 16:16 Thierry Vignaud + + * po/cy.po: update (Rhoslyn Prys) + +2009-03-05 08:53 Tomasz Bednarski + + * po/pl.po: update translation for Polish + +2009-03-04 18:45 bedi + + * po/pt_BR.po: fixed typo in pt_BR + +2009-03-04 18:36 bedi + + * po/pt_BR.po: Removal of unwanted capslock words for ptBR Language + +2009-03-04 13:35 bedi + + * po/pt_BR.po: Changes to fix rpmdrake potfile for pt_BR + +2009-03-03 19:52 bedi + + * po/pt_BR.po: fixed error in pt_BR translation + +2009-03-03 06:21 Shiva Huang + + * po/zh_TW.po: Update zh_TW translation + +2009-03-03 03:30 bedi + + * po/pt_BR.po: Updated tranlation for brazilian portuguese + +2009-03-02 17:22 bedi + + * po/pt_BR.po: updated for pt_BR translation + +2009-03-01 22:51 atilla + + * po/tr.po: updated translation for turkish language + +2009-03-01 20:10 Inigo Salvador Azurmendi + + * po/eu.po: Osatuta. + +2009-02-28 04:54 dimitrios + + * po/el.po: update translation for greek language + +2009-02-27 19:13 bedi + + * po/pt_BR.po: updated for pt_BR translation + +2009-02-27 19:02 bedi + + * po/pt_BR.po: Updated tranlation for brazilian portuguese + +2009-02-27 06:25 dimitrios + + * po/el.po: update translation for greek language + +2009-02-26 16:09 bedi + + * po/pt_BR.po: ressending rpmdrake potfile + +2009-02-25 17:58 bedi + + * po/pt_BR.po: changed translation line for pt_BR + +2009-02-25 16:53 bedi + + * po/pt_BR.po: fixed fuzzy line for pt_BR + +2009-02-24 02:04 bedi + + * po/pt_BR.po: Updated tranlation for brazilian portuguese + +2009-02-23 18:43 Thierry Vignaud + + * po/pt_BR.po: fix po error that breaks build + +2009-02-23 16:57 Thierry Vignaud + + * NEWS, rpmdrake.pm: use right icon + +2009-02-23 16:55 Thierry Vignaud + + * Makefile, NEWS: 5.9 + +2009-02-23 16:52 Thierry Vignaud + + * gui.lst: further update + +2009-02-23 16:47 Thierry Vignaud + + * NEWS: log latest changes + +2009-02-23 16:36 Thierry Vignaud + + * Rpmdrake/pkg.pm: (get_updates_list,get_pkgs) latest + simplification commit enables to further simplify, thus removing + a useless loop on update media + +2009-02-23 16:27 Thierry Vignaud + + * Rpmdrake/pkg.pm: (get_pkgs) simplify and optimize + +2009-02-23 15:48 Thierry Vignaud + + * Rpmdrake/open_db.pm: (get_inactive_backport_media) do not try to + update & parse inactive debug + backports media (slightly reduce memory usage -- 464kb on current + 2009.0 media config) + +2009-02-23 15:25 Thierry Vignaud + + * Rpmdrake/pkg.pm: (extract_header,get_installed_packages) further + reduce memory usage by not keeping around + descriptions for installed packages ; fetch them on demand + (1.2% of resident memory further saved on std x86_64 media + config) + +2009-02-23 15:22 Thierry Vignaud + + * Rpmdrake/gui.pm, Rpmdrake/pkg.pm: (get_pkgs,get_summary) slightly + reduce memory usage by not keeping around + summaries (2.1% of resident memory saved on std x86_64 media + config) + +2009-02-22 21:03 Reinout van Schouwen + + * po/nl.po: 2009-02-22 Reinout van Schouwen + + - nl.po: Updated Dutch translation + + +2009-02-22 17:47 Yukiko Bando + + * po/ja.po: Japanese translation updated. + +2009-02-21 21:58 cfrussen + + * po/ro.po: Updated Romanian translation + +2009-02-21 21:00 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-20 10:37 Thierry Vignaud + + * NEWS, gui.lst: update GUI package list + +2009-02-20 03:48 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-20 03:16 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-20 03:12 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-19 18:59 bedi + + * po/pt_BR.po: Update for pt_BR Language + +2009-02-18 06:11 atilla + + * po/tr.po: update translation for turkish language + +2009-02-16 21:34 bedi + + * po/pt_BR.po: Update for pt_BR Language + +2009-02-16 21:08 bedi + + * po/pt_BR.po: Update for pt_BR Language + +2009-02-16 16:16 bedi + + * po/pt_BR.po: Update for pt_BR Language + +2009-02-16 15:42 Gergely Lónyai + + * po/hu.po: Hungarian translation update + +2009-02-16 13:44 Thierry Vignaud + + * NEWS, rpmdrake: prevent running more than one instance (#47755) + +2009-02-16 10:41 Marek Laane + + * po/et.po: Updated Estonian translation. + +2009-02-15 09:19 Thierry Vignaud + + * Rpmdrake/edit_urpm_sources.pm: (mainwindow) make more readable + +2009-02-15 09:08 Thierry Vignaud + + * Rpmdrake/pkg.pm: (get_updates_list) split it out of get_pkgs() + +2009-02-15 08:30 Thierry Vignaud + + * NEWS: latest commit closed a bug report btw... + +2009-02-15 08:29 Thierry Vignaud + + * Rpmdrake/pkg.pm: (get_pkgs) enhance previous commit (r252875): + skip even more + computations but do compute updates for MandrivaUpdate + +2009-02-15 08:22 Thierry Vignaud + + * NEWS, Rpmdrake/pkg.pm, rpmdrake: (get_pkgs) add 'compute_updates' + option that enable super fast startup + by skipping computing updates on startup + +2009-02-15 07:36 Jure Repinc + + * po/sl.po: Updated Slovenian translation + +2009-02-15 00:11 Thierry Vignaud + + * Rpmdrake/gui.pm: (do_action) add a FIXME note about offering to + report the problem into bugzilla + +2009-02-14 23:56 Thierry Vignaud + + * NEWS: typo fix + +2009-02-14 23:39 Thierry Vignaud + + * Makefile, NEWS: 5.8 + +2009-02-14 23:37 Thierry Vignaud + + * NEWS, Rpmdrake/edit_urpm_sources.pm, icons/title-media.png: use + same icon as in mcc instead of rpmdarke one (#44671) + +2009-02-14 23:36 Thierry Vignaud + + * NEWS: move bug reference + +2009-02-14 23:35 Thierry Vignaud + + * NEWS: log latest change (update banner icons from mcc ones) + +2009-02-14 23:34 Thierry Vignaud + + * icons/title-install.png, icons/title-update.png: copy icons from + MCC + +2009-02-14 23:32 Thierry Vignaud + + * icons/title-remove.png, rpmdrake-remove: kill rpmdrake-remove + forever (unpackaged for a while) + +2009-02-14 23:27 Thierry Vignaud + + * MandrivaUpdate, NEWS, Rpmdrake/edit_urpm_sources.pm, rpmdrake: + use mcc icon if availlable (#44671) + +2009-02-14 23:25 Thierry Vignaud + + * rpmdrake.pm: (get_icon) introduce it in order to reuse mcc icon + if availlable (#44671) + +2009-02-14 23:15 Thierry Vignaud + + * NEWS, Rpmdrake/edit_urpm_sources.pm: + (easy_add_callback_with_mirror,easy_add_callback) honnor + canceling + when the user closed the "updates/full_sources" dialog (#47125) + +2009-02-14 23:13 Thierry Vignaud + + * rpmdrake.pm: (interactive_msg) document return value + +2009-02-14 23:06 Thierry Vignaud + + * NEWS, rpmdrake.pm: (choose_mirror) honnor canceling when the user + refused to access the + network when adding a specific mirror from the menubar (#46027) + +2009-02-14 16:40 Christophe Berthelé + + * po/fr.po: Update French translation + +2009-02-13 23:40 Thierry Vignaud + + * po/rpmdrake.pot: (toggle_nodes) remove useless end of lines + +2009-02-13 23:39 Thierry Vignaud + + * Rpmdrake/gui.pm, po/af.po, po/am.po, po/ar.po, po/az.po, + po/be.po, po/bg.po, po/bn.po, po/br.po, po/bs.po, po/ca.po, + po/cs.po, po/cy.po, po/da.po, po/de.po, po/el.po, po/eo.po, + po/es.po, po/et.po, po/eu.po, po/fa.po, po/fi.po, po/fr.po, + po/fur.po, po/ga.po, po/gl.po, po/he.po, po/hi.po, po/hr.po, + po/hu.po, po/hy.po, po/id.po, po/is.po, po/it.po, po/ja.po, + po/ka.po, po/ko.po, po/ku.po, po/ky.po, po/lt.po, po/ltg.po, + po/lv.po, po/mk.po, po/mn.po, po/ms.po, po/mt.po, po/nb.po, + po/nl.po, po/nn.po, po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, + po/ro.po, po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, + po/sl.po, po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, + po/tg.po, po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, + po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: + (toggle_nodes) remove useless end of lines + +2009-02-13 23:32 Thierry Vignaud + + * po/af.po, po/am.po, po/ar.po, po/az.po, po/be.po, po/bg.po, + po/bn.po, po/br.po, po/bs.po, po/ca.po, po/cs.po, po/cy.po, + po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, + po/eu.po, po/fa.po, po/fi.po, po/fr.po, po/fur.po, po/ga.po, + po/gl.po, po/he.po, po/hi.po, po/hr.po, po/hu.po, po/hy.po, + po/id.po, po/is.po, po/it.po, po/ja.po, po/ka.po, po/ko.po, + po/ku.po, po/ky.po, po/lt.po, po/ltg.po, po/lv.po, po/mk.po, + po/mn.po, po/ms.po, po/mt.po, po/nb.po, po/nl.po, po/nn.po, + po/pa_IN.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, + po/rpmdrake.pot, po/ru.po, po/sc.po, po/sk.po, po/sl.po, + po/sq.po, po/sr.po, po/sr@Latn.po, po/sv.po, po/ta.po, po/tg.po, + po/th.po, po/tl.po, po/tr.po, po/uk.po, po/uz.po, + po/uz@cyrillic.po, po/vi.po, po/wa.po, po/zh_CN.po, po/zh_TW.po: + sync with code + +2009-02-13 23:26 Thierry Vignaud + + * Rpmdrake/gui.pm: (toggle_nodes) previous commit nicely showed + some duplicated code ; + let's factorize it + +2009-02-13 23:21 Jure Repinc + + * po/sl.po: Updated Slovenian translation + +2009-02-13 23:19 Thierry Vignaud + + * Rpmdrake/gui.pm: (toggle_nodes) add a titles when warning about + conflicting package + +2009-02-13 23:19 Thierry Vignaud + + * Rpmdrake/gui.pm: (toggle_nodes) fix title when asking for + removing additional packages confirmatin + +2009-02-13 23:06 Thierry Vignaud + + * Rpmdrake/pkg.pm: (already_installed_or_not_installable) really do + not show empty + dialogs (r252829 was incomplete) + +2009-02-13 22:53 Thierry Vignaud + + * Rpmdrake/pkg.pm: (perform_installation) try to pass a meaningfull + @ask_unselect to urpm::main_loop::run() + +2009-02-13 22:52 Thierry Vignaud + + * Rpmdrake/pkg.pm: (already_installed_or_not_installable) do not + show empty dialogs + + rationale: due to some bugs in urpmi, we cannot always keep the + state + and thus urpm::select::translate_already_installed() results in + us + displaying empty dialogs sometimes + +2009-02-13 22:40 Thierry Vignaud + + * NEWS, Rpmdrake/pkg.pm: (perform_installation) fix crashing on + uninstalling packages (#47751) + +2009-02-13 15:24 Yukiko Bando + + * po/ja.po: Japanese translation updated. + +2009-02-12 10:30 Thierry Vignaud + + * NEWS, Rpmdrake/edit_urpm_sources.pm: (mainwindow) do not use the + same shortcut for "Add a specific "media + mirror" and "_Add a custom medium" menu entries (#46027) + +2009-02-12 10:24 Thierry Vignaud + + * NEWS: better log + +2009-02-12 10:23 Thierry Vignaud + + * NEWS, Rpmdrake/open_db.pm: (fast_open_urpmi_db) prevent crashing + in URPM when using --env with relative paths + (eg: "unable to read synthesis file + bug-envs/47305_full/rpmdb.cz") + + (I suspect some chdir() happens at a certain stage in urpmi or + URPM) + +2009-02-11 21:29 Andrea Celli + + * po/it.po: update translation for Italian + +2009-02-11 17:48 Thierry Vignaud + + * Makefile, NEWS: 5.7 + +2009-02-11 15:48 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-11 15:37 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-11 15:21 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-11 15:00 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-11 14:55 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-10 17:52 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-10 17:49 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-10 16:46 Thierry Vignaud + + * NEWS, rpmdrake: (run_treeview_dialog) add C-F accelerator in + order to focus on search entry (#46404) + +2009-02-10 14:36 Thierry Vignaud + + * rpmdrake.pm: (update_sources) simplify + +2009-02-10 11:22 Thierry Vignaud + + * NEWS, Rpmdrake/open_db.pm: (fast_open_urpmi_db) fix using + --justdb option + +2009-02-10 10:58 Thierry Vignaud + + * NEWS: fix date + +2009-02-10 10:55 Thierry Vignaud + + * NEWS, Rpmdrake/pkg.pm: (perform_installation) implement + 'need_restart' so that we warn when rebooting + is needed after installing packages + +2009-02-10 06:06 dimitrios + + * po/el.po: update translation for greek language + +2009-02-09 14:25 Thierry Vignaud + + * Makefile, NEWS: 5.6 + +2009-02-09 14:25 Thierry Vignaud + + * gui.lst: further update GUI package list + +2009-02-09 14:19 Thierry Vignaud + + * NEWS, rpmdrake.pm: (update_sources_interactive) fix media + selection dialog layout so that + dialog behaves smoothly on resizing (#47271) + +2009-02-09 14:08 Thierry Vignaud + + * NEWS, Rpmdrake/pkg.pm: (warn_about_media) use new proper API to + select media, thus fixing not + updating media (side effect of urpmi-6.14.12 API changes, #47209) + +2009-02-05 22:21 bedi + + * po/pt_BR.po: update translation for pt_BR language + +2009-02-05 18:28 Marek Laane + + * po/et.po: Modified as requested by Jaanus Ojangu. + +2009-01-31 22:23 Karl Ove Hufthammer + + * po/nn.po: Updated Norwegian Nynorsk translation. + +2009-01-28 12:31 Pavel Maryanov + + * po/ru.po: Russian translation updated + +2009-01-22 15:22 bedi + + * po/pt_BR.po: update translation for pt_BR language + 2008-10-06 19:45 Thierry Vignaud * rpmdrake.pm: (run_as_user) export it for Rpmdrake::gui diff --git a/Makefile b/Makefile index 3fab6dc3..812d5cdb 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ dis: clean find $(NAME)-$(VERSION) -name .svnignore |xargs rm -rf find $(NAME)-$(VERSION) -name '*.pm' -o -name rpmdrake -o -name MandrivaUpdate | xargs ./simplify-drakx-modules ./simplify-drakx-modules $(NAME)-$(VERSION)/{gurpmi.addmedia,edit-urpm-sources.pl} - tar cfY ../$(NAME)-$(VERSION).tar.lzma $(NAME)-$(VERSION) + tar cfJ ../$(NAME)-$(VERSION).tar.lzma $(NAME)-$(VERSION) rm -rf $(NAME)-$(VERSION) gui.lst: diff --git a/MandrivaUpdate b/MandrivaUpdate index 21678716..4f5f6e69 100755 --- a/MandrivaUpdate +++ b/MandrivaUpdate @@ -79,6 +79,8 @@ sub refresh_packages_list { if (!$initialized) { $pkgs->{$_}{selected} = 0 foreach @requested; my @selectable = grep { !$pkgs->{$_}{pkg}->flag_skip } @requested; + # adjust boolean to reality of selected state: + toggle($list, @selectable) if @selectable; toggle($list, @selectable) if @selectable; $initialized = 1; } @@ -131,6 +133,17 @@ sub quit() { Gtk2->main_quit; } +sub select_n_refresh { + my ($list, $info, $update_button, $value) = @_; + toggle_all({ + widgets => { + detail_list => $list, + detail_list_model => $list->get_model + }, + }, $value); + refresh_packages_list($list, $info, $update_button); +} + sub run_treeview_dialog { my ($callback_action) = @_; @@ -175,15 +188,11 @@ sub run_treeview_dialog { ), 0, gtksignal_connect( Gtk2::Button->new(but_(N("Select all"))), - clicked => sub { - toggle_all({ - widgets => { - detail_list => $list, - detail_list_model => $list->get_model - }, - }, 1); - refresh_packages_list($list, $info, $update_button); - }, + clicked => sub { select_n_refresh($list, $info, $update_button, 1) }, + ), + 0, gtksignal_connect( + Gtk2::Button->new(but_(N("Unselect all"))), + clicked => sub { select_n_refresh($list, $info, $update_button, 0) }, ), 1, gtknew('Label'), 0, my $action_button = gtksignal_connect( diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index e1d0abbc..33052285 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -398,6 +398,7 @@ sub toggle_all { my @l = children($w) or return; my @unsel = grep_unselected(@l); + # FIXME: ignore unsel according to $_val (val=0 => unselect?, =1 => select?) my @p = @unsel ? #- not all is selected, select all if no option to potentially override (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) @@ -510,6 +511,10 @@ sub ask_browse_tree_given_widgets_for_rpmdrake { $common->{initial_selection} and toggle_nodes($w->{tree}->window, $w->{detail_list_model}, \&set_leaf_state, undef, @{$common->{initial_selection}}); #my $_b = before_leaving { $clear_all_caches->() }; $common->{init_callback}->() if $common->{init_callback}; + use Data::Dumper; + #output('/tmp/pkgs.pm', Dumper([ + # format_pkg_simplifiedinfo($pkgs, 'basesystem', $urpm, $descriptions) + #])); $w->{w}->main; } @@ -549,15 +554,7 @@ sub pkgs_provider { ); my %tmp_filter_methods = ( all => sub { [ keys %$pkgs ] }, - all_updates => sub { - # potential "updates" from media not tagged as updates: - if (!$options{pure_updates} && !$Rpmdrake::pkg::need_restart) { - [ @{$h->{updates}}, - difference2([ grep { is_updatable($_) } @{$h->{installable}} ], $h->{backports}) ]; - } else { - $h->{updates}; - } - }, + all_updates => sub { $h->{updates} }, backports => sub { $h->{backports} }, meta_pkgs => sub { $h->{meta_pkgs} }, gui_pkgs => sub { $h->{gui_pkgs} }, @@ -667,6 +664,8 @@ sub toggle_nodes { \@nodes, \@nodes_with_deps) or @nodes_with_deps = (); }; + warn ">> old_state=$old_state, new_state=$new_state\n"; + if (member($old_state, qw(to_remove installed))) { # remove pacckages if ($new_state) { my @remove; @@ -758,6 +757,7 @@ sub toggle_nodes { packages_selection_ok: } else { my @unrequested; + warn ">> DESELECTING\n"; slow_func($widget, sub { @unrequested = $urpm->disable_selected(open_rpm_db(), $urpm->{state}, map { $pkgs->{$_}{pkg} } @nodes) }); diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 581ed6b8..023694dc 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -401,11 +401,15 @@ sub get_updates_list { # list updates including skiped ones + their deps in MandrivaUpdate: @$requested_list = uniq(@$requested_list, @$requested_strict); + #use Data::Dumper; die Dumper $urpm->{media}; + # do not pre select updates in rpmdrake: @$requested_strict = () if !$probe_only_for_updates; } sub get_pkgs { + use Benchmark; + my $t0 = new Benchmark; my ($opts) = @_; my $w = $::main_window; @@ -475,9 +479,27 @@ sub get_pkgs { my $state = {}; my (@requested, @requested_strict); + warn ">> $compute_updates || $::MODE eq 'update'\n"; if ($compute_updates || $::MODE eq 'update') { + # faster, ony look at update media for computing updates: + use Data::Dumper; output('/tmp/media.pm', Dumper [ \@update_medias, $urpm->{media} ]); + my $urpm = $urpm; + #my have side effects :-( : + $urpm = open_urpmi_db(update => 1) if !is_it_a_devel_distro(); + #local $urpm->{media} = \@update_medias; # not enough, request_packages_to_upgrade->() will find them anyway due to all packages being known + get_updates_list($urpm, $db, $state, $requested, \@requested, \@requested_strict, \%all_pkgs); } + my $t1 = new Benchmark; + my $td = timediff($t1, $t0); + print "the code took:",timestr($td),"\n"; + use Data::Dumper; + $Data::Dumper::Sortkeys = 1; + warn ">> $compute_updates || $::MODE eq 'update'\n"; + output("/tmp/pkgs_$$.pm", Dumper([ \@requested, \@requested_strict ])); + #DIE "DONE\n"; + $a; + #exit 1; $priority_state = $need_restart ? $state : undef; $priority_requested = $need_restart ? $requested : undef; @@ -512,6 +534,7 @@ sub get_pkgs { } } @updates = @requested; + #warn Dumper [ \@updates, \@requested, \@requested_strict ]; # selecting updates by default but skipped ones (MandrivaUpdate only): foreach (@requested_strict) { $all_pkgs{$_}{selected} = 1; @@ -651,6 +674,10 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( } my @to_install = @{$urpm->{depslist}}[keys %{$state->{selected}}]; + # FIXME: selection are not identical: + use Data::Dumper; warn Dumper [ \@to_install, + [ grep { $pkgs->{$_}{selected} } keys %$pkgs ], + ]; my @pkgs = map { scalar($_->fullname) } sort(grep { $_->flag_selected } @to_install); @{$urpm->{ask_remove}} = sort(urpm::select::removed_packages($urpm, $urpm->{state})); @@ -689,7 +716,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my $_gurpm_clean_guard = before_leaving { undef $gurpm }; my $something_installed; - if (@to_install && $::rpmdrake_options{auto_orphans}) { + if (@to_install) { urpm::orphans::compute_future_unrequested_orphans($urpm, $state); if (my @orphans = map { scalar $_->fullname } @{$state->{orphans_to_remove}}) { interactive_msg(N("Orphan packages"), P("The following orphan package will be removed.", @@ -861,7 +888,6 @@ you may now inspect some in order to take actions:"), } N("RPM transaction %d/%d"); - N("Unselect all"); N("Details"); statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this diff --git a/gui.lst b/gui.lst index ee8a70ba..7d267f66 100644 --- a/gui.lst +++ b/gui.lst @@ -7,7 +7,6 @@ CriticalMass Eterm ExEf FileRunner -FlashPlayer GSnes9x GTorrentViewer LightZone @@ -17,7 +16,6 @@ OilWar OpenDX PolarViewer R-base -RealPlayer SheepShaver SpiralLoops SpiralSynth @@ -29,10 +27,8 @@ VOCP-web VariCAD_2009-en VariCAD_View_2009-en VisualBoyAdvance -XCombust abe abiword -abiword-plugin-impexp abuse_sdl accerciser acidrip @@ -139,8 +135,6 @@ blogtk bluedj-hall bluefish blueman -bluez-gnome -bluez-gnome-analyzer bmpx boa-constructor bobobot @@ -181,6 +175,13 @@ cdvst cedega-mandriva celestia cellwriter +celtx-ca +celtx-cs +celtx-de +celtx-en-US +celtx-es-ES +celtx-fr +celtx-pt-BR cervisia cgoban1 chbg @@ -267,6 +268,7 @@ ding dino disksearch distcc-gnome-monitor +djl djview4 djvulibre dlume @@ -727,8 +729,9 @@ helixplayer heroes hexamine hexcalc +hexxagon highmoon -hinetradio +hinedo hipo holotz-castle holotz-castle-editor @@ -812,7 +815,6 @@ kaconnect kaddressbook kadu kaffeine -kaffeine4 kalarm kalgebra kalva @@ -1027,7 +1029,6 @@ kiten kjots kjumpingcube kkbswitch -kkeyled klamav klavaro klcc @@ -1061,7 +1062,6 @@ kmymoney2 knemo knetwalk knewspost -knmap knoda knode knotes @@ -1101,7 +1101,6 @@ kpilot kplato kplayer kpodder -kpopup kpovmodeler kppp kpresenter @@ -1322,6 +1321,7 @@ monsoon monster-masher monsterz moonshine-player +moovida motv mountloop mousepad @@ -1554,7 +1554,6 @@ poker-network pokerth policycoreutils-gui policykit-gnome -policykit-kde polyxmass ponyprog2000 popfile @@ -1615,6 +1614,7 @@ qt-recordmydesktop qt4-assistant qt4-designer qt4-linguist +qtads qtemu qterm qtiplot @@ -1635,6 +1635,7 @@ quakeforge-clients-glx quakeforge-clients-sdl quakeforge-clients-sgl quakeforge-clients-x11 +quarry quasar-client quassel quassel-client @@ -1725,6 +1726,7 @@ shutter siag-common sim simple-ccsm +simsam sipbomber sirius sk1 @@ -1761,6 +1763,7 @@ spacepong spe spearfish-grass specimen +speedcrunch spiralsynthmodular spring springlobby diff --git a/po/cs.po b/po/cs.po index 5fd98904..60d48be6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -22,7 +22,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" #: ../MandrivaUpdate:102 ../Rpmdrake/gui.pm:862 @@ -460,7 +461,8 @@ msgstr "Chcete-li pokračovat, musíte vložit médium" #: ../Rpmdrake/edit_urpm_sources.pm:518 #, c-format -msgid "In order to save the changes, you need to insert the medium in the drive." +msgid "" +"In order to save the changes, you need to insert the medium in the drive." msgstr "Chcete-li uložit změny, musíte do zařízení vložit médium." #: ../Rpmdrake/edit_urpm_sources.pm:553 @@ -1879,7 +1881,8 @@ msgstr " --media=medium1,.. omezení na zadané zdroje" #: ../Rpmdrake/init.pm:53 #, c-format -msgid " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" +msgid "" +" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" msgstr "" " --merge-all-rpmnew navrhne sloučit všechny nalezené soubory .rpmnew/." "rpmsave" @@ -1887,18 +1890,21 @@ msgstr "" #: ../Rpmdrake/init.pm:54 #, c-format msgid " --mode=MODE set mode (install (default), remove, update)" -msgstr " --mode=MODE nastaví režim (install (výchozí), remove, update)" +msgstr "" +" --mode=MODE nastaví režim (install (výchozí), remove, update)" #: ../Rpmdrake/init.pm:55 #, c-format msgid "" " --justdb update the database, but do not modify the " "filesystem" -msgstr " --justdb aktualizuje databázi, ale nezmění souborový systém" +msgstr "" +" --justdb aktualizuje databázi, ale nezmění souborový systém" #: ../Rpmdrake/init.pm:56 #, c-format -msgid " --no-confirmation don't ask first confirmation question in update mode" +msgid "" +" --no-confirmation don't ask first confirmation question in update mode" msgstr "" " --no-confirmation nebude se ptát na první potvrzení v režimu " "aktualizace" @@ -1929,7 +1935,8 @@ msgstr " --rpm-root=cesta použije pro instalaci jiný kořenový adresá #: ../Rpmdrake/init.pm:61 #, c-format -msgid " --urpmi-root use another root for urpmi db & rpm installation" +msgid "" +" --urpmi-root use another root for urpmi db & rpm installation" msgstr "" " --urpmi-root použít jiný kořenový adresář pro instalaci balíčků " "rpm a databázi urpmi" @@ -1959,7 +1966,8 @@ msgstr " --search=pkg spustí vyhledávání balíčku \"pkg\"" msgid "" " --test only verify if the installation can be achieved " "correctly" -msgstr " --test pouze ověří, zda-li lze instalaci provést bezchybně" +msgstr "" +" --test pouze ověří, zda-li lze instalaci provést bezchybně" #: ../Rpmdrake/init.pm:66 #, c-format @@ -2002,11 +2010,13 @@ msgstr "Počkejte, prosím " #: ../Rpmdrake/pkg.pm:124 #, c-format msgid "No xml info for medium \"%s\", only partial result for package %s" -msgstr "Chybí XML informace pro zdroj \"%s\", pouze částečný výsledek pro balíček %s" +msgstr "" +"Chybí XML informace pro zdroj \"%s\", pouze částečný výsledek pro balíček %s" #: ../Rpmdrake/pkg.pm:126 #, c-format -msgid "No xml info for medium \"%s\", unable to return any result for package %s" +msgid "" +"No xml info for medium \"%s\", unable to return any result for package %s" msgstr "" "Chybí XML informace pro zdroj \"%s\", nelze vrátit žádný výsledek pro " "balíček %s" @@ -2248,7 +2258,8 @@ msgstr "" #: ../Rpmdrake/pkg.pm:672 #, c-format msgid "The following packages have to be removed for others to be upgraded:" -msgstr "Následující balíčky musí být odebrány, aby bylo možné jiné aktualizovat:" +msgstr "" +"Následující balíčky musí být odebrány, aby bylo možné jiné aktualizovat:" #: ../Rpmdrake/pkg.pm:675 #, c-format @@ -2524,7 +2535,8 @@ msgstr "Žádné výsledky hledání." msgid "" "No search results. You may want to switch to the '%s' view and to the '%s' " "filter" -msgstr "Žádné výsledky hledání. Možná chcete přepnout na pohled „%s” a filtr „%s”" +msgstr "" +"Žádné výsledky hledání. Možná chcete přepnout na pohled „%s” a filtr „%s”" #: ../rpmdrake:236 #, c-format @@ -2718,7 +2730,8 @@ msgstr "Najít:" #: ../rpmdrake:650 #, c-format msgid "Please type in the string you want to search then press the key" -msgstr "Zadejte prosím řetězec, který chcete vyhledat, a stiskněte klávesu " +msgstr "" +"Zadejte prosím řetězec, který chcete vyhledat, a stiskněte klávesu " #: ../rpmdrake:677 #, c-format @@ -2737,8 +2750,10 @@ msgstr "Balíčky můžete prohlížet pomocí stromu kategorií po levé stran #: ../rpmdrake:698 #, c-format -msgid "You can view information about a package by clicking on it on the right list." -msgstr "Informace o balíčku můžete prohlížet po klepnutí na balíček v seznamu vpravo." +msgid "" +"You can view information about a package by clicking on it on the right list." +msgstr "" +"Informace o balíčku můžete prohlížet po klepnutí na balíček v seznamu vpravo." #: ../rpmdrake:699 #, c-format @@ -2960,7 +2975,8 @@ msgstr "Prosím počkejte, stahuji adresy zrcadel." #: ../rpmdrake.pm:554 #, c-format msgid "Please wait, downloading mirror addresses from the Mandriva website." -msgstr "Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti Mandriva." +msgstr "" +"Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti Mandriva." #: ../rpmdrake.pm:575 #, c-format @@ -3143,7 +3159,8 @@ msgstr "Aktualizovat zdroje" #: ../rpmdrake.pm:802 #, c-format -msgid "No active medium found. You must enable some media to be able to update them." +msgid "" +"No active medium found. You must enable some media to be able to update them." msgstr "" "Nebyl nalezen žádný aktivní zdroj. Aby bylo možné zdroje aktualizovat, " "musíte některé z nich povolit." @@ -3227,8 +3244,10 @@ msgstr "Nápověda spuštěna v pozadí" #: ../rpmdrake.pm:963 #, c-format -msgid "The help window has been started, it should appear shortly on your desktop." -msgstr "Okno s nápovědou bylo spuštěno, po chvíli by se mělo objevit na vaší ploše." +msgid "" +"The help window has been started, it should appear shortly on your desktop." +msgstr "" +"Okno s nápovědou bylo spuštěno, po chvíli by se mělo objevit na vaší ploše." #: ../data/rpmdrake-browse-only.desktop.in.h:1 msgid "A graphical front end for browsing installed & available packages" @@ -3257,4 +3276,3 @@ msgstr "Přidat zdroj urpmi" #: ../mime/x-urpmi-media.desktop.in.h:1 msgid "Urpmi medium info" msgstr "Informace o zdroji urpmi" - diff --git a/po/da.po b/po/da.po index b7b97db2..38d0bc11 100644 --- a/po/da.po +++ b/po/da.po @@ -376,7 +376,8 @@ msgstr "" #: ../Rpmdrake/edit_urpm_sources.pm:377 #, c-format msgid "For remote media, XML meta-data are never downloaded." -msgstr "For medier, som skal hentes over nettet, bliver XML meta-data aldrig hentet." +msgstr "" +"For medier, som skal hentes over nettet, bliver XML meta-data aldrig hentet." #: ../Rpmdrake/edit_urpm_sources.pm:380 #, c-format @@ -400,7 +401,8 @@ msgstr "" #: ../Rpmdrake/edit_urpm_sources.pm:387 #, c-format msgid "All XML info files are downloaded when adding or updating media." -msgstr "Alle XML-info filer bliver hentet ved tilføjelse eller opdatering af medier." +msgstr "" +"Alle XML-info filer bliver hentet ved tilføjelse eller opdatering af medier." #: ../Rpmdrake/edit_urpm_sources.pm:416 #, c-format @@ -454,7 +456,8 @@ msgstr "Du skal indsætte mediet for at fortsætte" #: ../Rpmdrake/edit_urpm_sources.pm:518 #, c-format -msgid "In order to save the changes, you need to insert the medium in the drive." +msgid "" +"In order to save the changes, you need to insert the medium in the drive." msgstr "For at gemme ændringerne skal du indsætte mediet i drevet." #: ../Rpmdrake/edit_urpm_sources.pm:553 @@ -489,7 +492,8 @@ msgstr "Værtsnavn for proxy:" #: ../Rpmdrake/edit_urpm_sources.pm:575 #, c-format msgid "You may specify a user/password for the proxy authentication:" -msgstr "Du kan angive en bruger og en adgangskode for autentifikation af proxy:" +msgstr "" +"Du kan angive en bruger og en adgangskode for autentifikation af proxy:" #: ../Rpmdrake/edit_urpm_sources.pm:578 #, c-format @@ -1854,7 +1858,8 @@ msgstr " --auto - brug standardsvar på alle spørgsmål." msgid "" " --changelog-first display changelog before filelist in the " "description window" -msgstr " --changelog-first vis ændringslog før filliste i beskrivelsesvinduet" +msgstr "" +" --changelog-first vis ændringslog før filliste i beskrivelsesvinduet" #: ../Rpmdrake/init.pm:52 #, c-format @@ -1863,13 +1868,16 @@ msgstr " --media=medium1,.. begræns til angivet medie" #: ../Rpmdrake/init.pm:53 #, c-format -msgid " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" -msgstr " --merge-all-rpmnew foreslå at flette alle .rpmnew/.rpmsave-filer fundet" +msgid "" +" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" +msgstr "" +" --merge-all-rpmnew foreslå at flette alle .rpmnew/.rpmsave-filer fundet" #: ../Rpmdrake/init.pm:54 #, c-format msgid " --mode=MODE set mode (install (default), remove, update)" -msgstr " --mode=MODE sæt tilstand (install (standard), remove, update)" +msgstr "" +" --mode=MODE sæt tilstand (install (standard), remove, update)" #: ../Rpmdrake/init.pm:55 #, c-format @@ -1882,7 +1890,8 @@ msgstr "" #: ../Rpmdrake/init.pm:56 #, c-format -msgid " --no-confirmation don't ask first confirmation question in update mode" +msgid "" +" --no-confirmation don't ask first confirmation question in update mode" msgstr "" " --no-confirmation spørg ikke det første bekræftelsesspørgsmål i " "opdateringssilstand" @@ -1913,8 +1922,10 @@ msgstr " --rpm-root=path - brug en anden rod for rpm-installering." #: ../Rpmdrake/init.pm:61 #, c-format -msgid " --urpmi-root use another root for urpmi db & rpm installation" -msgstr " --urpmi-root brug en anden rod for urpmi-db og rpm-installation" +msgid "" +" --urpmi-root use another root for urpmi db & rpm installation" +msgstr "" +" --urpmi-root brug en anden rod for urpmi-db og rpm-installation" #: ../Rpmdrake/init.pm:62 #, c-format @@ -1941,7 +1952,8 @@ msgstr " --search=pkg kør søgning for \"pkg\"" msgid "" " --test only verify if the installation can be achieved " "correctly" -msgstr " --test efterprøv kun om installationen kan opnås korrekt" +msgstr "" +" --test efterprøv kun om installationen kan opnås korrekt" #: ../Rpmdrake/init.pm:66 #, c-format @@ -1988,7 +2000,8 @@ msgstr "Ingen xml info for medie \"%s\", kun delvist resultat for pakke %s" #: ../Rpmdrake/pkg.pm:126 #, c-format -msgid "No xml info for medium \"%s\", unable to return any result for package %s" +msgid "" +"No xml info for medium \"%s\", unable to return any result for package %s" msgstr "" "Ingen xml info for medie \"%s\", kan ikke returnere noget resultat for pakke " "%s" @@ -2501,7 +2514,9 @@ msgstr "Ingen søgeresultater." msgid "" "No search results. You may want to switch to the '%s' view and to the '%s' " "filter" -msgstr "Ingen søgeresultater. Måske vil du skifte over til '%s'-visningen og til -%s'-filtret" +msgstr "" +"Ingen søgeresultater. Måske vil du skifte over til '%s'-visningen og til -%" +"s'-filtret" #: ../rpmdrake:236 #, c-format @@ -2714,8 +2729,10 @@ msgstr "Du kan bladre i pakkerne via kategoritræet til venstre." #: ../rpmdrake:698 #, c-format -msgid "You can view information about a package by clicking on it on the right list." -msgstr "Du kan se information om en pakke ved at klikke på den i listen til højre." +msgid "" +"You can view information about a package by clicking on it on the right list." +msgstr "" +"Du kan se information om en pakke ved at klikke på den i listen til højre." #: ../rpmdrake:699 #, c-format @@ -3119,7 +3136,8 @@ msgstr "Opdatér medier" #: ../rpmdrake.pm:802 #, c-format -msgid "No active medium found. You must enable some media to be able to update them." +msgid "" +"No active medium found. You must enable some media to be able to update them." msgstr "" "Intet aktivt medie blev fundet. Du skal aktivere nogen medier for at kunne " "opdatere dem." @@ -3203,8 +3221,10 @@ msgstr "Hjælp startes i baggrunden" #: ../rpmdrake.pm:963 #, c-format -msgid "The help window has been started, it should appear shortly on your desktop." -msgstr "Hjælpevinduer er blevet startet, det bør vise sig snart på dit skrivebord." +msgid "" +"The help window has been started, it should appear shortly on your desktop." +msgstr "" +"Hjælpevinduer er blevet startet, det bør vise sig snart på dit skrivebord." #: ../data/rpmdrake-browse-only.desktop.in.h:1 msgid "A graphical front end for browsing installed & available packages" @@ -3237,4 +3257,3 @@ msgstr "Tilføj urpmi-medier" #: ../mime/x-urpmi-media.desktop.in.h:1 msgid "Urpmi medium info" msgstr "Info om urpmi medie" - diff --git a/po/de.po b/po/de.po index 7766fd19..a535beb7 100644 --- a/po/de.po +++ b/po/de.po @@ -385,7 +385,8 @@ msgstr "" #: ../Rpmdrake/edit_urpm_sources.pm:377 #, c-format msgid "For remote media, XML meta-data are never downloaded." -msgstr "Für entfernte Medien sollen die XML Meta-Dateien nie heruntergeladen werden." +msgstr "" +"Für entfernte Medien sollen die XML Meta-Dateien nie heruntergeladen werden." #: ../Rpmdrake/edit_urpm_sources.pm:380 #, c-format @@ -467,8 +468,10 @@ msgstr "Sie müssen das Medium einlegen, um fortfahren zu können" #: ../Rpmdrake/edit_urpm_sources.pm:518 #, c-format -msgid "In order to save the changes, you need to insert the medium in the drive." -msgstr "Um die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen." +msgid "" +"In order to save the changes, you need to insert the medium in the drive." +msgstr "" +"Um die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen." #: ../Rpmdrake/edit_urpm_sources.pm:553 #, c-format @@ -696,7 +699,7 @@ msgid "U" msgstr "U" #: ../Rpmdrake/edit_urpm_sources.pm:964 -#, c-format, fuzzy +#, fuzzy, c-format msgid "/Add a specific _media mirror" msgstr "/Ein bestimmtes _Medium hinzufügen" @@ -1889,7 +1892,8 @@ msgstr " --media=medium1,.. anzugebende Medien begrenzen" #: ../Rpmdrake/init.pm:53 #, c-format -msgid " --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" +msgid "" +" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found" msgstr "" " --merge-all-rpmnew vorschlagen, alle gefundenen .rpmnew/.rpmsave " "Dateien zu vereinen" @@ -1912,7 +1916,8 @@ msgstr "" #: ../Rpmdrake/init.pm:56 #, c-format -msgid " --no-confirmation don't ask first confirmation question in update mode" +msgid "" +" --no-confirmation don't ask first confirmation question in update mode" msgstr "" " --no-confirmation keine Erstbestätigung im Aktualisierungsmodus " "abfragen" @@ -1920,7 +1925,8 @@ msgstr "" #: ../Rpmdrake/init.pm:57 #, c-format msgid " --no-media-update don't update media at startup" -msgstr " --no-media-update die Medien nicht bei Inbetriebnahme aktualisieren" +msgstr "" +" --no-media-update die Medien nicht bei Inbetriebnahme aktualisieren" #: ../Rpmdrake/init.pm:58 #, c-format @@ -1945,7 +1951,8 @@ msgstr "" #: ../Rpmdrake/init.pm:61 #, c-format -msgid " --urpmi-root use another root for urpmi db & rpm installation" +msgid "" +" --urpmi-root use another root for urpmi db & rpm installation" msgstr "" " --urpmi-root benutze anderes Wurzelverzeichnis für urpmi db & " "RPM Installation." @@ -2026,7 +2033,8 @@ msgstr "" #: ../Rpmdrake/pkg.pm:126 #, c-format -msgid "No xml info for medium \"%s\", unable to return any result for package %s" +msgid "" +"No xml info for medium \"%s\", unable to return any result for package %s" msgstr "" "Keine XML Informationen für das Medium \"%s\" vorhanden, es können keine " "Ergebnisse für das Paket %s angegeben werden" @@ -2269,7 +2277,8 @@ msgstr "Das folgende Paket muss entfernt werden, um andere zu aktualisieren:" #: ../Rpmdrake/pkg.pm:672 #, c-format msgid "The following packages have to be removed for others to be upgraded:" -msgstr "Die folgenden Pakete müssen entfernt werden, um andere zu aktualisieren:" +msgstr "" +"Die folgenden Pakete müssen entfernt werden, um andere zu aktualisieren:" #: ../Rpmdrake/pkg.pm:675 #, c-format @@ -2336,7 +2345,8 @@ msgstr "%d Installation schlug fehl" #: ../Rpmdrake/pkg.pm:811 #, c-format msgid "Unrecoverable error: no package found for installation, sorry." -msgstr "Unbehebbarer Fehler: es wurde kein Paket zum Installieren gefunden,sorry." +msgstr "" +"Unbehebbarer Fehler: es wurde kein Paket zum Installieren gefunden,sorry." #: ../Rpmdrake/pkg.pm:814 #, c-format @@ -2451,7 +2461,8 @@ msgstr "Bitte warten, ich suche ..." #: ../gurpmi.addmedia:103 #, c-format msgid "bad (for local directory, the path must be absolute)" -msgstr "Fehler in der (für das Lokale Verzeichnis, der Pfad muss absolut sein)" +msgstr "" +"Fehler in der (für das Lokale Verzeichnis, der Pfad muss absolut sein)" #: ../gurpmi.addmedia:117 #, c-format @@ -2546,7 +2557,9 @@ msgstr "Keine Suchergebnisse" msgid "" "No search results. You may want to switch to the '%s' view and to the '%s' " "filter" -msgstr "Keine Suchergebnisse. Sie sollten auf die '%s' Ansicht und den '%s' Filter umschalten" +msgstr "" +"Keine Suchergebnisse. Sie sollten auf die '%s' Ansicht und den '%s' Filter " +"umschalten" #: ../rpmdrake:236 #, c-format @@ -2688,7 +2701,7 @@ msgid "Clear download cache after successfull install" msgstr "Lösche den Downloadspeicher nach der erfolgreichen Installation" #: ../rpmdrake:524 -#, c-format, fuzzy +#, fuzzy, c-format msgid "/_Compute updates on startup" msgstr "/_Aktualisierungen beim Start bestimmen" @@ -2740,7 +2753,9 @@ msgstr "Finden:" #: ../rpmdrake:650 #, c-format msgid "Please type in the string you want to search then press the key" -msgstr "Bitte geben Sie die Zeichenkette ein, nach der Sie suchen wollen und drücken Sie dann die Eingabetaste" +msgstr "" +"Bitte geben Sie die Zeichenkette ein, nach der Sie suchen wollen und drücken " +"Sie dann die Eingabetaste" #: ../rpmdrake:677 #, c-format @@ -2755,11 +2770,13 @@ msgstr "Kurze Einführung" #: ../rpmdrake:697 #, c-format msgid "You can browse the packages through the categories tree on the left." -msgstr "Sie können die Pakete durch die Kategorien auf der linken Seite durchsuchen." +msgstr "" +"Sie können die Pakete durch die Kategorien auf der linken Seite durchsuchen." #: ../rpmdrake:698 #, c-format -msgid "You can view information about a package by clicking on it on the right list." +msgid "" +"You can view information about a package by clicking on it on the right list." msgstr "" "Sie bekommen Informationen über das Paket, wenn Sie auf die Liste auf der " "rechten Seite klicken." @@ -3167,7 +3184,8 @@ msgstr "Medien aktualisieren" #: ../rpmdrake.pm:802 #, c-format -msgid "No active medium found. You must enable some media to be able to update them." +msgid "" +"No active medium found. You must enable some media to be able to update them." msgstr "" "Kein aktives Medium gefunden. Sie müssen Medien aktivieren, um diese " "aktualisieren zu können." @@ -3250,14 +3268,16 @@ msgstr "Hilfe im Hintergrund gestartet" #: ../rpmdrake.pm:963 #, c-format -msgid "The help window has been started, it should appear shortly on your desktop." +msgid "" +"The help window has been started, it should appear shortly on your desktop." msgstr "" "Das Hilfe-Fenster wurde gestartet, es sollte gleich auf dem Desktop " "erscheinen." #: ../data/rpmdrake-browse-only.desktop.in.h:1 msgid "A graphical front end for browsing installed & available packages" -msgstr "Grafische Benutzerschnittstelle um verfügbare Programme zu installieren" +msgstr "" +"Grafische Benutzerschnittstelle um verfügbare Programme zu installieren" #: ../data/rpmdrake-browse-only.desktop.in.h:2 msgid "Browse Available Software" @@ -3284,5 +3304,3 @@ msgstr "urpmi Medium hinzufügen " #: ../mime/x-urpmi-media.desktop.in.h:1 msgid "Urpmi medium info" msgstr "Urpmi Medien Info" - - diff --git a/rpmdrake b/rpmdrake index 0652d171..c2c4aac0 100755 --- a/rpmdrake +++ b/rpmdrake @@ -53,6 +53,14 @@ our $statusbar; my %elems; +my ($results_ok, $results_none) = (N("Search results"), N("Search results (none)")); + +sub clear_search { + my ($options) = @_; + $options->{delete_category}->($_) foreach $results_ok, $results_none; + $options->{state}{flat} and $options->{delete_all}->(); +} + sub do_search($$$$$$$) { my ($find_entry, $tree, $tree_model, $options, $current_search_type, $urpm, $pkgs) = @_; my $entry = $find_entry->get_text or return; @@ -63,9 +71,7 @@ sub do_search($$$$$$$) { $entry =~ s/^\s*$//; } my $entry_rx = eval { qr/$entry/i } or return; - my ($results_ok, $results_none) = (N("Search results"), N("Search results (none)")); - $options->{delete_category}->($_) foreach $results_ok, $results_none; - $options->{state}{flat} and $options->{delete_all}->(); + clear_search($options); $tree->collapse_all; my @search_results; if ($current_search_type eq 'normal') { @@ -655,7 +661,13 @@ sub run_treeview_dialog { 'icon-press' => sub { my (undef, $pos, $event) = @_; # emulate Sexy::IconEntry's clear_button: - $find_entry->set_text('') if $pos eq 'secondary'; + if ($pos eq 'secondary') { + $find_entry->set_text(''); + clear_search($options); + # clear package list: + #$options->{add_nodes}->(); IF search_ok|none SELECTED + + } return if $pos ne 'primary'; $search_menu->popup(undef, undef, undef, undef, $event->button, $event->time); }, -- cgit v1.2.1