aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Marie Dirks <anna@helixcode.com>2000-11-08 02:59:16 +0800
committerAnna Dirks <anna@src.gnome.org>2000-11-08 02:59:16 +0800
commit1c81061178a53a4784fa6db69cb96a0823656dcf (patch)
tree30b53fb3a831e943c927045112ac8e9934e1bd1d
parent25ec1b1c821edae387f56a7e5d3199616f15c84c (diff)
downloadgsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar.gz
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar.bz2
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar.lz
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar.xz
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.tar.zst
gsoc2013-evolution-1c81061178a53a4784fa6db69cb96a0823656dcf.zip
Fixed cvs conflicts.
2000-11-07 Anna Marie Dirks <anna@helixcode.com> * Fixed cvs conflicts. svn path=/trunk/; revision=6485
-rw-r--r--ui/evolution-message-composer.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
index 126d9a9e35..bcc259c4d5 100644
--- a/ui/evolution-message-composer.h
+++ b/ui/evolution-message-composer.h
@@ -20,7 +20,7 @@ gchar *s = N_("Insert text file...");
gchar *s = N_("Insert a file as text into the message");
gchar *s = N_("Send");
gchar *s = N_("Send the message now");
-gchar *s = N_("Send later");
+gchar *s = N_("Send _later");
gchar *s = N_("Send the message later");
gchar *s = N_("Attach");
gchar *s = N_("Attach a file");
@@ -34,7 +34,7 @@ gchar *s = N_("_Save");
gchar *s = N_("Save _As...");
gchar *s = N_("Save in _folder... (FIXME)");
gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send _Now");
+gchar *s = N_("Send");
gchar *s = N_("Send _Later");
gchar *s = N_("_Close");
gchar *s = N_("_Edit");
@@ -44,5 +44,10 @@ gchar *s = N_("Show _attachments");
gchar *s = N_("_Help");
gchar *s = N_("_About...");
gchar *s = N_("_Debug");
+gchar *s = N_("Send this message now");
gchar *s = N_("Bold");
gchar *s = N_("Sets something as bold");
+
+
+
+