From 0f7060ee7dcceac8d10aaa9100c919712de491ff Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Apr 2009 11:34:11 +0200 Subject: Define .error files correctly and external-editor crash fix ** Fix for bug #561188 --- plugins/groupwise-features/ChangeLog | 15 +++++++++ plugins/groupwise-features/Makefile.am | 17 +++++----- .../org-gnome-mail-retract-errors.xml | 8 ----- .../org-gnome-mail-retract.error.xml | 8 +++++ .../groupwise-features/org-gnome-proxy-errors.xml | 27 ---------------- .../org-gnome-proxy-login-errors.xml | 16 ---------- .../org-gnome-proxy-login.error.xml | 16 ++++++++++ .../groupwise-features/org-gnome-proxy.error.xml | 27 ++++++++++++++++ .../org-gnome-shared-folder.error.xml | 37 ++++++++++++++++++++++ .../org-gnome-shared-folder.errors.xml | 37 ---------------------- 10 files changed, 112 insertions(+), 96 deletions(-) delete mode 100644 plugins/groupwise-features/org-gnome-mail-retract-errors.xml create mode 100644 plugins/groupwise-features/org-gnome-mail-retract.error.xml delete mode 100644 plugins/groupwise-features/org-gnome-proxy-errors.xml delete mode 100644 plugins/groupwise-features/org-gnome-proxy-login-errors.xml create mode 100644 plugins/groupwise-features/org-gnome-proxy-login.error.xml create mode 100644 plugins/groupwise-features/org-gnome-proxy.error.xml create mode 100644 plugins/groupwise-features/org-gnome-shared-folder.error.xml delete mode 100644 plugins/groupwise-features/org-gnome-shared-folder.errors.xml (limited to 'plugins/groupwise-features') diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 2afaec6080..085b62155c 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,18 @@ +2009-04-27 Milan Crha + + ** Part of fix for bug #561188 + + * Makefile.am: + * org-gnome-proxy-login-errors.xml: Renamed to: + * org-gnome-proxy-login.error.xml: + * org-gnome-mail-retract-errors.xml: Renamed to: + * org-gnome-mail-retract.error.xml: + * org-gnome-shared-folder.errors.xml: Renamed to: + * org-gnome-shared-folder.error.xml: + * org-gnome-proxy-errors.xml: Renamed to: + * org-gnome-proxy.error.xml: + Create .error files properly. + 2009-01-21 Suman Manjunath ** Fix for bug #541209 diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 3ece8b0569..d18a7c87f4 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -62,22 +62,23 @@ glade_DATA = \ proxy-listing.glade \ proxy-login-dialog.glade -error_DATA = \ - org-gnome-shared-folder.errors.xml \ - org-gnome-proxy-errors.xml \ - org-gnome-proxy-login-errors.xml \ - org-gnome-mail-retract-errors.xml +error_DATA = \ + org-gnome-shared-folder.error \ + org-gnome-proxy.error \ + org-gnome-proxy-login.error \ + org-gnome-mail-retract.error errordir = $(privdatadir)/errors BUILT_SOURCES = org-gnome-groupwise-features.eplug $(error_i18n) EXTRA_DIST = \ - $(error_DATA) \ $(glade_DATA) \ org-gnome-compose-send-options.xml \ org-gnome-groupwise-features.eplug.xml \ - org-gnome-proxy-login-errors.xml \ - org-gnome-mail-retract-errors.xml + org-gnome-shared-folder.error.xml \ + org-gnome-proxy.error.xml \ + org-gnome-proxy-login.error.xml \ + org-gnome-mail-retract.error.xml CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/groupwise-features/org-gnome-mail-retract-errors.xml b/plugins/groupwise-features/org-gnome-mail-retract-errors.xml deleted file mode 100644 index 64e2ce2f1e..0000000000 --- a/plugins/groupwise-features/org-gnome-mail-retract-errors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - <_primary>Message retract failed - <_secondary>The server did not allow the selected message to be retracted. - - diff --git a/plugins/groupwise-features/org-gnome-mail-retract.error.xml b/plugins/groupwise-features/org-gnome-mail-retract.error.xml new file mode 100644 index 0000000000..64e2ce2f1e --- /dev/null +++ b/plugins/groupwise-features/org-gnome-mail-retract.error.xml @@ -0,0 +1,8 @@ + + + + + <_primary>Message retract failed + <_secondary>The server did not allow the selected message to be retracted. + + diff --git a/plugins/groupwise-features/org-gnome-proxy-errors.xml b/plugins/groupwise-features/org-gnome-proxy-errors.xml deleted file mode 100644 index dad6fbe8f1..0000000000 --- a/plugins/groupwise-features/org-gnome-proxy-errors.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - -<_primary>Invalid user - -<_secondary> -Proxy access cannot be given to user "{0}" - - - - -<_primary>Specify User - -<_secondary> -You have to specify a valid user name to give proxy rights. - - - - -<_primary>Specify User - -<_secondary> -You have already given proxy permissions to this user. - - - - diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml deleted file mode 100644 index fccddfd6c6..0000000000 --- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - -<_primary>Invalid user -<_secondary> - -Proxy login as "{0}" was unsuccessful. Please check your email address and try again. - - - - - <_primary>Account Already Exists - <_secondary>Account "{0}" already exists. Please check your folder tree. - - - diff --git a/plugins/groupwise-features/org-gnome-proxy-login.error.xml b/plugins/groupwise-features/org-gnome-proxy-login.error.xml new file mode 100644 index 0000000000..fccddfd6c6 --- /dev/null +++ b/plugins/groupwise-features/org-gnome-proxy-login.error.xml @@ -0,0 +1,16 @@ + + + +<_primary>Invalid user +<_secondary> + +Proxy login as "{0}" was unsuccessful. Please check your email address and try again. + + + + + <_primary>Account Already Exists + <_secondary>Account "{0}" already exists. Please check your folder tree. + + + diff --git a/plugins/groupwise-features/org-gnome-proxy.error.xml b/plugins/groupwise-features/org-gnome-proxy.error.xml new file mode 100644 index 0000000000..dad6fbe8f1 --- /dev/null +++ b/plugins/groupwise-features/org-gnome-proxy.error.xml @@ -0,0 +1,27 @@ + + + +<_primary>Invalid user + +<_secondary> +Proxy access cannot be given to user "{0}" + + + + +<_primary>Specify User + +<_secondary> +You have to specify a valid user name to give proxy rights. + + + + +<_primary>Specify User + +<_secondary> +You have already given proxy permissions to this user. + + + + diff --git a/plugins/groupwise-features/org-gnome-shared-folder.error.xml b/plugins/groupwise-features/org-gnome-shared-folder.error.xml new file mode 100644 index 0000000000..ca63ad80aa --- /dev/null +++ b/plugins/groupwise-features/org-gnome-shared-folder.error.xml @@ -0,0 +1,37 @@ + + + + +<_primary>Invalid user +<_secondary> +You cannot share this folder with the specified user "{0}" + + + + +<_primary>Specify User +<_secondary> + You have to specify a user name which you want to add to the list + + + + +<_primary>This is a recurring meeting + +<_secondary>Would you like to accept it? +