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, 8 insertions, 40 deletions

diff --git a/data/.cvsignore b/data/.cvsignore
index 282522db03..13fe803164 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+evolution.keys
diff --git a/data/Makefile.am b/data/Makefile.am
index 1748709438..250a51a7f2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 mimedir = $(datadir)/mime-info
-mime_DATA = evolution.keys
+mime_in_files = evolution.keys.in
+mime_DATA = $(mime_in_files:.keys.in=.keys)
+@XML_I18N_MERGE_KEYS_RULE@
 
-EXTRA_DIST = \
-	evolution.desktop	\
-	$(mime_DATA)
\ No newline at end of file
+EXTRA_DIST = $(mime_in_files)
diff --git a/data/evolution.desktop b/data/evolution.desktop
deleted file mode 100644
index 6e1c463530..0000000000
--- a/data/evolution.desktop
+++ /dev/null
@@ -1,30 +0,0 @@
-[Desktop Entry]
-Name=Evolution
-Name[pt_BR]=Evolution
-Name[da]=Evolution
-Name[es]=Evolution
-Name[fr]=Evolucija
-Name[hu]=Evolúció
-Name[lt]=Evolution
-Name[no]=Evolution
-Name[ru]=ü×ÏÌÀÃÉÑ
-Name[sk]=Evolution
-Name[sl]=Evolucija
-Name[sv]=Evolution
-Name[tr]=Evolution
-Comment=Mail, Contacts and Task.
-Comment[pt_BR]=Correio, Contatos e Tarefa.
-Comment[da]=E-post, kontakter og opgaver.
-Comment[es]=Correo electrónico, contactos y agenda de tareas.
-Comment[fr]=Courrier électronique, Contacts, Agenda et Tâches.
-Comment[hu]=A GNOME csoportmunka-szoftvere
-Comment[lt]=El. paðtas, adresai ir uþduotys
-Comment[no]=E-post, kontakter og oppgaver.
-Comment[ru]=üÌ.ÐÏÞÔÁ, ËÏÎÔÁËÔÙ É ÚÁÄÁÎÉÑ.
-Comment[sk]=Po¹ta, Kontakty a Úlohy.
-Comment[sl]=Po¹ta, stiki in naloge.
-Comment[sv]=E-post, kontakter och uppgifter.
-Comment[tr]=ePosta, tanýk ve görevler
-Exec=evolution
-Terminal=0
-Type=Application
diff --git a/data/evolution.keys b/data/evolution.keys.in
index 5bd89cbda5..c2c27d1af7 100644
--- a/data/evolution.keys
+++ b/data/evolution.keys.in
@@ -1,6 +1,5 @@
 text/x-vcard
-	description=address card
-	[no]description=adressekort
+	_description=address card
 	default_action_type=component
 	default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
 	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
@@ -8,8 +7,7 @@ text/x-vcard
 	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
 
 text/x-calendar
-	description=calendar information
-	[no]description=kalenderinformasjon
+	_description=calendar information
 	default_action_type=component
 	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
 	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
@@ -17,8 +15,7 @@ text/x-calendar
 	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
 
 text/calendar
-	description=calendar information
-	[no]description=kalenderinformasjon
+	_description=calendar information
 	default_action_type=component
 	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control
 	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control