aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/.cvsignore1
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/shell-errors.xml.h33
3 files changed, 38 insertions, 1 deletions
diff --git a/shell/.cvsignore b/shell/.cvsignore
index 528cd09dd1..ab00681752 100644
--- a/shell/.cvsignore
+++ b/shell/.cvsignore
@@ -23,4 +23,3 @@ e-shell-marshal.c
e-shell-marshal.h
GNOME_Evolution_Shell*.server
GNOME_Evolution_Test*.server
-shell-errors.xml.h
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3bd6586673..3e4400f822 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-06 Rodney Dawes <dobey@novell.com>
+
+ * e-shell-errors.xml.h: Add this back to CVS for translators
+ * .cvsignore: Don't ignore e-shell-errors.xml.h
+
2004-06-24 Not Zed <NotZed@Ximian.com>
** See bug #57367.
diff --git a/shell/shell-errors.xml.h b/shell/shell-errors.xml.h
new file mode 100644
index 0000000000..e71c875578
--- /dev/null
+++ b/shell/shell-errors.xml.h
@@ -0,0 +1,33 @@
+/* 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.");