diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-08 12:26:12 +0800 |
| commit | cea054cd54d84479352a43bbabc19c9ce9af5efb (patch) | |
| tree | ba02763209ba0f22989024004f57689071603ec5 /plugins/groupwise-features | |
| parent | 91a6b6899e5568ed34f913bedb538dd6c9e35b32 (diff) | |
| download | gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.gz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.bz2 gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.lz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.xz gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.tar.zst gsoc2013-evolution-cea054cd54d84479352a43bbabc19c9ce9af5efb.zip | |
Merge revisions 35747:35930 from trunk.
svn path=/branches/kill-bonobo/; revision=35931
Diffstat (limited to 'plugins/groupwise-features')
4 files changed, 30 insertions, 7 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index f0587b07df..1b18e0c3f2 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,18 @@ +2008-08-01 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes bug #544861 + + * org-gnome-proxy-login-errors.xml: + Reword "invalid-user" error message. + +2008-07-28 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #543756 + + * org-gnome-shared-folder.errors.xml: + * process-meeting.c: (process_meeting): + Make question better translatable. + 2008-06-20 Sankar P <psankar@novell.com> * mail-retract.c (retract_mail_settings): diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml index 2523f51056..36d8527e49 100644 --- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml @@ -3,7 +3,7 @@ <error id="invalid-user" type="error"> <_primary>Invalid user</_primary> <_secondary> -Proxy login as "{0}" was unsuccessful. Please check Email Id and try again. +Proxy login as "{0}" was unsuccessful. Please check your email address and try again. </_secondary> </error> diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml index 85ce4ac156..5e7bfb28e5 100644 --- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml +++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml @@ -15,9 +15,17 @@ You cannot share folder with specified user "{0}" </_secondary> </error> -<error id="recurrence" type="question" default="GTK_RESPONSE_YES"> +<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES"> <_primary>This is a recurring meeting</_primary> -<_secondary>What would you like to {0}?</_secondary> +<_secondary>Would you like to accept it?</_secondary> + <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> + <button label="This instance" response="GTK_RESPONSE_NO"/> + <button label="All instances" response="GTK_RESPONSE_YES"/> +</error> + +<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES"> +<_primary>This is a recurring meeting</_primary> +<_secondary>Would you like to decline it?</_secondary> <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> <button label="This instance" response="GTK_RESPONSE_NO"/> <button label="All instances" response="GTK_RESPONSE_YES"/> diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 5b8da30b7e..f4606439ce 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -221,14 +221,14 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status) if (recurring) { gint response; - const char *arg; + const char *msg; if (status == ICAL_PARTSTAT_ACCEPTED || status == ICAL_PARTSTAT_TENTATIVE) - arg = "accept"; + msg = "org.gnome.evolution.mail_shared_folder:recurrence-accept"; else - arg = "decline"; + msg = "org.gnome.evolution.mail_shared_folder:recurrence-decline"; - response = e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:recurrence", arg, NULL); + response = e_error_run (NULL, msg, NULL); if (response == GTK_RESPONSE_YES) { icalproperty *prop; const char *uid = icalcomponent_get_uid (r_data->icalcomp); |