aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/Makefile.am2
-rw-r--r--shell/shell-errors.xml.h33
-rw-r--r--shell/shell-errors.xml.in23
4 files changed, 9 insertions, 57 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 78b201c1a6..67ef492e08 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-27 Rodney Dawes <dobey@novell.com>
+
+ * Makefile.am (EXTRA_DIST): Don't dist $(error_i18n) as it requires
+ e-error-tool to be built
+
+ * shell-errors.xml.(h|in): Remove these from CVS, the .in is not used
+ any more, and the .h is generated from the .xml
+
2004-05-26 Sarfraaz Ahmed <asarfraaz@novell.com>
* e-shell.c (set_interactive): Implemented. Sends the "interactive"
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4a4715a20e..b358c0d547 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -258,7 +258,7 @@ EXTRA_DIST = \
$(IDLS) \
$(server_in_files) \
GNOME_Evolution_Test.server.in.in \
- $(error_DATA) $(error_i18n) \
+ $(error_DATA) \
$(etspec_DATA) \
$(schema_DATA) \
$(icons) \
diff --git a/shell/shell-errors.xml.h b/shell/shell-errors.xml.h
deleted file mode 100644
index e71c875578..0000000000
--- a/shell/shell-errors.xml.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* shell:upgrade-nospace primary */
-char *s = N_("Insufficient disk space for upgrade.");
-/* shell:upgrade-nospace secondary */
-char *s = N_("Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
- "\n"
- "You will need to make more space available in your home directory before you can continue.");
-/* shell:upgrade-failed primary */
-char *s = N_("Upgrade from previous version failed:\n"
- "{0}");
-/* shell:upgrade-failed secondary */
-char *s = N_("{1}\n"
- "\n"
- "If you choose to continue, you may not have access to some of your old data.\n"
- "");
-char *s = N_("Continue");
-/* shell:noshell title */
-char *s = N_("Cannot start Evolution");
-/* shell:noshell primary */
-char *s = N_("Evolution can not start.");
-/* shell:noshell secondary */
-char *s = N_("Your system configuration does not match your Evolution configuration.\n"
- "\n"
- "Click help for details");
-/* shell:noshell-reason title */
-char *s = N_("Cannot start Evolution");
-/* shell:noshell-reason primary */
-char *s = N_("Evolution can not start.");
-/* shell:noshell-reason secondary */
-char *s = N_("Your system configuration does not match your Evolution configuration:\n"
- "\n"
- "{0}\n"
- "\n"
- "Click help for details.");
diff --git a/shell/shell-errors.xml.in b/shell/shell-errors.xml.in
deleted file mode 100644
index 70facf2994..0000000000
--- a/shell/shell-errors.xml.in
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<error-list domain="shell">
-
- <error id="upgrade-nospace" type="error">
- <_primary>Insufficient disk space for upgrade.</_primary>
- <_secondary>Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.
-
-You will need to make more space available in your home directory before you can continue.</_secondary>
- <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
- </error>
-
- <error id="upgrade-failed" type="error">
- <_primary>Upgrade from previous version failed:
-{0}</_primary>
- <_secondary>{1}
-
-If you choose to continue, you may not have access to some of your old data.
-</_secondary>
- <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
- <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
- </error>
-
-</error-list>