ayatana-commits team mailing list archive

[Gabor Kelemen <kelemeng@xxxxxxxx>]

Gabor Kelemen has proposed merging lp:~kelemeng/evolution-indicator/bug437963 into lp:evolution-indicator.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  Bug #437963 in Evolution Indicator: "Untranslatable strings in Plugin manager"
  https://bugs.launchpad.net/evolution-indicator/+bug/437963

For more details, see:
https://code.launchpad.net/~kelemeng/evolution-indicator/bug437963/+merge/67456
-- 
https://code.launchpad.net/~kelemeng/evolution-indicator/bug437963/+merge/67456
Your team ayatana-commits is subscribed to branch lp:evolution-indicator.

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-02-16 20:47:52 +0000
+++ po/POTFILES.in	2011-07-10 14:02:37 +0000
@@ -1,2 +1,3 @@
 data/evolution-indicator.schemas.in
 src/evolution-indicator.c
+src/org-freedesktop-evolution-indicator.eplug.xml

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-03-01 12:06:20 +0000
+++ src/Makefile.am	2011-07-10 14:02:37 +0000
@@ -15,12 +15,16 @@
 	-module -avoid-version	\
 	$(DEPS_LIBS)
 
-org-freedesktop-evolution-indicator.eplug: org-freedesktop-evolution-indicator.eplug.in
-	sed -e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
+org-freedesktop-evolution-indicator.eplug.in : org-freedesktop-evolution-indicator.eplug.xml
+	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp/notthere $< $@
+
+org-freedesktop-evolution-indicator.eplug : org-freedesktop-evolution-indicator.eplug.in
+	sed -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|'	\
+	-e 's|\@PLUGINDIR\@|$(plugindir)|' $< > $@
 
 BUILT_SOURCES = $(plugin_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-	org-freedesktop-evolution-indicator.eplug.in
+	org-freedesktop-evolution-indicator.eplug.xml

=== renamed file 'src/org-freedesktop-evolution-indicator.eplug.in' => 'src/org-freedesktop-evolution-indicator.eplug.xml'
--- src/org-freedesktop-evolution-indicator.eplug.in	2010-03-02 19:34:48 +0000
+++ src/org-freedesktop-evolution-indicator.eplug.xml	2011-07-10 14:02:37 +0000
@@ -4,9 +4,10 @@
     type="shlib" 
     location="@PLUGINDIR@/liborg-freedesktop-evolution-indicator.so" 
     id="org.freedesktop.evolution_indicator" 
-    name="Evolution Indicator">
+    domain="@GETTEXT_PACKAGE@"
+    _name="Evolution Indicator">
 
-		<description>Shows new mail count in a message indicator.</description>
+		<_description>Shows new mail count in a message indicator.</_description>
 		<author name="Neil Jagdish Patel" email="neil.patel@xxxxxxxxxxxxx"/>
 
 		<hook class="org.gnome.evolution.mail.events:1.0">
@@ -19,7 +20,7 @@
 
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group target="prefs" id="org.gnome.evolution.mail.prefs">
-				<item type="section_table" path="00.general/30.options" label="When New Mail Arrives"></item>
+				<item type="section_table" path="00.general/30.options" _label="When New Mail Arrives"></item>
 				<item type="item_table" path="00.general/40.options" factory="org_gnome_get_prefs"/>
 			</group>
 		</hook>