aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog4
-rw-r--r--composer/mail-composer-errors.xml12
-rw-r--r--composer/mail-composer-errors.xml.h10
3 files changed, 15 insertions, 11 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1cc35f7439..a9e228b311 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-27 Jeffrey Stedfast <fejj@novell.com>
+
+ * mail-composer-errors.xml: s/${0}/{0}/g
+
2004-05-27 Rodney Dawes <dobey@novell.com>
* Makefile.am (EXTRA_DIST): Add $(error_i18n)
diff --git a/composer/mail-composer-errors.xml b/composer/mail-composer-errors.xml
index 96ace3dd7b..ff332c622a 100644
--- a/composer/mail-composer-errors.xml
+++ b/composer/mail-composer-errors.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<error-list domain="mail-composer">
<error id="no-attach" type="error" modal="true">
- <primary>You cannot attach the file `${0}' to this message.</primary>
- <secondary>${1}</secondary>
+ <primary>You cannot attach the file `{0}' to this message.</primary>
+ <secondary>{1}</secondary>
</error>
<error id="attach-notfile" type="warning">
- <primary>The file `${0}' is not a regular file and cannot be sent in a message.</primary>
+ <primary>The file `{0}' is not a regular file and cannot be sent in a message.</primary>
</error>
<error id="attach-directory">
@@ -39,12 +39,12 @@
<error id="no-build-message" type="error" modal="true">
<primary>Could not create message.</primary>
- <secondary>Because &quot;${0}&quot;, you may need to select different mail options.</secondary>
+ <secondary>Because &quot;{0}&quot;, you may need to select different mail options.</secondary>
</error>
<error id="no-sig-file" type="warning" modal="true">
<primary>Could not read signature file &quot;{0}&quot;.</primary>
- <secondary>Because &quot;${1}&quot;.</secondary>
+ <secondary>Because &quot;{1}&quot;.</secondary>
</error>
<error id="all-accounts-deleted" type="warning" modal="true">
diff --git a/composer/mail-composer-errors.xml.h b/composer/mail-composer-errors.xml.h
index d45b635ecc..8527e3e72f 100644
--- a/composer/mail-composer-errors.xml.h
+++ b/composer/mail-composer-errors.xml.h
@@ -1,9 +1,9 @@
/* mail-composer:no-attach primary */
-char *s = N_("You cannot attach the file `${0}' to this message.");
+char *s = N_("You cannot attach the file `{0}' to this message.");
/* mail-composer:no-attach secondary */
-char *s = N_("${1}");
+char *s = N_("{1}");
/* mail-composer:attach-notfile primary */
-char *s = N_("The file `${0}' is not a regular file and cannot be sent in a message.");
+char *s = N_("The file `{0}' is not a regular file and cannot be sent in a message.");
/* mail-composer:attach-directory primary */
char *s = N_("Directories can not be attached to Messages.");
/* mail-composer:attach-directory secondary */
@@ -31,11 +31,11 @@ char *s = N_("Save Message");
/* mail-composer:no-build-message primary */
char *s = N_("Could not create message.");
/* mail-composer:no-build-message secondary */
-char *s = N_("Because \"${0}\", you may need to select different mail options.");
+char *s = N_("Because \"{0}\", you may need to select different mail options.");
/* mail-composer:no-sig-file primary */
char *s = N_("Could not read signature file \"{0}\".");
/* mail-composer:no-sig-file secondary */
-char *s = N_("Because \"${1}\".");
+char *s = N_("Because \"{1}\".");
/* mail-composer:all-accounts-deleted primary */
char *s = N_("All accounts have been removed.");
/* mail-composer:all-accounts-deleted secondary */