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, 12 insertions, 30 deletions

diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore
index 67db02346b..87b35d3be5 100644
--- a/addressbook/conduit/.cvsignore
+++ b/addressbook/conduit/.cvsignore
@@ -5,4 +5,5 @@ Makefile.in
 Makefile
 libeaddress_conduit.la
 e-address-conduit-control-applet
-e-address.conduit
\ No newline at end of file
+e-address-conduit-control-applet.desktop
+e-address.conduit
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 99373e85e3..a1ced3e4c6 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -55,7 +55,9 @@ e-address.conduit: e-address.conduit.in Makefile
 ccenterdir = $(datadir)/control-center
 ccenterPalmPilotdir = $(ccenterdir)/Peripherals
 ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-address-conduit-control-applet.desktop 
+ccenterConduits_in_files = e-address-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)
@@ -65,13 +67,8 @@ Conduit_DATA = e-address.conduit
 
 EXTRA_DIST = \
 	e-address.conduit.in \
-        $(ccenterConduits_DATA)
+        $(ccenterConduits_in_files)
 
 install-data-local:
 	$(mkinstalldirs) $(ccenterConduitsdir)
 	$(mkinstalldirs) $(Conduitdir)
-
-
-
-
-
diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop b/addressbook/conduit/e-address-conduit-control-applet.desktop
deleted file mode 100644
index 3ae83b8d77..0000000000
--- a/addressbook/conduit/e-address-conduit-control-applet.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Name=Evolution Address conduit 
-Name[sl]=Evolucijin veznik naslovov
-Name[da]=Udstående
-Name[es]=Enlace del libro de direcciones de Evolution
-Name[fr]=Conduit Adresses
-Name[no]=Oppgaver
-Name[sk]=Spojka adresára Evolution
-Name[sv]=Adresser
-Name[tr]=Adres parçasý
-Comment=Configure the address conduit
-Comment[sl]=Nastavi veznik naslovov
-Comment[da]=Konfigurér Udstående
-Comment[es]=Configura el enlace del libro de direcciones
-Comment[fr]=Configuration du conduit Adresses
-Comment[no]=Konfigurér oppgavelisten
-Comment[sk]=Nastavenie spojky adresára
-Comment[sv]=Konfigurera adresskanalen
-Comment[tr]=Adres parçasýnýn ayarlarý
-Exec=e-address-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop.in b/addressbook/conduit/e-address-conduit-control-applet.desktop.in
new file mode 100644
index 0000000000..10633de800
--- /dev/null
+++ b/addressbook/conduit/e-address-conduit-control-applet.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Evolution Address conduit 
+_Comment=Configure the address conduit
+Exec=e-address-conduit-control-applet --cap-id=1
+Terminal=0
+Type=Application