[brasero: 8/8] Merge branch 'plugins'
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero: 8/8] Merge branch 'plugins'
- Date: Mon, 26 Oct 2009 19:56:00 +0000 (UTC)
commit b7c7719ace6531bb6036bbb27f8fb74e9e6893a7
Merge: a435e02... 834baaa...
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Mon Oct 26 20:44:12 2009 +0100
Merge branch 'plugins'
In this branch, strings describing plugins were improved and now every plugin appear in the file manager though some (the core) will remain insensitive. This is for the user to be able to see all plugins andthe errors when there are.
Conflicts:
plugins/cdrdao/burn-toc2cue.c
plugins/cdrtools/burn-mkisofs.c
plugins/checksum/burn-checksum-files.c
plugins/checksum/burn-checksum-image.c
plugins/dvdcss/burn-dvdcss.c
plugins/growisofs/burn-growisofs.c
plugins/libburnia/burn-libburn.c
plugins/libburnia/burn-libisofs.c
plugins/transcode/burn-normalize.c
plugins/transcode/burn-vob.c
src/brasero-project.c
libbrasero-burn/burn-plugin-manager.c | 37 +++++++++++++++++---------
plugins/cdrdao/burn-cdrdao.c | 4 +-
plugins/cdrdao/burn-toc2cue.c | 2 +-
plugins/cdrkit/burn-genisoimage.c | 3 +-
plugins/cdrkit/burn-readom.c | 2 +-
plugins/cdrkit/burn-wodim.c | 2 +-
plugins/cdrtools/burn-cdrecord.c | 2 +-
plugins/cdrtools/burn-mkisofs.c | 2 +-
plugins/cdrtools/burn-readcd.c | 2 +-
plugins/checksum/burn-checksum-files.c | 2 +-
plugins/checksum/burn-checksum-image.c | 2 +-
plugins/dvdauthor/burn-dvdauthor.c | 2 +-
plugins/dvdcss/burn-dvdcss.c | 3 +-
plugins/growisofs/burn-dvd-rw-format.c | 2 +-
plugins/growisofs/burn-growisofs.c | 2 +-
plugins/libburnia/burn-libburn.c | 2 +-
plugins/libburnia/burn-libisofs.c | 2 +-
plugins/transcode/burn-normalize.c | 2 +-
plugins/transcode/burn-transcode.c | 2 +-
plugins/transcode/burn-vob.c | 2 +-
plugins/vcdimager/burn-vcdimager.c | 2 +-
src/brasero-plugin-manager-ui.c | 44 +++++++++++++++++++++++--------
22 files changed, 79 insertions(+), 46 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]