[gnac/infobar: 21/22] Merge branch 'master' into infobar
- From: David Joaquim <djoaquim src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnac/infobar: 21/22] Merge branch 'master' into infobar
- Date: Tue, 8 Dec 2009 19:21:34 +0000 (UTC)
commit bc2e248b6f326a86909185023912cc6a2f1ba189
Merge: 1064caa... e19fd9e...
Author: David Joaquim <djoaquim src gnome org>
Date: Tue Dec 8 20:16:13 2009 +0100
Merge branch 'master' into infobar
Conflicts:
data/ui/gnac.xml
AUTHORS | 6 +-
Makefile.am | 2 +-
NEWS | 25 +-
configure.ac | 13 +-
data/Makefile.am | 73 +--
data/icons/Makefile.am | 58 +
data/{ => icons}/gnac-128.png | Bin 17561 -> 17561 bytes
data/{ => icons}/gnac-16.png | Bin 988 -> 988 bytes
data/{ => icons}/gnac-192.png | Bin 29175 -> 29175 bytes
data/{ => icons}/gnac-22.png | Bin 1436 -> 1436 bytes
data/{ => icons}/gnac-24.png | Bin 1688 -> 1688 bytes
data/{ => icons}/gnac-256.png | Bin 41271 -> 41271 bytes
data/{ => icons}/gnac-32.png | Bin 2532 -> 2532 bytes
data/{ => icons}/gnac-48.png | Bin 4466 -> 4466 bytes
data/{ => icons}/gnac-64.png | Bin 6841 -> 6841 bytes
data/{ => icons}/gnac-72.png | Bin 8051 -> 8051 bytes
data/{ => icons}/gnac-96.png | Bin 12153 -> 12153 bytes
data/{ => icons}/gnac.png | Bin 4466 -> 4466 bytes
data/{ => icons}/gnac.svg | 0
data/profiles/Makefile.am | 17 +-
data/profiles/ui/Makefile.am | 18 +
data/profiles/{ => ui}/gnac-profiles-aac.xml | 0
.../{ => ui}/gnac-profiles-base-advanced.xml | 0
data/profiles/{ => ui}/gnac-profiles-combo.xml | 0
data/profiles/{ => ui}/gnac-profiles-flac.xml | 0
data/profiles/{ => ui}/gnac-profiles-lame.xml | 0
data/profiles/{ => ui}/gnac-profiles-manager.xml | 0
.../profiles/{ => ui}/gnac-profiles-properties.xml | 0
data/profiles/{ => ui}/gnac-profiles-speex.xml | 0
data/profiles/{ => ui}/gnac-profiles-unknown.xml | 0
data/profiles/{ => ui}/gnac-profiles-vorbis.xml | 0
data/profiles/{ => ui}/gnac-profiles-wav.xml | 0
data/profiles/{ => ui}/gnac-profiles-wavpack.xml | 0
data/ui/Makefile.am | 8 +
data/{ => ui}/gnac-pref-window.xml | 38 +-
data/{ => ui}/gnac-properties-window.xml | 0
data/{ => ui}/gnac.xml | 7 +-
gnac.doap | 10 +-
gnac.spec.in | 65 -
libgnac/libgnac-converter.c | 100 ++-
libgnac/libgnac-converter.h | 10 +-
libgnac/libgnac-debug.c | 8 +-
libgnac/libgnac-debug.h | 8 +-
libgnac/libgnac-error.c | 8 +-
libgnac/libgnac-error.h | 8 +-
libgnac/libgnac-gst.c | 488 +++++++--
libgnac/libgnac-gst.h | 33 +-
libgnac/libgnac-marshallers.c | 8 +-
libgnac/libgnac-marshallers.h | 8 +-
libgnac/libgnac-metadata-tags.h | 28 +-
libgnac/libgnac-metadata.c | 165 ++-
libgnac/libgnac-metadata.h | 8 +-
libgnac/libgnac-output.c | 8 +-
libgnac/libgnac-output.h | 8 +-
man/Makefile.am | 4 +
{data => man}/gnac.1 | 12 +-
po/LINGUAS | 2 +
po/POTFILES.in | 30 +-
po/cs.po | 705 ++++++------
po/de.po | 856 ++++++++------
po/es.po | 1229 ++++++++++++++++++++
po/fr.po | 16 +-
po/sl.po | 1187 +++++++++++++++++++
src/Makefile.am | 8 +-
src/gnac-bars.c | 8 +-
src/gnac-bars.h | 8 +-
src/gnac-file-list.c | 8 +-
src/gnac-file-list.h | 8 +-
src/gnac-gconf.c | 8 +-
src/gnac-gconf.h | 8 +-
src/gnac-main.c | 22 +-
src/gnac-main.h | 14 +-
src/gnac-playlist.c | 8 +-
src/gnac-playlist.h | 8 +-
src/gnac-prefs.c | 8 +-
src/gnac-prefs.h | 8 +-
src/gnac-properties.c | 8 +-
src/gnac-properties.h | 8 +-
src/gnac-stock-items.c | 8 +-
src/gnac-stock-items.h | 8 +-
src/gnac-ui.c | 8 +-
src/gnac-ui.h | 9 +-
src/gnac-utils.c | 8 +-
src/gnac-utils.h | 8 +-
src/gnac.h | 8 +-
src/profiles/formats/gnac-profiles-aac.c | 8 +-
src/profiles/formats/gnac-profiles-aac.h | 8 +-
src/profiles/formats/gnac-profiles-flac.c | 8 +-
src/profiles/formats/gnac-profiles-flac.h | 8 +-
src/profiles/formats/gnac-profiles-lame.c | 8 +-
src/profiles/formats/gnac-profiles-lame.h | 8 +-
src/profiles/formats/gnac-profiles-speex.c | 8 +-
src/profiles/formats/gnac-profiles-speex.h | 8 +-
src/profiles/formats/gnac-profiles-unknown.c | 8 +-
src/profiles/formats/gnac-profiles-unknown.h | 8 +-
src/profiles/formats/gnac-profiles-vorbis.c | 8 +-
src/profiles/formats/gnac-profiles-vorbis.h | 8 +-
src/profiles/formats/gnac-profiles-wav.c | 8 +-
src/profiles/formats/gnac-profiles-wav.h | 8 +-
src/profiles/formats/gnac-profiles-wavpack.c | 8 +-
src/profiles/formats/gnac-profiles-wavpack.h | 8 +-
src/profiles/gnac-profiles-default.c | 8 +-
src/profiles/gnac-profiles-default.h | 8 +-
src/profiles/gnac-profiles-manager.c | 8 +-
src/profiles/gnac-profiles-manager.h | 8 +-
src/profiles/gnac-profiles-properties.c | 8 +-
src/profiles/gnac-profiles-properties.h | 8 +-
src/profiles/gnac-profiles-utils.c | 8 +-
src/profiles/gnac-profiles-utils.h | 8 +-
src/profiles/gnac-profiles-xml-engine.c | 8 +-
src/profiles/gnac-profiles-xml-engine.h | 8 +-
src/profiles/gnac-profiles.c | 8 +-
src/profiles/gnac-profiles.h | 8 +-
113 files changed, 4248 insertions(+), 1450 deletions(-)
---
diff --cc data/ui/gnac.xml
index 6afe963,f68d747..5a30fa5
--- a/data/ui/gnac.xml
+++ b/data/ui/gnac.xml
@@@ -381,16 -354,18 +381,17 @@@ Gnac is distributed in the hope that i
You should have received a copy of the GNU General Public License along with Gnac; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</property>
- <property name="authors">Benoit Dupasquier <bdupasqu users sourceforge net>
- David Joaquim <daiji users sourceforge net>
- Alexandre Roux <alexandreroux users sourceforge net></property>
+ <property name="authors">Benoit Dupasquier <bdupasqu src gnome org>
+ David Joaquim <djoaquim src gnome org>
+ Alexandre Roux <alexroux src gnome org></property>
+ <property name="artists">Grada Cristian (krig) <krigenator gmail com></property>
<property name="translator_credits" translatable="yes">translator-credits</property>
- <property name="wrap_license">True</property>
- <property name="icon_name">gnac</property>
+ <property name="artists">Grada Cristian (krig) <krigenator gmail com></property>
<property name="logo_icon_name">gnac</property>
- <property name="comments" translatable="yes">An audio converter for GNOME</property>
- <signal handler="gtk_widget_hide_on_delete" name="close"/>
- <signal handler="gtk_widget_hide_on_delete" name="delete-event"/>
- <signal handler="gtk_widget_hide_on_delete" name="response"/>
+ <property name="wrap_license">True</property>
+ <signal name="close" handler="gtk_widget_hide_on_delete"/>
+ <signal name="response" handler="gtk_widget_hide_on_delete"/>
+ <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
