Getting almost full and proper use of xml-i18n-tools.

Removed all files where glade writes strings.
Changed Makefile.am to not distribute them.
Changed all glade files to not write strings to those files.

Removed *.desktop and evolution.keys files, because they are generated.
Added them to .cvsignore
Added *.desktop.in evolution.keys.in files without transalted strings.
Added all existing entries from desktop files to po files.
Changed Makefile.am to distribute only .in files, and merge translations into
desktop files.

Removed obsolete files from po/ dir

svn path=/trunk/; revision=8164

4 files changed, 11 insertions, 33 deletions

diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
index 6b94f92c38..3ee063c770 100644
--- a/calendar/conduits/todo/.cvsignore
+++ b/calendar/conduits/todo/.cvsignore
@@ -5,4 +5,5 @@ Makefile
 *.lo
 *.la
 e-todo-conduit-control-applet
+e-todo-conduit-control-applet.desktop
 e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index ec4a8a23fb..ce99497c4d 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -54,7 +54,9 @@ e-todo.conduit: e-todo.conduit.in Makefile
 ccenterdir = $(datadir)/control-center
 ccenterPalmPilotdir = $(ccenterdir)/Peripherals
 ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-todo-conduit-control-applet.desktop 
+ccenterConduits_in_files = e-todo-conduit-control-applet.desktop.in 
+ccenterConduits_DATA = $(ccenterConduits_in_files:.desktop.in=.desktop)
+@XML_I18N_MERGE_DESKTOP_RULE@
 
 panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
 panelConduits_DATA = $(ccenterConduits_DATA)
@@ -64,19 +66,8 @@ Conduit_DATA = e-todo.conduit
 
 EXTRA_DIST = \
 	e-todo.conduit.in \
-        $(ccenterConduits_DATA)
+        $(ccenterConduits_in_files)
 
 install-data-local:
 	$(mkinstalldirs) $(ccenterConduitsdir)
 	$(mkinstalldirs) $(Conduitdir)
-
-
-
-
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
deleted file mode 100644
index 67ca779ded..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Evolution ToDo conduit 
-Name[da]=Udstående
-Name[es]=Enlace con el componente `Por Hacer' de Evolution
-Name[fr]=Conduit Evolution `A Faire'
-Name[no]=Oppgaver
-Name[sk]=Spojka ToDo Evolution
-Name[sv]=Att göra-lista
-Name[tr]=Yapılacaklar parçası
-Comment=Configure the todo conduit
-Comment[da]=Konfigurér Udstående
-Comment[es]=Configurar el enlace con el componente `Por Hacer'
-Comment[fr]=Configuration du conduit `A Faire'
-Comment[no]=Konfigurér oppgavelisten
-Comment[sk]=Nastavenie spojky todo
-Comment[sv]=Konfigurerar att göra-listan
-Comment[tr]=Yapılacaklar parçası ayarları
-Exec=e-todo-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
new file mode 100644
index 0000000000..216c07afd5
--- /dev/null
+++ b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Evolution ToDo conduit 
+_Comment=Configure the todo conduit
+Exec=e-todo-conduit-control-applet --cap-id=1
+Terminal=0
+Type=Application