commit 652f178f559d76a4d153326e81d71b5274224503
Merge: 5cb03c5 a53708d
Author: phantomjinx <[email protected]>
Date: Thu Aug 12 22:00:27 2010 +0100
Merge branch 'master' into plugin-framework
Conflicts:
src/Makefile.am
.gitignore | 3 +
ChangeLog | 187 ++
Makefile.am | 2 +
NEWS | 19 +-
data/Makefile.am | 4 +
po/ca.po | 801 ++++---
po/de.po | 602 +++--
po/es.po | 636 +++---
po/fr.po | 1683 +++++--------
po/he.po | 7409 ++++++++++++++++++++++++------------------------------
po/it.po | 1268 ++++-------
po/ja.po | 1533 +++++-------
po/ro.po | 1893 ++++++---------
po/ru.po | 1607 ++++++------
po/sv.po | 1713 ++++++--------
po/zh_CN.po | 608 +++--
src/file.c | 2 +-
src/help.c | 1 +
18 files changed, 8872 insertions(+), 11099 deletions(-)
---
diff --cc data/Makefile.am
index 5f1660d,87aa617..b62ad10
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@@ -11,12 -16,15 +11,16 @@@ appdata_DATA =
gtkpod-icon-32.png \
gtkpod-icon-48.png \
gtkpod-logo.png \
- gtkpod-read.png \
- gtkpod-read-16.png \
photo-toolbar-album.png \
- photo-toolbar-photos.png
+ photo-toolbar-photos.png \
+ anjuta.session \
+ default.profile \
+ dock-layout.xml
+ all-local:
+ $(INTLTOOL_EXTRACT) -type=gettext/glade gtkpod.glade
+
+
EXTRA_DIST = \
$(desktop_in_files) \
$(appdata_DATA)
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
