From ac9abd5e6096d8511a1fe3892cf9453eb7c7ba2f Mon Sep 17 00:00:00 2001
From: Gediminas Paulauskas <menesis@src.gnome.org>
Date: Sun, 11 Feb 2001 02:56:16 +0000
Subject: 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
---
 data/.cvsignore        |  1 +
 data/Makefile.am       |  8 ++++----
 data/evolution.desktop | 30 ------------------------------
 data/evolution.keys    | 27 ---------------------------
 data/evolution.keys.in | 24 ++++++++++++++++++++++++
 5 files changed, 29 insertions(+), 61 deletions(-)
 delete mode 100644 data/evolution.desktop
 delete mode 100644 data/evolution.keys
 create mode 100644 data/evolution.keys.in

(limited to 'data')

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
deleted file mode 100644
index 5bd89cbda5..0000000000
--- a/data/evolution.keys
+++ /dev/null
@@ -1,27 +0,0 @@
-text/x-vcard
-	description=address card
-	[no]description=adressekort
-	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
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
-
-text/x-calendar
-	description=calendar information
-	[no]description=kalenderinformasjon
-	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
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-
-text/calendar
-	description=calendar information
-	[no]description=kalenderinformasjon
-	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
-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
-
diff --git a/data/evolution.keys.in b/data/evolution.keys.in
new file mode 100644
index 0000000000..c2c27d1af7
--- /dev/null
+++ b/data/evolution.keys.in
@@ -0,0 +1,24 @@
+text/x-vcard
+	_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
+	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
+	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control
+
+text/x-calendar
+	_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
+	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
+	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
+
+text/calendar
+	_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
+	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
+	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control
+
-- 
cgit