callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It's a grand old string-review! Nitpicky and minor changes; details in the appropriate ChangeLog files.

Browse Source 
svn path=/trunk/; revision=18268
This commit is contained in:
Aaron Weber
2002-09-30 20:11:15 +00:00
parent 44a1f8aeec
commit 43dfa91e96
22 changed files with 75 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-27 gettextize <bug-gnu-gettext@gnu.org>
* Makefile.am (SUBDIRS): Add m4.
(ACLOCAL_AMFLAGS): New variable.
(EXTRA_DIST): Add config.rpath.
* configure.in (AC_OUTPUT): Add po/Makefile.in, m4/Makefile.
2002-09-23 Radek Doulik <rodo@ximian.com>
* configure.in: use pkg-config for gtkhtml

4
addressbook/ChangeLog
View File

@ -1,3 +1,7 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* gui/widgets/e-addressbook-util.c (e_addressbook_show_multiple_cards): rephrase string on l. 213
2002-09-30 Dan Winship <danw@ximian.com>
* backend/ebook/e-card.c (e_card_list_send): update for

4
addressbook/gui/widgets/e-addressbook-util.c
View File

@ -210,8 +210,8 @@ e_addressbook_show_multiple_cards (EBook *book,
GNOME_STOCK_BUTTON_CANCEL,
NULL);
string = g_strdup_printf (_("You have requested that %d cards be cards. This will cause %d new windows to be\n"
"displayed on your screen. Do you really want to display all of these cards?"), length, length);
string = g_strdup_printf (_("Opening %d cards will open %d new windows as well.\n"
"Do you really want to display all of these cards?"), length, length);
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), gtk_label_new (string), FALSE, FALSE, 0);
g_free (string);

7
calendar/ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* gui/e-itip-control.c (update_item): adjust string on line 1609
and 1517.
* gui/dialogs/alarm-options.glade: rephrase string on line 270
2002-09-27 Dan Winship <danw@ximian.com>
* gui/calendar-commands.c (pixmaps): Remove "/Toolbar/New" and

2
calendar/gui/dialogs/alarm-options.glade
View File

@ -267,7 +267,7 @@ days
<class>GtkLabel</class>
<name>malarm-group</name>
<visible>False</visible>
<label>This is an email reminder, but Evolution does not yet support this kind of reminders. You will not be able to edit the options for this reminder.</label>
<label>Evolution does not yet support email notification for reminders. You will not be able to edit the options for this reminder.</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>True</wrap>
<xalign>0.5</xalign>

4
calendar/gui/e-itip-control.c
View File

@ -1514,7 +1514,7 @@ update_item (EItipControl *itip)
dialog = gnome_warning_dialog (_("Object could not be found\n"));
break;
case CAL_CLIENT_RESULT_PERMISSION_DENIED :
dialog = gnome_warning_dialog (_("You don't have permissions to update the calendar\n"));
dialog = gnome_warning_dialog (_("You do not have the right permissions to update the calendar\n"));
break;
case CAL_CLIENT_RESULT_SUCCESS :
dialog = gnome_ok_dialog (_("Update complete\n"));
@ -1606,7 +1606,7 @@ update_attendee_status (EItipControl *itip)
dialog = gnome_warning_dialog (_("Object could not be found\n"));
break;
case CAL_CLIENT_RESULT_PERMISSION_DENIED :
dialog = gnome_warning_dialog (_("You don't have permissions to update the calendar\n"));
dialog = gnome_warning_dialog (_("You don't have the right permissions to update the calendar\n"));
break;
case CAL_CLIENT_RESULT_SUCCESS :
dialog = gnome_ok_dialog (_("Attendee status updated\n"));

6
composer/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* evolution-composer.c (evolution_composer_factory_init): adjust string on line 391
* e-msg-composer.c (create_composer): adjust string on 2872
2002-09-27 Dan Winship <danw@ximian.com>
* Evolution-Composer.idl (setHeaders): let the caller set the

4
composer/e-msg-composer.c
View File

@ -2818,7 +2818,9 @@ create_composer (int visible_mask)
if (!composer->editor) {
e_activation_failure_dialog (GTK_WINDOW (composer),
_("Could not create composer window:\n"
"Unable to activate HTML editor component."),
"Unable to activate HTML editor component.\n"
"Please make sure you have the correct version\n"
"of gtkhtml and libgtkhtml installed.\n"),
GNOME_GTKHTML_EDITOR_CONTROL_ID,
"IDL:Bonobo/Control:1.0");
gtk_object_destroy (GTK_OBJECT (composer));

2
composer/evolution-composer.c
View File

@ -405,7 +405,7 @@ evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID,
factory_fn, NULL) == NULL) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Cannot initialize Evolution's composer."));
_("Cannot initialize the Evolution composer."));
exit (1);
}

8
filter/ChangeLog
View File

@ -1,3 +1,11 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* filter-folder.c (validate): adjust string on 149 to "You must
specify a folder.
* filter-datespec.c (get_best_span): adjust string on 174 from
"You have forgotten to choose a date" to "You must choose a date."
2002-09-25 Dan Winship <danw@ximian.com>
* filter-folder.c (get_widget): Use "mail/*" as the allowed folder

2
filter/filter-datespec.c
View File

@ -171,7 +171,7 @@ validate (FilterElement *fe)
valid = fds->type != FDST_UNKNOWN;
if (!valid) {
GtkWidget *gd = gnome_ok_dialog (_("You have forgotten to choose a date."));
GtkWidget *gd = gnome_ok_dialog (_("You must choose a date."));
gnome_dialog_run_and_close (GNOME_DIALOG (gd));
}

3
filter/filter-folder.c
View File

@ -146,8 +146,7 @@ validate (FilterElement *fe)
} else {
GtkWidget *dialog;
dialog = gnome_ok_dialog (_("You forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."));
dialog = gnome_ok_dialog (_("You must specify a folder.\n"));
gnome_dialog_run_and_close (GNOME_DIALOG (dialog));

11
mail/ChangeLog
View File

@ -1,3 +1,14 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* mail-signature-editor.c (mail_signature_editor): change
string to "Enter a name for this signature" on line 372.
* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): change
HTML-mail warning on 255
* component-factory.c (component_factory_init): change
"Evolution's foo" to "the Evolution foo" in string on 1078
2002-09-30 Not Zed <NotZed@Ximian.com>
* mail-session.c (request_password): translate prompt from utf8 to

2
mail/component-factory.c
View File

@ -1075,7 +1075,7 @@ component_factory_init (void)
result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (shell_component));
if (result == OAF_REG_ERROR) {
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Cannot initialize Evolution's mail component."));
_("Cannot initialize the Evolution mail component."));
exit (1);
} else if (result == OAF_REG_ALREADY_ACTIVE) {
g_warning ("evolution-mail is already running");

4
mail/mail-callbacks.c
View File

@ -252,8 +252,8 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip
}
/* FIXME: this wording sucks */
str = g_string_new (_("You are sending an HTML-formatted message, but the following recipients "
"do not want HTML-formatted mail:\n"));
str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n"
"the following recipients are willing and able to receive HTML mail:\n"));
for (i = 0; recipients[i] != NULL; ++i) {
if (!e_destination_get_html_mail_pref (recipients[i])) {
const char *name;

2
mail/mail-signature-editor.c
View File

@ -369,7 +369,7 @@ mail_signature_editor (MailConfigSignature *sig)
hbox = gtk_hbox_new (FALSE, 4);
vbox1 = gtk_vbox_new (FALSE, 3);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 3);
label = gtk_label_new (_("Type the name by which you would like to refer to this signature."));
label = gtk_label_new (_("Enter a name for this signature."));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
gtk_box_pack_start (GTK_BOX (vbox1), label, FALSE, TRUE, 0);
label = gtk_label_new (_("Name:"));

6
shell/ChangeLog
View File

@ -1,3 +1,9 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* importer/import.glade: Import Assistant vs. Importer assistant.
* glade/evolution-startup-wizard.glade: setup/set up confusion in 15.
2002-09-30 Dan Winship <danw@ximian.com>
* e-shell-view-menu.c (command_remove_other_users_folder): Calls

2
shell/importer/import.glade
View File

@ -19,7 +19,7 @@
<class>GtkWindow</class>
<name>importwizard</name>
<visible>False</visible>
<title>Evolution Importer Assistant</title>
<title>Evolution Import Assistant</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>

7
ui/ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-30 Aaron Weber <aaron@ximian.com>
* evolution-mail-message.xml: setup/set up
* evolution-executive-summary.xml: Customize is spelled with a Z
in us english, and an S elsewhere. Nitpicky!
2002-09-30 Dan Winship <danw@ximian.com>
* evolution.xml: Add FileRemoveOtherUsersFolder

2
ui/evolution-executive-summary.xml
View File

@ -4,7 +4,7 @@
<submenu name="Settings">
<menuitem name="CustomiseMyEvolution" verb="CustomiseMyEvolution"
_label="Customise My Evolution"/>
_label="Customize My Evolution"/>
</submenu>