GNOME.org
 

[cheese/three-point-oh] make the effect files translatable

commit 587e19bd7d8582a255107670926c7e863b8b9999
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Mon Jul 12 01:40:16 2010 +0200

    make the effect files translatable
    
    from now on, when adding a new effect, it has to be added to
    data/effects/Makefile.am and po/POTFILES.in

 data/effects/Makefile.am            |   27 +++++++++++++++++++++++----
 data/effects/agingtv.effect         |    3 ---
 data/effects/agingtv.effect.in      |    4 ++++
 data/effects/dicetv.effect          |    3 ---
 data/effects/dicetv.effect.in       |    4 ++++
 data/effects/edgetv.effect          |    3 ---
 data/effects/edgetv.effect.in       |    4 ++++
 data/effects/hulk.effect            |    3 ---
 data/effects/hulk.effect.in         |    4 ++++
 data/effects/mauve.effect           |    3 ---
 data/effects/mauve.effect.in        |    4 ++++
 data/effects/noir.effect            |    3 ---
 data/effects/noir.effect.in         |    4 ++++
 data/effects/optv.effect            |    3 ---
 data/effects/optv.effect.in         |    4 ++++
 data/effects/quarktv.effect         |    3 ---
 data/effects/quarktv.effect.in      |    4 ++++
 data/effects/radioactv.effect       |    3 ---
 data/effects/radioactv.effect.in    |    4 ++++
 data/effects/saturation.effect      |    3 ---
 data/effects/saturation.effect.in   |    4 ++++
 data/effects/shagadelictv.effect    |    3 ---
 data/effects/shagadelictv.effect.in |    4 ++++
 data/effects/streaktv.effect        |    3 ---
 data/effects/streaktv.effect.in     |    4 ++++
 data/effects/vertigotv.effect       |    3 ---
 data/effects/vertigotv.effect.in    |    4 ++++
 data/effects/warptv.effect          |    3 ---
 data/effects/warptv.effect.in       |    4 ++++
 po/POTFILES.in                      |   32 +++++++++++++++++++++++---------
 po/POTFILES.skip                    |    4 ++++
 src/cheese-effects-manager.vala     |    4 ++--
 32 files changed, 108 insertions(+), 57 deletions(-)
---
diff --git a/data/effects/Makefile.am b/data/effects/Makefile.am
index 800d86d..f0449a7 100644
--- a/data/effects/Makefile.am
+++ b/data/effects/Makefile.am
@@ -1,7 +1,26 @@
-Datadir = $(datadir)/cheese/effects
+%.effect: %.effect.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-Data_DATA = *.effect
+effectsdir = $(datadir)/cheese/effects
+effects_in_files = \
+	agingtv.effect.in \
+	dicetv.effect.in \
+	edgetv.effect.in \
+	hulk.effect.in \
+	mauve.effect.in \
+	noir.effect.in \
+	optv.effect.in \
+	quarktv.effect.in \
+	radioactv.effect.in \
+	saturation.effect.in \
+	shagadelictv.effect.in \
+	streaktv.effect.in \
+	vertigotv.effect.in \
+	warptv.effect.in
 
-EXTRA_DIST =			\
-	$(Data_DATA)
+effects_DATA = $(effects_in_files:.effect.in=.effect)
 
+EXTRA_DIST = \
+	$(effects_in_files)
+
+DISTCLEANFILES = \
+	$(effects_DATA)
diff --git a/data/effects/agingtv.effect.in b/data/effects/agingtv.effect.in
new file mode 100644
index 0000000..115942b
--- /dev/null
+++ b/data/effects/agingtv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=AgingTV
+PipelineDescription=agingtv
diff --git a/data/effects/dicetv.effect.in b/data/effects/dicetv.effect.in
new file mode 100644
index 0000000..031fbf0
--- /dev/null
+++ b/data/effects/dicetv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=dicetv
+PipelineDescription=dicetv
diff --git a/data/effects/edgetv.effect.in b/data/effects/edgetv.effect.in
new file mode 100644
index 0000000..0f2fb67
--- /dev/null
+++ b/data/effects/edgetv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=edge
+PipelineDescription=edgetv
diff --git a/data/effects/hulk.effect.in b/data/effects/hulk.effect.in
new file mode 100644
index 0000000..39a1877
--- /dev/null
+++ b/data/effects/hulk.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=hulk
+PipelineDescription=videobalance saturation=1.5 hue=-0.5
diff --git a/data/effects/mauve.effect.in b/data/effects/mauve.effect.in
new file mode 100644
index 0000000..be82328
--- /dev/null
+++ b/data/effects/mauve.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=mauve
+PipelineDescription=videobalance saturation=1.5 hue=+0.5
diff --git a/data/effects/noir.effect.in b/data/effects/noir.effect.in
new file mode 100644
index 0000000..dabd9f7
--- /dev/null
+++ b/data/effects/noir.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=Noir
+PipelineDescription=videobalance saturation=0
diff --git a/data/effects/optv.effect.in b/data/effects/optv.effect.in
new file mode 100644
index 0000000..27b4f09
--- /dev/null
+++ b/data/effects/optv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=Optv
+PipelineDescription=optv
diff --git a/data/effects/quarktv.effect.in b/data/effects/quarktv.effect.in
new file mode 100644
index 0000000..2b74dde
--- /dev/null
+++ b/data/effects/quarktv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=QuarkTV
+PipelineDescription=quarktv
diff --git a/data/effects/radioactv.effect.in b/data/effects/radioactv.effect.in
new file mode 100644
index 0000000..6e022c7
--- /dev/null
+++ b/data/effects/radioactv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=Radioactive
+PipelineDescription=radioactv
diff --git a/data/effects/saturation.effect.in b/data/effects/saturation.effect.in
new file mode 100644
index 0000000..c10fc4c
--- /dev/null
+++ b/data/effects/saturation.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=saturation
+PipelineDescription=videobalance saturation=2
diff --git a/data/effects/shagadelictv.effect.in b/data/effects/shagadelictv.effect.in
new file mode 100644
index 0000000..2f27963
--- /dev/null
+++ b/data/effects/shagadelictv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=shagadelic
+PipelineDescription=shagadelictv
diff --git a/data/effects/streaktv.effect.in b/data/effects/streaktv.effect.in
new file mode 100644
index 0000000..b450bd6
--- /dev/null
+++ b/data/effects/streaktv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=Streaks
+PipelineDescription=streaktv
diff --git a/data/effects/vertigotv.effect.in b/data/effects/vertigotv.effect.in
new file mode 100644
index 0000000..1bef929
--- /dev/null
+++ b/data/effects/vertigotv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=Vertigo
+PipelineDescription=vertigotv
diff --git a/data/effects/warptv.effect.in b/data/effects/warptv.effect.in
new file mode 100644
index 0000000..644d579
--- /dev/null
+++ b/data/effects/warptv.effect.in
@@ -0,0 +1,4 @@
+[Cheese Effect]
+Encoding=UTF-8
+_Name=WarpTv
+PipelineDescription=warptv
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e00d402..7fe5198 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,19 +1,33 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+[type: gettext/glade]data/cheese-about.ui
+[type: gettext/glade]data/cheese-actions.ui
+[type: gettext/glade]data/cheese-main-window.ui
+[type: gettext/glade]data/cheese-prefs.ui
+[type: gettext/glade]data/cheese-prefs.ui
 data/cheese.desktop.in.in
 data/cheese.schemas.in
-[type: gettext/glade]data/cheese.ui
-[type: gettext/glade]data/cheese-prefs.ui
+[type: gettext/ini]data/effects/agingtv.effect.in
+[type: gettext/ini]data/effects/dicetv.effect.in
+[type: gettext/ini]data/effects/edgetv.effect.in
+[type: gettext/ini]data/effects/hulk.effect.in
+[type: gettext/ini]data/effects/mauve.effect.in
+[type: gettext/ini]data/effects/noir.effect.in
+[type: gettext/ini]data/effects/optv.effect.in
+[type: gettext/ini]data/effects/quarktv.effect.in
+[type: gettext/ini]data/effects/radioactv.effect.in
+[type: gettext/ini]data/effects/saturation.effect.in
+[type: gettext/ini]data/effects/shagadelictv.effect.in
+[type: gettext/ini]data/effects/streaktv.effect.in
+[type: gettext/ini]data/effects/vertigotv.effect.in
+[type: gettext/ini]data/effects/warptv.effect.in
 libcheese/cheese-avatar-chooser.c
 libcheese/cheese-camera-device.c
 libcheese/cheese-camera.c
 libcheese/cheese-countdown.c
 libcheese/cheese-widget.c
-src/cheese-commands-file.c
-src/cheese-commands-help.c
-src/cheese-effect-chooser.c
-src/cheese-no-camera.c
-src/cheese-ui.h
-src/cheese-window.c
-src/cheese.c
+src/cheese-countdown.vala
+src/cheese-effects-manager.vala
+src/cheese-main.vala
+src/cheese-window.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 93b7a3a..b4e3e4c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,7 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
 data/cheese.desktop.in
+src/cheese-countdown.c
+src/cheese-effects-manager.c
+src/cheese-main.c
+src/cheese-window.c
diff --git a/src/cheese-effects-manager.vala b/src/cheese-effects-manager.vala
index 962cb72..640322d 100644
--- a/src/cheese-effects-manager.vala
+++ b/src/cheese-effects-manager.vala
@@ -13,8 +13,8 @@ internal class Cheese.EffectsManager : GLib.Object
     try
     {
       kf.load_from_file (filename, KeyFileFlags.NONE);
-      eff.name          = kf.get_string (GROUP_NAME, "name");
-      eff.pipeline_desc = kf.get_string (GROUP_NAME, "pipeline_desc");
+      eff.name          = kf.get_string (GROUP_NAME, "Name");
+      eff.pipeline_desc = kf.get_string (GROUP_NAME, "PipelineDescription");
     }
     catch (KeyFileError err)
     {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]