From b7276b6f7c7c304bde4f3de30f09af200b4b1275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 2 Sep 2008 09:56:44 +0000
Subject: Enable/fix up translations for these plugins.

Original commit message from CVS:
* ext/resindvd/plugin.c: (plugin_init):
* ext/resindvd/resindvdsrc.c:
* ext/twolame/gsttwolame.c: (plugin_init):
* gst/aiffparse/aiffparse.c: (plugin_init):
Enable/fix up translations for these plugins.
* po/LINGUAS:
Add 'ca' to LINGUAS.
* po/POTFILES.in:
* po/POTFILES.skip:
Add more files for translation and more files which tools
should skip.
---
 ChangeLog                  | 16 ++++++++++++++++
 ext/resindvd/plugin.c      |  9 ++++++++-
 ext/resindvd/resindvdsrc.c |  3 +--
 ext/twolame/gsttwolame.c   |  1 +
 gst/aiffparse/aiffparse.c  |  7 +++++++
 po/LINGUAS                 |  2 +-
 po/POTFILES.in             | 12 +++++++-----
 po/POTFILES.skip           |  2 ++
 8 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 293308aa..0628333e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-09-02  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* ext/resindvd/plugin.c: (plugin_init):
+	* ext/resindvd/resindvdsrc.c:
+	* ext/twolame/gsttwolame.c: (plugin_init):
+	* gst/aiffparse/aiffparse.c: (plugin_init):
+	  Enable/fix up translations for these plugins.
+
+	* po/LINGUAS:
+	  Add 'ca' to LINGUAS.
+
+	* po/POTFILES.in:
+	* po/POTFILES.skip:
+	  Add more files for translation and more files which tools
+	  should skip.
+
 2008-09-02  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* gst/mpegtsmux/tsmux/tsmux.c: (tsmux_write_ts_header):
diff --git a/ext/resindvd/plugin.c b/ext/resindvd/plugin.c
index bc0a9640..33b95003 100644
--- a/ext/resindvd/plugin.c
+++ b/ext/resindvd/plugin.c
@@ -24,8 +24,8 @@
 #include <gst/gst.h>
 
 #include "resindvdbin.h"
-
 #include "gstmpegdemux.h"
+#include <gst/gst-i18n-plugin.h>
 
 GST_DEBUG_CATEGORY (resindvd_debug);
 #define GST_CAT_DEFAULT resindvd_debug
@@ -38,6 +38,13 @@ plugin_init (GstPlugin * plugin)
   GST_DEBUG_CATEGORY_INIT (resindvd_debug, "resindvd elements",
       0, "DVD playback elements from resindvd");
 
+#ifdef ENABLE_NLS
+  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+      LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
   result &= gst_element_register (plugin, "rsndvdbin",
       GST_RANK_PRIMARY, RESIN_TYPE_DVDBIN);
 
diff --git a/ext/resindvd/resindvdsrc.c b/ext/resindvd/resindvdsrc.c
index 7f07f0bf..bf4d033d 100644
--- a/ext/resindvd/resindvdsrc.c
+++ b/ext/resindvd/resindvdsrc.c
@@ -24,8 +24,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-// #include <gst/gst-i18n-plugin.h>
-#define _(s) s                  /* FIXME - add i18n bits to build */
+#include <gst/gst-i18n-plugin.h>
 
 #include "resindvdsrc.h"
 
diff --git a/ext/twolame/gsttwolame.c b/ext/twolame/gsttwolame.c
index 3700aa35..81b865bf 100644
--- a/ext/twolame/gsttwolame.c
+++ b/ext/twolame/gsttwolame.c
@@ -1024,6 +1024,7 @@ plugin_init (GstPlugin * plugin)
   GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
       LOCALEDIR);
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif /* ENABLE_NLS */
 
   if (!gst_element_register (plugin, "twolame", GST_RANK_NONE,
diff --git a/gst/aiffparse/aiffparse.c b/gst/aiffparse/aiffparse.c
index f1ba94ac..09ec2e52 100644
--- a/gst/aiffparse/aiffparse.c
+++ b/gst/aiffparse/aiffparse.c
@@ -1538,6 +1538,13 @@ gst_aiffparse_change_state (GstElement * element, GstStateChange transition)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+#ifdef ENABLE_NLS
+  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+      LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
   return gst_element_register (plugin, "aiffparse", GST_RANK_PRIMARY,
       TYPE_AIFFPARSE);
 }
diff --git a/po/LINGUAS b/po/LINGUAS
index 5dd4ba0a..c036db34 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-af az bg cs da de en_GB es fi fr hu id it ky lt nb nl or pl pt_BR ru sk sq sr sv uk vi zh_CN
+af az bg ca cs da de en_GB es fi fr hu id it ky lt nb nl or pl pt_BR ru sk sq sr sv uk vi zh_CN
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 624ce5ae..4c24596d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,11 @@
-# ext/audiofile/gstafsink.c
-# ext/audiofile/gstafsrc.c
-# sys/dxr3/dxr3audiosink.c
-# sys/dxr3/dxr3audiosink.c
-# sys/dxr3/dxr3videosink.c
+ext/resindvd/resindvdsrc.c
+ext/resindvd/rsnbasesrc.c
 ext/sndfile/gstsfsink.c
 ext/sndfile/gstsfsrc.c
+ext/twolame/gsttwolame.c
+gst/aiffparse/aiffparse.c
 gst/nuvdemux/gstnuvdemux.c
 sys/dvb/gstdvbsrc.c
+sys/oss4/oss4-mixer.c
+sys/oss4/oss4-sink.c
+sys/oss4/oss4-source.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d43f7607..8e9ebe07 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -3,3 +3,5 @@ ext/audiofile/gstafsrc.c
 sys/dxr3/dxr3audiosink.c
 sys/dxr3/dxr3spusink.c
 sys/dxr3/dxr3videosink.c
+tests/icles/metadata_editor.glade
+
-- 
cgit v1.2.1