Merge branch 'master' of http://www.leroutier.net/floss/git/swfdec/swfdec-gnome

10 files changed, 129 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 38be96b..73e7ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,8 @@ Makefile.in
 missing
 mkinstalldirs
 stamp-h1
-swfdec-player.desktop
+data/swfdec-player.desktop
+data/swfdec.xml
 player/.deps
 player/Makefile
 player/Makefile.in
@@ -34,9 +35,11 @@ po/Makefile.in.in
 po/POTFILES
 po/stamp-it
 po/stamp-it.tmp
+po/*.gmo
 thumbnailer/.deps
 thumbnailer/Makefile
 thumbnailer/Makefile.in
 thumbnailer/*.o
 thumbnailer/swfdec-thumbnailer
 thumbnailer/swfdec-thumbnailer.schemas
+
diff --git a/Makefile.am b/Makefile.am
index 5dbe93f..6c5ddeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,10 @@
-SUBDIRS = player thumbnailer po
+SUBDIRS = player thumbnailer po data
 
 EXTRA_DIST =			\
 	autogen.sh		\
 	intltool-extract.in	\
 	intltool-merge.in	\
-	intltool-update.in	\
-	swfdec-player.desktop.in\
-	swfdec.xml
-
-desktop_in_files = swfdec-player.desktop.in
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-mimedir = $(datadir)/mime/packages
-mime_DATA = swfdec.xml
-
-CLEANFILES = 			\
-	swfdec-player.desktop
+	intltool-update.in
 
 DISTCLEANFILES =		\
 	intltool-extract	\
diff --git a/configure.ac b/configure.ac
index 26181cb..d58ee2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,30 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
 AC_PREREQ([2.58])
-AC_INIT(swfdec-gnome, 0.5.3.1)
+AC_INIT( swfdec-gnome, [0.5.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=swfdec] )
 
 AM_INIT_AUTOMAKE(1.6)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SRCDIR([config.h.in])
+AC_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 
+# Checks for programs.
 AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 IT_PROG_INTLTOOL([0.35.0])
 
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+
+# Checks for library functions.
+AC_CHECK_FUNCS([strstr])
+
 GNOME_COMMON_INIT
 dnl GNOME_DOC_INIT
 GNOME_MAINTAINER_MODE_DEFINES
@@ -17,15 +34,12 @@ GNOME_DEBUG_CHECK
 
 dnl GTK_DOC_CHECK(1.0)
 
-
 dnl Setup gettext
-
 GETTEXT_PACKAGE=swfdec-gnome
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
 AM_GLIB_GNU_GETTEXT
 
-
 dnl Required versions
 
 SWFDEC_MAJORMINOR=0.5
@@ -34,7 +48,6 @@ SWFDEC_REQUIRED=0.5.3.1
 
 GTK_REQUIRED=2.12.0
 
-
 dnl Check dependencies
 
 PKG_CHECK_MODULES(THUMBNAILER, swfdec-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRED)
@@ -51,6 +64,9 @@ dnl Finish up
 
 AC_SUBST(GLOBAL_CFLAGS)
 
-AC_CONFIG_FILES(Makefile player/Makefile thumbnailer/Makefile po/Makefile.in)
-
+AC_CONFIG_FILES([Makefile
+                 data/Makefile
+                 player/Makefile
+                 po/Makefile.in
+                 thumbnailer/Makefile])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..e85ceef
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,18 @@
+EXTRA_DIST =			\
+	swfdec-player.desktop.in\
+	swfdec.xml.in
+
+desktop_in_files = swfdec-player.desktop.in
+desktopdir = $(datadir)/applications
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+mime_in_files = swfdec.xml.in
+mimedir = $(datadir)/mime/packages
+mime_DATA = $(mime_in_files:.xml.in=.xml)
+@INTLTOOL_XML_RULE@
+
+CLEANFILES = 			\
+	swfdec-player.desktop	\
+	swfdec.xml
+
diff --git a/swfdec-player.desktop.in b/data/swfdec-player.desktop.in
index 86edfa0..86edfa0 100644
--- a/swfdec-player.desktop.in
+++ b/data/swfdec-player.desktop.in
diff --git a/swfdec.xml b/data/swfdec.xml.in
index f72e935..34be08e 100644
--- a/swfdec.xml
+++ b/data/swfdec.xml.in
@@ -3,19 +3,19 @@
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
 
    <mime-type type="application/x-shockwave-flash">
-     <comment>Adobe/Macromedia Flash animation</comment>
+     <_comment>Adobe/Macromedia Flash animation</_comment>
      <glob pattern="*.swf"/>
    </mime-type>
 
    <mime-type type="video/x-flv">
-     <comment>Adobe/Macromedia Flash video</comment>
+     <_comment>Adobe/Macromedia Flash video</_comment>
      <glob pattern="*.flv"/>
      <alias type="video/flv"/>
      <alias type="flv-application/octet-stream"/>
    </mime-type>
 
    <mime-type type="application/futuresplash">
-     <comment>???</comment>
+     <_comment>???</_comment>
      <glob pattern="*.spl"/>
    </mime-type>
 
diff --git a/po/LINGUAS b/po/LINGUAS
index d2b08cb..a1bece0 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1,3 @@
 # please keep this list sorted alphabetically
+fr
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8cee494..0f707ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,11 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+data/swfdec-player.desktop.in
+data/swfdec.xml.in
 player/swfdec-player.c
 player/swfdec-player.ui
 player/swfdec-window-handlers.c
 player/swfdec-window.c
-swfdec-player.desktop.in
 thumbnailer/swfdec-thumbnailer.schemas.in
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..f082883
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2007 Stéphane Loeuillet
+# This file is distributed under the same license as the swfdec-gnome package.
+# Stéphane Loeuillet <leroutier@gmail.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-10-28 16:27+0100\n"
+"PO-Revision-Date: 2007-10-28 16:24+0100\n"
+"Last-Translator: Stéphane Loeuillet <leroutier@gmail.com>\n"
+"Language-Team: Français <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/swfdec-player.desktop.in.h:1
+msgid "Play Adobe Flash files"
+msgstr ""
+
+#: ../data/swfdec-player.desktop.in.h:2 ../player/swfdec-player.c:63
+msgid "Swfdec Flash Player"
+msgstr ""
+
+#: ../data/swfdec.xml.in.h:1
+msgid "???"
+msgstr ""
+
+#: ../data/swfdec.xml.in.h:2
+msgid "Adobe/Macromedia Flash animation"
+msgstr ""
+
+#: ../data/swfdec.xml.in.h:3
+msgid "Adobe/Macromedia Flash video"
+msgstr ""
+
+#: ../player/swfdec-player.c:56
+msgid "don't play sound"
+msgstr ""
+
+#: ../player/swfdec-player.c:57
+msgid "start player paused"
+msgstr ""
+
+#: ../player/swfdec-window-handlers.c:54
+msgid "Select a file to play"
+msgstr ""
+
+#: ../player/swfdec-window.c:165
+msgid "Internal error in the user interface defintion"
+msgstr ""
+
+#: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:1
+msgid ""
+"Boolean options available, true enables thumbnailing and false disables the "
+"creation of new thumbnails"
+msgstr ""
+
+#: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:2
+msgid "Enable thumbnailing of Flash files"
+msgstr ""
+
+#: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:3
+msgid "Thumbnail command for Flash files"
+msgstr ""
+
+#: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:4
+msgid ""
+"Valid command plus arguments for the Flash file thumbnailer. See nautilus "
+"thumbnailer documentation for more information."
+msgstr ""