diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 03:52:33 +0800 |
commit | 00e495279937c6495d6fab99fe7f89583859ecd1 (patch) | |
tree | 34b9779e6406e44a646bd8bf65a66dc55654f51a /modules/offline-alert/evolution-offline-alert.error.xml | |
parent | 0c83b9b25d967ce6d6793ef851e86bc272a2f129 (diff) | |
parent | f3abed7ac2c6099dbf5fd3e7c2483b6d75a637b5 (diff) | |
download | gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.gz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.bz2 gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.lz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.xz gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.tar.zst gsoc2013-evolution-00e495279937c6495d6fab99fe7f89583859ecd1.zip |
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
Diffstat (limited to 'modules/offline-alert/evolution-offline-alert.error.xml')
-rw-r--r-- | modules/offline-alert/evolution-offline-alert.error.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/offline-alert/evolution-offline-alert.error.xml b/modules/offline-alert/evolution-offline-alert.error.xml index a6362da42e..782ee8d635 100644 --- a/modules/offline-alert/evolution-offline-alert.error.xml +++ b/modules/offline-alert/evolution-offline-alert.error.xml @@ -3,11 +3,9 @@ <error id="offline" type="info"> <_primary>Evolution is currently offline.</_primary> <_secondary>Click 'Work Online' to return to online mode.</_secondary> - <button _label="_Dismiss" response="GTK_RESPONSE_OK"/> </error> <error id="no-network" type="info"> <_primary>Evolution is currently offline due to a network outage.</_primary> <_secondary>Evolution will return to online mode once a network connection is established.</_secondary> - <button _label="_Dismiss" response="GTK_RESPONSE_OK"/> </error> </error-list> |