--- evolution-2.30.3.orig/debian/README.Debian +++ evolution-2.30.3/debian/README.Debian @@ -0,0 +1,27 @@ +Evolution for Debian +==================== + +IMAP +---- + +In versions prior to 2.8, two different IMAP providers (backend modules) were installed. "IMAP" was considered more stable and "IMAP4rev1" had a few experimental features. Starting with version 2.8, IMAP4rev1 has been removed. All accounts with IMAP4rev1 set as server type for incoming email must be switched to IMAP. + +Mailbox corruption +------------------ + +Mailbox summary corruption is an issue that is known to appear in exceptional cases as reported in http://bugs.debian.org/295270 and http://bugs.debian.org/347703. A typical symptom is the error message: "Error while Refreshing folder: Summary and folder mismatch, even after a sync." No data is lost, but one or more summary files are corrupted. + +Before fixing the problem, backup your ~/.evolution folder just in case. Delete ~/.evolution/mail/local/MAILBOX.ev-summary where MAILBOX is your mailboxes. For example, the inbox summary file is Inbox.ev-summary. To rebuild the summaries, restart evolution and evolution-data-server. + +Common console error messages +--------------------- +libnm_glib_nm_state_cb: dbus returned an error. + (org.freedesktop.DBus.Error.ServiceUnknown) The name org.freedesktop.NetworkManager was not provided by any .service files + +Evolution cannot contact network-manager, most likely because it is not installed. The error message only indicates that network-manager will not be used, and automatic offline mode is disabled. + + +libnm_glib_nm_state_cb: dbus returned an error. + (org.freedesktop.DBus.Error.AccessDenied) A security policy in place prevents this sender from sending this message to this recipient, see message bus configuration file (rejected message had interface "org.freedesktop.NetworkManager" member "state" error name "(unset)" destination "org.freedesktop.NetworkManager") + +Access is denied to the network-manager service. The required permissions can be configured in /etc/dbus-1/system.d/NetworkManager.conf. A typical way to acquire permission is to add the current user to the 'netdev' group. As with missing network-manager, the default fallback if access is denied is to toggle offline operation manually. --- evolution-2.30.3.orig/debian/rules +++ evolution-2.30.3/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') +export LDFLAGS + +include /usr/share/cdbs/1/rules/buildvars.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') + + +ELIBDIR := usr/lib/evolution/2.30 + +DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR) +DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/modules +DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' +DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins + + +CFLAGS += -fPIC + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-openldap \ + --enable-nls \ + --disable-scrollkeeper \ + --disable-pilot-conduits \ + --with-krb5=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --enable-plugins=experimental \ + --enable-python \ + --disable-pst-import \ + --disable-image-inline \ + --disable-contacts-map + +ifneq ($(DEB_HOST_ARCH_OS), linux) + DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm +else + DEB_CONFIGURE_EXTRA_FLAGS+=--enable-nm +endif + +install/evolution-common:: + mv debian/tmp/usr/share/une/applications/evolution-mail-une.desktop debian/tmp/usr/share/une/applications/evolution.desktop + +binary-install/evolution-common:: + chmod +x debian/evolution-common/usr/share/evolution/signature.py + +clean:: + find -name '*.schemas' | xargs rm -f --- evolution-2.30.3.orig/debian/NEWS +++ evolution-2.30.3/debian/NEWS @@ -0,0 +1,28 @@ +evolution (2.29.5-1) experimental; urgency=low + + * Due to gnome-pilot not beeing recent enough in Debian, it is now disabled + in evolution builds. + + -- Yves-Alexis Perez Mon, 11 Jan 2010 15:08:11 +0100 + +evolution (2.24.5-2) unstable; urgency=low + + * Evolution 2.24 now uses an sqlite database to store the messages + summaries, so at first restart it'll generate the database. That could + take some time for large messages folders. + * Evolution 2.24 is a large upgrade, and touches many things, so, just in + case, you should make sure: + - to make a backup of current setup, either by using the integrated + plugin or by backing up your $HOME/.evolution folders. + - to shutdown Evolution completely before upgrading, using: + evolution --force-shutdown + + -- Yves-Alexis Perez Wed, 11 Mar 2009 23:41:01 +0100 + +evolution (2.2.2-2) unstable; urgency=low + + * Plugin package is available now. + Please install 'evolution-plugins' package if you want to use it. + + -- Takuo KITAME Thu, 14 Apr 2005 12:12:38 +0900 + --- evolution-2.30.3.orig/debian/evolution-common.install +++ evolution-2.30.3/debian/evolution-common.install @@ -0,0 +1,11 @@ +debian/tmp/usr/share/applications +debian/tmp/usr/share/une/applications +debian/tmp/usr/share/mime-info +debian/tmp/usr/share/evolution +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome +debian/tmp/usr/share/omf +debian/lintian/evolution-common usr/share/lintian/overrides/ +debian/signature.py usr/share/evolution/ + --- evolution-2.30.3.orig/debian/evolution-common.debhelper.log +++ evolution-2.30.3/debian/evolution-common.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/signature.py +++ evolution-2.30.3/debian/signature.py @@ -0,0 +1,8 @@ +#!/usr/bin/python +from gettext import gettext as _ +import gettext + +gettext.bindtextdomain("evolution-2.30","/usr/share/locale") +gettext.textdomain("evolution-2.30") + +print _("Sent from Ubuntu") --- evolution-2.30.3.orig/debian/libevolution.debhelper.log +++ evolution-2.30.3/debian/libevolution.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/evolution.1 +++ evolution-2.30.3/debian/evolution.1 @@ -0,0 +1,69 @@ +.TH EVOLUTION 1 2004\-11\-06 "GNOME" "GNOME" +.SH NAME +evolution \- groupware suite for GNOME containing e\-mail, calendar, +addressbook, to-do list and memo tools +.SH SYNOPSIS +.B evolution +.RI [ OPTIONS ] " " [ MAILTO ] +.SH DESCRIPTION +This manual page briefly introduces the +.B evolution +command. Evolution is a graphical groupware suite, a single +application for reading and sending e\-mail and for managing +calendars, address books, notes, to-do lists and memos. It is written +for the GNOME graphical desktop. +.PP +.RI "An optional " MAILTO " expression can be specified, typically" +.RI "invoked from another application. An example " MAILTO " expression" +is `mailto:username@example.com`. This will open a new composer window +with an empty e-mail to `username@example.com`. More advanced expressions +are also suppported, but should conform to RFC 2368. +.PP +For a more detailed explanation of Evolution, please see the Help menu. +.SH OPTIONS +.TP +.B \-?, \-\-help +Show a help message listing all the options and their meanings. +.TP +.B \-\-usage +Show a brief help message listing the names of the options only. +.TP +.BI "\-c, \-\-component=" COMPONENT +Start Evolution by activating the desired component. +.I COMPONENT +is one of `mail', `calendar', `contacts', `tasks', `memos'. +.TP +.B \-\-offline +Start in offline mode. +.TP +.BR \-\-online +Start in online mode. +.TP +.B \-\-force\-shutdown +Forcibly shut down all Evolution components. +.TP +.B \-\-force\-migrate +Forcibly re-migrate from Evolution 1.4. +.TP +.BI \-\-debug= FILE +.RI "Send the debugging output of all components to " FILE "." +.TP +.B \-\-disable-eplugin +Disable loading of any plugins. +.PP +In addition, the usual GTK+ and GNOME command line options apply. +See the output of \-\-help for details. +.SH "SEE ALSO" +http://www.novell.com/products/evolution/ +.SH AUTHOR +Evolution was originally developed by the company Ximian, now a part +of Novell. +Evolution is now part of GNOME, and many people have touched the code. +See the "About" item in the "Help" menu for a list. +.PP +This manual page was originally written by Lars Wirzenius for the +Debian system. +.\" Copyright 2004 Lars Wirzenius +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. +.\" Updated by Oystein Gisnas --- evolution-2.30.3.orig/debian/evolution-dbg.debhelper.log +++ evolution-2.30.3/debian/evolution-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/evolution-plugins-experimental.debhelper.log +++ evolution-2.30.3/debian/evolution-plugins-experimental.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/evolution-plugins-experimental.install +++ evolution-2.30.3/debian/evolution-plugins-experimental.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/evolution/2.30/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,tnef-attachments,profiler}*.{so,eplug,xml} --- evolution-2.30.3.orig/debian/evolution-plugins.install +++ evolution-2.30.3/debian/evolution-plugins.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/evolution/2.30/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,pst-import,image-inline}*.{so,eplug,xml} --- evolution-2.30.3.orig/debian/evolution-2.2.desktop +++ evolution-2.30.3/debian/evolution-2.2.desktop @@ -0,0 +1,117 @@ +[Desktop Entry] +Name=Evolution +Name[ar]=افُليوشِن +Name[az]=Evolution +Name[be]="Эвалюцыя" +Name[bg]=Evolution +Name[bn]=Evolution +Name[ca]=Evolution +Name[cs]=Evolution +Name[cy]=Evolution +Name[da]=Evolution +Name[de]=Evolution +Name[el]=Evolution +Name[en_CA]=Evolution +Name[en_GB]=Evolution +Name[es]=Evolution +Name[et]=Evolution +Name[eu]=Evolution +Name[fa]=Evolution +Name[fi]=Evolution +Name[fr]=Evolution +Name[ga]=Evolution +Name[gl]=Evolution +Name[gu]=ઈવોલ્યુશન +Name[hr]=Evolution +Name[hu]=Evolution +Name[id]=Evolution +Name[it]=Evolution +Name[ja]=Evolution +Name[ko]=Evolution +Name[lt]=Evolution +Name[lv]=Evolution +Name[mn]=Эволюшин +Name[ms]=Evolution +Name[nb]=Evolution +Name[ne]=इभुलोसन +Name[nl]=Evolution +Name[nn]=Evolution +Name[no]=Evolution +Name[pa]=ਈਵੇਲੂਸ਼ਨ +Name[pl]=Evolution +Name[pt]=Evolution +Name[pt_BR]=Evolution +Name[ro]=Evolution +Name[ru]=Evolution +Name[rw]=Impinduka +Name[sk]=Evolution +Name[sl]=Evolucija +Name[sq]=Evolution +Name[sr]=Еволуција +Name[sr@Latn]=Evolucija +Name[sv]=Evolution +Name[th]=Evolution +Name[tr]=Evolution +Name[uk]=Evolution +Name[vi]=Evolution +Name[wa]=Evolution +Name[xh]=I-Evolution +Name[zh_CN]=Evolution +Name[zh_TW]=Evolution +Comment=Manage email, calendar, contacts and tasks +Comment[bg]=Програма за работа в група Evolution +Comment[bn]=Evolution Groupware Suite +Comment[ca]=El paquet d'aplicacions de treball en grup Evolution +Comment[cs]=Sada nástrojů pro skupinovou spolupráci Evolution +Comment[cy]=Cyfres Meddalwedd Grŵp Evolution +Comment[da]=Samarbejdsprogrammellet Evolution +Comment[de]=Die Groupware-Suite Evolution +Comment[el]=Η σουίτα εφαρμογών του Evolution +Comment[en_CA]=The Evolution Groupware Suite +Comment[en_GB]=The Evolution Groupware Suite +Comment[es]=La suite de trabajo en grupo Evolution +Comment[et]=Evolution grupitarkvarakomplekt +Comment[eu]=Evolution-en talde-lanerako suitea +Comment[fi]=Evolution työryhmäohjelmisto +Comment[fr]=La suite de travail collaboratif Evolution +Comment[gu]=ઈવોલ્યુશન ગ્રુપવેર સેવા +Comment[hu]=Az Evolution csoportmunka-programcsomag +Comment[id]=The Evolution Groupware Suite +Comment[it]=La suite Evolution per il groupware +Comment[ja]=Evolution グループウェア・スイートです +Comment[ko]=Evolution 그룹웨어 모음 +Comment[lt]=Evolution grupinio darbo rinkinys +Comment[ms]=Sut perisian kumpulan Evolution +Comment[nb]=Gruppevaresuiten Evolution +Comment[ne]=इभोलुसन ग्रुपवेर सुट +Comment[nl]=De Evolution Groupware suite +Comment[nn]=Pakka Evolution Groupware +Comment[no]=Gruppevaresuiten Evolution +Comment[pa]=ਈਵੇਲੂਸ਼ਨ ਸਮੂਹਵੇਅਰ ਸਰੂਪ +Comment[pl]=Pakiet do pracy grupowej Evolution +Comment[pt]=O Pacote de Colaboração Evolution +Comment[pt_BR]=O Conjunto de Aplicações para Grupos de Trabalho Evolution +Comment[ro]=Suita Groupware Evolution +Comment[ru]=Набор приложений групповой работы Evolution +Comment[sq]=Suite Groupware e Evolution. +Comment[sr]=Пакет програма Еволуција +Comment[sr@Latn]=Paket programa Evolucija +Comment[sv]=Grupprogramvarusviten Evolution +Comment[th]=ชุดกรุ๊ปแวร์ Evolution +Comment[tr]=Evolution Groupware Programları +Comment[uk]=Набір програм для групової роботи Evolution +Comment[vi]=Bộ phần mềm nhóm Evolution +Comment[xh]=I-Groupware Suite ye-Evolution +Comment[zh_CN]=Evolution 群件套件 +Comment[zh_TW]=Evolution Groupware 套件 +Exec=evolution +Icon=evolution +Terminal=false +Type=Application +Categories=GNOME;Office;X-Red-Hat-Base; +NoDisplay=true +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=Evolution +X-GNOME-Bugzilla-Version=2.29.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.30;evolution-exchange-storage;evolution-alarm-notify; --- evolution-2.30.3.orig/debian/evolution-addressbook-export.1 +++ evolution-2.30.3/debian/evolution-addressbook-export.1 @@ -0,0 +1,50 @@ +.TH EVOLUTION-ADDRESSBOOK-EXPORT 1 2006\-05\-13 "GNOME" "GNOME" +.SH NAME +evolution-addressbook-export \- export addressbook content from Evoluion +.SH SYNOPSIS +.B evolution-addressbook-export +.RI [ OPTIONS ] " " [ ADDRESSBOOK ] +.SH DESCRIPTION +Export the entire contents of the Evolution address book with ID +.I ADDRESSBOOK +, or the default address book if none is given. Available address book +IDs can be listed with the \-l option. Supported export formats are +vCard and CSV. +.SH OPTIONS +.TP +.BR \-? ", " \-\-help +Show a help message listing all the options and their meanings. +.TP +.B \-\-usage +Show a brief help message listing the names of the options only. +.TP +.BI \-\-output= OUTPUTFILE +.RI "Use " OUTPUTFILE "as output file for exported data. Defaults to standard out." +.TP +.BR \-l ", " \-\-list\-addressbook\-folders +Export a comma-separated list of address book IDs, names and number of +entries instead of address book contents. +.TP +.BI \-\-format= FORMAT +.RI "Specify the output format. " FORMAT " must be either `vcard' or `csv'." +The default format is vCard. +.TP +.BR \-a ", " \-\-async +.RI "Export in asynchronous mode. " OUTPUTFILE " must be set and will be the prefix for the output files." +.TP +.BI \-\-size= NUMBER +.RI "Export " NUMBER " entries to each output file. The default is 100." +This option is only valid in asynchronous mode. +.PP +In addition, the usual Bonobo activation and GNOME command line options apply. +See the output of \-\-help for details. +.SH "SEE ALSO" +.BR evolution (1) +.SH AUTHOR +Gilbert Fang +.PP +This manual page was originally written by Oystein Gisnas for the +Debian system. +.\" Copyright 2006 ystein Gisns +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. --- evolution-2.30.3.orig/debian/evolution-mail.desktop +++ evolution-2.30.3/debian/evolution-mail.desktop @@ -0,0 +1,46 @@ +[Desktop Entry] +Name=Evolution Mail +Name[da]=Evolution - e-post-program +Name[de]=Evolution eMail +Name[es]=Cliente de correo Evolution +Name[fi]=Evolution-sähköposti +Name[fr]=Lecteur de courrier Evolution +Name[he]=דואר אבולושיין +Name[is]=Evolution Póstur +Name[it]=Gestore di posta Evolution +Name[nb]=Evolution e-post +Name[nn]=Evolution e-post +Name[no]=Evolution e-post +Name[pt_BR]=Leitor de E-mail Evolution +Name[ro]=Evolution Mail +Name[sv]=Evolution e-post +Name[xh]=I-Imeyili ye-Evolution +Name[zh_CN]=Evolution 电子邮件 +Comment=Read and write emails +Comment[da]=Læs og skriv e-breve +Comment[de]=Emails lesen und schreiben +Comment[es]=Cliente de correo Evolution +Comment[fr]=Lire et écrire des courriers électroniques +Comment[he]=קרא דואר באמצעות אבולושיין +Comment[fi]=Evolution-sähköposti +Comment[is]=Evolution Póstur +Comment[it]=Leggi e scrivi email +Comment[nb]=Les og send e-post +Comment[nn]=Les og send e-post +Comment[no]=Les og send e-post +Comment[pt_BR]=Leia e envie e-mails +Comment[ro]=Evolution Mail +Comment[sv]=Läs och skriv e-post +Comment[xh]=I-Imeyili ye-Evolution +Comment[zh_CN]=Evolution 电子邮件 +Exec=evolution --component=mail +Icon=evolution +Terminal=false +Type=Application +Categories=GNOME;Network; +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=Evolution +X-GNOME-Bugzilla-Component=Miscellaneous +X-GNOME-Bugzilla-Version=2.27.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-alarm-notify; --- evolution-2.30.3.orig/debian/evolution.menu +++ evolution-2.30.3/debian/evolution.menu @@ -0,0 +1,3 @@ +?package(evolution):needs="X11" section="Applications/Network/Communication" \ + title="Evolution" command="/usr/bin/evolution" \ + hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm" --- evolution-2.30.3.orig/debian/evolution.manpages +++ evolution-2.30.3/debian/evolution.manpages @@ -0,0 +1,3 @@ +debian/evolution.1 +debian/evolution-addressbook-export.1 +debian/csv2vcard.1 --- evolution-2.30.3.orig/debian/control +++ evolution-2.30.3/debian/control @@ -0,0 +1,257 @@ +Source: evolution +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Evolution Maintainers +Uploaders: Jordi Mallach , + Margarita Manterola , + Loic Minier , + Heikki Henriksen , + Oystein Gisnas , + Pedro Fragoso , + Yves-Alexis Perez +Standards-Version: 3.9.1 +Dm-Upload-Allowed: yes +Homepage: http://www.gnome.org/projects/evolution/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution +Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution/ubuntu +Build-Depends: debhelper (>= 5.0.0), + cdbs (>= 0.4.52), + dh-autoreconf (>= 1ubuntu1), + dpkg-dev (>= 1.14.16), + scrollkeeper, + flex, + bison, + intltool (>= 0.35.0), + libtool, + pkg-config (>= 0.16.0), + gnome-icon-theme (>= 2.19.92), + gnome-doc-utils (>= 0.3.2), + gtk-doc-tools (>= 0.6), + libatk1.0-dev, + libldap2-dev, + libgtkhtml3.14-dev (>= 3.30.3), + libgtkhtml-editor-dev (>= 3.30.3), + libkrb5-dev, + libnss3-dev, + psmisc, + libglib2.0-dev (>= 2.22.0), + evolution-data-server-dev (>= 2.30.3), + evolution-data-server-dev (<< 2.31), + libgtk2.0-dev (>= 2.18.0), + libgnomecanvas2-dev, + libxml2-dev, + libgconf2-dev, + libcamel1.2-dev (>= 2.30.3), + libedataserver1.2-dev (>= 2.30.3), + libegroupwise1.2-dev (>= 2.30.3), + libedataserverui1.2-dev (>= 2.30.3), + libebackend1.2-dev (>= 2.30.3), + libgdata1.2-dev (>= 2.30.3), + libgdata-google1.2-dev (>= 2.30.3), + libgnome2-dev, + libecal1.2-dev (>= 2.30.3), + libebook1.2-dev (>= 2.30.3), + libdbus-glib-1-dev, + libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libnotify-dev (>= 0.3.0), + libsoup2.4-dev, + libdbus-1-dev, + libgstreamer0.10-dev, + libytnef0-dev, + automake, + libtool, + libical-dev, + libicu-dev, + libgweather-dev (>= 2.25.3), + libgnome-desktop-dev (>= 2.26.0), + sharutils, + libunique-dev, + gnome-pkg-tools, + libcanberra-dev, + libcanberra-gtk-dev, + python-dev, + shared-mime-info (>= 0.22), + libpst-dev (>=0.6.41), + liblaunchpad-integration-dev + +Package: evolution +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution-common (= ${source:Version}), + evolution-data-server (>= 2.30.3), + evolution-data-server (<< 2.31), + gnome-icon-theme (>= 2.19.92), + dbus +Recommends: gnome-desktop-data, + evolution-plugins, + evolution-webcal, + yelp, + bogofilter | spamassassin +Suggests: bug-buddy, + gnupg, + network-manager, + evolution-exchange, + evolution-dbg, + evolution-plugins-experimental +Provides: mail-reader, + imap-client +Description: groupware suite with mail client and organizer + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + Additional features include integration with Exchange and Groupwise + servers, newsgroup client, LDAP support, web calendars and + synchronization with Palm devices. + . + Evolution is a graphical application that is part of GNOME, and + is distributed by Novell, Inc. + . + See http://www.novell.com/products/evolution/ for more + information. + . + The following plugins belonging to the "base" set are included. + - calendar-file + - calendar-http + - calendar-weather + - email-custom-headers + - itip-formatter + - plugin-manager + - python + - default-source + - addressbook-file + - startup-wizard + - mark-all-read + - groupwise-features + - groupwise-account-setup + - mail-account-disable + - publish-calendar + - caldav + - imap-features + - google-account-setup + - sa-junk-plugin + - bogo-junk-plugin + - mono + - webdav-account-setup + +Package: libevolution +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Replaces: evolution (<< 2.29.1-1) +Description: evolution libraries + This package contains libraries used by evolution and the Anjal mail client. + +Package: evolution-common +Architecture: all +Depends: ${misc:Depends} +Recommends: evolution +Replaces: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Conflicts: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Provides: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Description: architecture independent files for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains the architecture independent files needed + by the evolution package. + +Package: evolution-dev +Section: devel +Architecture: any +Depends: evolution (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +# evolution-plugin + libxml2-dev, + libcamel1.2-dev, + libunique-dev, + libgtkhtml3.14-dev, + libgtkhtml-editor-dev, + libgnomecanvas2-dev, +# evolution-shell + libgconf2-dev, + libgnome-desktop-dev, + libgtk2.0-dev, + libedataserverui1.2-dev +Description: development library files for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains header and static library files + for developing Evolution components. + +Package: evolution-dbg +Section: debug +Priority: extra +Architecture: any +Depends: evolution (= ${binary:Version}), + ${misc:Depends} +Description: debugging symbols for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains unstripped binaries of evolution for + use in debugging. + +Package: evolution-plugins +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: evolution-plugins-experimental (<< 2.29.2-1) +Replaces: evolution-plugins-experimental (<< 2.29.1-1) +Recommends: notification-daemon +Description: standard plugins for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes plugins for evolution. The plugins belong + to the set of "standard" plugins, which are useful, but not + necessary for a functioning application. + . + The following standard plugins are included. + - bbdb + - subject-thread + - save-calendar + - select-one-source + - copy-tool + - mail-to-task + - audio-inline + - mailing-list-actions + - default-mailer + - email-custom-header + - import-ics-attachments + - prefer-plain + - mail-notification + - attachment-reminder + - backup-restore + - templates + - vcard-inline + - image-inline + - pst-import + +Package: evolution-plugins-experimental +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution (= ${binary:Version}), +Replaces: evolution-plugins (<< 2.27) +Description: experimental plugins for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes plugins for Evolution. The plugins belong + to the set of "experimental" plugins, which are unsupported, have + undergone little testing, and might cause problems to the rest of + Evolution. Use with care. + . + The following plugins are included. + - face + - folder-unsubscribe + - mail-to-meeting + - save-attachments + - external-editor + - tnef-attachments + - evolution-webdav --- evolution-2.30.3.orig/debian/evolution-plugins.debhelper.log +++ evolution-2.30.3/debian/evolution-plugins.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/evolution-dev.debhelper.log +++ evolution-2.30.3/debian/evolution-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/compat +++ evolution-2.30.3/debian/compat @@ -0,0 +1 @@ +5 --- evolution-2.30.3.orig/debian/libevolution.install +++ evolution-2.30.3/debian/libevolution.install @@ -0,0 +1,8 @@ +debian/tmp/usr/lib/evolution/2.30/*.so.* +debian/tmp/usr/lib/evolution/2.30/csv2vcard +debian/tmp/usr/lib/evolution/2.30/modules/*.so +debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-export +debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-clean +debian/tmp/usr/lib/evolution/2.30/evolution-backup +debian/tmp/usr/lib/evolution/2.30/evolution-alarm-notify +debian/tmp/usr/lib/evolution/2.30/killev --- evolution-2.30.3.orig/debian/changelog +++ evolution-2.30.3/debian/changelog @@ -0,0 +1,2886 @@ +evolution (2.30.3-1ubuntu5.ppa2) maverick; urgency=low + + * Non-maintainer upload. + * debian/patches/92_dateformat_ad_uses_weekdays.patch: + - Changed abbreviated date to show weekdays for dates in the last 7 days + + -- Oded Thu, 30 Sep 2010 16:31:29 +0200 + +evolution (2.30.3-1ubuntu5) maverick; urgency=low + + * debian/patches/91_add_u1_email_translations.patch: + - Added LP translations for Ubuntu One introduction email (LP: #633972) + + -- Rodrigo Moya Tue, 21 Sep 2010 12:00:16 +0200 + +evolution (2.30.3-1ubuntu4) maverick; urgency=low + + * debian/patches/89_add_une_desktop_file.patch: + - Internet desktop field isn't invalid, use Network instead + + -- Didier Roche Tue, 21 Sep 2010 09:54:30 +0200 + +evolution (2.30.3-1ubuntu3) maverick; urgency=low + + * debian/patches/01_ubuntu_signature.patch: (LP: #642839) + - don't set the ubuntu signature as default for new accounts + + -- Didier Roche Mon, 20 Sep 2010 16:25:26 +0200 + +evolution (2.30.3-1ubuntu2) maverick; urgency=low + + * add debian/patches/89_remove_component_id_registration.patch: + - ignore -c component gconf registration on launching just "evolution" + (LP: #642244) + * add debian/patches/91_git_fix_e_shell_ref_counting.patch: + - should fix a crasher (LP: #602828) when quitting evolution because a bad + reference counting (backport from evo 2.31) + + -- Didier Roche Sun, 19 Sep 2010 15:31:34 +0200 + +evolution (2.30.3-1ubuntu1) maverick; urgency=low + + * backport some changes from debian + - new version fixing a crash (LP: #602907) + * debian/patches/01_ubuntu_signature.patch: + - add ubuntu signature to new account + * debian/patches/02_fix_missing_include_for_composer.patch: + - add a missing include for composer to build + * debian/patches/89_express.patch: + - remerged evolution express with great care + - fix impossibility to set "keep mail on server" for POP account + (LP: #615023) + * debian/patches/90_disable_deprecation_warning.patch: refreshed + * debian/patches/91_git_fix_format_itip.patch: removed, included upstream + * backport debian/patches/91_git_additional_chinese_translations.patch, + debian/patches/91_git_fix_untranslatable_list_editor.patch from trunk + + -- Didier Roche Wed, 01 Sep 2010 19:56:03 +0200 + +evolution (2.30.3-1) unstable; urgency=low + + * New upstream bugfix release. + - fix crash in group_by_thread(). closes: #589340 + * debian/patches: + - 01_dont-ship-evo-mail-notifier.png dropped, included upstream. + - 03_fix-crash-itip as well + * debian/control: + - bump gtkhtml build-depends to 3.30.3. + - update standards version to 3.9.1. + * debian/preinst: + - only match evolution main process, evolution-data-server and + evolution-exchange storage process for candidate to be stopped at upgrade + time. + * debian/bug-presubj: + - update text, asking to report in Debian BTS and adding Forwarded-To + header. + + -- Yves-Alexis Perez Sat, 14 Aug 2010 13:47:16 +0200 + +evolution (2.30.2-1ubuntu3) maverick; urgency=low + + * debian/evolution-common.install: + - install signature.py in right place + * debian/evolution.install: + - install evolution-mail.desktop + * debian/patches/01_ubuntu_signature.patch: + - fix a memleak (thanks seb128) + * debian/rules: + - make signature.py executable + + -- Didier Roche Mon, 30 Aug 2010 22:27:33 +0200 + +evolution (2.30.2-1ubuntu2) maverick; urgency=low + + * debian/evolution-mail.desktop, + debian/evolution-mail.desktop.in, + debian/patches/61_translate_menu_entry.patch: + - use that change again since quite some users search their email client + in the internet category and not the office one + * debian/patches/01_ubuntu_signature.patch, + debian/signature.py: + - define an Ubuntu signature which writes "Sent from Ubuntu", the signature + is in the list but not default yet for new accounts, that should change + before the end of the cycle + (lp: #615300) + + -- Sebastien Bacher Fri, 27 Aug 2010 00:07:56 +0200 + +evolution (2.30.2-1ubuntu1) maverick; urgency=low + + * Backport some of the recent debian changes in testing + * debian/patches/90_disable_deprecation_warning.patch: + - don't enable the disable deprecated options for gdk either, since + it's breaking the build currently + * debian/control: + - updated standards version + + -- Sebastien Bacher Thu, 26 Aug 2010 15:38:13 +0200 + +evolution (2.30.2-1) unstable; urgency=low + + * New upstream release. + - fix message deleting in search folers. closes: #585794 + - fix crash on i386 with largefile. closes: #585921 + - fix folder creation inside filter window. closes: #586905 + * debian/rules: + - install some information on bug reporting + - include gnome-get-source.mk. + * debian/bug-presubj: warn user that she should report upstream issues + directly to upstream bugzilla because of lack of time and manpower. + * debian/patches + - 03_fix-segfault-on-some-mails-display, + 04_fix-crash-when-viewing-closing-mails-quickly dropped, + included upstream. + - 03_fix-crash-itip added, fix crash in ITIP parser. closes: #584661 + * debian/control: + - update build-deps to 2.30.2. + - update debhelper build-dep to 7.2.3 for dh_bugfiles. + - add build-dep on gnome-pkg-tools for gnome-get-source.mk. + * Switch to 3.0 (quilt) format. + * debian/libevolution.install: + - install /usr/lib/evolution/2.30/evolution-alarm-notify in the package. + + -- Yves-Alexis Perez Fri, 25 Jun 2010 16:59:53 +0200 + +evolution (2.30.2-0ubuntu11.1) maverick; urgency=low + + * debian/patches/09_add_ubuntuone_email.patch: + - Add patch to add Ubuntu One introduction (LP: 615874) + + -- Rodrigo Moya Thu, 19 Aug 2010 17:37:22 +0200 + +evolution (2.30.2-0ubuntu11) maverick; urgency=low + + * debian/patches/89_express.patch: + - revert renaming of notjunk to not-junk as gnome-icon-theme changed it + (LP: #613413) + + -- Didier Roche Thu, 05 Aug 2010 22:38:21 +0200 + +evolution (2.30.2-0ubuntu10) maverick; urgency=low + + [ Bilal Akhtar ] + * debian/patches/11_remove_upstream_submit_bugreport.patch: + - Remove 'Submit Bug Report' option from Help menu. (LP: #105093) + + [ Sense Hofstede ] + * debian/patches/12_remove_not_recommended_for_top_posting.patch: + - Remove 'Not recommended' for top posting in the editor dialog + (LP: #588298) + + -- Bilal Akhtar Wed, 04 Aug 2010 23:00:20 +0530 + +evolution (2.30.2-0ubuntu9) maverick; urgency=low + + * debian/patches/03_lpi.patch: cleaning + * add debian/patches/90_disable_deprecation_warning.patch: + - fix FTBFS with new gtk deprecation + + -- Didier Roche Mon, 02 Aug 2010 12:44:58 +0200 + +evolution (2.30.2-0ubuntu8) maverick; urgency=low + + * debian/patches/89_add_une_desktop_file.patch: + - use different icons for evolution express + + -- Didier Roche Fri, 30 Jul 2010 14:06:34 +0200 + +evolution (2.30.2-0ubuntu7) maverick; urgency=low + + * Really include the patch with bzr add :) + * debian/evolution-common.install, debian/rules: + rename the mail desktop file + + -- Didier Roche Wed, 21 Jul 2010 12:57:57 +0200 + +evolution (2.30.2-0ubuntu6) maverick; urgency=low + + * debian/patches/89_add_une_desktop_file.patch, + debian/evolution-common.install: + - install express desktop files for UNE session + + -- Didier Roche Tue, 20 Jul 2010 17:41:41 +0200 + +evolution (2.30.2-0ubuntu5) maverick; urgency=low + + * debian/patches/89_remove_quit_button.patch: + remove prominent quit button on calendar for evolution express + + -- Didier Roche Tue, 13 Jul 2010 14:59:25 +0200 + +evolution (2.30.2-0ubuntu4) maverick; urgency=low + + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + debian/patches/64_translate_autostart_strings.patch: + - drop local desktop copy since the upstream has it now + * debian/evolution.install: + - don't install the local copy desktop + * debian/libevolution.install: + - install evolution-alarm-notify there + + -- Sebastien Bacher Thu, 01 Jul 2010 21:49:50 +0200 + +evolution (2.30.2-0ubuntu3) maverick; urgency=low + + * debian/patches/91_git_fix_format_itip.patch: + - fix crasher when receiving a calendar event + + -- Didier Roche Mon, 28 Jun 2010 13:17:16 +0200 + +evolution (2.30.2-0ubuntu2) maverick; urgency=low + + * debian/patches/89_express.patch: + - add evolution express branch enhancement with slight modification + to make it apply with current e-d-s + * use dh-autoreconf: + - remove debian/patches/90_autoconf.patch + - add build-dep to debian/control + - include rule in debian/rules + + -- Didier Roche Thu, 24 Jun 2010 10:57:26 +0200 + +evolution (2.30.2-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Proxy login window is not in focus. (Vibha Yadav) + - Mail inline parser doesn't always work (Milan Crha) (LP: #219104) + - [new-mail-notify] Intermittent notifications (Milan Crha) + - SIGSEGV in e_plugin_mono_register_type (bnc) + (Chenthill Palanisamy) + - Use camel_init() to initialize NSS consistently (David Woodhouse) + - Don't overwrite Date: header when writing Fcc (David Woodhouse) + - New folder window is not in focus in filter dialog (Milan Crha) + - Allow setting alarms on any meeting (Jim Ramsay) (LP: #528557) + - Reopened drafts shouldn't ask for save without change + (Milan Crha) (LP: #510529) + - Custom headers not displayed in message preview (Milan Crha) + - Calendar view not remembered (Milan Crha) + - Can't drag and drop multiple attachments (Matthew Barnes) + - 'Mark as junk' should be disabled in junk folder (Milan Crha) + - Crash in em_format_snoop_type (Michel Dänzer) + - No copyright/licensing information for geo-utils (Cedric Bosdonnat) + - Use cached table row height rather than recalculate (Michel Dänzer) + - Reduce junk icon size (LP: #582839) + - Preview pane's attachment bar accepts drop (Matthew Barnes) + - Use contact's free/busy URL only when not empty (Holger Mickler) + - New task pop up in calendar day view doesn't work (Matthew Barnes) + - Don't display attachment size if it's unknown (Matthew Barnes) + - Evolution allows moving IMAP Inbox to other folders (Milan Crha) + - Force 24h format for locales not supporting 12h format + (Gert Michael Kulyk) + - Set translation domain for e-mail-reader actions (Gert Kulyk) + - System timezone label not initialized in preferences (Matthew Barnes) + - Crash printing contacts in List View (Bharath Acharya) + - Quits without asking user to save unfinished messages + (Milan Crha) (LP: #572962) + - Various data file cleanups (Matthew Barnes) + - Missing icon in alarm dialog (Matthew Barnes) + - Mobile Phone of imported contacts not shown in preview (Milan Crha) + - "Mark All Messages as Read" shortcut missing (Matthew Barnes) + - Crash when viewing/closing messages quickly (Matthew Barnes) + - Mailer's crash avoidance features are broken (Matthew Barnes) + - mail_shell_backend_sync_store_cb() has wrong signature (Jonathon Jongsma) + - GtkHTML color settings not being honored (Matthew Barnes) + - system_tz_label is not translated in cal-prefs-dialog + (Gert Michael Kulyk) + - EventEditor: Disconnect signal handlers before disposing model + (Matthew Barnes) + - Next/prev shortcuts should focus message list (Matthew Barnes) + - Checkbox in vfolder deletion prompt is saved backwards (Matthew Barnes) + - Improve auto-selection of messages (Matthew Barnes) + - Due date is not displayed in message list (Matthew Barnes) + - Use default headers when none stored to display in mailer (Milan Crha) + Fix a typo on Makefile.am that prevents installation of a big + chunk of the stock icons (Fridrich Štrba) + - Create the source groups required to ensure local adresssbooks + and calendars are created (Chenthill Palanisamy) + - Improve attachment bar selection behavior. (Matthew Barnes) + - Fix alignment of lblCarset in composer-prefs-dialog + (Gert Michael Kulyk) + - Add more missing icons for GtkhtmlEditor. (Matthew Barnes) + - Warn the user before marking all messages as read (Chenthill Palanisamy) + - Various win32 improvements (Fridrich Štrba) + - Updated translations + * debian/patches/03_fix-segfault-on-some-mails-display.patch, + debian/patches/04_fix-crash-when-viewing-closing-mails-quickly.patch: + - remove as picked from upstream + * debian/control: + - update e-d-s dep + + -- Didier Roche Mon, 21 Jun 2010 15:14:56 +0200 + +evolution (2.30.1.2-3ubuntu1) maverick; urgency=low + + * Remerge from debian unstable, remaining changes: + + debian/control: + - add Vcs-Bzr tag + - don't use po-debconf + - build-depends on libpst, python and shared-mime-info + - don't split documentation since it goes to langpacks + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - build-dep on liblaunchpad-integration-dev + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message + indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Mon, 31 May 2010 12:43:31 +0200 + +evolution (2.30.1.2-3) unstable; urgency=low + + * debian/patches + - 03_fix-segfault-on-some-mails-display added. (LP: #584536) + - 04_fix-crash-when-viewing-closing-mails-quickly added, + cherry-picked from upstream. Fix crash when opening/closing mails + quickly. closes: #582564 + * debian/evolution.links dropped, upstream doesn't ship them in /usr/bin for + good reason, they're supposed to be called from evolution not directly by + user, and the interface might not be stable. closes: #582491 + * debian/watch updated to order the first directory too. + + -- Yves-Alexis Perez Tue, 25 May 2010 07:25:00 +0200 + +evolution (2.30.1.2-2ubuntu1) maverick; urgency=low + + * Remerge from debian unstable, remaining changes: + + debian/control: + - add Vcs-Bzr tag + - don't use po-debconf + - build-depends on libpst, python and shared-mime-info + - don't split documentation since it goes to langpacks + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - build-dep on liblaunchpad-integration-dev + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message + indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Fri, 21 May 2010 18:48:41 +0200 + +evolution (2.30.1.2-2) unstable; urgency=low + + * debian/rules: + - fix nm disabled in linux builds. closes: #579592 + * debian/control: + - drop recommends on gnome-pilot-conduits since we don't build anymore + with pilot support. closes: #580293 + - update evolution-dev dependencies according to pkgconfig files. + * debian/evolution-dev.install: + - ship documentation. + * Upload to unstable. + + -- Yves-Alexis Perez Mon, 17 May 2010 15:31:33 +0200 + +evolution (2.30.1.2-1ubuntu3) maverick; urgency=low + + * debian/control: + evolution-dev should depend on libgnome-desktop-dev, libunique-dev + + -- Didier Roche Fri, 21 May 2010 15:02:37 +0200 + +evolution (2.30.1.2-1ubuntu2) maverick; urgency=low + + * debian/control: + - build-dep on liblaunchpad-integration-dev + + -- Didier Roche Tue, 18 May 2010 17:12:58 +0200 + +evolution (2.30.1.2-1ubuntu1) maverick; urgency=low + + * Merge from debian experimental: + + debian/control: + - add Vcs-Bzr tag + - don't build depends on pilot-link it's not required + - don't use po-debconf there either + - build-depends on libpst, python and shared-mime-info + - set gnome-pilot-conduits as suggests + - don't split documentation since it goes to langpacks + - evolution replaces evolution-plugins (<< 2.22.2-1) + since the bogofilter plugin has been moved there + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Mon, 17 May 2010 13:54:05 +0200 + +evolution (2.30.1.2-1) experimental; urgency=low + + * New upstream bugfix release. + * debian/patches: + - 03_fix-face-plugin-linking dropped, included upstream. + + -- Yves-Alexis Perez Wed, 28 Apr 2010 21:36:23 +0200 + +evolution (2.30.1.1-1) experimental; urgency=low + + * New upstream bugfix release. (LP: #154752) + * debian/patches: + - 03_fix-face-plugin-linking, fix ftbfs with face plugin. + * debian/control: + - bump (build-)deps to gtkhtml/eds 2.30.1. + + -- Yves-Alexis Perez Mon, 26 Apr 2010 21:12:22 +0200 + +evolution (2.30.0.1-1) experimental; urgency=low + + * New upstream release. + * debian/watch updated to track stable releases. + * debian/control: + - bump eds and gtkhtml build-deps to 2.30. + * debian/evolution-mail.desktop: update components version to 2.30. + * debian/lintian/evolution-common: + - add an override for evolution-settings command not being in the package. + * debian/lintian: + - evolution-plugins dropped, useless now. + - evolution-plugins-experimental dropped as well. + * debian/evolution-plugins-experimental.install, + debian/evolution-plugins.install: don't install lintian overrides. + + + -- Yves-Alexis Perez Sat, 24 Apr 2010 13:40:06 +0200 + +evolution (2.29.92.1-1) experimental; urgency=low + + * New upstream release candidate. + * debian/copyright updated. + + -- Yves-Alexis Perez Sun, 21 Mar 2010 19:36:21 +0100 + +evolution (2.29.92-1) experimental; urgency=low + + * New upstream release candidate. (LP: #433674, #198392) + * debian/control: + - bump build-deps on eds and gtkhtml. + * debian/rules: + - remove deprecated --enable-nntp arg to configure. + + -- Yves-Alexis Perez Mon, 08 Mar 2010 23:16:12 +0100 + +evolution (2.29.91-1) experimental; urgency=low + + * New upstream release candidate. (LP: #478976, #409795, + * debian/control: + - bump build-deps on eds and gtkhtml. + + -- Yves-Alexis Perez Tue, 23 Feb 2010 21:38:32 +0100 + +evolution (2.29.90-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - bump build-deps on eds et gtkhtml. + - add build-dep on libunique-dev. + - bump standards version to 3.8.4. + + -- Yves-Alexis Perez Mon, 08 Feb 2010 22:36:39 +0100 + +evolution (2.29.6-1) experimental; urgency=low + + * New upstream development release. + * debian/control: + - bump eds and gtkhtml versions to 2.29.6. + * debian/rules: + - disable nm on non Linux builds, fix FTBFS on kFreeBSD. closes: #566928 + * debian/patches + - 02_fix-gtkdoc dropped. + + -- Yves-Alexis Perez Tue, 26 Jan 2010 20:06:10 +0100 + +evolution (2.29.5-1) experimental; urgency=low + + * New upstream development release. (LP: #471825) + * debian/control: + - drop build-dep on libgnomeprint. + - bump eds and gtkhtml versions to 2.29.5. + - bump GTK+ build-dep to 2.18. + - drop build-dep on hal. + - drop build-dep on gnome-pilot. + * debian/patches: + - drop 02_fix-ftbfs-pilot_charset. + - 02_fix-gtkdoc added, fix FTBFS with gtk-doc 1.13. + * drop gnome-pilot support. * + + -- Yves-Alexis Perez Sat, 16 Jan 2010 10:38:59 +0100 + +evolution (2.29.3.2-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - add libgtkhtml3.14-dev to evolution-dev dependencies. + - bump glib build-dep to 2.22. + + -- Yves-Alexis Perez Tue, 15 Dec 2009 21:43:56 +0100 + +evolution (2.29.3-1) experimental; urgency=low + + * New upstream release. (LP: #414666, #289205) + * debian/control: + - update build deps for gtkhtml 3.29.3 and eds 2.29.3. + - drop libglade build-dep. + * debian/rules: + - don't build contact-map plugin for now. + * debian/patches: + - 02_fix-ftbfs-pilot_charset added, fix FTBFS because of unknown component + in structure by reverting the culprit commit (GNOME #603452). + * debian/*.install: + - don't install non existent .glade files. + * debian/libevolution.install: install killev in the package. + + -- Yves-Alexis Perez Thu, 03 Dec 2009 21:20:29 +0100 + +evolution (2.29.2-1) experimental; urgency=low + + [2.29.1] + * New upstream development release. (LP: #452044, #145132, #470169, #319910) + (LP: #251417, #460054, #429008, #444493, #365037, #182575, #431899) + (LP: #105849, #530255, #115039, #376523, #487655, #145354) + * debian/watch updated to track development releases. + * debian/control: + - add a new libevolution package to separate the libs from the main + package. + - update build deps: + + drop bonobo, gnomeui, and libexchange-storage ; + + add libunique-dev, libcanberra-dev, libcanberra-gtk-dev ; + + update gtkhtml and eds to 2.29.1. + * debian/{lib,}evolution.install: ship libs in the libevolution package. + * debian/rules: + - update ELIBDIR to 2.30. + - don't build exchange plugin now inexistant. + - drop unknown configure options: + + --without-openssl-includes, --without-openssl-libs, --disable-openssl + + --enable-cairo-calendar, + + --without-krb4, + + --enable-ipv6, + - don't build pstimport plugin since we don't have libpst in Debian. + * debian/lintian: update paths to 2.29. + * debian/*.install: + - update paths to 2.30 ; + - move vcard, custom-headers, webdav and templates plugin from + experimental to base package. + * debian/evolution-dev.install: + - drop bonobo interface folder. + + [2.29.2] + * New upstream development release. + * debian/control: + - update build-deps for 2.29.2. + - add build-deps on libgtkimageview-dev. + * debian/evolution-plugins.install: + - add inline image viewer plugin. + * debian/links: + - drop manpage symlink. + - add evolution-addressbook-clean and evolution-backup synlinks to + /usr/bin. + + -- Yves-Alexis Perez Mon, 16 Nov 2009 21:54:13 +0100 + +evolution (2.28.3-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/patches: + - 03_evo-addr-export-segfault dropped, included upstream. + * debian/control: + - update build-deps to 2.28.3 for eds and gtkhtml. + - update standards version to 3.8.4. + + -- Yves-Alexis Perez Mon, 01 Mar 2010 19:10:50 +0100 + +evolution (2.28.3-0ubuntu9) lucid; urgency=low + + * debian/control + - Remove unnecessary build dependency libgnomevfs2-dev. (LP: #562368) + + -- Onkar Shinde Tue, 13 Apr 2010 19:09:38 +0530 + +evolution (2.28.3-0ubuntu8) lucid; urgency=low + + * debian/patches/80_git_rtl_bar.patch: + - git change to fix rendering issue in the composer in rtl locales + (lp: #545459) + + -- Sebastien Bacher Thu, 01 Apr 2010 00:11:16 +0200 + +evolution (2.28.3-0ubuntu7) lucid; urgency=low + + * Bump cdbs build dependency, to ensure that we are building with a + langpack.mk which works with multi-section .desktop files. (LP: #535650) + + -- Martin Pitt Mon, 22 Mar 2010 09:14:57 +0100 + +evolution (2.28.3-0ubuntu6) lucid; urgency=low + + * No-change rebuild against a reverted CDBS. + + -- Steve Kowalik Sat, 20 Mar 2010 18:27:47 +1100 + +evolution (2.28.3-0ubuntu5) lucid; urgency=low + + * Bump cdbs build dependency, to ensure that we are building with a + langpack.mk which works with multi-section .desktop files. (LP: #535650) + + -- Martin Pitt Fri, 19 Mar 2010 15:26:12 +0100 + +evolution (2.28.3-0ubuntu4) lucid; urgency=low + + * debian/patches/10_desktop_shortcuts.patch + - Make names translatable + + -- Ken VanDine Wed, 10 Mar 2010 13:49:00 -0500 + +evolution (2.28.3-0ubuntu3) lucid; urgency=low + + * debian/patches/10_desktop_shortcuts.patch + Adds desktop shortcuts for the messaging menu. + + -- Ted Gould Thu, 04 Mar 2010 00:08:13 -0600 + +evolution (2.28.3-0ubuntu2) lucid; urgency=low + + * debian/control: + - update the eds requirement to the current version + + -- Sebastien Bacher Tue, 02 Mar 2010 00:32:25 +0100 + +evolution (2.28.3-0ubuntu1) lucid; urgency=low + + * New upstream version: + Bug Fixes: + - #601551 - [PST] evolution crashed with SIGSEGV (lp: #471852) + - #554663 - Swap "Save" and "Save as Draft" accelerators in composer + (lp: #424416) + - #601787 - Double free in destroy_oof_data + - #602185 - Crash after 'Show only this calendar' + - #609042 - Convert quoted-printing to UTF-8 when copying to clipboard + - #610124 - Autosave errors dialogues can't be dismissed + - #607087 - Not all inlined text attachments are included in replies + - #607741 - Move folder to claims it's copying in status bar + - #607458 - Fix format security warning + - #603480 - [bbdb] Traverse lists in destinations properly + - #602827 - Disable broken plugins automatically + - #607234 - Open received attachments as read-only + - #604670 - addressbook-export segfaults when specifying addressbook + - #605485 - Keeps search from previous folder in message list + - #606449 - Empty mail-notification popups + - #599794 - Set composer as not changed on reply or forward action + (lp: #510529) + - #605600 - Meeting reminders with wrong times (lp: #242954) + - #565582 - Make sure the comp_data is not NULL before using it + (lp: #351617) + - #606340 - Crash on non-utf8 letter in mail folder name + - #549988 - "Empty Trash" in Trash popup empties all Trash folders + - #595501 - Crash on a changed mail filter action removal (lp: #452921) + - #599615 - i18n support for emae and filter-bar when used as lib + - #250046 - Do not count Post To addresses when not shown (lp: #485831) + * debian/patches/90_autoconf.patch: + - new version update + + -- Sebastien Bacher Mon, 01 Mar 2010 23:30:42 +0100 + +evolution (2.28.2-3) unstable; urgency=low + + * debian/patches: + - 03_evo-addr-export-segfault added, fix segfault in + evolution-addressbook-export. closes: #554442 + + -- Yves-Alexis Perez Thu, 14 Jan 2010 08:54:29 +0100 + +evolution (2.28.2-2) unstable; urgency=low + + [ Josselin Mouette ] + * Drop libgnomeprint build-dependencies. + + [ Yves-Alexis Perez ] + * debian/po: + - Try to really remove spurious spaces in debconf templates and unfuzzy + translations. closes: #548510 + - add pt_BR.po, thanks Fábio Ferreira. closes: #563034 + * debian/patches: + - 02_let-nss-search-for-nssckbi added, fix nss modules lookup, should fix + certificate verification in evolution. closes: #563253 + + -- Yves-Alexis Perez Tue, 12 Jan 2010 21:37:26 +0100 + +evolution (2.28.2-1ubuntu6) lucid; urgency=low + + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in: + - use the new X-GNOME-Autostart-Delay autostart key + + -- Sebastien Bacher Mon, 01 Feb 2010 16:05:23 -0800 + +evolution (2.28.2-1ubuntu5) lucid; urgency=low + + * Rebuild to get the new gtkhtml shlib + + -- Sebastien Bacher Mon, 25 Jan 2010 15:58:31 +0100 + +evolution (2.28.2-1ubuntu4) lucid; urgency=low + + * debian/control: + - don't recommends gnome-pilot rather suggests it, it's not used by lot + of users nowadays and rather confusing (lp: #507362) + + -- Sebastien Bacher Thu, 14 Jan 2010 11:58:21 +0100 + +evolution (2.28.2-1ubuntu3) lucid; urgency=low + + * debian/control, debian/evolution-plugins-experimental.install: + - don't build ipodsync which upstream stopped shipping in new versions, + clean the libhal build-depends which was used only there (lp: #503607) + + -- Sebastien Bacher Wed, 06 Jan 2010 23:43:43 +0100 + +evolution (2.28.2-1ubuntu2) lucid; urgency=low + + * debian/control: + - use build-depends on libpst, python and shared-mime-info to fix build + + -- Sebastien Bacher Thu, 17 Dec 2009 10:41:31 +0100 + +evolution (2.28.2-1ubuntu1) lucid; urgency=low + + * Resync on Debian + * New upstream version: + Bug Fixes: + - #271836 - Incorrect signature for "model_cell_changed" signal handler + - #397265 - Image loading for new contact requires restarting Evolution + - #411768 - Drag and drop header columns (lp: #344373) + - #468736 - Prevent recursion in em-format + - #474502 - Don't check for contacts in broken address books + - #551464 - Paste files into composer as attachments + - #551603 - Special case "positive zero alarms" + - #554779 - Removal of task due date does not sync from Palm + - #555901 - Preserve Start/End/Due timezone when editing in list view + - #557613 - evolution crashed with SIGSEGV in try_open_e_book_cb + (lp: #287136) + - #570835 - Custom e-mail headers inserted with double column + - #590127 - Define ETable::vertical-spacing style property + - #596027 - In Anjal, although invalid mail address warning popup, mail's + tab closed automatically + - #596566 - Crash on quit with composer window opened (lp: #438382) + - #596827 - Don't remove meeting attendees after edit + - #597582 - Original Date: header should be given precedence + - #599124 - Signature always includes an empty line in front of text + (lp: #456220) + - #599190 - Drag and drop broken for received MIME parts (lp: #456690) + - #599245 - Use bitwise AND instead of logical AND for checking flags + - #599627 - Crash when adding a new task in a table + - #599792 - Anjal composer's Send button doesn't work after pressed Save + Drafts button + - #599882 - Crash in em_folder_tree_select_prev_path() when wrapping to + bottom + - #600132 - Direct print from composer fails when special characters used + - #600133 - Crash on day view print preview without all day events + (lp: #464197) + - #601202 - Evo deletes system addressbook + - #601218 - Accepted meeting doesn't show attachments in calendar view + - #601219 - Transient dialogs in composer window blocks main window + - #601644 - Disable rename for system folders + Other Changes: + Synchronize with attachment logic in Evolution 2.29. + Improve comments: widgets/misc/e-filter-bar.c + [PATCH] Output an error message on system filter rules loading error + Use same macro name for consistency + Add mail_component_show_status_bar + Explicitly dllimport/export comp_editor_registry on Windows + Support other forward types for Anjal. + Sync to disk the outbox, since if we crash, we endup sending mail again. + Add support for Googlemail and hotmail/live/msn.com accounts. + Translations + * debian/control: + - Build-Depends on liblpint-bonobo-dev for the lpi patch + - conflicts, replaces, provides the previous documentation binaries + - don't Build-Depends on libgnomeprint2.2-dev, libgnomeprintui2.2-dev + - don't build depends on pilot-link it's not required + - don't split documentation since it goes to langpacks + - don't use po-debconf there either + - evolution replaces evolution-plugins (<< 2.22.2-1) + since the bogofilter plugin has been moved there + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - updated evolution-data-server requirement + * debian/docs: + - renamed evolution-common.docs + * debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + * debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + * debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + * debian/evolution-common.install: + - install extra .glade + * debian/evolution-dev.install: + - detail the .so to install + * debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + * debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + debian/patches/64_translate_autostart_strings.patch: + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + * debian/evolution-mail.desktop, debian/evolution-mail.desktop.in, + debian/patches/61_translate_menu_entry.patch: + - don't reapply this ubuntu change and use only one menu entry + * debian/evolution.preinst, + debian/evolution.templates: + - don't display debconf template on upgrade + * debian/patches/03_lpi.patch: + - launchpad-integration patch + * debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message indicator + is running + * debian/patches/70_1024x600_contact-editor.glade.patch, + debian/patches/71_1024x600_em-account-editor.c.patch + debian/patches/72_1024x600_e-shell-settings-dialog.c.patch + debian/patches/73_1024x600_e-shell-window.c.patch + debian/patches/74_1024x600_e-sidebar.c.patch + debian/patches/75_1024x600_e-task-bar.c.patch + debian/patches/76_1024x600_e-timezone-dialog-1024x600.glade.patch + debian/patches/77_1024x600_mail-config.glade.patch + debian/patches/78_1024x600_startup-wizard.c.patch: + - change by Ying-Chun Liu to work better on small screens (lp: #8629) + * debian/patches/79_relayout_preferences.patch: + - change by Neil J. Patel to update the preferences dialog layout and get + options for the message indicator + * debian/patches/90_autoconf.patch: + - autoconf patch + * debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + + -- Sebastien Bacher Wed, 16 Dec 2009 22:45:56 +0100 + +evolution (2.28.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - 02_empty-line_signature dropped, included upstream. + - 03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work too. + - 04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch too. + + -- Yves-Alexis Perez Tue, 15 Dec 2009 08:55:42 +0100 + +evolution (2.28.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * 02_empty-line_signature.patch: stolen from upstream git. Stop + including an empty line in front of the signature. + + [ Yan Li ] + * debian/patches/03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work.patch + - fixed GNOME Bug #599792 + * debian/patches/04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch + - fixed GNOME Bug #596027 + + [ Yves-Alexis Perez ] + * debian/control: + - adjust evolution-dev dependencies. closes: #559771 + + -- Yves-Alexis Perez Sat, 12 Dec 2009 17:02:42 +0100 + +evolution (2.28.1-2) unstable; urgency=low + + * debian/rules: + - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304 + * debian/control: + - build-dep on hal on kfreebsd. + + -- Yves-Alexis Perez Tue, 10 Nov 2009 08:01:55 +0100 + +evolution (2.28.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - 01_dont-ship-evo-mail-notifier.png.patch added, remove + evo_mail_notifier.png from Makefiles so it's not shipped at all. + + -- Yves-Alexis Perez Sun, 18 Oct 2009 20:33:50 +0200 + +evolution (2.28.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Thu, 24 Sep 2009 21:39:25 +0200 + +evolution (2.28.0-1) experimental; urgency=low + + * New upstream stable release. + * debian/watch updated to track stable releases. + * debian/control: + - (build-)deps updated for 2.28. + + -- Yves-Alexis Perez Tue, 22 Sep 2009 10:58:47 +0200 + +evolution (2.27.92-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - update build-deps on gtkhtml and eds. + + -- Yves-Alexis Perez Tue, 08 Sep 2009 15:08:13 +0200 + +evolution (2.27.91-1) experimental; urgency=low + + * New upstream beta release. + * debian/control: + - update standards version to 3.8.3. + - adjust build-deps to gtkhtml and eds 2.27.91. + * debian/patches: + - 01_fix-evolution-cal-shared-module dropped, included upstream. + + -- Yves-Alexis Perez Mon, 24 Aug 2009 19:28:39 +0200 + +evolution (2.27.90-2) experimental; urgency=low + + * debian/patches: + - 01_fix-evolution-cal-shared-module added, don't build + libevolution-cal-shared.so as a module. closes: #541195 + + -- Yves-Alexis Perez Thu, 13 Aug 2009 23:18:47 +0200 + +evolution (2.27.90-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.90. + - add build-dep on libgnome-desktop-dev. + - add shlibs:Depends to evolution-dev depends. + * debian/rules: + - ignore shlibs on libevolution-cal-shared.so. + + -- Yves-Alexis Perez Tue, 11 Aug 2009 21:07:28 +0200 + +evolution (2.27.5-1) experimental; urgency=low + + * New upstream development release. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.5 + + -- Yves-Alexis Perez Tue, 04 Aug 2009 07:30:14 +0200 + +evolution (2.27.4-1) experimental; urgency=low + + [ Josselin Mouette ] + * Stop suggesting gnome-spell, evolution uses enchant now. + + [ Yves-Alexis Perez ] + * New upstream development release. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.4 + + -- Yves-Alexis Perez Mon, 13 Jul 2009 22:55:22 +0200 + +evolution (2.27.3-1) experimental; urgency=low + + * New upstream development release. + * debian/watch: look in development folder. + * po: + - fr.po updated, unfuzzified. Thanks Christian Perrier. closes: #546232 + + -- Yves-Alexis Perez Fri, 11 Sep 2009 23:28:10 +0200 + +evolution (2.26.3-3) unstable; urgency=low + + * po: + - ja.po added, thanks Hideki Yamane. closes: #539596 + - sv.po added, thanks Martin Bagge. closes: #522972 + - de.po added, thanks Helge Kreutzmann. closes: #543728 + - remove spurious spaces in templates. Thanks Christian Perrier for + patch against all translations. closes: #543725 + * debian/control: + - update standards version to 3.8.3. + + -- Yves-Alexis Perez Tue, 08 Sep 2009 10:26:06 +0200 + +evolution (2.26.3-2) unstable; urgency=low + + * debian/control: + - bump build-deps for 2.26.3 release. closes: #536711 + + -- Yves-Alexis Perez Mon, 13 Jul 2009 08:03:05 +0200 + +evolution (2.26.3-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream bugfix release. + * debian/control: + - update standards version to 3.8.2. + * po: + - cs.po: add czech, thanks to Martin Šín. closes: #532165 + - fi.po: add finnish, thanks to Esko Arajärvi. closes: #534610 + * debian/control: + - update deps and build-deps for 2.27 branch. + - update standards version to 3.8.2. + * debian/*.install: update folder name to 2.28. + * debian/evolution-plugins-experimental.install + - add vcard-inline plugin. + * debian/lintian/*: + - update folder name to 2.28. + - update components to match real rpaths. + + -- Yves-Alexis Perez Sun, 12 Jul 2009 18:03:16 +0200 + +evolution (2.26.2-2) unstable; urgency=low + + * debian/control + - bump build-deps to 2.26.2. closes: #530746 + + -- Yves-Alexis Perez Wed, 27 May 2009 19:44:20 +0200 + +evolution (2.26.2-1) unstable; urgency=low + + * New upstream bugfix release. + * po: + - es.po: add spanish, thanks Fernando González de Requena. closes: #528970 + - it.po: add italian, thanks Luca Monducci. closes: #529159 + - ru.po: add russian, thanks Yuri Kozlov. closes: #529809 + + -- Yves-Alexis Perez Tue, 26 May 2009 08:11:35 +0200 + +evolution (2.26.1.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * evolution.preinst: use pgrep to match evolution processes instead of + being so strict. Closes: #525985. + + [ Yves-Alexis Perez ] + * Debconf translations: + - sv.po added, thanks to Martin Bagge. + - pt.po added, thanks to Miguel Figueiredo. + - fr.po added, Yoann Ciabaud. + * debian/rules: + - re-enable weather calendar. closes: #526827 + - run debconf-updatepo at clean time. + * debian/control: + - build-dep on libgweather-dev and po-debconf. + - bump build deps on gtkhtml3.14 and evolution-data-server to be sure + to use the fixed ones. + + -- Yves-Alexis Perez Wed, 06 May 2009 23:18:32 +0200 + +evolution (2.26.1.1-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + - 2.26 finally available. closes: #520766 + * debian/control: + - update standards version to 3.8.1. + - update (build-)deps for 2.26. + - add build-dep on libical-dev and libicu-dev. + * debian/*.install: upgrade paths to 2.26. + * debian/lintian/*: upgrade paths to 2.26. + + [ Josselin Mouette ] + * Fix section for the debug package. + + -- Yves-Alexis Perez Sun, 26 Apr 2009 09:51:16 +0200 + +evolution (2.24.5-3) unstable; urgency=low + + [ Yves-Alexis Perez ] + * debian/NEWS.Debian: warn user to make a backup and quit evolution + before upgrading. + + [ Josselin Mouette ] + * evolution.{preinst,templates): add a pre-upgrade check that prevents + any upgrade if evolution is currently running. Closes: #519206. + * Add a Pre-Depends on debconf for the debconf use in preinst. + + -- Josselin Mouette Wed, 01 Apr 2009 13:00:41 +0200 + +evolution (2.24.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Sun, 08 Mar 2009 13:42:30 +0100 + +evolution (2.24.5-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - update build-deps on evolution-data-server. + - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev + - drop build-dep on gtkhtml3.14. + - add myself to Uploaders:. + - add build-dep on automake and libtool. + - drop obsolete Conflicts/Replaces. + * debian/rules: + - run autoreconf at build time to relibtoolize the package. + - ignore plugin folder in dh_makeshlibs. + * debian/lintian/evolution-plugins: + - update overrides for private rpaths. + * debian/evolution-plugins-experimental.install + - install lintian override file. + - ship email-custom-header, evolution-webdav and templates plugin. + + -- Yves-Alexis Perez Sat, 28 Feb 2009 20:34:59 +0100 + +evolution (2.22.3.1-1) unstable; urgency=medium + + [ Pedro Fragoso ] + * New upstream bugfix release (Closes: #488782) + - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 + (Closes: #484639) + - Set urgency to medium + * debian/control: + - Add myself to Uploaders + - Bump Standards-Version to 3.8.0 (no changes) + + -- Heikki Henriksen Sun, 06 Jul 2008 13:51:11 +0200 + +evolution (2.22.2-1) unstable; urgency=low + + * New upstream release + - bugfixes and translation updates + * Remove debian/lintian/evolution + - private-dir rpaths are finally ignored with lintian >= 1.23.49 + + -- Heikki Henriksen Mon, 26 May 2008 22:45:36 +0200 + +evolution (2.22.1.1-1) unstable; urgency=low + + [ Heikki Henriksen ] + * debian/evolution-mail.desktop: + Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) + + [ Oystein Gisnas ] + * New upstream bugfix release + + -- Oystein Gisnas Sun, 04 May 2008 18:16:59 +0200 + +evolution (2.22.1-1) unstable; urgency=low + + [ Pedro Fragoso ] + * New upstream bugfix release + - 35_fix_tnef_locale.patch, Dropped, merged upstream + + [ Heikki Henriksen ] + * 2.22.1 fixes subject in composer window (closes: #475370) + + -- Heikki Henriksen Thu, 10 Apr 2008 19:43:54 +0200 + +evolution (2.22.0-3) unstable; urgency=low + + * Upload to unstable + * Add patch 35_fix_tnef_locale.patch + - fixes locale-bug in tnef-attachments (closes: #464670) + * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump + build-dep on dpkg-dev + * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) + * Update evolution.menu to follow newest menu sub-policy and use + Applications/Network/Communication (fixes lintian-warning) + * Convert copyright to UTF-8 (fixes lintian-warning) + * Update versioned dirs in lintian-overrides + * Add lintian override for desktop-command-not-in-package in + evolution-common, and install in evolution-common.install + + -- Heikki Henriksen Sat, 05 Apr 2008 19:25:32 +0200 + +evolution (2.22.0-2) experimental; urgency=low + + * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) + * Fix file path to Google Calendar plugin (closes: #473309) + + -- Oystein Gisnas Mon, 31 Mar 2008 14:51:04 +0200 + +evolution (2.22.0-1) experimental; urgency=low + + [ Heikki Henriksen ] + * New upstream release + * Acknowledge NMU from Security Team: + - remove 80_CVE-2008-0072.patch: applied upstream + * Bump Standards-version to 3.7.3 + * Upgrade build-dep: + - libsoup2.4-dev from libsoup2.2-dev + * Bump build-deps: + - libglib2.0-dev (>= 2.15.3) + - libgtk2.0-dev (>= 2.12.0) + - evolution-data-server-dev (>= 2.21.92) + - evolution-data-server-dev (<< 2.23.0) + - gnome-icon-theme (>= 2.19.91) + - libbonobo2-dev (>= 2.20.3) + - libgtkhtml3.14-dev (>= 3.17.5) + - libgnome-pilot2-dev (>= 2.0.15) + - libnotify-dev (>= 0.3.0) + * Add build-dep: + - pilot-link + * Update base plugins: + - add google-account-setup + - add bogo-junk-plugin + - wait and evaluate on mono + * Update standard plugins: + - add audio-inline + - remove bogo-junk-plugin + - rename new-mail-notify to mail-notification + - add attachment-reminder + - add face + - add backup-restore + * Update experimental plugins: + - remove backup-restore + - add external-editor + - add tnef-attachments + * Remove patch: + - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is + removed upstream + + [ Oystein Gisnas ] + * Bump e-d-s build-deps to 2.21.92 + * Sync build-deps of -dev packages with pkg-config files + + -- Oystein Gisnas Tue, 18 Mar 2008 00:46:53 +0100 + +evolution (2.12.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix Encrypted Message Version Format String Vulnerability + (CVE-2008-0072). + + -- Thijs Kinkhorst Tue, 04 Mar 2008 21:27:27 +0100 + +evolution (2.12.3-1) unstable; urgency=low + + [ Heikki Henriksen ] + * Conflict with older evolution-plugins and evolution-plugins-experimental + to ensure full upgrades (closes: #454473) + * Add recommends evolution-webcal (closes: #455598) + + [ Oystein Gisnas ] + * New upstream release (bugfixes and translations) + (closes: #454435, #458728, #443483) + * Remove configure flags --with-nspr-includes and --with-nss-includes + (closes: #461312, #460615, #460683) + + -- Oystein Gisnas Tue, 22 Jan 2008 08:19:08 +0100 + +evolution (2.12.2-1) unstable; urgency=low + + [ Heikki Henriksen ] + * New upstream release (bugfixes and translations) (closes: #446890) + * Swap bogofilter and spamassassin recommmends, since bogofilter is quite + lightweight (closes: #435635) + * Versioned build-dependency on eds-dev and dependency on eds (closes: + #445375) + * Update patch: 70_no-mail-remote-plugin.patch + * Upstream fix for glade-dir (closes: #450524) + * [debian/rules] Update ELIBDIR + * Remove patches applied upstream: + - 15_contact-list-editor-expand.patch + - 25_mute-debug-messages.patch + - 30_mute-alarm-notify.patch + - 50_filter_missing_gettext.patch + - 50_libnssckbi-location.patch + - 60_new_addressbook_set_relative_url.patch + * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control + * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments + * Add tnef-attachments to plugins-experimental + * Add build-dep on gtk-doc-tools to build gtk-doc development documentation + * Enable building of gtk-doc in rules + * Update lintian overrides (version-bumps in rpaths) + * Update evolution-mail.desktop + + -- Oystein Gisnas Mon, 03 Dec 2007 18:06:48 +0100 + +evolution (2.12.0-2) unstable; urgency=low + + * Conflicts with evolution-exchange (<< 2.11.90) (closes: #444012, #444018) + * Tighter build-dependency on libedataserver (>= 1.11.2) for new + data-structure, EFlag (closes: #444036) + + -- Heikki Henriksen Wed, 26 Sep 2007 14:58:24 +0200 + +evolution (2.12.0-1) unstable; urgency=low + + * New upstream release. + * Adjusted Build-Deps. + * Adjusted .install paths to reflect new upstream. + * Added attachment-reminder, audio-inline, bogo-junk-plugin, face, + mail-notification to the evolution-plugin package. + * Dropped patches: + 08_to_translate_list_update.patch - Applied upstream. + 20_minicard-email-colon.patch - Upstream has a better fix. + + -- Riccardo Setti Mon, 24 Sep 2007 01:43:12 +0200 + +evolution (2.10.3-1) unstable; urgency=low + + * New upstream stable release; bug fixes. + + -- Loic Minier Wed, 25 Jul 2007 16:38:09 +0200 + +evolution (2.10.2-1) unstable; urgency=low + + * New upstream release. (closes: #423060) + * 15_contact-list-editor-expand.patch: Fix contact list dialog resize + bug (bugzilla #424055) + * 20_minicard-email-colon.patch: Fix for missing row columns in + contacts minicard view (bugzilla #404239) + * 25_mute-debug-messages.patch: Mute console noise from plugins + * 30_mute-alarm-notify.patch: Mute noisy debug output from evolution- + alarm-notify + + -- Oystein Gisnas Mon, 28 May 2007 23:33:35 +0200 + +evolution (2.10.1-1) unstable; urgency=low + + [ Oystein Gisnas ] + * New upstream release + - Add gnome-doc-utils (>= 0.3.2) build-dep + - Change libgtkhtml3.8* dependencies to libgtkhtml3.14* + - Bump e-d-s build-deps to >= 1.9.4 + - Bump libgtk2.0-dev to >= 2.10.0 + - Add evolution Recommends: spamassassin | bogofilter + - Drop 10_etasks-missing-include.patch + - Drop 90_build_with_new_pisock.patch, fixed upstream + * 50_libnssckbi-location.patch: Adapt private library search path + to relocated xulruner libraries. + * Update watch file to track all stable versions + * 08_to_translate_list_update.patch: Translatable files + * Don't create shlibs.local - CDBS has been fixed long ago + * Create symlink for manpage evolution-2.10 + * Add lintian overrides + + [ Loic Minier ] + * Upload to unstable. + + -- Loic Minier Tue, 24 Apr 2007 16:36:09 +0200 + +evolution (2.8.3-1) experimental; urgency=low + + * New upstream stable release; bug fixes and translations. + * Drop Takuo Kitame from Uploaders. + + -- Loic Minier Thu, 05 Apr 2007 14:27:55 +0200 + +evolution (2.8.2.1-1) experimental; urgency=low + + * New upstream release. + - Fixes crash on exit; closes: #406492. + + -- Loic Minier Thu, 11 Jan 2007 17:28:35 +0100 + +evolution (2.8.2-1) experimental; urgency=low + + [ Jordi Mallach ] + * 50_filter_missing_gettext.patch: Add missing gettext() calls to the + filter dialogs (Bugzilla #359276). + + [ Oystein Gisnas ] + * New upstream release + - debian/control: Move prefer plain plugin to standard + - 70_no-mail-remote-plugin.patch: Update patch + - Treat data/evolution.{keys,mime} special + * Document mailbox summary corruption and removal of + IMAP4rev1 provider. [debian/README.Debian] + * Document common network-manager error messages. + [debian/README.Debian] + * Don't depend on HAL and NetworkManager on non-Linux archs. Thanks to + Petr Salinger. (closes: #401540) [debian/control] + + -- Oystein Gisnas Sun, 7 Jan 2007 22:52:16 +0100 + +evolution (2.8.1.1-1) experimental; urgency=low + + * New upstream release (closes: #347645) + - included: debian/patches/20_show-deleted-msgs-in-trash.patch + + -- Oystein Gisnas Tue, 31 Oct 2006 22:16:23 +0100 + +evolution (2.8.1-2) experimental; urgency=low + + * Pull patch from upstream (closes: #391250) + - debian/patches/20_show-deleted-msgs-in-trash.patch + + -- Oystein Gisnas Sun, 22 Oct 2006 09:52:34 +0200 + +evolution (2.8.1-1) experimental; urgency=low + + * New upstream release + * Fix symlinks to point to 2.8 [debian/evolution.links] (closes: #389272) + + -- Heikki Henriksen Tue, 3 Oct 2006 15:19:14 +0200 + +evolution (2.8.0-2) experimental; urgency=low + + * Remove superfluous libusb-dev build-dep [debian/control] + + -- Heikki Henriksen Tue, 26 Sep 2006 09:56:17 +0200 + +evolution (2.8.0-1) experimental; urgency=low + + [ Oystein Gisnas ] + * debian/patches/06_fix_inline_pgp_breaking_charset.patch: Applied + upstream + * remove debian/patches/11_window_settings_stored.patch + * debian/patches/11_window_settings_stored.patch: Applied upstream + * debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied + upstream + * debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply + cleanly + * debian/patches/20_xulrunner.patch: Fixed upstream + * debian/patches/30_no-ipod-sync.patch: Doesn't apply cleanly + * debian/patches/31_no-audio-inline.patch: Doesn't apply cleanly + * debian/patches/40_disposition-notification.patch: Fixed upstream + * debian/patches/60_exchange-operations-create-addressbook.patch: + Applied upstream + * debian/patches/70_build-experimental-plugins.patch: Doesn't apply + cleanly + * debian/*.install: Update version number in filename paths + * Label typo patch applied upstream. + [debian/patches/18_fix_label_typo.patch] + * Gettext domain patch applied upstream. + [debian/patches/20_correct_gettext_domain.patch] + + [ Riccardo Setti ] + * Added patch to fix compile with the new libpisock (closes: #341172) + [debian/patches/90_build_with_new_pisock.patch] + + [ Heikki Henriksen ] + * New upstream release (1.8.0) + * Updated debian/watch to follow 2.8-series + * --enable-cairo-calender=yes [debian/rules] + * Missing include to avoid possible segfault applied upstream. + Thanks to Dann Frazier (closes: #384280) + * Remove patches fixed/applied upstream: + - 07_default_shell_only_with_no_uris.patch + - 10_pkg-config-rpath.patch + - 30_ipod-sync_missing-files.patch + - 55_fi-translation-fix.patch + - 60_alarm-list-dialog-peek.patch + - 61_itip-formatter-date-in-past.patch + - 65_null-camel-exception.patch + * Update patches: + + 10_etasks-missing-include.patch + + 70_no-mail-remote-plugin.patch + * Add build-dep on gtkhtml3.8 to find Editor.idl [debian/control] + * Temporary build-dep on libusb-dev until this is in place at the right + place (libpisock-dev) [debian/control] + * Bump build-dep on libgtk2.0-dev to (>= 2.8.0) to pull in cairo + [debian/control] + + -- Heikki Henriksen Fri, 22 Sep 2006 12:51:40 +0200 + +evolution (2.6.3-1) unstable; urgency=low + + [ Oystein Gisnas ] + * New upstream release + - does not ping when offline (closes: #360373) + * Reorder build-deps to match order in configure.in. [debian/control] + * Add build-deps for each e-d-s lib used. [debian/control] + * Patches applied upstream: + - debian/patches/18_fix_label_typo.patch + - debian/patches/20_correct_gettext_domain.patch + - debian/patches/31_no-audio-inline.patch: Obsolete + - debian/patches/70_build-experimental-plugins.patch: Obsolete + * Update patch debian/patches/70_no-mail-remote-plugin.patch + + [ Heikki Henriksen ] + * Check build-deps (closes: #383174) + * Re-add build-dep on gtkhtml3.8 to fix ftbfs + + -- Heikki Henriksen Tue, 15 Aug 2006 21:07:17 +0200 + +evolution (2.6.2-4) unstable; urgency=high + + * Add gnome-icon-theme build-dep. [debian/control] (Closes: #377161) + + -- Oystein Gisnas Fri, 7 Jul 2006 08:40:16 +0200 + +evolution (2.6.2-3) unstable; urgency=low + + * debian/control: Add ${misc:Depends} + * debian/control: Remove conflict with older evolution + * debian/evolution-dev.install: Remove .la files again + * debian/patches/10_pkg-config-rpath.patch: Add explicit -rpath to + private libs pkg-config to fix .la-less builds against these libs + * Convert icon to XPM format for Debian menu + * debian/control: Clean up dependencies + * Move icon, menu and .desktop from evolution-common to evolution + * debian/control: Depend on = source:Version of -common package + for binNMU compatibility + + -- Oystein Gisnas Thu, 6 Jul 2006 09:45:29 +0200 + +evolution (2.6.2-2) unstable; urgency=low + + * Make the package binNMU-safe: + - Build-depend on dpkg-dev >= 1.13.19. [debian/control] + - Use ${binary:Version} & ${source:Version} [debian/control] + - use UPSTREAM_VERSION [debian/rules] + + -- Heikki Henriksen Mon, 12 Jun 2006 09:53:50 +0200 + +evolution (2.6.2-1) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/patches/61_itip-formatter-date-in-past.patch: (Closes: + #368920) + * Update manpages + * Move architecture independent files to package evolution-common + (Closes: #232890) + * Move experimental plugins to evolution-plugins-experimental + * debian/control: Update package descriptions + * debian/control: Correct Suggests: and Recommends: for plugins + + [ Heikki Henriksen ] + * New upstream release + * Update patches: + - debian/patches/17_fix_alarm_delay_for_calendar.patch + - debian/patches/31_no-audio-inline.patch + - debian/patches/55_fi-translation-fix.patch + - debian/patches/70_build-experimental-plugins.patch + * Drop patches applied upstream: + - debian/patches/06_fix_inline_pgp_breaking_charset.patch + - debian/patches/11_window_settings_stored.patch + - debian/patches/12_fix_icon_metaphors_bug_339626.patch + - debian/patches/40_disposition-notification.patch + - debian/patches/60_exchange-operations-create-addressbook.patch + * plugin for ipod-sync works again: + - debian/patches/30_no-ipod-sync.patch: dropped + - debian/patches/30_ipod-sync_missing-files.patch: added + - debian/control: bring back build-deps on hal >= 0.5.4 + - debian/evolution-plugins.install: add ipod-sync to experimental line + * debian/control: Change dep on Source-Version from = to >= to have it + binNMU-able + * debian/control: add dep on libhal-dev to evolution-dev + * debian/rules: Fix Version\: in dpkg-parsechangelog + * debian/rules: Don't overwrite DEB_SHLIBDEPS_INCLUDE & + DEB_DH_MAKESHLIBS_ARGS_? + * debian/evolution-dev.install: bring back *.la until we get broken + rpath in some libs fixed + + -- Heikki Henriksen Sun, 11 Jun 2006 20:18:06 +0200 + +evolution (2.6.1-3) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/control: Move -dbg pkg to section gnome + * debian/control: Claim compliance with Debian Policy 3.7.2 + * debian/patches/60_new_addressbook_set_relative_url.patch: (Closes: #361995) + * debian/evolution-dev.install: drop installation of *.la + * Add manpages csv2vcard.1 and evolution-addressbook-export.1 + * debian/evolution.install: drop installation of + evolution-addressbook-clean (closes: #346088) + * debian/patches/65_null-camel-exception.patch: stop using NULL in + place of Camel exceptions + * debian/patches/70_build-experimental-plugins.patch: Build + experimental plugins. Thanks to Michel Dänzer. (Closes: #312288) + * debian/patches/evolution{,-plugins}.install: Move base plugins to + evolution package + + [ Heikki Henriksen ] + * patches pulled from ubuntu: + - debian/patches/06_fix_inline_pgp_breaking_charset.patch + - debian/patches/11_window_settings_stored.patch: (closes: #363259) + - debian/patches/12_fix_icon_metaphors_bug_339626.patch + - debian/patches/17_fix_alarm_delay_for_calendar.patch + - debian/patches/18_fix_label_typo.patch + - debian/patches/20_correct_gettext_domain.patch + + -- Oystein Gisnas Thu, 25 May 2006 08:09:47 +0200 + +evolution (2.6.1-2) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/patches/60_exchange-operations-create-addressbook.patch: + Fix create addressbook breakage caused by exchange-operations plugin + * debian/control: Add dep dbus (closes: #365797) + + [ Heikki Henriksen ] + * debian/control: add dep on libnm-glib-dev & libgtkhtml3.8-dev for + evolution-dev + * debian/evolution-plugins.install: not install *.la + * debian/patches/60_alarm-list-dialog-peek.patch: fix segfault on certain + cases/archs. Thanks to Dann Frazier (closes: #365923) + + -- Oystein Gisnas Thu, 4 May 2006 12:25:51 +0200 + +evolution (2.6.1-1) unstable; urgency=low + + [ Heikki Henriksen ] + * Upload to unstable + * New upstream release (2.6.1) + * debian/control: add recommends notification-daemon to evolution-plugins + * debian/control: bump debhelper build-dep to >= 5.0.0 + * debian/control: added recommends: yelp (closes: #277707) + * debian/control: removed old unecessary conflicts/replaces + * debian/control: add suggests on evolution-dbg + * evolution-wombat has been removed some time ago + (closes: #236852, #265568, #160049, #211656, #218075, #196426) + * debian/evolution-mail.desktop: pull from ubuntu (and add norwegian + translations :) ) (closes: #257322) + * debian/rules: clean up clean:: + * debian/control: add build-dep libnm-glib-dev and suggest network-manager. + Provides NetworkManager-magic if available. + * Upstream fix for addressbook data-loss (uid vs relative_uri) + (closes: #361995) + * debian/watch: added + * debian/patches/40_disposition-notification.patch: + Fix crash on disposition-notification (upstream bug: 324327) + * debian/patches/31_no-audio-inline.patch & debian/control: + Remove build-dep on gstreamer0.8 and audio-inline-plugin until its' fixed + * Upstream fix for new-mail-plugin (closes: #341085) + + [ Oystein Gisnas ] + * Upstream fixes for mbox import (closes: #292810) + * Upstream fixes for yelp user guide category and title++ + (closes: #360860, #339500) + * Upstream support for contact groups (closes: #297236) + * Upstream LDAP fixes (closes: #187821, #190750, #251060, #139947) + * Remove obsolete README.SSL since SSL/TLS is builtin + * Upstream fix for creation of task from mail message (closes: #327406) + * debian/evolution.links: Fix link filename for evolution-2.6 manpage + * debian/rules: Add dh_shlibdeps flag to aviod unnecessary runs of ldconfig + * debian/evolution.menu: Remove obsolete tag in menu file (see #129131) + + [ Jordi Mallach ] + * debian/rules: + - don't overwrite CFLAGS, or we get unusable -dbg packages + (thanks seb128). + - likewise for DEB_CONFIGURE_EXTRA_FLAGS. + + -- Heikki Henriksen Fri, 28 Apr 2006 17:12:48 +0200 + +evolution (2.6.0-2) experimental; urgency=medium + + * Now updates count for drafts folder (closes: #284095) + * Build --without-krb4 (closes: #278242) + * Move spamassassin recommends to evolution-plugins (closes: #343987) + * Upstream fixes in ldif-import (closes: #357845) + * Bump debhelper compat to 5 + * remove camel-providers from evolution.install: + moved to e-d-s once upon a time + * remove evolution-importers from evolution.install: + goes under *so + + -- Heikki Henriksen Mon, 3 Apr 2006 20:02:52 +0200 + +evolution (2.6.0-1) experimental; urgency=low + + * New upstream release + * Added -dbg package with Priority: extra + * debian/patches/50_de-translation-typo.patch: + Removed - string is no longer valid + * debian/patches/55_fi-translation-fix.patch: + Updated + * debian/patches/80_default_mailer_free-fix.patch: + Removed - fixed upstream + * Enable experimental plugins and update plugin-list + (closes: #349163, #312288) + * debian/patches/07_default_shell_only_with_no_uris.patch: + Added from ubuntu's packages + * debian/patches/30_no-ipod-sync.patch: + Don't build ipod-sync-plugin (at least not until it wants to build) + + -- Heikki Henriksen Thu, 30 Mar 2006 17:56:35 +0200 + +evolution (2.4.2.1-2) unstable; urgency=medium + + * Acknowledge NMU (closes: #358432) + * Add myself to Uploaders + * Tighten dependency on libgtkhtml3.8-dev >= 3.8.1-1.1 + * Tighten dependency on e-d-s >= 1.4.2.1-1.1 + * 80_default_mailer_free-fix.patch: + fix crash on startup (closes: #358071) + * debian/patches/15_x-face-support.patch: + broken and not accepted upstream, so removed (closes: #347702) + + -- Heikki Henriksen Sun, 26 Mar 2006 17:26:15 +0100 + +evolution (2.4.2.1-1.1) unstable; urgency=low + + * NMU to fix crasher in startup (closes: #358071) + + -- Heikki Henriksen Wed, 22 Mar 2006 13:59:44 +0000 + +evolution (2.4.2.1-1) unstable; urgency=low + + [ Jordi Mallach ] + * New upstream release (closes: #336968). + - can introduce tasks (closes: #334026). + - won't crash when adding contacts (closes: #342725). + - won't crash on libsoup2.2 bugs (closes: #340488). + - should not loop, eating all memory (closes: #341694). + * Upload to unstable. + * Don't build-depend on automake1.7 [debian/control]. + + [ Loic Minier ] + * Add missing build-dep on gtkhtml3.8 (>= 3.7.0). (Closes: #340184) + [debian/control] + + -- Jordi Mallach Mon, 9 Jan 2006 14:13:13 +0100 + +evolution (2.4.1-3) experimental; urgency=low + + * Merge changes done in SVN by marga as "2.4.0-3", which were overriden in + experimental in kitame's "2.4.0-3". + - Re-add the updated translations patches (german and finish). + - Rename bugbuddy Suggests in bug-buddy. + * Update and rename patches to apply cleanly and in a defined order. + * Update X-Face support patch to cover Makefile.am too. + * Update pixmap PATH to 2.4. [debian/evolution.menu] + * Update description to not list the Evolution version. [debian/control] + * Update list of evolution-dev files. [debian/evolution-dev.install] + + -- Loic Minier Fri, 11 Nov 2005 15:58:25 +0100 + +evolution (2.4.1-2) experimental; urgency=low + + * Rebuild against evolution-data-server >= 1.4.1.1-1 and bump build-dep. + [debian/control] + * Remove anything related to gal, now merged in evolution-data-server. + [debian/control] + * Switch to experimental dbus by replacing dbus-1-dev and dbus-glib-1-dev + with libdbus-1-dev and libdbus-glib-1-dev. + [debian/control] + * Update copyright information, upstream URL, authors... + [debian/copyright] + * Add myself to Uploaders. + [debian/control] + * Remove all files from the Debian diff.gz not below debian/. + * Add CDBS' utils. [debian/rules] + + -- Loic Minier Mon, 7 Nov 2005 17:53:06 +0100 + +evolution (2.4.1-1) experimental; urgency=low + + * New upstream release + * Build againsta gtkhtml3.8 instead of gtkhtml + + -- Takuo KITAME Mon, 10 Oct 2005 05:50:53 +0900 + +evolution (2.4.0-3) experimental; urgency=low + + * Depends on untagged libgal-common and gtkhtml. + + -- Takuo KITAME Fri, 16 Sep 2005 15:19:14 +0900 + +evolution (2.4.0-2) experimental; urgency=low + + * fix libgal2.5-common dependency. + + -- Takuo KITAME Tue, 13 Sep 2005 12:23:37 +0900 + +evolution (2.4.0-1) experimental; urgency=low + + * New upstream release + * Depends on e-d-s 1.4.0, gal 2.5, gtkhtml3.8 + * remove translation fix patch at once. + + -- Takuo KITAME Mon, 12 Sep 2005 11:33:24 +0900 + +evolution (2.2.3-4) unstable; urgency=low + + * Erased unnecesary files from the debian/ directory, including + 02_help_is_not_included.patch which wasn't being applied anyway. + * Fix de.po translation, with the patch provided by Jens Seidel + (Closes: #314119). + * Add a suggestion for the evolution-exchange package (Closes: #304827). + * Fixed an "implicitly converted pointer" bug with the patch provided by + David Mosberger (Closes: #304708, #320892) + * Re-included the changelog entries that had been dropped during + experimental phase. + * Fixed build-dependencies (libpam-dev -> libpam0g-dev). + * Updated all libgal2.4 dependencies to > 2.4.3 + * Updated copyright file. + + -- Margarita Manterola Tue, 6 Sep 2005 16:32:25 -0300 + +evolution (2.2.3-3) unstable; urgency=high + + * security fix. (closes: Bug#32253) + - Multiple exploitable format string vulnerabilities + Applied unofficial security fix patch from + http://www.sitic.se/dokument/evolution.formatstring.patch + + -- Takuo KITAME Thu, 25 Aug 2005 14:58:34 +0900 + +evolution (2.2.3-2) unstable; urgency=low + + * Added "Evolution Team" in the Maintainer field, and listed the members of + the team as the Uploaders. + * Added a manpage provided by Lars Wirzenius (Closes: #239643). + * Added a symlink in /usr/bin for evolution-addressbook-export and + csv2vcard (Closes: #285174). + * Fixed finnish translations, as suggested by Lars Wirzenius, + by adding the corresponding patch (Closes: #279977, #288674) + * Build-depend on libkrb5-dev, since it's being used. (Closes: #318981) + * Update the libgal2.4-0 dependency, to prevent being installed with the + buggy version. + * Fixed the menu file (Closes: #307840, #318163) + + -- Margarita Manterola Mon, 1 Aug 2005 10:24:13 -0300 + +evolution (2.2.3-1) unstable; urgency=low + + * New upstream release + * change dependency to e-d-s instead of e-d-s1.2 + + -- Takuo KITAME Wed, 13 Jul 2005 15:13:40 +0900 + +evolution (2.2.2-4) unstable; urgency=low + + * remove unnecessary diffs from diff.gz (config.sub, config.guss, *.desktop) + * remove libdb4.2-dev from Build-Depends. + * Build-Depends on evolution-data-server1.2-dev (>= 1.2.2-4) + * build against latest e-d-s. + + -- Takuo KITAME Tue, 10 May 2005 12:29:37 +0900 + +evolution (2.2.2-3) unstable; urgency=low + + * added build-depends: dbus-glib-1-dev (closes: #305001) + + -- Takuo KITAME Sat, 30 Apr 2005 03:32:27 +0900 + +evolution (2.2.2-2) unstable; urgency=low + + * Oops. Previous release forgot to include plugins directory. + * Added build-depends for plugins. (libgstreamer0.8-dev, dbus-1-dev) + + -- Takuo KITAME Thu, 14 Apr 2005 11:42:22 +0900 + +evolution (2.2.2-1) unstable; urgency=low + + * New upstream release + * Fix debian menu (closes: #303657) + * --enable-plugins=all (closes: #304324) + + -- Takuo KITAME Wed, 13 Apr 2005 22:22:59 +0900 + +evolution (2.2.1.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 30 Mar 2005 12:06:30 +0900 + +evolution (2.2.1-1) unstable; urgency=low + + * New upstream release + * Upload to unstable/main + * Change package name to 'evolution' + + -- Takuo KITAME Tue, 22 Mar 2005 18:17:12 +0900 + +evolution2.2 (2.1.6-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 22 Mar 2005 15:39:39 +0900 + +evolution2.2 (2.1.5-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 22 Feb 2005 11:18:58 +0900 + +evolution2.2 (2.1.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 4 Feb 2005 14:57:30 +0900 + +evolution2.2 (2.1.3.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 13 Jan 2005 14:49:22 +0900 + +evolution2.2 (2.1.2-1) experimental; urgency=low + + * New upstream release + * fix build-depends (closes: #288572) + + -- Takuo KITAME Thu, 6 Jan 2005 15:05:08 +0900 + +evolution2.2 (2.1.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 17 Dec 2004 16:51:15 +0900 + +evolution2.2 (2.1.0-1) experimental; urgency=low + + * New upstream release + * experimental, tagged package name. + + -- Takuo KITAME Fri, 5 Nov 2004 14:37:51 +0900 + +evolution (2.0.4-2) testing-proposed-updates; urgency=high + + * remove broken patch: decode-rfc2047-invalid-encoded-word.patch + (closes: #280303) + * applied security fix patch. + - CAN-2005-0806: Remote denial of service in evolution 2.0.3 + (closes: #300815) + + -- Takuo KITAME Thu, 28 Apr 2005 12:35:33 +0900 + +evolution (2.0.4-1) unstable; urgency=low + + * Maintainer upload (closes: #285908) + + -- Takuo KITAME Wed, 16 Mar 2005 19:23:19 +0900 + +evolution (2.0.4-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * debian/patches/CAN-2005-0102.patch, + debian/patches/mail-preserve-auth-conf.patch: removed, applied upstream. + * debian/control: + - Build-Conflict on kerberos4kth-dev (closes: #285908). + - update Build-Depends for new requirements. + + -- Jordi Mallach Tue, 1 Mar 2005 18:42:43 +0100 + +evolution (2.0.3-1.2) unstable; urgency=HIGH + + * Non-maintainer upload to fix SECURITY issues. + * debian/patches/CAN-2005-0102.patch: + - camel/camel-lock-helper.c: malloc()'ing supplied path length + 1 allowed + an integer overflow and malloc()ation of a 0-byte buffer, which was then + filled by an arbitrary amount of user-supplied data. Now restrict + the length of the supplied path to at most 0xFFFF characters (patch + taken from Ubuntu USN-69-1, thanks pitti!). + * debian/patches/mail-preserve-auth-conf.patch: patch from Ximian Bugzilla + to fix the skipping of the needauth setting (closes: #290291). + * debian/rules: add DEB_FIXPERMS_EXCLUDE for camel-lock-helper. + * debian/evolution.postinst: removed, chmod/chgrp handled by make install + (this changes camel-lock-help from suid root to sgid mail). + + -- Jordi Mallach Tue, 25 Jan 2005 17:49:41 +0100 + +evolution (2.0.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: bump several build dependencies to the versions + required by configure.in (closes: #285226). + + -- Jordi Mallach Tue, 14 Dec 2004 20:30:06 +0100 + +evolution (2.0.3-1) unstable; urgency=low + + * New upstream release + * remove camel-charset-map-patch. + * upstream fix: + - failed to migrate 1.4 data to 2.0 (closes: #276162) + * build-depends on debhelper >= 4.2.21 (closes: #282038) + + -- Takuo KITAME Thu, 9 Dec 2004 17:36:28 +0900 + +evolution (2.0.2-3) unstable; urgency=low + + * upload to unstable/main + + -- Takuo KITAME Fri, 15 Oct 2004 14:20:05 +0900 + +evolution (2.0.2-2) experimental; urgency=low + + * install help files, evolution-addressbook-export (closes: #274976, #275709) + + -- Takuo KITAME Wed, 13 Oct 2004 16:26:33 +0900 + +evolution (2.0.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 13 Oct 2004 12:52:30 +0900 + +evolution (2.0.1-1) experimental; urgency=low + + * New upstream release + * include help files. + + -- Takuo KITAME Wed, 29 Sep 2004 16:03:30 +0900 + +evolution (2.0.0-1) experimental; urgency=low + + * New upstream release, RC package for uploading into main. + * usr/share/idl is -dev files. + * chmod u+s /usr/lib/evolution/2.0/camel/camel-lock-helper + + -- Takuo KITAME Wed, 15 Sep 2004 13:51:07 +0900 + +evolution1.5 (1.5.94.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 31 Aug 2004 14:54:54 +0900 + +evolution1.5 (1.5.93-1) experimental; urgency=low + + * New upstream release + * try to decode rfc2047 invalid (non-lwsp separated e-word) mime subject. + * decode rfc2047 e-word in comment of User-Agent/X-Mailer (upstream patch) + * --enable-nntp (closes: #264280) + + -- Takuo KITAME Mon, 16 Aug 2004 12:59:41 +0900 + +evolution1.5 (1.5.92.1-1) experimental; urgency=low + + * New upstream release + * apply patch to decode encoded-word which is not space-separated. + + -- Takuo KITAME Thu, 5 Aug 2004 18:07:56 +0900 + +evolution1.5 (1.5.91-2) experimental; urgency=low + + * Applied http://primates.ximian.com/~fejj/camel-charset-map.patch + fix multibyte charset header encoding. + + -- Takuo KITAME Wed, 21 Jul 2004 18:42:49 +0900 + +evolution1.5 (1.5.91-1) experimental; urgency=low + + * New upstream release + some bugs were fixed by upstream (closes: #242014, #256707, #256830, #236333, #241003, #244703) + * Depends on gnome-icon-theme (closes: #259594) + * Recommends spamassasin (closes: #249822) + * clean up doc files (closes: #257404) + * --enable-ipv6 + + -- Takuo KITAME Fri, 16 Jul 2004 09:25:48 +0900 + +evolution1.5 (1.5.90-2) experimental; urgency=low + + * fix for local mailbox access (closes: #256988) + chgrp mail /usr/lib/evolution/1.5/camel/camel-lock-helper + chmod g+s /usr/lib/evolution/1.5/camel/camel-lock-helper + + -- Takuo KITAME Sun, 11 Jul 2004 23:35:33 +0900 + +evolution1.5 (1.5.90-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 8 Jul 2004 18:59:48 +0900 + +evolution1.5 (1.5.9.2-2) experimental; urgency=low + + * link againsta libcompface (closes: #257064) + + -- Takuo KITAME Thu, 1 Jul 2004 21:42:23 +0900 + +evolution1.5 (1.5.9.2-1) experimental; urgency=low + + * New upstream release (closes: #256476, #250840) + * use cdbs instead of dbs + + -- Takuo KITAME Mon, 28 Jun 2004 12:00:04 +0900 + +evolution1.5 (1.5.9.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 7 Jun 2004 12:14:39 +0900 + +evolution1.5 (1.5.8-2) experimental; urgency=low + + * update Dependency. + + -- Takuo KITAME Thu, 27 May 2004 08:57:51 +0900 + +evolution1.5 (1.5.8-1) experimental; urgency=low + + * New upstream release + * Applied X-Face header display support. + + -- Takuo KITAME Wed, 21 Apr 2004 15:13:24 +0900 + +evolution1.5 (1.5.7-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Apr 2004 17:16:04 +0900 + +evolution1.5 (1.5.6.2-2) experimental; urgency=low + + * Build-Depends on libgail-dev (closes: #241157) + + -- Takuo KITAME Fri, 16 Apr 2004 23:20:40 +0900 + +evolution1.5 (1.5.6.2-1) experimental; urgency=low + + * New upstream release + libgtkhtml3.1-7 is still in incoming... :< + * Depends on e-d-s (>= 0.0.91) (closes: #236260, #236328) + * use tar.gz upstream source (closes: #241157) + * comment out #include (closes: #243390) + + -- Takuo KITAME Fri, 16 Apr 2004 13:48:42 +0900 + +evolution1.5 (1.5.6-1) experimental; urgency=low + + * New upstream release + * NOTE: + libgtkhtml3.1-7 package had been uploaded already. + But it marked as NEW package and waiting for ACCEPTED. + So please wait for installing into archive by ftp-maintainer. + + -- Takuo KITAME Wed, 7 Apr 2004 14:14:13 +0900 + +evolution1.5 (1.5.5-1) experimental; urgency=low + + * New upstream release + * NOTE: + libsoup2.2-3 and libgtkhtml3.1-6 package had been uploaded already. + But it marked as NEW package and waiting for ACCEPTED. + So please wait for installing into archive by ftp-maintainer. + + -- Takuo KITAME Tue, 9 Mar 2004 13:13:05 +0900 + +evolution1.5 (1.5.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 19 Feb 2004 15:02:12 +0900 + +evolution1.5 (1.5.3-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 3 Feb 2004 14:34:58 +0900 + +evolution1.5 (1.5.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Jan 2004 17:03:35 +0900 + +evolution1.5 (1.5.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 9 Jan 2004 14:35:23 +0900 + +evolution1.5 (1.5-1) experimental; urgency=low + + * New upstream release + * remove db3 source + * Depends: on evolution-data-server + * experimental release, package name is evolution1.5 + + -- Takuo KITAME Mon, 15 Dec 2003 16:45:13 +0900 + +evolution (1.4.5-3) unstable; urgency=low + + * build against G2.4 (closes: #217681) + + -- Takuo KITAME Tue, 28 Oct 2003 17:22:55 +0900 + +evolution (1.4.5-2) unstable; urgency=low + + * applied patch imap-reduce-max-command-length (closes: #169209) + * Build-Depends on libgnomecanvas2-0 (>= 2.2.0.2) (closes: #211613) + * applied patch to handle +1300 time zone (closes: #214533) + + -- Takuo KITAME Fri, 17 Oct 2003 15:05:56 +0900 + +evolution (1.4.5-1) unstable; urgency=low + + * New upstream release (closes: #210976) + * Maintainer upload (closes: #211158, #210917) + + -- Takuo KITAME Wed, 24 Sep 2003 12:44:55 +0900 + +evolution (1.4.4-2.1) unstable; urgency=medium + + * NMU + * [debian/control] Added Build-Depends: libheimdal-dev; added evolution-dev + Depends: libsoup2.0-dev, libgal2.0-dev. (Closes: #211158) + * New build (using pbuilder), resulting in installable packages. + (Closes: #210917) + + -- J.H.M. Dassen (Ray) Sun, 21 Sep 2003 14:58:32 +0200 + +evolution (1.4.4-2) unstable; urgency=low + + * applied patch to use default encoding when message has no CT: charset= header. + * applied patch to fix invalid convert to UTF-8 via IMAP (closes: #207476) + * Build-Depends on latest autotools-dev (closes: #201421) + * fix debian/script/lib (closes: #158664) + * Recommends: gnome-desktop-data (closes: #198917) + + -- Takuo KITAME Wed, 3 Sep 2003 12:45:22 +0900 + +evolution (1.4.4-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 5 Aug 2003 14:43:40 +0900 + +evolution (1.4.3-2) unstable; urgency=low + + * Update build-depends (closes: 201320, 200958, 200942) + + -- Takuo KITAME Tue, 15 Jul 2003 11:15:15 +0900 + +evolution (1.4.3-1) unstable; urgency=low + + * New upstream release (closes: 200826) + + -- Takuo KITAME Fri, 11 Jul 2003 15:41:15 +0900 + +evolution (1.4.0-4) unstable; urgency=low + + * camel-pop3-store.c: don't send CAPA after login like evo1.2 (closes: #196141) + * fix Makefile of conduits (closes: #197682) + + -- Takuo KITAME Tue, 17 Jun 2003 16:27:47 +0900 + +evolution (1.4.0-3) unstable; urgency=low + + * Depends on scrollkeeper (${misc:Depends})(closes: #197380) + * Fix mozilla depenedency (closes: #197314) + * Build with -fPIC (closes: #197561) + * regenerate evolution.desktop (closes: #197213, #197248) + + -- Takuo KITAME Mon, 16 Jun 2003 12:18:36 +0900 + +evolution (1.4.0-2) unstable; urgency=low + + * Fix debian menu entry (closes: #197209, #192760) + * Fix GNOME menu entry (closes: #197213, #197248) + * Build-Depends: on libgnome-pilot2-dev (>= 2.0.9-2) (closes: 196629) + * use dh_scrollkeeper (closes: #197111) + + -- Takuo KITAME Fri, 13 Jun 2003 11:54:58 +0900 + +evolution (1.4.0-1) unstable; urgency=low + + * New upstream release (closes: #196977) + * fix build-depends. referred to configure script to know which version is really needed. (closes: #196542) + * fix description (closes: #197033) + + -- Takuo KITAME Thu, 12 Jun 2003 12:12:00 +0900 + +evolution (1.3.92-2) unstable; urgency=low + + * Remove unnecessary debconf configs (closes: #196229) + * debian/evolution.menu: fix entry (closes: #162898,#196299) + * debian/rules: Recommends: gnome-pilot-conduits (closes: #161242) + + -- Takuo KITAME Fri, 6 Jun 2003 11:37:46 +0900 + +evolution (1.3.92-1) unstable; urgency=low + + * Upload into unstable/main + * fix crash on startup (closes: #195536, #195137, #195133, #195142, #196031, #195986, #195400) + * enable pilot support (closes: #195400, #185107) + + -- Takuo KITAME Wed, 4 Jun 2003 11:34:52 +0900 + +evolution1.3 (1.3.92-1) experimental; urgency=low + + * New upstream release + * Depends on libgal2.0-common (closes: #194301) + + -- Takuo KITAME Wed, 28 May 2003 11:41:18 +0900 + +evolution1.3 (1.3.3-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 7 May 2003 14:01:04 +0900 + +evolution1.3 (1.3.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 24 Apr 2003 11:30:33 +0900 + +evolution1.3 (1.3.1-2) experimental; urgency=low + + * disable broken IPv6 support. + + -- Takuo KITAME Mon, 31 Mar 2003 17:01:54 +0900 + +evolution1.3 (1.3.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 19 Mar 2003 18:27:07 +0900 + +evolution (1.2.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 10 Feb 2003 14:14:21 +0900 + +evolution (1.2.1-3) unstable; urgency=low + + * Build Depends on psmisc (closes: #169181, #176672, #178642) + + -- Takuo KITAME Tue, 28 Jan 2003 14:23:56 +0900 + +evolution (1.2.1-2) unstable; urgency=low + + * Build-Depends on pilot-link (>= 0.11.7),libncurses5-dev (closes: #175308, #175037) + * update ja.po + + -- Takuo KITAME Fri, 27 Dec 2002 15:04:29 +0900 + +evolution (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 24 Dec 2002 17:28:09 +0900 + +evolution (1.2.0-4) unstable; urgency=low + + * Build against mozilla 1.2.1, update dependency. + + -- Takuo KITAME Wed, 4 Dec 2002 23:02:33 +0900 + +evolution (1.2.0-3) unstable; urgency=low + + * Build against mozilla 1.2 + * Fix build-depends (closes: #169414, #170326) + * Fix postinst, don't call twice ldconfig (closes: #157893) + + -- Takuo KITAME Fri, 29 Nov 2002 10:21:55 +0900 + +evolution (1.2.0-2) unstable; urgency=low + + * fix evolution-mail-upgrade location (closes: #169088) + * recommends gnome-spell (>= 0.5) (closes: #169506) + + -- Takuo KITAME Wed, 20 Nov 2002 08:18:42 +0900 + +evolution (1.2.0-1) unstable; urgency=low + + * New upstream release (closes: #168702) + * Change Maintainer address to @debian.org + + -- Takuo KITAME Wed, 13 Nov 2002 12:46:22 +0900 + +evolution (1.0.8-5) unstable; urgency=low + + * Build against gdk-imlib1 + + -- Takuo KITAME Fri, 30 Aug 2002 17:01:56 +0900 + +evolution (1.0.8-4) unstable; urgency=low + + * Build against libpng2 (closes: #157329) + + -- Takuo KITAME Tue, 20 Aug 2002 16:01:06 +0900 + +evolution (1.0.8-3) unstable; urgency=low + + * UTF8 Fix omf file. (closes: #152000) + * update .desktop file for G2 (closes: #148746) + + -- Takuo KITAME Mon, 19 Aug 2002 05:08:28 +0900 + +evolution (1.0.8-2) unstable; urgency=low + + * Build against libpisock-dev (>= 0.11.3-2) + + -- Takuo KITAME Mon, 12 Aug 2002 15:38:03 +0900 + +evolution (1.0.8-1) unstable; urgency=low + + * New upstream release. + + -- Takuo KITAME Mon, 12 Aug 2002 14:24:43 +0900 + +evolution (1.0.7-3) unstable; urgency=low + + * Build depends libpisock-dev (>= 0.10.99-3) (closes: 152713) + + -- Takuo KITAME Sat, 13 Jul 2002 16:53:09 +0900 + +evolution (1.0.7-2) unstable; urgency=low + + * libcamel0: Depends on libnss3 (>> 1.0.0) + * evolution: Reccomends mozilla-psm (>> 1.0.0). + added README.SSL (closes: #151446) + * Build against libpisock5 (closes: #151677) + + -- Takuo KITAME Wed, 3 Jul 2002 12:39:20 +0900 + +evolution (1.0.7-1) unstable; urgency=low + + * New upstream release. + * build against gtkhtml 1.0.4 + * debian/rules: mozilla include path is /usr/include/mozilla-1.0.0/{nspr,nss} + (closes: #147149) + + -- Takuo KITAME Mon, 17 Jun 2002 12:45:46 +0900 + +evolution (1.0.5-1) unstable; urgency=low + + * New upstream release. + * move some executables into /usr/lib/evolution/ (closes: #126044) + + -- Takuo KITAME Tue, 14 May 2002 10:11:12 +0900 + +evolution (1.0.3-3) unstable; urgency=critical + + * debian/patches/24140.patch + - fix Possible DoS attack through message headers (closes: #145903) + * remove evolution-dev package from control. It is useless. (closes: #144269) + + -- Takuo KITAME Sun, 28 Apr 2002 00:26:42 +0900 + +evolution (1.0.3-2) unstable; urgency=low + + * fix menu entry (closes: #142418) + * fix Description (closes: #141328) + * applied patch to changes a default charset for Japanese (closes: #142365) + + -- Takuo KITAME Sat, 13 Apr 2002 04:05:48 +0900 + +evolution (1.0.3-1) unstable; urgency=low + + * New upstrem release. + * removed upstream merged patches + - debian/patches/fix-mail-crash + - debian/patches/pgpfix + + -- Takuo KITAME Tue, 26 Mar 2002 17:10:49 +0900 + +evolution (1.0.2-3) unstable; urgency=low + + * move to main from non-US + * menu category is Apps/Net (closes: #137976) + + -- Takuo KITAME Sun, 24 Mar 2002 04:19:58 +0900 + +evolution (1.0.2-2) unstable; urgency=low + + * debian/patches/pgpfix: + - added to fix verifying pgp signed message (closes: #137045) + * debian/patches/fix-mail-crash: + - added to fix crashing mail (patch from bugzilla.ximian.com #19564) (closes: #132433) + * fix conduits icon path (closes: #131115) + * debian/control: + - evolution suggests gnome-spell (closes: #119518, #123760) + + -- Takuo KITAME Wed, 6 Mar 2002 18:08:40 +0900 + +evolution (1.0.2-1) unstable; urgency=low + + * New upstream release. + * debian/evolution.menu: + - fix package name (closes: #129436) + * debian/control: + - evolution suggests bugbuddy (closes: #131790) + + -- Takuo KITAME Fri, 1 Feb 2002 16:32:59 +0900 + +evolution (1.0.1-1) unstable; urgency=low + + * New upstream release. + * Build against libgal19 + * debian/patches/{calendar-import-from-korganizer-fix,addressbook-conduit-backport-1.0.1}: + - removed (fixed by upstream) + + -- Takuo KITAME Sun, 13 Jan 2002 23:16:23 +0900 + +evolution (1.0-5) unstable; urgency=high + + * Build fix (krb4 related)for powerpc. (closes: #127457) + + -- Takuo KITAME Fri, 4 Jan 2002 00:31:00 +0900 + +evolution (1.0-4) unstable; urgency=high + + * debian/patches/addressbook-conduit-backport-1.0.1: + - Backport from EVOLUTION_1_0_1. It includes conduit bug fix. (closes: #123892) + * debian/patches/calendar-import-from-korganizer-fix + - added to fix import from korganizer (closes: #122327) + * debian/patches/libical-char-signed-char: + - fix for arch which's char is unsigned char. (closes: #126997) + + -- Takuo KITAME Mon, 31 Dec 2001 05:45:33 +0900 + +evolution (1.0-3) unstable; urgency=low + + * debian/rules,debian/control: + - support SSL/Kerberos45, move to non-us, evolution-ssl is obsolete. (closes: #116665) + - Replaces,Provides with evolution-ssl + * It's time for remove evolution-ssl from ftp archive. + + -- Takuo KITAME Sun, 23 Dec 2001 07:26:42 +0900 + +evolution (1.0-2) unstable; urgency=low + + * Applied fPIC patch of Bug#124141 (closes: #124141) + * Applied correcthelosmtp.diff of Bug#123922 (closes: #123922) + * debian/control: + - remove beta notice from Description. + + -- Takuo KITAME Mon, 17 Dec 2001 07:19:43 +0000 + +evolution (1.0-1) unstable; urgency=low + + * New upstream release. + * Build against libgtkhtml20 + + -- Takuo KITAME Tue, 4 Dec 2001 06:20:56 +0000 + +evolution (0.99.2-1) unstable; urgency=low + + * New upstream release. + * Provides mail-reader and imap-client. + + * some bugs were fixed by upstream + - undefined symbol in pilot conduits (closes: #119153, #119677) + - Crashing while starting the program. (closes: #112519) + - some crashing evolution-mail (closes: #115073, #100120) + + -- Takuo KITAME Tue, 20 Nov 2001 03:49:50 +0000 + +evolution (0.99.0-2) unstable; urgency=low + + * fix build fail with creating KDE_APPLNK_DIR (closes: #118918) + + -- Takuo KITAME Sat, 10 Nov 2001 09:27:27 +0000 + +evolution (0.99.0-1) unstable; urgency=low + + * New upstream release + * Fixed Calendar/Task componet crash (closes: #117208, #117209) + * Build-depends: libgal-dev (>= 0.18), libgtkhtml-dev (>= 0.16.0) + + -- Takuo KITAME Thu, 8 Nov 2001 03:43:00 +0000 + +evolution (0.16-1) unstable; urgency=low + + * New upstream release + * Task/Calendar is still broken!! wait for next upstream. + * build against latest libraries, update Build-Depends. + * fixed splash (closes: #117211) + + -- Takuo KITAME Sun, 4 Nov 2001 06:48:57 +0000 + +evolution (0.15-6) unstable; urgency=low + + * rebuild with libgconf11 1.0.6-3 (closes: #115944) + * fixed build-dep (closes: #116663) + * Suggests: gnupg + + -- Takuo KITAME Tue, 23 Oct 2001 02:24:14 +0900 + +evolution (0.15-5) unstable; urgency=low + + * build against libgtkhtml18 (>= 0.15.0-3) which is without GConf + (closes: #116077, #115944) + * build against libgal15 + + -- Takuo KITAME Sat, 20 Oct 2001 19:43:35 +0900 + +evolution (0.15-4) unstable; urgency=low + + * build-depends libgal-dev (>= 0.14), gtkhtml (>= 0.14) (closes: #114026) + + libgnome-pilot1-dev, gnome-pilot (>= 0.1.62) + * --enable-pilot-conduits (closes: #90290) + * remove --enable-nntp (closes: #115755) + + -- Takuo KITAME Tue, 16 Oct 2001 19:24:02 +0900 + +evolution (0.15-3) unstable; urgency=low + + * build against GAL 0.14 + + -- Takuo KITAME Thu, 11 Oct 2001 15:38:14 +0900 + +evolution (0.15-2) unstable; urgency=low + + * build against libgtkhtml17 + * --disable-gtk-doc + + -- Takuo KITAME Tue, 9 Oct 2001 09:17:46 +0900 + +evolution (0.15-1) unstable; urgency=low + + * New upstream release. + * debian/rules: based on evolution-ssl package. + * remove rdf encoding patch, it was merged into upstream. + http://bugzilla.ximian.com/show_bug.cgi?id=11160 + * build against gtkhtml 0.13.0 but it is wrong. + I'll rebuild after installed 0.14.0 + * fix bug about GPG clear signed mail + http://bugzilla.ximian.com/show_bug.cgi?id=11548 + + -- Takuo KITAME Fri, 5 Oct 2001 16:58:29 +0900 + +evolution (0.14-2) unstable; urgency=low + + * Added DebianPlanet and Slashdot Japan into ExectiveSummary NewsFeed. + * take RDF encoding property in ExectiveSummary NewsFeed. + * close old bug about dependency. (closes: #99963) + * about + #112519 (Configuration database not found. on 0.13), + #107852 (Segfault on startup with evolution-shell-WARNING **: CORBA exception ... on 0.12), + #86405 (another crash with querying "bigfoot" for address data. on 0.8cvs), + #94254 (Mail component crash after sending mail. on 0.9), + #97487 (None of evolution's oaf objects are being embedded. on 0.10), + #99434 (takes for eva to load. on 0.10), + #106412 (doesn't load contact list. on 0.11 with old gtkhtml), + #107911 (evolution crashes when trying to empty trash. on 0.12.1), + #112401, #112656 (Error: Could not create composer window. on 0.13, I think it is gtkhtml problem), + I've checked and checked with evolution 0.14. and couldn't reproduce. + I think they were fixed by upstream. close it. + and feel free to reopen them if it wasn't fixed. + (closes: #112519,#107852,#86405,#94254,#97487,#99434,#106412,#107911,#112401,#112656) + + -- Takuo KITAME Sun, 30 Sep 2001 15:03:51 +0900 + +evolution (0.14-1) unstable; urgency=low + + * New upstream release. + * it fixes gnome-vfs build problem (closes: #113292) + + -- Takuo KITAME Wed, 26 Sep 2001 22:45:45 +0900 + +evolution (0.13-2) unstable; urgency=low + + * fix description. (closes: #111632) + + -- Takuo KITAME Sat, 8 Sep 2001 07:35:25 +0900 + +evolution (0.13-1) unstable; urgency=low + + * New upstream release. + * Fix description (closes: #111363) + * Fix #107626: Cannot read mbox files in /var/mail/ + #107881: evolution: lock problem and permission in /var/spool/mail + (closes: #107626, #107881) + Thanks, Dominik 'Aeneas' Schnitzer + + -- Takuo KITAME Fri, 7 Sep 2001 19:02:45 +0900 + +evolution (0.12+cvs0903-2) unstable; urgency=low + + * Fix build-depends (closes: #111079, #111159) + + -- Takuo KITAME Wed, 5 Sep 2001 19:42:07 +0900 + +evolution (0.12+cvs0903-1) unstable; urgency=low + + * CVS update -r evolution-0-13-branch + * Build with libgtkhtml15 + + -- Takuo KITAME Mon, 3 Sep 2001 19:33:39 +0900 + +evolution (0.12+cvs0831-1) unstable; urgency=low + + * New upstream release. (CVS version for GAL update) + * build with latest gal (closes: Bug#110765, Bug#110749) + + -- Takuo KITAME Fri, 31 Aug 2001 19:02:14 +0900 + +evolution (0.12-1) unstable; urgency=low + + * New upstream release. + * Fix build problem when /bin/sh -> ash (closes: Bug#98205) + + -- Takuo KITAME Fri, 3 Aug 2001 21:55:42 +0900 + +evolution (0.11.0-1) unstable; urgency=low + + * bump upstream version, orig.tar.gz changes. + source includes db3-3.1.17 + * link with db3 3.1.17 staticaly (closes: Bug#106303) + * Fix debian/docs (closes: Bug#106718) + * --with-openldap (closes: Bug#106478) + + -- Takuo KITAME Sat, 28 Jul 2001 10:53:22 +0900 + +evolution (0.11-1) unstable; urgency=low + + * New upstream release. (closes: Bug#98319) + + -- Takuo KITAME Mon, 23 Jul 2001 21:20:38 +0900 + +evolution (0.10-2) unstable; urgency=low + + * Fix camel patch (closes: #97617) + * debian/control: evolution-dev replaces evolution << 0.10 (closes: Bug#97460) + + -- Takuo KITAME Fri, 18 May 2001 13:54:45 +0900 + +evolution (0.10-1) unstable; urgency=low + + * New upstream release (cvs update -r EVOLUTION_0_10) + * use dbs_make for build package. + * closes: Bug#89763 Evolution help documentation is missing. + * closes: Bug#92507 evolution: Evolution's help menus dont work because /usr/share/gnome/help/evolution/C is empty + * build with libgal6 (closes: Bug#95708) + * build with libgtkhtml9 (closes: Bug#97316) + + -- Takuo KITAME Sun, 13 May 2001 23:03:06 +0900 + +evolution (0.9-2) unstable; urgency=low + + * Build-Depends: libgnome-vfs-dev (closes: Bug#90917) + + -- Takuo KITAME Mon, 26 Mar 2001 23:34:30 +0900 + +evolution (0.9-1) unstable; urgency=low + + * New upstream release + * rebuild with gal-0.5 (closes: Bug#89645) + + -- Takuo KITAME Thu, 15 Mar 2001 11:21:59 +0900 + +evolution (0.8.0.cvs20010311-1) unstable; urgency=low + + * New upstream release (CVS snapshot) + * libcamel0: include camel-providers/*/*.so (closes: Bug#87032,Bug#86403,Bug#88927,Bug#88181) + * hopefully fix #87796: could not create composer window (closes: Bug#87796) + * evolution-dev: remove ical development files (closes: Bug#86402) + + -- Takuo KITAME Tue, 13 Mar 2001 11:29:37 +0900 + +evolution (0.8.0.cvs20010214-1) unstable; urgency=low + + * New upstream release + * debian/control: libical install to /usr/lib/libical (closes: Bug#86398) + note that does libical exists in main? I couldn't find the package. + * debian/contorol: fix Build-Depends (closes: Bug#86344) + * versioned depends on bonobo (closes: Bug#86562) + + -- Takuo KITAME Wed, 28 Feb 2001 17:41:19 +0900 + +evolution (0.8.0.cvs20010212-1) unstable; urgency=low + + * New upstream release + * use CVS version because for GAL 0.5, Bonobo 0.36 (latest Debian package) + + -- Takuo KITAME Tue, 13 Feb 2001 23:44:24 +0900 + +evolution (0.8-1) unstable; urgency=low + + * Initial Release, referenced from Akira TAGOH's diff.gz (0.8.cvs20010212-2) + + -- Takuo KITAME Tue, 13 Feb 2001 21:30:43 +0900 + --- evolution-2.30.3.orig/debian/evolution-common.docs +++ evolution-2.30.3/debian/evolution-common.docs @@ -0,0 +1,5 @@ +NEWS +README +AUTHORS +HACKING +MAINTAINERS --- evolution-2.30.3.orig/debian/evolution-mail.desktop.in +++ evolution-2.30.3/debian/evolution-mail.desktop.in @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Evolution Mail +_Comment=Read and write emails +Exec=evolution --component=mail +Icon=evolution +Terminal=false +Type=Application +Categories=GNOME;Application;Network; +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=Evolution +X-GNOME-Bugzilla-Component=Miscellaneous +X-GNOME-Bugzilla-Version=2.10.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.8;evolution-exchange-storage;evolution-alarm-notify; --- evolution-2.30.3.orig/debian/evolution-dev.install +++ evolution-2.30.3/debian/evolution-dev.install @@ -0,0 +1,26 @@ +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include +debian/tmp/usr/lib/evolution/*/libcomposer.so +debian/tmp/usr/lib/evolution/*/libeabutil.so +debian/tmp/usr/lib/evolution/*/libeconduit.so +debian/tmp/usr/lib/evolution/*/libecontacteditor.so +debian/tmp/usr/lib/evolution/*/libecontactlisteditor.so +debian/tmp/usr/lib/evolution/*/libemformat.so +debian/tmp/usr/lib/evolution/*/libemiscwidgets.so +debian/tmp/usr/lib/evolution/*/libeshell.so +debian/tmp/usr/lib/evolution/*/libessmime.so +debian/tmp/usr/lib/evolution/*/libetable.so +debian/tmp/usr/lib/evolution/*/libetext.so +debian/tmp/usr/lib/evolution/*/libetimezonedialog.so +debian/tmp/usr/lib/evolution/*/libeutil.so +debian/tmp/usr/lib/evolution/*/libevolution-a11y.so +debian/tmp/usr/lib/evolution/*/libevolution-addressbook-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-calendar-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-calendar.so +debian/tmp/usr/lib/evolution/*/libevolution-mail-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-mail-settings.so +debian/tmp/usr/lib/evolution/*/libevolution-mail.so +debian/tmp/usr/lib/evolution/*/libevolution-smime.so +debian/tmp/usr/lib/evolution/*/libfilter.so +debian/tmp/usr/lib/evolution/*/libmenus.so +debian/tmp/usr/share/gtk-doc --- evolution-2.30.3.orig/debian/watch +++ evolution-2.30.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[02468]/evolution-([\d\.]+)\.tar\.gz debian uupdate --- evolution-2.30.3.orig/debian/evolution.debhelper.log +++ evolution-2.30.3/debian/evolution.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.3.orig/debian/evolution.gconf-defaults +++ evolution-2.30.3/debian/evolution.gconf-defaults @@ -0,0 +1 @@ +/apps/evolution/shell/skip_warning_dialog true --- evolution-2.30.3.orig/debian/evolution.install +++ evolution-2.30.3/debian/evolution.install @@ -0,0 +1,7 @@ +debian/tmp/etc/gconf +debian/tmp/etc/xdg +debian/tmp/usr/bin +debian/tmp/usr/lib/evolution/2.30/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,python,startup-wizard,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,gnome-evolution-webdav,mail-account-disable,publish-calendar,caldav,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml} +debian/evolution-2.2.desktop usr/share/applications +debian/evolution.xpm usr/share/pixmaps/ +debian/evolution-mail.desktop usr/share/applications/ --- evolution-2.30.3.orig/debian/evolution.xpm +++ evolution-2.30.3/debian/evolution.xpm @@ -0,0 +1,198 @@ +/* XPM */ +static char * evolution_xpm[] = { +"24 24 171 2", +" c None", +". c #888A85", +"+ c #ABACA9", +"@ c #FFFFFF", +"# c #EDEDED", +"$ c #EBEBEB", +"% c #E9E9E9", +"& c #E8E8E8", +"* c #E6E6E6", +"= c #E4E4E4", +"- c #E2E2E2", +"; c #E1E1E1", +"> c #E0E0E0", +", c #DDDDDD", +"' c #DBDBDB", +") c #DADADA", +"! c #E7E7E7", +"~ c #DEDEDE", +"{ c #DCDCDC", +"] c #D9D9D9", +"^ c #D7D7D7", +"/ c #D5D5D5", +"( c #E5E5E5", +"_ c #E3E3E3", +": c #D8D8D8", +"< c #D3D3D3", +"[ c #B0B1AF", +"} c #A6A7A5", +"| c #D2D2D2", +"1 c #C9CAC9", +"2 c #B8B9B7", +"3 c #B2B2B1", +"4 c #C0C1BF", +"5 c #D0D0CF", +"6 c #FAFAFA", +"7 c #F5F5F5", +"8 c #B0B0AF", +"9 c #ACADAA", +"0 c #CDCECC", +"a c #C5C5C4", +"b c #C0C0BF", +"c c #B4B4B3", +"d c #BBBBBA", +"e c #CBCBCA", +"f c #F7F7F7", +"g c #FDFDFD", +"h c #FBFBFB", +"i c #F8F8F8", +"j c #C8C8C8", +"k c #C7C7C6", +"l c #E2E4E2", +"m c #F4F4F4", +"n c #FCFCFC", +"o c #F6F6F6", +"p c #F0F0F1", +"q c #917E9B", +"r c #7D6086", +"s c #76527C", +"t c #7B5D84", +"u c #9885A1", +"v c #878984", +"w c #D8DAD8", +"x c #D9DAD9", +"y c #F3F3F3", +"z c #F2F2F2", +"A c #C4BDC9", +"B c #7D5F86", +"C c #B090B1", +"D c #D6B9D3", +"E c #DCC0D9", +"F c #75577E", +"G c #F1F1F1", +"H c #B7B9B6", +"I c #E0E0DF", +"J c #F0F0F0", +"K c #EFEFEF", +"L c #EEEEEE", +"M c #E3E3E5", +"N c #7C5F86", +"O c #C7AAC6", +"P c #CFBDD0", +"Q c #D2CFD0", +"R c #D3D2D1", +"S c #E5E5E4", +"T c #DBD8DA", +"U c #CDBACD", +"V c #75557E", +"W c #E8E9E8", +"X c #ABAEAA", +"Y c #D1D2D0", +"Z c #C8C9C7", +"` c #82708E", +" . c #D0BDD0", +".. c #F2F2F0", +"+. c #9E9E9D", +"@. c #F1F1EF", +"#. c #F4F4F2", +"$. c #EFEFED", +"%. c #E7E7E5", +"&. c #CEBBCF", +"*. c #6F567B", +"=. c #DDDEDD", +"-. c #A9AAA7", +";. c #795B82", +">. c #EAE7E8", +",. c #F5F5F3", +"'. c #EDEDEB", +"). c #A9A9A8", +"!. c #F6F6F4", +"~. c #F0F0EE", +"{. c #EAEAE8", +"]. c #DDDADC", +"^. c #75567E", +"/. c #ECECEC", +"(. c #C4C6C3", +"_. c #A9ACA8", +":. c #DCDBDF", +"<. c #75527C", +"[. c #D3D2D2", +"}. c #F3F3F1", +"|. c #F7F7F5", +"1. c #868686", +"2. c #B7B7B6", +"3. c #E2E2E0", +"4. c #C1C1C0", +"5. c #75517B", +"6. c #C0C2BF", +"7. c #CCCECB", +"8. c #D3D2D6", +"9. c #DAD9D8", +"0. c #E6E6E4", +"a. c #787878", +"b. c #C2C2C1", +"c. c #EBEBE9", +"d. c #E4E4E2", +"e. c #CCCBCA", +"f. c #EAEAEA", +"g. c #C5C7C4", +"h. c #785A81", +"i. c #E2DFE0", +"j. c #6D6D6C", +"k. c #D2D2D0", +"l. c #E3E3E1", +"m. c #DDDBDE", +"n. c #74557D", +"o. c #E5E6E5", +"p. c #826F8D", +"q. c #D1BED0", +"r. c #DADAD8", +"s. c #DEDEDC", +"t. c #CFBCD0", +"u. c #6E557A", +"v. c #F4F3F5", +"w. c #D1BED1", +"x. c #DCD9DA", +"y. c #B3B3B1", +"z. c #D1D0CF", +"A. c #DCD9DB", +"B. c #CEBBCE", +"C. c #73547C", +"D. c #838580", +"E. c #858782", +"F. c #746F77", +"G. c #74567D", +"H. c #73547B", +"I. c #604A6B", +"J. c #72537B", +"K. c #74517B", +"L. c #74507B", +"M. c #715279", +"N. c #5E4667", +" ", +" . . . . . ", +" + @ @ @ @ @ . ", +" . @ # # $ % & @ . ", +" . @ # $ % * = - ; @ . ", +" . @ $ % * = - > , ' ) @ . ", +" . @ % ! = - > ~ { ] ^ / / @ . ", +" . @ ! ( _ ; ~ { ) : / < [ } | @ . ", +" . @ 1 _ ; ~ { ) : 2 3 4 5 6 7 8 9 @ . ", +" . @ 0 a { b c d e f g h i i i j k @ . ", +" . @ l b a m n h i o o p q r s s t u v ", +" . @ 7 w x o 7 m y z A B C D E E D C F ", +" . @ y G H I J K L M N O P Q R S T U O V ", +" . @ G G W X Y Z Z ` C ...+.@.#.$.%.&.C *. ", +" . @ K K L =.-.. v ;.D >.,.'.).!.~.{.].D ^. ", +" . @ # # /.(._.o :.<.E [.}.|.1.2.$.3.4.E 5. ", +" . @ $ $ 6.7.y & 8.<.E 9.$.0.a.b.c.d.e.E 5. ", +" . @ f.g.m /.! * ( h.D i.{.j.k.{.%.l.m.D n. ", +" . @ o.m ! * * ( ( p.C q.l.r.s.d.3.s.t.C u. ", +" . @ @ @ @ @ @ @ @ v.h.O w.x.y.z.A.B.O C. ", +" D.. . . . . . . . E.F.G.C D E E D C H. ", +" I.J.K.L.M.N. ", +" ", +" "}; --- evolution-2.30.3.orig/debian/copyright +++ evolution-2.30.3/debian/copyright @@ -0,0 +1,210 @@ += Copyright and licensing information + +This package was debianized by Takuo KITAME on +Tue, 13 Feb 2001 21:33:43 +0900. + +It was downloaded from . + +== Authors: + +The full list is in the /usr/share/doc/evolution/AUTHORS file. + +=== Addressbook + Arturo Esponosa (Original Gnomecard author) + Nat Friedman + Chris Lahey + Chris Toshok + Jon Trowbridge + +=== Artwork + Tuomas Kuosmanen + Jakub Steiner + +=== Calendar + Seth Alves + Eric Busboom (libical author) + Arturo Esponosa (Gnomecal contributor) + Damon Chaplin + Federico Mena-Quintero + Rodrigo Moya + Jesse Pavel + JP Rosevear + Russell Steinthal (Gnomecal maintainer) + +=== Documentation + Kevin Breit + Aaron Weber + +=== Mailer + Radek Doulik + Larry Ewing + Bertrand Guiheneuf + Jason Leach + Matt Loper + Ettore Perazzoli + Jeffrey Stedfast + Jon Trowbridge + Peter Williams + Dan Winship + Michael Zucchi + +=== Notes + Anders Carlsson + +=== Pilot + JP Rosevear + +=== Shell + Miguel de Icaza + Jason Leach + Ettore Perazzoli + +=== Translations + Akira TAGOH + Andraz Tori + Andreas Hyden + Arjan Scherpenisse + Clara Tattoni + Fatih Demir + Gediminas Paulauskas + GNOME PL Team + Gustavo Maciel Dias Vieira + Héctor García Alvarez + Jesús Bravo Álvarez + Keld Simonsen + Kjartan Maraas + Matthias Warkus + Spiros Papadimitriou + Sung-Hyun Nam + Szabolcs BAN + Tiago Antão + Duarte Loreto + Valek Filippov + Vincent Renardias + Yuri Syrota + +=== UI + Anna Dirks + +=== Widgets + Damon Chaplin + Miguel de Icaza + Chris Lahey + Federico Mena-Quintero + Chris Toshok + + +== Licensing information + +=== Program license + +Evolution is licensed under the LGPLv2 or LGPLv3 license using following text: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) version 3. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the program; if not, see + +On Debian systems, the complete text of the GNU Less General Public License +(version 2) can be found in `/usr/share/common-licenses/LGPL-2'. + +=== Exceptions + +==== GPLv2 + +* addressbook/gui/widgets/e-addressbook-selector.{h,c} +* calendar/gui/e-calendar-selector.c +* calendar/gui/e-memo-list-selector.c +* calendar/gui/e-task-list-selector.c +* calendar/gui/e-task-list-selector.h +* calendar/gui/e-calendar-selector.h +* calendar/gui/e-memo-list-selector.h + +On Debian systems, the complete text of the GNU General Public License +(version 2) can be found in `/usr/share/common-licenses/GPL-2'. + +==== GPLv2+ + +* e-util/e-non-intrusive-error-dialog.{h,c} +* plugins/calendar-weather/calendar-weather.c +* plugins/calendar-http/calendar-http.c +* widgets/misc/e-spinner.{h,c} + + +On Debian systems, the complete text of the GNU General Public License +(version 2 or later) can be found in `/usr/share/common-licenses/GPL'. + +==== OpenLDAP license + +* modules/addressbook/openldap-extract.h + +---- + The OpenLDAP Public License + Version 2.8, 17 August 2003 + + Redistribution and use of this software and associated documentation + ("Software"), with or without modification, are permitted provided + that the following conditions are met: + + 1. Redistributions in source form must retain copyright statements + and notices, + + 2. Redistributions in binary form must reproduce applicable copyright + statements and notices, this list of conditions, and the following + disclaimer in the documentation and/or other materials provided + with the distribution, and + + 3. Redistributions must contain a verbatim copy of this document. + + The OpenLDAP Foundation may revise this license from time to time. + Each revision is distinguished by a version number. You may use + this Software under terms of this license revision or under the + terms of any subsequent revision of the license. + + THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS + CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) + OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + The names of the authors and copyright holders must not be used in + advertising or otherwise to promote the sale, use or other dealing + in this Software without specific, written prior permission. Title + to copyright in this Software shall at all times remain with copyright + holders. + + OpenLDAP is a registered trademark of the OpenLDAP Foundation. + + Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, + California, USA. All Rights Reserved. Permission to copy and + distribute verbatim copies of this document is granted. +---- + +==== MPL 1.1 / GPL2 / LGPL-2.1 + +* smime/lib/e-asn1-object.c +* smime/lib/e-cert.c +* smime/lib/e-pkcs12.c +* smime/lib/e-cert-db.c + +On Debian systems, the complete text of the GNU General Public License (version +2.1) can be found in `/usr/share/common-licenses/LGPL-2.1'. + + +// vim: filetype=asciidoc: --- evolution-2.30.3.orig/debian/csv2vcard.1 +++ evolution-2.30.3/debian/csv2vcard.1 @@ -0,0 +1,19 @@ +.TH CSV2VCARD 1 2006\-05\-13 "GNOME" "GNOME" +.SH NAME +csv2vcard \- Convert a CSV-formatted list of contacts to vCards +.SH SYNOPSIS +.B csv2vcard +.I INFILE OUTFILE +.SH DESCRIPTION +Takes the CSV-formatted list of contacts from Outlook and attempts to +convert it into a list of vCards suitable for import into Evolution. +.SH "SEE ALSO" +.BR evolution (1) +.SH AUTHOR +Michael MacDonald +.PP +This manual page was originally written by Oystein Gisnas for the +Debian system. +.\" Copyright 2006 ystein Gisns +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. --- evolution-2.30.3.orig/debian/lintian/evolution-common +++ evolution-2.30.3/debian/lintian/evolution-common @@ -0,0 +1,2 @@ +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution-settings.desktop evolution-settings --- evolution-2.30.3.orig/debian/patches/89_add_une_desktop_file.patch +++ evolution-2.30.3/debian/patches/89_add_une_desktop_file.patch @@ -0,0 +1,119 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//configure.ac evolution-2.30.2.new//configure.ac +--- evolution-2.30.2//configure.ac 2010-07-21 08:50:17.304510001 +0200 ++++ evolution-2.30.2.new//configure.ac 2010-07-21 08:50:42.428510001 +0200 +@@ -1653,6 +1653,9 @@ + data/evolution.desktop.in + data/evolution-alarm-notify.desktop.in + data/evolution-settings.desktop.in ++data/evolution-contacts-une.desktop.in ++data/evolution-calendar-une.desktop.in ++data/evolution-mail-une.desktop.in + data/icons/Makefile + doc/Makefile + doc/reference/Makefile +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-calendar-une.desktop.in.in evolution-2.30.2.new//data/evolution-calendar-une.desktop.in.in +--- evolution-2.30.2//data/evolution-calendar-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-calendar-une.desktop.in.in 2010-07-21 08:50:42.428510001 +0200 +@@ -0,0 +1,18 @@ ++[Desktop Entry] ++_Name=Evolution Calendar ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Calendar ++_Comment=Manage your schedule ++Exec=evolution --express -c calendar %U ++Icon=evolution-calendar ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Office;Calendar;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/calendar;text/x-vcard; ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-contacts-une.desktop.in.in evolution-2.30.2.new//data/evolution-contacts-une.desktop.in.in +--- evolution-2.30.2//data/evolution-contacts-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-contacts-une.desktop.in.in 2010-07-21 08:56:48.928510002 +0200 +@@ -0,0 +1,18 @@ ++[Desktop Entry] ++_Name=Evolution Contacts ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Contacts ++_Comment=Manage your contacts ++Exec=evolution --express -c contacts %U ++Icon=office-contact ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Office;ContactManagement;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822; ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-mail-une.desktop.in.in evolution-2.30.2.new//data/evolution-mail-une.desktop.in.in +--- evolution-2.30.2//data/evolution-mail-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-mail-une.desktop.in.in 2010-07-21 08:50:42.428510001 +0200 +@@ -0,0 +1,29 @@ ++[Desktop Entry] ++_Name=Evolution Mail ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Mail ++_Comment=Manage your email ++Exec=evolution --express -c mail %U ++Icon=evolution ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Network;Email;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/directory;application/mbox;message/rfc822; ++X-Ayatana-Desktop-Shortcuts=Compose;Contacts ++ ++[Compose Shortcut Group] ++_Name=Compose New Message ++Exec=evolution --express mailto: ++OnlyShowIn=Messaging Menu ++ ++[Contacts Shortcut Group] ++_Name=Contacts ++Exec=evolution --express -c contacts ++OnlyShowIn=Messaging Menu ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/Makefile.am evolution-2.30.2.new//data/Makefile.am +--- evolution-2.30.2//data/Makefile.am 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.2.new//data/Makefile.am 2010-07-21 08:50:42.428510001 +0200 +@@ -4,6 +4,10 @@ + desktop_in_files = evolution.desktop.in evolution-settings.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + ++unedesktopdir = $(datadir)/une/applications ++unedesktop_in_files = evolution-mail-une.desktop.in evolution-calendar-une.desktop.in evolution-contacts-une.desktop.in ++unedesktop_DATA = $(unedesktop_in_files:.desktop.in=.desktop) ++ + autostartdir = $(sysconfdir)/xdg/autostart + autostart_in_files = evolution-alarm-notify.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +@@ -25,10 +29,12 @@ + + CLEANFILES = \ + $(autostart_DATA) \ +- $(desktop_DATA) ++ $(desktop_DATA) \ ++ $(unedesktop_DATA) + + EXTRA_DIST = \ + $(autostart_in_files) \ +- $(desktop_in_files) ++ $(desktop_in_files) \ ++ $(unedesktop_in_files) + + -include $(top_srcdir)/git.mk --- evolution-2.30.3.orig/debian/patches/89_express.patch +++ evolution-2.30.3/debian/patches/89_express.patch @@ -0,0 +1,26962 @@ +diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui +index 964ce43..51fc9c9 100644 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//addressbook/gui/contact-editor/contact-editor.ui evolution-2.30.3.new//addressbook/gui/contact-editor/contact-editor.ui +--- evolution-2.30.3//addressbook/gui/contact-editor/contact-editor.ui 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.3.new//addressbook/gui/contact-editor/contact-editor.ui 2010-09-01 19:18:57.469184000 +0200 +@@ -78,6 +78,7 @@ + True + False + 0 ++ vertical + + + True +@@ -135,11 +136,24 @@ + False + False + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ ++ + + 12 + True + False + 1 ++ vertical + + + True +@@ -417,6 +431,7 @@ + True + False + 10 ++ vertical + + + True +@@ -424,7 +439,7 @@ + 0.5 + GTK_SHADOW_NONE + +- ++ + 12 + True + 3 +@@ -620,29 +635,72 @@ + + + +- +- True +- Email +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- +- +- ++ ++ True ++ False ++ 4 ++ ++ ++ True ++ Email ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 20 ++ 20 ++ True ++ True ++ GTK_RELIEF_NONE ++ True ++ ++ ++ True ++ GTK_ARROW_RIGHT ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ Telephone ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ + + +- 0 ++ 0 + False + False + +@@ -652,6 +710,7 @@ + True + False + 0 ++ vertical + + + True +@@ -664,6 +723,7 @@ + True + False + 6 ++ vertical + + + True +@@ -1080,7 +1140,7 @@ + + + +- ++ + True + True + True +@@ -1099,7 +1159,7 @@ + + + +- ++ + True + True + True +@@ -1152,7 +1212,7 @@ + + + +- ++ + True + False + True +@@ -1167,7 +1227,7 @@ + + + +- ++ + True + False + True +@@ -1234,6 +1294,12 @@ + + + ++ ++ ++ ++ ++ ++ + + False + True +@@ -1258,12 +1324,24 @@ + 0 + + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ + +- ++ + 12 + True + False + 12 ++ vertical + + + True +@@ -1508,6 +1586,13 @@ + + + ++ ++ True ++ False ++ 4 ++ ++ ++ + + True + Web Addresses +@@ -1527,7 +1612,40 @@ + + + +- ++ ++ ++ ++ 20 ++ 20 ++ True ++ True ++ GTK_RELIEF_NONE ++ True ++ ++ ++ True ++ GTK_ARROW_RIGHT ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ Web addresses ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ + + + 0 +@@ -1881,10 +1999,9 @@ + + + +- ++ + True +- 0 +- 0.5 ++ True + GTK_SHADOW_NONE + + +@@ -2126,11 +2243,18 @@ + + + ++ ++ ++ ++ ++ ++ + + False + True + + ++ + + + True +@@ -2151,10 +2275,24 @@ + + + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ ++ ++ + + True + False + 0 ++ vertical + + + 6 +@@ -2910,12 +3048,10 @@ + + + +- ++ + 6 + True +- 0 +- 0.5 +- GTK_SHADOW_NONE ++ True + + + 6 +@@ -3287,6 +3423,13 @@ + + + ++ ++ ++ ++ ++ ++ ++ + + False + True +@@ -3316,6 +3459,7 @@ + True + False + 0 ++ vertical + + + 6 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//addressbook/gui/contact-editor/e-contact-editor.c evolution-2.30.3.new//addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-2.30.3//addressbook/gui/contact-editor/e-contact-editor.c 2010-06-20 14:14:59.000000000 +0200 ++++ evolution-2.30.3.new//addressbook/gui/contact-editor/e-contact-editor.c 2010-09-01 19:18:57.473184000 +0200 +@@ -742,15 +742,6 @@ + } + + static void +-init_email (EContactEditor *editor) +-{ +- gint i; +- +- for (i = 1; i <= EMAIL_SLOTS; i++) +- init_email_record_location (editor, i); +-} +- +-static void + fill_in_email_record (EContactEditor *editor, gint record, const gchar *address, gint location) + { + GtkWidget *location_combo_box; +@@ -1144,24 +1135,95 @@ + } + + static void +-expand_phone (EContactEditor *editor, gboolean expanded) ++set_arrow_image (EContactEditor *editor, ++ const gchar *arrow_widget, ++ gboolean expanded) ++{ ++ GtkWidget *arrow; ++ ++ arrow = e_builder_get_widget (editor->builder, arrow_widget); ++ if (expanded) ++ gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); ++ else ++ gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); ++} ++ ++static void ++expand_widget_list (EContactEditor *editor, ++ const gchar **widget_names, ++ gboolean expanded) + { +- GtkWidget *phone_ext_table; +- GtkWidget *phone_ext_arrow; ++ gint i; ++ for (i = 0; widget_names[i]; i++) ++ gtk_widget_set_visible ( ++ e_builder_get_widget (editor->builder, widget_names[i]), ++ expanded); ++} + +- phone_ext_table = e_builder_get_widget (editor->builder, "table-phone-extended"); +- phone_ext_arrow = e_builder_get_widget (editor->builder, "arrow-phone-expand"); ++static void ++expand_web (EContactEditor *editor, gboolean expanded) ++{ ++ const gchar *names[] = { ++ "label-videourl", "label-fburl", ++ "entry-videourl", "entry-fburl", ++ NULL ++ }; ++ set_arrow_image (editor, "arrow-phone-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++} + +- if (expanded) { +- gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); +- gtk_widget_show (phone_ext_table); +- } else { +- gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); +- gtk_widget_hide (phone_ext_table); ++static void ++expand_phone (EContactEditor *editor, gboolean expanded) ++{ ++ const gchar *names[] = { ++ "entry-phone-2", "combobox-phone-2", ++ "entry-phone-4", "combobox-phone-4", ++ "table-phone-extended", NULL ++ }; ++ set_arrow_image (editor, "arrow-phone-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++} ++ ++static void ++expand_mail (EContactEditor *editor, gboolean expanded) ++{ ++ GtkTable *table; ++ GtkWidget *check; ++ const gchar *names[] = { ++ "entry-email-2", "combobox-email-2", ++ "entry-email-3", "combobox-email-3", ++ "entry-email-4", "combobox-email-4", ++ NULL ++ }; ++ set_arrow_image (editor, "arrow-mail-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++ ++ /* move 'use html mail' into position */ ++ check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); ++ table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); ++ if (check != NULL && table != NULL) { ++ g_object_ref (G_OBJECT (check)); ++ gtk_container_remove (GTK_CONTAINER (check->parent), check); ++ if (expanded) ++ gtk_table_attach_defaults (table, check, 0, 4, 2, 3); ++ else ++ gtk_table_attach_defaults (table, check, 2, 4, 0, 1); ++ g_object_unref (G_OBJECT (check)); + } + } + + static void ++init_email (EContactEditor *editor) ++{ ++ gint i; ++ ++ for (i = 1; i <= EMAIL_SLOTS; i++) ++ init_email_record_location (editor, i); ++ ++ expand_mail (editor, !editor->compress_ui); ++} ++ ++static void + fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, gint phone_type) + { + GtkWidget *phone_type_combo_box; +@@ -1458,6 +1520,11 @@ + service_combo_box = e_builder_get_widget (editor->builder, widget_name); + g_free (widget_name); + ++ if (editor->compress_ui && record > 2) { ++ gtk_widget_hide (name_entry); ++ gtk_widget_hide (service_combo_box); ++ } ++ + init_item_sensitiveable_combo_box (GTK_COMBO_BOX (service_combo_box)); + + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (service_combo_box))); +@@ -1739,6 +1806,17 @@ + } + + static void ++init_personal (EContactEditor *editor) ++{ ++ gtk_expander_set_expanded ( ++ GTK_EXPANDER (e_builder_get_widget (editor->builder, ++ "expander-personal-misc")), ++ !editor->compress_ui); ++ ++ expand_web (editor, !editor->compress_ui); ++} ++ ++static void + init_address_textview (EContactEditor *editor, gint record) + { + gchar *textview_name; +@@ -1785,6 +1863,11 @@ + + for (i = 0; i < ADDRESS_SLOTS; i++) + init_address_record (editor, i); ++ ++ gtk_expander_set_expanded ( ++ GTK_EXPANDER (e_builder_get_widget (editor->builder, ++ "expander-address-other")), ++ !editor->compress_ui); + } + + static void +@@ -2586,11 +2669,22 @@ + static void + init_all (EContactEditor *editor) + { +- init_simple (editor); +- init_email (editor); +- init_phone (editor); +- init_im (editor); +- init_address (editor); ++ GtkRequisition tab_req; ++ ++ init_simple (editor); ++ init_email (editor); ++ init_phone (editor); ++ init_im (editor); ++ init_personal (editor); ++ init_address (editor); ++ ++ /* with so many scrolled windows, we need to ++ do some manual sizing */ ++ gtk_widget_size_request ( ++ e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req); ++ gtk_widget_set_size_request ( ++ e_builder_get_widget (editor->builder, "scrolledwindow-size-leader"), ++ tab_req.width, tab_req.height + 8); + } + + static void +@@ -3372,15 +3466,41 @@ + } + + static void ++expand_web_toggle (EContactEditor *ce) ++{ ++ GtkWidget *widget; ++ ++ widget = e_builder_get_widget (ce->builder, "label-videourl"); ++#if GTK_CHECK_VERSION(2,19,7) ++ expand_web (ce, !gtk_widget_get_visible (widget)); ++#else ++ expand_web (ce, !GTK_WIDGET_VISIBLE (widget)); ++#endif ++} ++ ++static void + expand_phone_toggle (EContactEditor *ce) + { + GtkWidget *phone_ext_table; + + phone_ext_table = e_builder_get_widget (ce->builder, "table-phone-extended"); + #if GTK_CHECK_VERSION(2,19,7) +- expand_phone (ce, gtk_widget_get_visible (phone_ext_table) ? FALSE : TRUE); ++ expand_phone (ce, !gtk_widget_get_visible (phone_ext_table)); ++#else ++ expand_phone (ce, !GTK_WIDGET_VISIBLE (phone_ext_table)); ++#endif ++} ++ ++static void ++expand_mail_toggle (EContactEditor *ce) ++{ ++ GtkWidget *mail; ++ ++ mail = e_builder_get_widget (ce->builder, "entry-email-4"); ++#if GTK_CHECK_VERSION(2,19,7) ++ expand_mail (ce, !gtk_widget_get_visible (mail)); + #else +- expand_phone (ce, GTK_WIDGET_VISIBLE (phone_ext_table) ? FALSE : TRUE); ++ expand_mail (ce, !GTK_WIDGET_VISIBLE (mail)); + #endif + } + +@@ -3402,6 +3522,7 @@ + e_contact_editor->target_editable = TRUE; + e_contact_editor->fullname_dialog = NULL; + e_contact_editor->categories_dialog = NULL; ++ e_contact_editor->compress_ui = e_shell_get_express_mode (e_shell_get_default ()); + + e_contact_editor->load_source_id = 0; + e_contact_editor->load_book = NULL; +@@ -3441,8 +3562,12 @@ + g_signal_connect (widget, "clicked", G_CALLBACK (file_cancel_cb), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-help"); + g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); ++ widget = e_builder_get_widget (e_contact_editor->builder, "button-web-expand"); ++ g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_web_toggle), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-phone-expand"); + g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor); ++ widget = e_builder_get_widget (e_contact_editor->builder, "button-mail-expand"); ++ g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_mail_toggle), e_contact_editor); + + widget = e_builder_get_widget (e_contact_editor->builder, "entry-fullname"); + if (widget) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//addressbook/gui/contact-editor/e-contact-editor.h evolution-2.30.3.new//addressbook/gui/contact-editor/e-contact-editor.h +--- evolution-2.30.3//addressbook/gui/contact-editor/e-contact-editor.h 2010-06-20 14:14:59.000000000 +0200 ++++ evolution-2.30.3.new//addressbook/gui/contact-editor/e-contact-editor.h 2010-09-01 19:18:57.473184000 +0200 +@@ -84,6 +84,9 @@ + /* Whether an image is changed */ + guint image_changed : 1; + ++ /* Whether to try to reduce space used */ ++ guint compress_ui : 1; ++ + EList *writable_fields; + + EList *required_fields; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/alarm-notify/alarm.c evolution-2.30.3.new//calendar/gui/alarm-notify/alarm.c +--- evolution-2.30.3//calendar/gui/alarm-notify/alarm.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/alarm-notify/alarm.c 2010-09-01 19:18:57.473184000 +0200 +@@ -152,7 +152,8 @@ + now = time (NULL); + + /* Add the time out */ +- d(g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now)); ++ d(g_message ("Setting timeout for %d.%2d (from now) %lu %lu", ++ diff / 60, diff % 60, ar->trigger, now)); + d(g_message (" %s", ctime (&ar->trigger))); + d(g_message (" %s", ctime (&now))); + timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/alarm-notify/alarm-queue.c evolution-2.30.3.new//calendar/gui/alarm-notify/alarm-queue.c +--- evolution-2.30.3//calendar/gui/alarm-notify/alarm-queue.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/alarm-notify/alarm-queue.c 2010-09-01 19:18:57.477184000 +0200 +@@ -183,6 +183,25 @@ + msg->func (msg); + } + ++/* ++ * use a static ring-buffer so we can call this twice ++ * in a printf without getting nonsense results. ++ */ ++static const gchar * ++e_ctime (const time_t *timep) ++{ ++ static gchar *buffer[4] = { 0, }; ++ static gint next = 0; ++ const gchar *ret; ++ ++ g_free (buffer[next]); ++ ret = buffer[next++] = g_strdup (ctime (timep)); ++ if (next >= G_N_ELEMENTS (buffer)) ++ next = 0; ++ ++ return ret; ++} ++ + /* Queues an alarm trigger for midnight so that we can load the next day's worth + * of alarms. + */ +@@ -199,7 +218,7 @@ + zone = config_data_get_timezone (); + midnight = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, ctime(&midnight))); ++ d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, e_ctime(&midnight))); + + midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL); + if (!midnight_refresh_id) { +@@ -471,7 +490,7 @@ + + alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL); + if (!alarm_id) { +- d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); ++ d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, e_ctime(&(instance->trigger)))); + continue; + } + +@@ -482,7 +501,7 @@ + qa->snooze = FALSE; + + cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa); +- d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow))); ++ d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), e_ctime(&tnow))); + } + + id = e_cal_component_get_id (alarms->comp); +@@ -571,7 +590,8 @@ + from = MAX (config_data_get_last_notification_time (ca->client) + 1, day_start); + + day_end = time_day_end_with_zone (now, zone); +- d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ctime (&from), ctime(&day_end))); ++ d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ++ g_strdup (ctime (&from)), g_strdup (e_ctime(&day_end)))); + load_alarms (ca, from, day_end); + } + +@@ -707,7 +727,7 @@ + + day_end = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, ctime(&from), ctime(&day_end))); ++ d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&day_end))); + + for (l = objects; l != NULL; l = l->next) { + ECalComponentId *id; +@@ -771,7 +791,7 @@ + + alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL); + if (!alarm_id) { +- d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); ++ d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&(instance->trigger)))); + continue; + } + +@@ -869,14 +889,14 @@ + + new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL); + if (!new_id) { +- d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&t))); ++ d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&t))); + return; + } + + orig_qa->instance->trigger = t; + orig_qa->alarm_id = new_id; + orig_qa->snooze = TRUE; +- d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, ctime(&t))); ++ d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, e_ctime(&t))); + } + + /* Launches a component editor for a component */ +@@ -1189,7 +1209,7 @@ + GtkTreeIter iter; + GtkTreeModel *model = NULL; + +- /* We can` also use tray_data->iter */ ++ /* We can also use tray_data->iter */ + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) { +@@ -1833,7 +1853,7 @@ + + if (config_data_get_last_notification_time (NULL) == -1) { + time_t tmval = time (NULL); +- d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, ctime(&tmval))); ++ d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, e_ctime(&tmval))); + config_data_set_last_notification_time (NULL, tmval); + } + +@@ -2139,7 +2159,7 @@ + from = time_day_begin_with_zone (time (NULL), zone); + to = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, ctime(&from), ctime(&to))); ++ d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&to))); + alarms = e_cal_util_generate_alarms_for_comp (newcomp, from, to, omit, + e_cal_resolve_tzid_cb, cqa->parent_client->client, zone); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/apps_evolution_calendar.schemas.in evolution-2.30.3.new//calendar/gui/apps_evolution_calendar.schemas.in +--- evolution-2.30.3//calendar/gui/apps_evolution_calendar.schemas.in 2010-04-17 19:49:09.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/apps_evolution_calendar.schemas.in 2010-09-01 19:18:57.477184000 +0200 +@@ -284,7 +284,7 @@ + /apps/evolution/calendar/display/date_navigator_pane_position + evolution-calendar + int +- 150 ++ 200 + + Month view vertical pane position + Position of the vertical pane, between the calendar lists and the date navigator calendar. +@@ -666,14 +666,14 @@ + + + +- /schemas/apps/evolution/calendar/display/day_view_show_week_number +- /apps/evolution/calendar/display/day_view_show_week_number ++ /schemas/apps/evolution/calendar/display/show_week_numbers ++ /apps/evolution/calendar/display/show_week_numbers + evolution-calendar + bool + false + +- Show week number in Day and Work Week View +- Whether to show week number in the Day and Work Week View. ++ Show week numbers in Day View, Work Week View, and Date Navigator ++ Whether to show week numbers in various places in the Calendar. + + + +@@ -682,27 +682,13 @@ + /apps/evolution/calendar/display/month_scroll_by_week + evolution-calendar + bool +- false ++ true + + Scroll Month View by a week + Whether to scroll a Month View by a week, not by a month. + + + +- +- +- +- /schemas/apps/evolution/calendar/date_navigator/show_week_numbers +- /apps/evolution/calendar/date_navigator/show_week_numbers +- evolution-calendar +- bool +- false +- +- Show week numbers in date navigator +- Whether to show week numbers in the date navigator. +- +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/calendar-config-keys.h evolution-2.30.3.new//calendar/gui/calendar-config-keys.h +--- evolution-2.30.3//calendar/gui/calendar-config-keys.h 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/calendar-config-keys.h 2010-09-01 19:18:57.477184000 +0200 +@@ -53,14 +53,11 @@ + #define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend" + #define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end" + #define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days" +-#define CALENDAR_CONFIG_DV_WEEK_NUMBER CALENDAR_CONFIG_PREFIX "/display/day_view_show_week_number" ++#define CALENDAR_CONFIG_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/display/show_week_numbers" + #define CALENDAR_CONFIG_DAY_SECOND_ZONE CALENDAR_CONFIG_PREFIX "/display/day_second_zone" + #define CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST CALENDAR_CONFIG_PREFIX "/display/day_second_zones" + #define CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX CALENDAR_CONFIG_PREFIX "/display/day_second_zones_max" + +-/* Date navigator settings */ +-#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers" +- + /* Task display settings */ + #define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks" + #define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks" +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.c evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.c +--- evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.c 2010-09-01 19:18:57.477184000 +0200 +@@ -36,6 +36,7 @@ + #include "e-util/e-datetime-format.h" + #include "e-util/e-dialog-widgets.h" + #include "e-util/e-util-private.h" ++#include "shell/e-shell-utils.h" + #include + #include + +@@ -746,16 +747,11 @@ + shell_settings, "cal-compress-weekend", + widget, "active"); + +- widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); ++ widget = e_builder_get_widget (prefs->builder, "show_week_numbers"); + e_mutual_binding_new ( + shell_settings, "cal-show-week-numbers", + widget, "active"); + +- widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); +- e_mutual_binding_new ( +- shell_settings, "cal-day-view-show-week-numbers", +- widget, "active"); +- + prefs->month_scroll_by_week = e_builder_get_widget (prefs->builder, "month_scroll_by_week"); + + widget = e_builder_get_widget (prefs->builder, "tasks_due_today_color"); +@@ -787,16 +783,42 @@ + e_mutual_binding_new ( + shell_settings, "cal-free-busy-template", + widget, "text"); +- target = e_cal_config_target_new_prefs (ec, prefs->gconf); +- e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); +- toplevel = e_config_create_widget ((EConfig *)ec); +- gtk_container_add (GTK_CONTAINER (prefs), toplevel); + + /* date/time format */ + table = e_builder_get_widget (prefs->builder, "datetime_format_table"); + e_datetime_format_add_setup_widget (table, 0, "calendar", "table", DTFormatKindDateTime, _("Time and date:")); + e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("Date only:")); + ++ /* Hide senseless preferences when running in Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "label_second_zone", ++ "hbox_second_zone", ++ "timezone", ++ "timezone_label", ++ "hbox_use_system_timezone", ++ "hbox_time_divisions", ++ "show_end_times", ++ "month_scroll_by_week", ++ NULL); ++ ++ /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns. ++ * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General ++ * preferences page. However, due to that behavior in GTK+, we get a lot of extra spacing in that ++ * section. Since we know that in Express mode we only leave a single row visible, we'll make the ++ * table's row spacing equal to 0 in that case. ++ */ ++ if (e_shell_get_express_mode (shell)) { ++ widget = e_builder_get_widget (prefs->builder, "time"); ++ gtk_table_set_row_spacings (GTK_TABLE (widget), 0); ++ } ++ ++ /* Hook up and add the toplevel widget */ ++ ++ target = e_cal_config_target_new_prefs (ec, prefs->gconf); ++ e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); ++ toplevel = e_config_create_widget ((EConfig *)ec); ++ gtk_container_add (GTK_CONTAINER (prefs), toplevel); ++ + show_config (prefs); + /* FIXME: weakref? */ + setup_changes (prefs); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.h evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.h +--- evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.h 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.h 2010-09-01 19:18:57.477184000 +0200 +@@ -78,8 +78,6 @@ + GtkWidget *time_divisions; + GtkWidget *show_end_times; + GtkWidget *compress_weekend; +- GtkWidget *dnav_show_week_no; +- GtkWidget *dview_show_week_no; + GtkWidget *month_scroll_by_week; + GtkWidget *tasks_hide_completed; + GtkWidget *tasks_hide_completed_interval; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.ui evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.ui +--- evolution-2.30.3//calendar/gui/dialogs/cal-prefs-dialog.ui 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/cal-prefs-dialog.ui 2010-09-01 19:18:57.485184000 +0200 +@@ -1,31 +1,27 @@ + + ++ ++ ++ + + 9999 +- 0 +- 10 + 1 +- 0 +- 0 ++ 10 + + + 9999 +- 0 +- 10 + 1 +- 0 +- 0 ++ 10 + + ++ 1 + 9999 +- 0 +- 10 + 1 +- 0 +- 1 ++ 10 + + + ++ + + + +@@ -54,6 +50,7 @@ + + + ++ + + + +@@ -70,6 +67,7 @@ + + + ++ + + + +@@ -86,6 +84,7 @@ + + + ++ + + + +@@ -108,6 +107,7 @@ + + + ++ + + + +@@ -122,8 +122,6 @@ + + + +- +- + + True + True +@@ -164,12 +162,12 @@ + + + True +- 5 ++ 4 + 2 + 6 + 6 + +- ++ + True + 0 + Se_cond zone: +@@ -177,14 +175,14 @@ + day_second_zone + + +- 4 +- 5 ++ 3 ++ 4 + GTK_FILL +- ++ + + + +- ++ + True + + +@@ -214,32 +212,48 @@ + + 1 + 2 +- 4 +- 5 ++ 3 ++ 4 + GTK_FILL + GTK_FILL + + + +- ++ ++ True ++ ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ + True + 0 +- Time format: ++ Time _zone: ++ True ++ timezone + + +- 3 +- 4 ++ 1 ++ 2 + GTK_FILL +- ++ + + + +- ++ + True +- 6 + +- +- _12 hour (AM/PM) ++ ++ Use s_ystem time zone + True + True + False +@@ -248,19 +262,14 @@ + + + False +- False + 0 + + + +- +- _24 hour ++ + True +- True +- False +- True +- True +- use_12_hour ++ 5 ++ (system/tz) + + + False +@@ -272,62 +281,51 @@ + + 1 + 2 +- 3 +- 4 +- GTK_FILL +- GTK_FILL +- +- +- +- +- True +- +- +- +- +- +- 1 +- 2 + 1 + 2 +- GTK_FILL ++ GTK_FILL + + + +- ++ + True + 0 +- Time _zone: +- True +- timezone ++ Time format: + + + GTK_FILL +- ++ + + + +- ++ + True ++ 6 + +- +- Use s_ystem time zone ++ ++ _12 hour (AM/PM) + True + True + False + True ++ True + True + + + False ++ False + 0 + + + +- ++ ++ _24 hour + True +- 5 +- (system/tz) ++ True ++ False ++ True ++ True ++ use_12_hour + + + False +@@ -340,14 +338,12 @@ + 1 + 2 + GTK_FILL ++ GTK_FILL + + + + + +- +- +- + + + 1 +@@ -391,7 +387,7 @@ + + + True +- 4 ++ 3 + 2 + 6 + 6 +@@ -399,13 +395,13 @@ + + True + 0 +- Wee_k starts on: ++ Wee_k starts on: + True + week_start_day + + + GTK_FILL +- ++ + + + +@@ -418,64 +414,21 @@ + 1 + 2 + GTK_FILL +- ++ + + + +- ++ + True + 0 + _Day begins: + True +- start_of_day + + + 2 + 3 + GTK_FILL +- +- +- +- +- +- True +- 0 +- Day _ends: +- True +- end_of_day +- +- +- 3 +- 4 +- GTK_FILL +- +- +- +- +- +- False +- True +- +- +- 1 +- 2 +- 2 +- 3 +- GTK_FILL +- +- +- +- +- False +- True +- +- +- 1 +- 2 +- 3 +- 4 +- GTK_FILL +- GTK_FILL ++ + + + +@@ -484,17 +437,14 @@ + 6 + + +- _Mon ++ _Mon + True + True + False + True + True +- +- +- + +- ++ + Monday + + +@@ -507,17 +457,14 @@ + + + +- _Tue ++ _Tue + True + True + False + True + True +- +- +- + +- ++ + Tuesday + + +@@ -530,17 +477,14 @@ + + + +- _Wed ++ _Wed + True + True + False + True + True +- +- +- + +- ++ + Wednesday + + +@@ -553,17 +497,14 @@ + + + +- T_hu ++ T_hu + True + True + False + True + True +- +- +- + +- ++ + Thursday + + +@@ -576,17 +517,14 @@ + + + +- _Fri ++ _Fri + True + True + False + True + True +- +- +- + +- ++ + Friday + + +@@ -599,17 +537,14 @@ + + + +- _Sat ++ _Sat + True + True + False + True + True +- +- +- + +- ++ + Saturday + + +@@ -622,17 +557,14 @@ + + + +- S_un ++ S_un + True + True + False + True + True +- +- +- + +- ++ + Sunday + + +@@ -671,6 +603,57 @@ + GTK_FILL + + ++ ++ ++ True ++ 12 ++ ++ ++ True ++ False ++ False ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Day _ends: ++ True ++ ++ ++ False ++ end ++ 2 ++ ++ ++ ++ ++ True ++ False ++ False ++ ++ ++ False ++ False ++ end ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ + + + 1 +@@ -736,7 +719,7 @@ + 4 + + +- Sh_ow a reminder ++ Sh_ow a reminder + True + True + False +@@ -778,7 +761,7 @@ + + + True +- before every appointment ++ before every appointment + + + False +@@ -797,7 +780,7 @@ + 4 + + +- Show a _reminder ++ Show a _reminder + True + True + False +@@ -839,7 +822,7 @@ + + + True +- before every anniversary/birthday ++ before every anniversary/birthday + + + False +@@ -913,7 +896,7 @@ + True + 6 + +- ++ + True + 6 + +@@ -980,8 +963,8 @@ + + + +- +- Show week _numbers in date navigator ++ ++ Show week _numbers + True + True + False +@@ -995,21 +978,6 @@ + + + +- +- Show week n_umber in Day and Work Week View +- True +- True +- False +- True +- True +- +- +- False +- False +- 4 +- +- +- + + Sc_roll Month View by a week + True +@@ -1021,7 +989,7 @@ + + False + False +- 5 ++ 4 + + + +@@ -1069,12 +1037,9 @@ + True + 6 + +- ++ + True +- 2 +- 2 +- 6 +- 6 ++ 12 + + + True +@@ -1084,57 +1049,59 @@ + tasks_due_today_color + + +- GTK_FILL +- ++ False ++ False ++ 0 + + + +- ++ + True +- 0 +- _Overdue tasks: +- True +- tasks_overdue_color ++ True ++ True ++ Pick a color ++ #000000000000 + + +- 1 +- 2 +- GTK_FILL +- ++ False ++ False ++ 1 + + + +- ++ + True +- True +- False +- Pick a color ++ 0 ++ _Overdue tasks: ++ True ++ tasks_overdue_color + + +- 1 +- 2 +- +- ++ False ++ False ++ end ++ 3 + + + + + True + True +- False ++ True + Pick a color ++ #000000000000 + + +- 1 +- 2 +- 1 +- 2 +- +- ++ False ++ False ++ end ++ 2 + + + + ++ False ++ False + 0 + + +@@ -1202,81 +1169,59 @@ + + + True +- Date/Time Format +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Date/Time Format + + + + + +- 0 + False + False ++ 4 + + + + + True +- False + 12 + + + True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 + + +- 0 + False + False ++ 0 + + + + + True +- 1 + 3 +- False +- 0 +- 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- 0 +- True +- True ++ 1 + + + + +- 0 +- True +- True ++ 5 + + + ++ ++ 1 ++ + + + +@@ -1296,101 +1241,69 @@ + + + True +- Alarms +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Alarms + + + + + +- 0 + False + False ++ 0 + + + + + True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 + 10 +- 0 + + ++ Display alarms in _notification area only + True + True +- Display alarms in _notification area only ++ False + True +- GTK_RELIEF_NORMAL +- True +- False +- False + True + + + + +- 0 + False +- True ++ 1 + + + + + True +- Select the calendars for alarm notification +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Select the calendars for alarm notification + + +- 0 + False + False ++ 2 + + + + +- True +- True +- automatic +- automatic +- in +- +- ++ True ++ True ++ automatic ++ automatic ++ in ++ ++ ++ + + +- 0 +- True +- True ++ 3 + + + ++ ++ 2 ++ + + + +@@ -1496,6 +1409,9 @@ + + + ++ ++ 3 ++ + + + +@@ -1508,4 +1424,10 @@ + + + ++ ++ ++ ++ ++ ++ + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/comp-editor.c evolution-2.30.3.new//calendar/gui/dialogs/comp-editor.c +--- evolution-2.30.3//calendar/gui/dialogs/comp-editor.c 2010-07-14 16:40:52.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/comp-editor.c 2010-09-01 19:18:57.485184000 +0200 +@@ -75,8 +75,6 @@ + + #define d(x) + +-static gboolean comp_lite = FALSE; +- + /* Private part of the CompEditor structure */ + struct _CompEditorPrivate { + +@@ -173,10 +171,16 @@ + " " + " " + " " +-" " +-" " +-" " ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" + " " ++" \n" ++"#if EXPRESS\n" ++" \n" ++" \n" ++"#endif\n" + " " + ""; + +@@ -421,7 +425,7 @@ + clone = e_cal_component_clone (priv->comp); + comp_editor_copy_new_attendees (clone, priv->comp); + for (l = priv->pages; l != NULL; l = l->next) { +- if (!comp_editor_page_fill_component (l->data, clone)) { ++ if (IS_COMP_EDITOR_PAGE(l->data) && !comp_editor_page_fill_component (l->data, clone)) { + g_object_unref (clone); + g_hash_table_destroy (timezones); + comp_editor_show_page (editor, COMP_EDITOR_PAGE (l->data)); +@@ -429,7 +433,8 @@ + } + + /* retrieve all timezones */ +- comp_editor_page_fill_timezones (l->data, timezones); ++ if (IS_COMP_EDITOR_PAGE(l->data)) ++ comp_editor_page_fill_timezones (l->data, timezones); + } + + /* If we are not the organizer, we don't update the sequence number */ +@@ -1598,6 +1603,9 @@ + gint n_targets; + GError *error = NULL; + ++ /* FIXME Shell should be passed in. */ ++ shell = e_shell_get_default (); ++ + editor->priv = priv = COMP_EDITOR_GET_PRIVATE (editor); + + g_object_weak_ref ( +@@ -1621,9 +1629,9 @@ + priv->is_group_item = FALSE; + + priv->ui_manager = e_ui_manager_new (); ++ e_ui_manager_set_express_mode (E_UI_MANAGER (priv->ui_manager), ++ e_shell_get_express_mode (shell)); + +- if (comp_lite) +- gtk_window_set_default_size ((GtkWindow *) editor, 800, 450); + gtk_window_add_accel_group ( + GTK_WINDOW (editor), + gtk_ui_manager_get_accel_group (priv->ui_manager)); +@@ -1705,7 +1713,7 @@ + action = comp_editor_get_action (editor, "save"); + gtk_action_set_sensitive (action, FALSE); + +- gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error); ++ e_ui_manager_add_ui_from_string (E_UI_MANAGER (priv->ui_manager), ui, &error); + if (error != NULL) { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); +@@ -1721,24 +1729,25 @@ + + container = widget; + +- widget = comp_editor_get_managed_widget (editor, "/main-menu"); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +- gtk_widget_show (widget); +- +- if (!comp_lite) { +- widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = comp_editor_get_managed_widget (editor, "/main-menu"); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +- gtk_widget_show (widget); ++ gtk_widget_set_visible (widget, !e_shell_get_meego_mode (shell)); + } + ++ widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ gtk_widget_show (widget); ++ + widget = e_attachment_paned_new (); + gtk_container_set_border_width (GTK_CONTAINER (widget), 6); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + priv->attachment_view = g_object_ref (widget); + gtk_widget_show (widget); + +- if (comp_lite) { +- GtkWidget *tmp, *tmp1, *tmp_box, *cont; ++ if (e_shell_get_express_mode (shell)) { ++ /*GtkWidget *tmp, *tmp1, *tmp_box, */ ++ GtkWidget *cont; + GtkWidget *combo; + + e_attachment_paned_set_expanded (E_ATTACHMENT_PANED (widget), TRUE); +@@ -1749,7 +1758,7 @@ + gtk_widget_hide (combo); + cont = e_attachment_paned_get_controls_container ( + E_ATTACHMENT_PANED (widget)); +- ++ /* + tmp_box = gtk_hbox_new (FALSE, 0); + tmp = gtk_hbox_new (FALSE, 0); + tmp1 = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); +@@ -1769,12 +1778,12 @@ + + gtk_widget_show(tmp_box); + gtk_box_pack_end (GTK_BOX (cont), tmp_box, FALSE, FALSE, 4); +- ++ */ + } + container = e_attachment_paned_get_content_area ( + E_ATTACHMENT_PANED (priv->attachment_view)); + +- if (comp_lite) { ++ if (e_shell_get_express_mode (shell)) { + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_show(scroll); +@@ -1782,14 +1791,14 @@ + } + + widget = gtk_notebook_new (); +- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); +- if (!comp_lite) ++ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), e_shell_get_express_mode (shell)); ++ if (!e_shell_get_express_mode (shell)) + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + else + gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) scroll, widget); + priv->notebook = GTK_NOTEBOOK (widget); + gtk_widget_show (widget); +- if (comp_lite) ++ if (e_shell_get_express_mode (shell)) + gtk_widget_set_size_request (scroll, 300, -1); + comp_editor_setup_recent_menu (editor); + +@@ -1831,9 +1840,8 @@ + + comp_editor_bind_gconf (editor); + +- /* FIXME Shell should be passed in. */ +- shell = e_shell_get_default (); + e_shell_watch_window (shell, GTK_WINDOW (editor)); ++ e_shell_adapt_window_size (shell, GTK_WINDOW (editor)); + } + + static gboolean +@@ -2273,6 +2281,51 @@ + } + + /** ++ * comp_editor_append_widget: ++ * @editor: A component editor ++ * @page: A component editor page ++ * @label: Label of the page. Should be NULL if add is FALSE. ++ * @add: Add's the page into the notebook if TRUE ++ * ++ * Appends a page to the notebook if add is TRUE else ++ * just adds it to the list of pages. ++ **/ ++void ++comp_editor_append_widget (CompEditor *editor, ++ GtkWidget *page, ++ const gchar *label, ++ gboolean add) ++{ ++ CompEditorPrivate *priv; ++ GtkWidget *label_widget = NULL; ++ ++ g_return_if_fail (IS_COMP_EDITOR (editor)); ++ ++ priv = editor->priv; ++ ++ g_object_ref (page); ++ ++ if (label) ++ label_widget = gtk_label_new_with_mnemonic (label); ++ ++ priv->pages = g_list_append (priv->pages, page); ++ ++ if (add) ++ gtk_notebook_append_page (priv->notebook, page, label_widget); ++ ++ /* Listen for when the page is mapped/unmapped so we can ++ install/uninstall the appropriate GtkAccelGroup. ++ g_signal_connect ( ++ page, "map", ++ G_CALLBACK (page_mapped_cb), page); ++ g_signal_connect( ++ page, "unmap", ++ G_CALLBACK (page_unmapped_cb), page); ++ */ ++ ++} ++ ++/** + * comp_editor_append_page: + * @editor: A component editor + * @page: A component editor page +@@ -2563,8 +2616,10 @@ + g_signal_handlers_block_by_func ( + action, G_CALLBACK (action_classification_cb), editor); + +- for (iter = priv->pages; iter != NULL; iter = iter->next) +- comp_editor_page_fill_widgets (iter->data, priv->comp); ++ for (iter = priv->pages; iter != NULL; iter = iter->next) { ++ if (IS_COMP_EDITOR_PAGE(iter->data)) ++ comp_editor_page_fill_widgets (iter->data, priv->comp); ++ } + + g_signal_handlers_unblock_by_func ( + action, G_CALLBACK (action_classification_cb), editor); +@@ -2807,8 +2862,10 @@ + comp = e_cal_component_clone (priv->comp); + comp_editor_copy_new_attendees (comp, priv->comp); + if (priv->changed) { +- for (l = priv->pages; l != NULL; l = l->next) +- all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok; ++ for (l = priv->pages; l != NULL; l = l->next) { ++ if (IS_COMP_EDITOR_PAGE(l->data)) ++ all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok; ++ } + } + + if (correct) +@@ -2975,7 +3032,7 @@ + GList *l; + + for (l = priv->pages; l != NULL; l = l->next) +- if (page != (CompEditorPage *) l->data) ++ if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE(l->data)) + comp_editor_page_set_dates (l->data, dates); + + if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) { +@@ -3032,14 +3089,3 @@ + close_dialog (editor); + } + +-gboolean +-comp_editor_get_lite () +-{ +- return comp_lite; +-} +- +-void +-comp_editor_set_lite (gboolean status) +-{ +- comp_lite = status; +-} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/comp-editor.h evolution-2.30.3.new//calendar/gui/dialogs/comp-editor.h +--- evolution-2.30.3//calendar/gui/dialogs/comp-editor.h 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/comp-editor.h 2010-09-01 19:18:57.485184000 +0200 +@@ -127,6 +127,11 @@ + CompEditorPage *page, + const gchar *label, + gboolean add); ++void comp_editor_append_widget (CompEditor *editor, ++ GtkWidget *page, ++ const gchar *label, ++ gboolean add); ++ + void comp_editor_remove_page (CompEditor *editor, + CompEditorPage *page); + void comp_editor_show_page (CompEditor *editor, +@@ -165,9 +170,6 @@ + const gchar *widget_path); + CompEditor * comp_editor_find_instance (const gchar *uid); + +-void comp_editor_set_lite (gboolean status); +-gboolean comp_editor_get_lite (void); +- + G_END_DECLS + + #endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/comp-editor-util.c evolution-2.30.3.new//calendar/gui/dialogs/comp-editor-util.c +--- evolution-2.30.3//calendar/gui/dialogs/comp-editor-util.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/comp-editor-util.c 2010-09-01 19:18:57.485184000 +0200 +@@ -209,7 +209,6 @@ + + /** + * comp_editor_new_date_edit: +- * @shell_settings: an #EShellSettings + * @show_date: Whether to show a date picker in the widget. + * @show_time: Whether to show a time picker in the widget. + * @make_time_insensitive: Whether the time field is made insensitive rather +@@ -221,15 +220,12 @@ + * Return value: A newly-created #EDateEdit widget. + **/ + GtkWidget * +-comp_editor_new_date_edit (EShellSettings *shell_settings, +- gboolean show_date, ++comp_editor_new_date_edit (gboolean show_date, + gboolean show_time, + gboolean make_time_insensitive) + { + EDateEdit *dedit; + +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- + dedit = E_DATE_EDIT (e_date_edit_new ()); + + e_date_edit_set_show_date (dedit, show_date); +@@ -240,29 +236,9 @@ + e_date_edit_set_make_time_insensitive (dedit, FALSE); + #endif + +- comp_editor_bind_date_edit_settings (GTK_WIDGET (dedit), shell_settings); +- + return GTK_WIDGET (dedit); + } + +-void +-comp_editor_bind_date_edit_settings (GtkWidget *dateedit, EShellSettings *shell_settings) +-{ +- g_return_if_fail (dateedit != NULL); +- g_return_if_fail (E_IS_DATE_EDIT (dateedit)); +- +- if (!shell_settings) +- shell_settings = e_shell_get_shell_settings (e_shell_get_default ()); +- +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- dateedit, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- dateedit, "week-start-day"); +-} +- + /* Returns the current time, for EDateEdit widgets and ECalendar items in the + dialogs. + FIXME: Should probably use the timezone from somewhere in the component +@@ -414,7 +390,9 @@ + * @note The list is just string of emails separated by ';' + **/ + void +-comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gboolean add) ++comp_editor_manage_new_attendees (ECalComponent *comp, ++ EMeetingAttendee *ma, ++ gboolean add) + { + const gchar *eml; + +@@ -426,7 +404,11 @@ + eml = itip_strip_mailto (eml); + g_return_if_fail (eml != NULL); + +- g_object_set_data_full (G_OBJECT (comp), "new-attendees", manage_new_attendees (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml, add), free_slist_strs); ++ g_object_set_data_full ( ++ G_OBJECT (comp), "new-attendees", ++ manage_new_attendees ( ++ g_object_get_data (G_OBJECT (comp), "new-attendees"), ++ eml, add), free_slist_strs); + } + + /** +@@ -469,15 +451,19 @@ + eml = itip_strip_mailto (eml); + g_return_val_if_fail (eml != NULL, FALSE); + +- return comp_editor_have_in_new_attendees_lst (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); ++ return comp_editor_have_in_new_attendees_lst ( ++ g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); + } + + /** + * comp_editor_have_in_new_attendees_lst: +- * Same as @ref comp_editor_have_in_new_attendees only parameters are direct GSList and string. ++ * ++ * Same as comp_editor_have_in_new_attendees() only parameters are ++ * direct GSList and string. + **/ + gboolean +-comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, const gchar *eml) ++comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, ++ const gchar *eml) + { + const GSList *l; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/comp-editor-util.h evolution-2.30.3.new//calendar/gui/dialogs/comp-editor-util.h +--- evolution-2.30.3//calendar/gui/dialogs/comp-editor-util.h 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/comp-editor-util.h 2010-09-01 19:18:57.485184000 +0200 +@@ -26,7 +26,6 @@ + #define _COMP_EDITOR_UTIL_H_ + + #include +-#include + #include "comp-editor-page.h" + #include "../e-meeting-attendee.h" + +@@ -35,13 +34,10 @@ + + void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label); + +-GtkWidget * comp_editor_new_date_edit (EShellSettings *shell_settings, +- gboolean show_date, ++GtkWidget * comp_editor_new_date_edit (gboolean show_date, + gboolean show_time, + gboolean make_time_insensitive); + +-void comp_editor_bind_date_edit_settings (GtkWidget *dateedit, EShellSettings *shell_settings); +- + struct tm comp_editor_get_current_time (GtkObject *object, gpointer data); + + gchar *comp_editor_strip_categories (const gchar *categories); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/copy-source-dialog.c evolution-2.30.3.new//calendar/gui/dialogs/copy-source-dialog.c +--- evolution-2.30.3//calendar/gui/dialogs/copy-source-dialog.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/copy-source-dialog.c 2010-09-01 19:18:57.485184000 +0200 +@@ -32,18 +32,19 @@ + #include "common/authentication.h" + + typedef struct { ++ GtkWindow *parent; + ESource *orig_source; + ECalSourceType obj_type; + ESource *selected_source; + } CopySourceDialogData; + + static void +-show_error (GtkWindow *parent, const gchar *msg) ++show_error (CopySourceDialogData *csdd, const gchar *msg) + { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new ( +- parent, 0, GTK_MESSAGE_ERROR, ++ csdd->parent, 0, GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, "%s", msg); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +@@ -88,7 +89,7 @@ + /* open the source */ + source_client = e_auth_new_cal_from_source (csdd->orig_source, csdd->obj_type); + if (!e_cal_open (source_client, TRUE, NULL)) { +- show_error (NULL, _("Could not open source")); ++ show_error (csdd, _("Could not open source")); + g_object_unref (source_client); + return FALSE; + } +@@ -96,7 +97,7 @@ + /* open the destination */ + dest_client = e_auth_new_cal_from_source (csdd->selected_source, csdd->obj_type); + if (!e_cal_open (dest_client, FALSE, NULL)) { +- show_error (NULL, _("Could not open destination")); ++ show_error (csdd, _("Could not open destination")); + g_object_unref (dest_client); + g_object_unref (source_client); + return FALSE; +@@ -105,7 +106,7 @@ + /* check if the destination is read only */ + e_cal_is_read_only (dest_client, &read_only, NULL); + if (read_only) { +- show_error (NULL, _("Destination is read only")); ++ show_error (csdd, _("Destination is read only")); + } else { + if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) { + GList *l; +@@ -135,7 +136,7 @@ + g_free (uid); + } else { + if (error) { +- show_error (NULL, error->message); ++ show_error (csdd, error->message); + g_error_free (error); + } + break; +@@ -168,6 +169,7 @@ + + g_return_val_if_fail (E_IS_SOURCE (source), FALSE); + ++ csdd.parent = parent; + csdd.orig_source = source; + csdd.selected_source = NULL; + csdd.obj_type = obj_type; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/event-editor.c evolution-2.30.3.new//calendar/gui/dialogs/event-editor.c +--- evolution-2.30.3//calendar/gui/dialogs/event-editor.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/event-editor.c 2010-09-01 19:18:57.489184000 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "event-page.h" + #include "recurrence-page.h" +@@ -89,11 +90,19 @@ + " " + " " + " " +-" " +-" " +-" " +-" " +-" " ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" " + " " + ""; + +@@ -275,6 +284,8 @@ + GtkActionGroup *action_group; + ECal *client; + gboolean is_meeting; ++ GtkWidget *alarm_page; ++ GtkWidget *attendee_page; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (event_editor_parent_class)->constructor ( +@@ -308,11 +319,34 @@ + + priv->recur_page = recurrence_page_new (editor); + page = COMP_EDITOR_PAGE (priv->recur_page); +- gtk_container_add ( +- GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)), +- comp_editor_page_get_widget (page)); +- gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window))); +- comp_editor_append_page (editor, page, NULL, FALSE); ++ if (!e_shell_get_express_mode(e_shell_get_default())) { ++ gtk_container_add ( ++ GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)), ++ comp_editor_page_get_widget (page)); ++ gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window))); ++ comp_editor_append_page (editor, page, NULL, FALSE); ++ } else { ++ comp_editor_append_page (editor, page, _("_Recurrence"), TRUE); ++ } ++ ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ ENameSelector *name_selector; ++ ++ priv->sched_page = schedule_page_new (priv->model, editor); ++ page = COMP_EDITOR_PAGE (priv->sched_page); ++ ++ name_selector = event_page_get_name_selector (priv->event_page); ++ schedule_page_set_name_selector (priv->sched_page, name_selector); ++ ++ comp_editor_append_page (editor, page, _("_Free/Busy"), TRUE); ++ schedule_page_update_free_busy (priv->sched_page); ++ ++ /* Alarm page */ ++ alarm_page = event_page_get_alarm_page (priv->event_page); ++ comp_editor_append_widget (editor, alarm_page, _("_Alarm"), TRUE); ++ g_object_unref(alarm_page); ++ ++ } + + if (is_meeting) { + +@@ -329,6 +363,12 @@ + + event_page_set_meeting (priv->event_page, TRUE); + priv->meeting_shown=TRUE; ++ ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ attendee_page = event_page_get_attendee_page (priv->event_page); ++ comp_editor_append_widget (editor, attendee_page, _("Attendee_s"), TRUE); ++ g_object_unref(attendee_page); ++ } + } + + return object; +@@ -371,25 +411,12 @@ + event_editor_constructed (GObject *object) + { + EventEditorPrivate *priv; +- EShellSettings *shell_settings; +- EShell *shell; + + priv = EVENT_EDITOR_GET_PRIVATE (object); + +- shell = comp_editor_get_shell (COMP_EDITOR (object)); +- shell_settings = e_shell_get_shell_settings (shell); +- + e_binding_new ( + object, "client", + priv->model, "client"); +- +- e_binding_new ( +- shell_settings, "cal-free-busy-template", +- priv->model, "free-busy-template"); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- priv->model, "timezone"); + } + + static void +@@ -520,7 +547,7 @@ + G_N_ELEMENTS (meeting_entries), ee); + + ui_manager = comp_editor_get_ui_manager (editor); +- gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); ++ e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error); + + id = "org.gnome.evolution.event-editor"; + e_plugin_ui_register_manager (ui_manager, id, ee); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/event-page.c evolution-2.30.3.new//calendar/gui/dialogs/event-page.c +--- evolution-2.30.3//calendar/gui/dialogs/event-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/event-page.c 2010-09-01 19:18:57.489184000 +0200 +@@ -828,7 +828,8 @@ + } else { + gtk_widget_show (priv->calendar_label); + gtk_widget_show (priv->list_box); +- gtk_widget_show (priv->attendee_box); ++ if (!e_shell_get_express_mode(e_shell_get_default())) ++ gtk_widget_show (priv->attendee_box); + gtk_widget_show (priv->organizer); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); + } +@@ -2197,7 +2198,7 @@ + + priv->invite = GW ("invite"); + priv->invite_label = GW ("invite-label"); +- if (comp_editor_get_lite ()) ++ if (e_shell_get_express_mode (e_shell_get_default ())) + gtk_widget_hide (priv->invite); + else + gtk_widget_hide (priv->invite_label); +@@ -2222,7 +2223,6 @@ + + /* Glade's visibility flag doesn't seem to work for custom widgets */ + priv->start_time = GW ("start-time"); +- comp_editor_bind_date_edit_settings (priv->start_time, NULL); + gtk_widget_show (priv->start_time); + + priv->time_hour = GW ("time-hour"); +@@ -2231,7 +2231,6 @@ + priv->end_time_combo = GW ("end-time-combobox"); + + priv->end_time = GW ("end-time"); +- comp_editor_bind_date_edit_settings (priv->end_time, NULL); + gtk_widget_show_all (priv->time_hour); + gtk_widget_hide (priv->end_time); + +@@ -2239,8 +2238,6 @@ + + priv->source_selector = GW ("source"); + +-#undef GW +- + e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources"); + + completion = e_category_completion_new (); +@@ -3259,3 +3256,42 @@ + e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view)); + } + ++GtkWidget * ++event_page_get_alarm_page (EventPage *epage) ++{ ++ EventPagePrivate *priv; ++ GtkWidget *alarm_page, *tmp; ++ ++ g_return_val_if_fail (epage != NULL, NULL); ++ g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); ++ ++ priv = epage->priv; ++ ++ tmp = GW("dialog-vbox1"); ++ alarm_page = GW("vbox2"); ++ g_object_ref(alarm_page); ++ gtk_container_remove ((GtkContainer *)tmp, alarm_page); ++ ++ return alarm_page; ++} ++ ++GtkWidget * ++event_page_get_attendee_page (EventPage *epage) ++{ ++ EventPagePrivate *priv; ++ GtkWidget *apage; ++ ++ g_return_val_if_fail (epage != NULL, NULL); ++ g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); ++ ++ priv = epage->priv; ++ ++ apage = priv->list_box; ++ g_object_ref(apage); ++ gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); ++ gtk_widget_hide (priv->attendee_box); ++ ++ return apage; ++} ++ ++#undef GW +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/event-page.h evolution-2.30.3.new//calendar/gui/dialogs/event-page.h +--- evolution-2.30.3//calendar/gui/dialogs/event-page.h 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/event-page.h 2010-09-01 19:18:57.489184000 +0200 +@@ -109,6 +109,8 @@ + void event_page_add_attendee (EventPage *epage, + EMeetingAttendee *attendee); + void event_page_remove_all_attendees (EventPage *epage); ++GtkWidget * event_page_get_alarm_page (EventPage *epage); ++GtkWidget * event_page_get_attendee_page (EventPage *epage); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/memo-page.c evolution-2.30.3.new//calendar/gui/dialogs/memo-page.c +--- evolution-2.30.3//calendar/gui/dialogs/memo-page.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/memo-page.c 2010-09-01 19:18:57.489184000 +0200 +@@ -816,7 +816,6 @@ + #undef GW + + e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/memos/sources"); +- comp_editor_bind_date_edit_settings (priv->start_date, NULL); + + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/recurrence-page.c evolution-2.30.3.new//calendar/gui/dialogs/recurrence-page.c +--- evolution-2.30.3//calendar/gui/dialogs/recurrence-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/recurrence-page.c 2010-09-01 19:18:57.489184000 +0200 +@@ -1340,8 +1340,6 @@ + make_ending_until_special (RecurrencePage *rpage) + { + RecurrencePagePrivate *priv = rpage->priv; +- EShell *shell; +- EShellSettings *shell_settings; + CompEditor *editor; + CompEditorFlags flags; + EDateEdit *de; +@@ -1353,13 +1351,9 @@ + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); + flags = comp_editor_get_flags (editor); + +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); +- + /* Create the widget */ + +- priv->ending_date_edit = comp_editor_new_date_edit ( +- shell_settings, TRUE, FALSE, FALSE); ++ priv->ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE, FALSE); + de = E_DATE_EDIT (priv->ending_date_edit); + + gtk_container_add (GTK_CONTAINER (priv->ending_special), +@@ -2088,14 +2082,10 @@ + RecurrencePagePrivate *priv; + GtkWidget *dialog, *toplevel; + CompEditor *editor; +- EShell *shell; +- EShellSettings *shell_settings; + + priv = rpage->priv; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + toplevel = gtk_widget_get_toplevel (priv->main); + dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (toplevel), +@@ -2104,7 +2094,7 @@ + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); + +- *date_edit = comp_editor_new_date_edit (shell_settings, TRUE, FALSE, TRUE); ++ *date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE); + gtk_widget_show (*date_edit); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6); + +@@ -2260,8 +2250,6 @@ + init_widgets (RecurrencePage *rpage) + { + RecurrencePagePrivate *priv; +- EShell *shell; +- EShellSettings *shell_settings; + CompEditor *editor; + ECalendar *ecal; + GtkAdjustment *adj; +@@ -2271,22 +2259,12 @@ + priv = rpage->priv; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + /* Recurrence preview */ + + priv->preview_calendar = e_calendar_new (); + ecal = E_CALENDAR (priv->preview_calendar); + +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- ecal->calitem, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- ecal->calitem, "week-start-day"); +- + g_signal_connect((ecal->calitem), "date_range_changed", + G_CALLBACK (preview_date_range_changed_cb), + rpage); +@@ -2423,12 +2401,6 @@ + GtkWidget * + make_exdate_date_edit (void) + { +- EShell *shell; +- EShellSettings *shell_settings; +- +- shell = e_shell_get_default (); +- shell_settings = e_shell_get_shell_settings (shell); +- +- return comp_editor_new_date_edit (shell_settings, TRUE, TRUE, FALSE); ++ return comp_editor_new_date_edit (TRUE, TRUE, FALSE); + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/schedule-page.c evolution-2.30.3.new//calendar/gui/dialogs/schedule-page.c +--- evolution-2.30.3//calendar/gui/dialogs/schedule-page.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/schedule-page.c 2010-09-01 19:18:57.489184000 +0200 +@@ -380,13 +380,9 @@ + schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) + { + SchedulePagePrivate *priv = spage->priv; +- EShellSettings *shell_settings; +- EShell *shell; + CompEditor *editor; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (spage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "schedule-page.ui"); +@@ -412,18 +408,6 @@ + gtk_widget_show (GTK_WIDGET (priv->sel)); + gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6); + +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- priv->sel, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-use-24-hour-format", +- priv->sel, "use-24-hour-format"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- priv->sel, "week-start-day"); +- + if (!init_widgets (spage)) { + g_message ("schedule_page_construct(): " + "Could not initialize the widgets!"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/task-details-page.c evolution-2.30.3.new//calendar/gui/dialogs/task-details-page.c +--- evolution-2.30.3//calendar/gui/dialogs/task-details-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/task-details-page.c 2010-09-01 19:18:57.489184000 +0200 +@@ -474,7 +474,6 @@ + priv->date_completed_label = GW ("date_completed_label"); + + priv->completed_date = GW ("completed-date"); +- comp_editor_bind_date_edit_settings (priv->completed_date, NULL); + gtk_widget_show (priv->completed_date); + + priv->url_label = GW ("url_label"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/task-editor.c evolution-2.30.3.new//calendar/gui/dialogs/task-editor.c +--- evolution-2.30.3//calendar/gui/dialogs/task-editor.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/task-editor.c 2010-09-01 19:18:57.493184000 +0200 +@@ -81,8 +81,10 @@ + " " + " " + " " +-" " +-" " ++" " ++" " ++" " ++" " + " " + ""; + +@@ -202,25 +204,12 @@ + task_editor_constructed (GObject *object) + { + TaskEditorPrivate *priv; +- EShellSettings *shell_settings; +- EShell *shell; + + priv = TASK_EDITOR_GET_PRIVATE (object); + +- shell = comp_editor_get_shell (COMP_EDITOR (object)); +- shell_settings = e_shell_get_shell_settings (shell); +- + e_binding_new ( + object, "client", + priv->model, "client"); +- +- e_binding_new ( +- shell_settings, "cal-free-busy-template", +- priv->model, "free-busy-template"); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- priv->model, "timezone"); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/dialogs/task-page.c evolution-2.30.3.new//calendar/gui/dialogs/task-page.c +--- evolution-2.30.3//calendar/gui/dialogs/task-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/dialogs/task-page.c 2010-09-01 19:18:57.493184000 +0200 +@@ -1363,10 +1363,8 @@ + + /* Glade's visibility flag doesn't seem to work for custom widgets */ + priv->due_date = e_builder_get_widget (priv->builder, "due-date"); +- comp_editor_bind_date_edit_settings (priv->due_date, NULL); + gtk_widget_show (priv->due_date); + priv->start_date = e_builder_get_widget (priv->builder, "start-date"); +- comp_editor_bind_date_edit_settings (priv->start_date, NULL); + gtk_widget_show (priv->start_date); + + priv->timezone = e_builder_get_widget (priv->builder, "timezone"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-calendar-view.c evolution-2.30.3.new//calendar/gui/e-calendar-view.c +--- evolution-2.30.3//calendar/gui/e-calendar-view.c 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-calendar-view.c 2010-09-01 19:18:57.493184000 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -104,7 +105,9 @@ + + static void calendar_view_selectable_init (ESelectableInterface *interface); + +-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ECalendarView, e_calendar_view, GTK_TYPE_TABLE, ++G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( ++ ECalendarView, e_calendar_view, GTK_TYPE_TABLE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) + G_IMPLEMENT_INTERFACE (E_TYPE_SELECTABLE, calendar_view_selectable_init)); + + static void +@@ -873,6 +876,8 @@ + target_list = gtk_target_list_new (NULL, 0); + e_target_list_add_calendar_targets (target_list, 0); + calendar_view->priv->paste_target_list = target_list; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (calendar_view)); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model.c evolution-2.30.3.new//calendar/gui/e-cal-model.c +--- evolution-2.30.3//calendar/gui/e-cal-model.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model.c 2010-09-01 19:18:57.493184000 +0200 +@@ -35,7 +35,7 @@ + #include "e-cal-model.h" + #include "itip-utils.h" + #include "misc.h" +-#include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + + #define E_CAL_MODEL_GET_PRIVATE(obj) \ +@@ -54,8 +54,6 @@ + } ECalModelClient; + + struct _ECalModelPrivate { +- EShellSettings *shell_settings; +- + /* The list of clients we are managing. Each element is of type ECalModelClient */ + GList *clients; + +@@ -128,7 +126,6 @@ + enum { + PROP_0, + PROP_DEFAULT_CLIENT, +- PROP_SHELL_SETTINGS, + PROP_TIMEZONE, + PROP_USE_24_HOUR_FORMAT, + PROP_WEEK_START_DAY +@@ -148,17 +145,9 @@ + static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +-G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE) +- +-static void +-cal_model_set_shell_settings (ECalModel *cal_model, +- EShellSettings *shell_settings) +-{ +- g_return_if_fail (E_IS_SHELL_SETTINGS (shell_settings)); +- g_return_if_fail (cal_model->priv->shell_settings == NULL); +- +- cal_model->priv->shell_settings = g_object_ref (shell_settings); +-} ++G_DEFINE_TYPE_WITH_CODE ( ++ ECalModel, e_cal_model, E_TABLE_MODEL_TYPE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + cal_model_set_property (GObject *object, +@@ -173,12 +162,6 @@ + g_value_get_object (value)); + return; + +- case PROP_SHELL_SETTINGS: +- cal_model_set_shell_settings ( +- E_CAL_MODEL (object), +- g_value_get_object (value)); +- return; +- + case PROP_TIMEZONE: + e_cal_model_set_timezone ( + E_CAL_MODEL (object), +@@ -215,13 +198,6 @@ + E_CAL_MODEL (object))); + return; + +- case PROP_SHELL_SETTINGS: +- g_value_set_object ( +- value, +- e_cal_model_get_shell_settings ( +- E_CAL_MODEL (object))); +- return; +- + case PROP_TIMEZONE: + g_value_set_pointer ( + value, +@@ -254,11 +230,6 @@ + + priv = E_CAL_MODEL_GET_PRIVATE (object); + +- if (priv->shell_settings != NULL) { +- g_object_unref (priv->shell_settings); +- priv->shell_settings = NULL; +- } +- + if (priv->clients) { + while (priv->clients != NULL) { + ECalModelClient *client_data = (ECalModelClient *) priv->clients->data; +@@ -317,28 +288,6 @@ + } + + static void +-cal_model_constructed (GObject *object) +-{ +- ECalModel *model; +- EShellSettings *shell_settings; +- +- model = E_CAL_MODEL (object); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- model, "timezone"); +- +- e_binding_new ( +- shell_settings, "cal-use-24-hour-format", +- model, "use-24-hour-format"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- model, "week-start-day"); +-} +- +-static void + e_cal_model_class_init (ECalModelClass *class) + { + GObjectClass *object_class; +@@ -352,7 +301,6 @@ + object_class->get_property = cal_model_get_property; + object_class->dispose = cal_model_dispose; + object_class->finalize = cal_model_finalize; +- object_class->constructed = cal_model_constructed; + + etm_class = E_TABLE_MODEL_CLASS (class); + etm_class->column_count = ecm_column_count; +@@ -382,17 +330,6 @@ + + g_object_class_install_property ( + object_class, +- PROP_SHELL_SETTINGS, +- g_param_spec_object ( +- "shell-settings", +- _("Shell Settings"), +- _("Application-wide settings"), +- E_TYPE_SHELL_SETTINGS, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, + PROP_TIMEZONE, + g_param_spec_pointer ( + "timezone", +@@ -513,6 +450,8 @@ + model->priv->notify_modified = NULL; + model->priv->notify_removed = NULL; + model->priv->notify_lock = g_mutex_new (); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (model)); + } + + /* ETableModel methods */ +@@ -1387,14 +1326,6 @@ + return assigned_colors[first_empty].color; + } + +-EShellSettings * +-e_cal_model_get_shell_settings (ECalModel *model) +-{ +- g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); +- +- return model->priv->shell_settings; +-} +- + icalcomponent_kind + e_cal_model_get_component_kind (ECalModel *model) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-calendar.c evolution-2.30.3.new//calendar/gui/e-cal-model-calendar.c +--- evolution-2.30.3//calendar/gui/e-cal-model-calendar.c 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-calendar.c 2010-09-01 19:18:57.493184000 +0200 +@@ -525,11 +525,7 @@ + * e_cal_model_calendar_new + */ + ECalModel * +-e_cal_model_calendar_new (EShellSettings *shell_settings) ++e_cal_model_calendar_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_CALENDAR, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_CALENDAR, NULL); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-calendar.h evolution-2.30.3.new//calendar/gui/e-cal-model-calendar.h +--- evolution-2.30.3//calendar/gui/e-cal-model-calendar.h 2010-06-20 14:14:55.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-calendar.h 2010-09-01 19:18:57.493184000 +0200 +@@ -71,8 +71,8 @@ + ECalModelClass parent_class; + }; + +-GType e_cal_model_calendar_get_type (void); +-ECalModel * e_cal_model_calendar_new (EShellSettings *shell_settings); ++GType e_cal_model_calendar_get_type (void); ++ECalModel * e_cal_model_calendar_new (void); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model.h evolution-2.30.3.new//calendar/gui/e-cal-model.h +--- evolution-2.30.3//calendar/gui/e-cal-model.h 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model.h 2010-09-01 19:18:57.493184000 +0200 +@@ -29,7 +29,6 @@ + #include + #include + #include "e-cell-date-edit-text.h" +-#include + + /* Standard GObject macros */ + #define E_TYPE_CAL_MODEL \ +@@ -176,7 +175,6 @@ + + GType e_cal_model_get_type (void); + GType e_cal_model_component_get_type (void); +-EShellSettings *e_cal_model_get_shell_settings (ECalModel *model); + icalcomponent_kind + e_cal_model_get_component_kind (ECalModel *model); + void e_cal_model_set_component_kind (ECalModel *model, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-memos.c evolution-2.30.3.new//calendar/gui/e-cal-model-memos.c +--- evolution-2.30.3//calendar/gui/e-cal-model-memos.c 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-memos.c 2010-09-01 19:18:57.493184000 +0200 +@@ -261,11 +261,7 @@ + * e_cal_model_memos_new + */ + ECalModel * +-e_cal_model_memos_new (EShellSettings *shell_settings) ++e_cal_model_memos_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_MEMOS, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_MEMOS, NULL); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-memos.h evolution-2.30.3.new//calendar/gui/e-cal-model-memos.h +--- evolution-2.30.3//calendar/gui/e-cal-model-memos.h 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-memos.h 2010-09-01 19:18:57.493184000 +0200 +@@ -71,7 +71,7 @@ + }; + + GType e_cal_model_memos_get_type (void); +-ECalModel * e_cal_model_memos_new (EShellSettings *shell_settings); ++ECalModel * e_cal_model_memos_new (void); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-tasks.c evolution-2.30.3.new//calendar/gui/e-cal-model-tasks.c +--- evolution-2.30.3//calendar/gui/e-cal-model-tasks.c 2010-06-20 14:14:55.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-tasks.c 2010-09-01 19:18:57.497184000 +0200 +@@ -133,27 +133,6 @@ + } + + static void +-cal_model_tasks_constructed (GObject *object) +-{ +- ECalModel *model; +- EShellSettings *shell_settings; +- +- model = E_CAL_MODEL (object); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-tasks-color-due-today", +- model, "color-due-today"); +- +- e_binding_new ( +- shell_settings, "cal-tasks-color-overdue", +- model, "color-overdue"); +- +- /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_model_tasks_parent_class)->constructed (object); +-} +- +-static void + e_cal_model_tasks_class_init (ECalModelTasksClass *class) + { + GObjectClass *object_class; +@@ -166,7 +145,6 @@ + object_class->set_property = cal_model_tasks_set_property; + object_class->get_property = cal_model_tasks_get_property; + object_class->finalize = cal_model_tasks_finalize; +- object_class->constructed = cal_model_tasks_constructed; + + table_model_class = E_TABLE_MODEL_CLASS (class); + table_model_class->column_count = ecmt_column_count; +@@ -1157,13 +1135,9 @@ + } + + ECalModel * +-e_cal_model_tasks_new (EShellSettings *shell_settings) ++e_cal_model_tasks_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_TASKS, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_TASKS, NULL); + } + + const gchar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-cal-model-tasks.h evolution-2.30.3.new//calendar/gui/e-cal-model-tasks.h +--- evolution-2.30.3//calendar/gui/e-cal-model-tasks.h 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-cal-model-tasks.h 2010-09-01 19:18:57.497184000 +0200 +@@ -79,7 +79,7 @@ + }; + + GType e_cal_model_tasks_get_type (void); +-ECalModel * e_cal_model_tasks_new (EShellSettings *shell_settings); ++ECalModel * e_cal_model_tasks_new (void); + const gchar * e_cal_model_tasks_get_color_due_today + (ECalModelTasks *model); + void e_cal_model_tasks_set_color_due_today +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-day-view.c evolution-2.30.3.new//calendar/gui/e-day-view.c +--- evolution-2.30.3//calendar/gui/e-day-view.c 2010-07-28 23:15:30.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-day-view.c 2010-09-01 19:18:57.497184000 +0200 +@@ -590,56 +590,12 @@ + day_view_constructed (GObject *object) + { + ECalModel *model; +- EDayView *day_view; +- EShellSettings *shell_settings; + +- day_view = E_DAY_VIEW (object); +- model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-day-view-show-week-numbers", +- day_view->week_number_label, "visible"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-show-line", +- day_view, "marcus-bains-show-line"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-day-view-color", +- day_view, "marcus-bains-day-view-color"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-time-bar-color", +- day_view, "marcus-bains-time-bar-color"); +- +- e_binding_new ( +- shell_settings, "cal-time-divisions", +- day_view, "mins-per-row"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-end-hour", +- day_view, "work-day-end-hour"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-end-minute", +- day_view, "work-day-end-minute"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-start-hour", +- day_view, "work-day-start-hour"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-start-minute", +- day_view, "work-day-start-minute"); +- +- e_binding_new ( +- shell_settings, "cal-working-days-bitset", +- day_view, "working-days"); ++ model = e_calendar_view_get_model (E_CALENDAR_VIEW (object)); + + g_signal_connect_swapped ( + model, "notify::week-start-day", +- G_CALLBACK (day_view_notify_week_start_day_cb), day_view); ++ G_CALLBACK (day_view_notify_week_start_day_cb), object); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-meeting-store.c evolution-2.30.3.new//calendar/gui/e-meeting-store.c +--- evolution-2.30.3//calendar/gui/e-meeting-store.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-meeting-store.c 2010-09-01 19:18:57.497184000 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include "itip-utils.h" + #include "e-meeting-utils.h" + #include "e-meeting-attendee.h" +@@ -87,7 +88,13 @@ + PROP_TIMEZONE + }; + +-static gpointer parent_class; ++/* Forward Declarations */ ++static void ems_tree_model_init (GtkTreeModelIface *iface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EMeetingStore, e_meeting_store, GTK_TYPE_LIST_STORE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, ems_tree_model_init)) + + static icalparameter_cutype + text_to_type (const gchar *type) +@@ -624,15 +631,14 @@ + g_mutex_free (priv->mutex); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_meeting_store_parent_class)->finalize (object); + } + + static void +-meeting_store_class_init (GObjectClass *class) ++e_meeting_store_class_init (EMeetingStoreClass *class) + { + GObjectClass *object_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EMeetingStorePrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -671,7 +677,7 @@ + } + + static void +-meeting_store_init (EMeetingStore *store) ++e_meeting_store_init (EMeetingStore *store) + { + store->priv = E_MEETING_STORE_GET_PRIVATE (store); + +@@ -682,41 +688,8 @@ + store->priv->mutex = g_mutex_new (); + + store->priv->num_queries = 0; +-} +- +-GType +-e_meeting_store_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EMeetingStoreClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) meeting_store_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EMeetingStore), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) meeting_store_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo tree_model_info = { +- (GInterfaceInitFunc) ems_tree_model_init, +- NULL, +- NULL +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_LIST_STORE, "EMeetingStore", &type_info, 0); +- +- g_type_add_interface_static ( +- type, GTK_TYPE_TREE_MODEL, &tree_model_info); +- } + +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (store)); + } + + GObject * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-meeting-time-sel.c evolution-2.30.3.new//calendar/gui/e-meeting-time-sel.c +--- evolution-2.30.3//calendar/gui/e-meeting-time-sel.c 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-meeting-time-sel.c 2010-09-01 19:18:57.501184000 +0200 +@@ -40,6 +40,7 @@ + + #include "misc/e-dateedit.h" + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + + #include "e-meeting-utils.h" +@@ -203,7 +204,9 @@ + + static void free_busy_template_changed_cb (EMeetingTimeSelector *mts); + +-G_DEFINE_TYPE (EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE) ++G_DEFINE_TYPE_WITH_CODE ( ++ EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + meeting_time_selector_set_property (GObject *object, +@@ -391,6 +394,8 @@ + + mts->fb_refresh_not = 0; + mts->style_change_idle_id = 0; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (mts)); + } + + void +@@ -1415,6 +1420,10 @@ + GdkCursor *cursor; + GdkWindow *window; + ++ /* nothing to refresh, lets not leak a busy cursor */ ++ if (e_meeting_store_count_actual_attendees (mts->model) <= 0) ++ return; ++ + start = mts->meeting_start_time; + g_date_subtract_days (&start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE); + start.hour = 0; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/e-week-view.c evolution-2.30.3.new//calendar/gui/e-week-view.c +--- evolution-2.30.3//calendar/gui/e-week-view.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/e-week-view.c 2010-09-01 19:18:57.501184000 +0200 +@@ -523,19 +523,9 @@ + { + ECalModel *model; + ECalendarView *calendar_view; +- EShellSettings *shell_settings; + + calendar_view = E_CALENDAR_VIEW (object); + model = e_calendar_view_get_model (calendar_view); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-compress-weekend", +- object, "compress-weekend"); +- +- e_binding_new ( +- shell_settings, "cal-show-event-end-times", +- object, "show-event-end-times"); + + g_signal_connect_swapped ( + model, "notify::week-start-day", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/gnome-cal.c evolution-2.30.3.new//calendar/gui/gnome-cal.c +--- evolution-2.30.3//calendar/gui/gnome-cal.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/gnome-cal.c 2010-09-01 19:18:57.501184000 +0200 +@@ -76,8 +76,6 @@ + + /* Private part of the GnomeCalendar structure */ + struct _GnomeCalendarPrivate { +- EShellSettings *shell_settings; +- + ECalModel *model; + + /* +@@ -329,16 +327,6 @@ + } + + static void +-gnome_calendar_set_shell_settings (GnomeCalendar *gcal, +- EShellSettings *shell_settings) +-{ +- g_return_if_fail (E_IS_SHELL_SETTINGS (shell_settings)); +- g_return_if_fail (gcal->priv->shell_settings == NULL); +- +- gcal->priv->shell_settings = g_object_ref (shell_settings); +-} +- +-static void + gnome_calendar_set_property (GObject *object, + guint property_id, + const GValue *value, +@@ -351,12 +339,6 @@ + g_value_get_object (value)); + return; + +- case PROP_SHELL_SETTINGS: +- gnome_calendar_set_shell_settings ( +- GNOME_CALENDAR (object), +- g_value_get_object (value)); +- return; +- + case PROP_VIEW: + gnome_calendar_set_view ( + GNOME_CALENDAR (object), +@@ -392,12 +374,6 @@ + GNOME_CALENDAR (object))); + return; + +- case PROP_SHELL_SETTINGS: +- g_value_set_object ( +- value, gnome_calendar_get_shell_settings ( +- GNOME_CALENDAR (object))); +- return; +- + case PROP_VIEW: + g_value_set_int ( + value, gnome_calendar_get_view ( +@@ -424,15 +400,12 @@ + gnome_calendar_constructed (GObject *object) + { + GnomeCalendar *gcal = GNOME_CALENDAR (object); +- EShellSettings *shell_settings; + ECalendarView *calendar_view; + ECalModel *model; + GtkAdjustment *adjustment; + +- shell_settings = gnome_calendar_get_shell_settings (gcal); +- + /* Create the model for the views. */ +- model = e_cal_model_calendar_new (shell_settings); ++ model = e_cal_model_calendar_new (); + e_cal_model_set_flags (model, E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES); + gcal->priv->model = model; + +@@ -545,17 +518,6 @@ + + g_object_class_install_property ( + object_class, +- PROP_SHELL_SETTINGS, +- g_param_spec_object ( +- "shell-settings", +- _("Shell Settings"), +- _("Application-wide settings"), +- E_TYPE_SHELL_SETTINGS, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, + PROP_VIEW, + g_param_spec_int ( + "view", +@@ -1461,7 +1423,7 @@ + priv->todo_update_lock = g_mutex_new (); + priv->dn_query_lock = g_mutex_new (); + +- priv->current_view_type = GNOME_CAL_DAY_VIEW; ++ priv->current_view_type = GNOME_CAL_WORK_WEEK_VIEW; + priv->range_selected = FALSE; + priv->lview_select_daten_range = TRUE; + +@@ -1490,11 +1452,6 @@ + gcal = GNOME_CALENDAR (object); + priv = gcal->priv; + +- if (priv->shell_settings != NULL) { +- g_object_unref (priv->shell_settings); +- priv->shell_settings = NULL; +- } +- + if (priv->model != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->model, view_progress_cb, gcal); +@@ -1904,21 +1861,9 @@ + } + + GtkWidget * +-gnome_calendar_new (EShellSettings *shell_settings) ++gnome_calendar_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- GNOME_TYPE_CALENDAR, +- "shell-settings", shell_settings, NULL); +-} +- +-EShellSettings * +-gnome_calendar_get_shell_settings (GnomeCalendar *gcal) +-{ +- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); +- +- return gcal->priv->shell_settings; ++ return g_object_new (GNOME_TYPE_CALENDAR, NULL); + } + + ECalendar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//calendar/gui/gnome-cal.h evolution-2.30.3.new//calendar/gui/gnome-cal.h +--- evolution-2.30.3//calendar/gui/gnome-cal.h 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.3.new//calendar/gui/gnome-cal.h 2010-09-01 19:18:57.501184000 +0200 +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include "e-cal-model.h" + +@@ -113,10 +112,8 @@ + }; + + GType gnome_calendar_get_type (void); +-GtkWidget * gnome_calendar_new (EShellSettings *shell_settings); ++GtkWidget * gnome_calendar_new (void); + void gnome_calendar_dispose (GnomeCalendar *gcal); +-EShellSettings *gnome_calendar_get_shell_settings +- (GnomeCalendar *gcal); + ECalendar * gnome_calendar_get_date_navigator + (GnomeCalendar *gcal); + void gnome_calendar_set_date_navigator +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-account-view.c evolution-2.30.3.new//capplet/settings/mail-account-view.c +--- evolution-2.30.3//capplet/settings/mail-account-view.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//capplet/settings/mail-account-view.c 2010-09-01 19:18:57.505184000 +0200 +@@ -26,14 +26,31 @@ + + #include + #include "mail-account-view.h" ++#include ++#include ++#include + #include + #include "mail-view.h" + #include "e-util/e-config.h" + #include "mail/mail-config.h" ++#include "mail/mail-session.h" + #include "mail-guess-servers.h" + + struct _MailAccountViewPrivate { + GtkWidget *tab_str; ++ ++ GtkWidget *calendar; ++ GtkWidget *gcontacts; ++ GtkWidget *gmail_info_label; ++ ++ gboolean is_gmail; ++ gboolean is_yahoo; ++ gboolean do_gcontacts; ++ gboolean do_calendar; ++ ++ gchar *username; ++ ++ GtkWidget *yahoo_cal_entry; + }; + + G_DEFINE_TYPE (MailAccountView, mail_account_view, GTK_TYPE_VBOX) +@@ -47,6 +64,7 @@ + ERROR_NO_FULLNAME = 1, + ERROR_NO_EMAIL = 2, + ERROR_INVALID_EMAIL = 3, ++ ERROR_NO_PASSWORD = 4, + }; + + struct _dialog_errors { +@@ -56,6 +74,7 @@ + { ERROR_NO_FULLNAME, N_("Please enter your full name.") }, + { ERROR_NO_EMAIL, N_("Please enter your email address.") }, + { ERROR_INVALID_EMAIL, N_("The email address you have entered is invalid.") }, ++ { ERROR_NO_PASSWORD, N_("Please enter your password.") } + }; + static guint signals[LAST_SIGNAL] = { 0 }; + +@@ -64,12 +83,17 @@ + { + shell->priv = g_new0(MailAccountViewPrivate, 1); + ++ shell->priv->is_gmail = FALSE; ++ shell->priv->is_yahoo = FALSE; ++ shell->priv->username = NULL; + } + + static void + mail_account_view_finalize (GObject *object) + { +- /*MailAccountView *shell = (MailAccountView *)object;*/ ++ MailAccountView *shell = (MailAccountView *)object; ++ ++ g_free(shell->priv->username); + + G_OBJECT_CLASS (mail_account_view_parent_class)->finalize (object); + } +@@ -136,11 +160,17 @@ + gchar *user = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME); + gchar *email = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS); + gchar *tmp; ++ const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password); + + if (!user || !*user) + return ERROR_NO_FULLNAME; + if (!email || !*email) + return ERROR_NO_EMAIL; ++ if (view->original) /* We don't query/store pwd on edit. */ ++ return 0; ++ if (!pwd || !*pwd) ++ return ERROR_NO_PASSWORD; ++ + tmp = strchr(email, '@'); + if (!tmp || tmp[1] == 0) + return ERROR_INVALID_EMAIL; +@@ -162,6 +192,258 @@ + #define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 12); gtk_widget_show(box); + #define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box); + ++#define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events" ++#define GMAIL_CALENDAR_LOCATION "://www.google.com/calendar/feeds/" ++#define CALENDAR_DEFAULT_PATH "/private/full" ++#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" ++#define YAHOO_CALENDAR_LOCATION "%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s" ++static gboolean ++is_email (const gchar *address) ++{ ++ /* This is supposed to check if the address's domain could be ++ an FQDN but alas, it's not worth the pain and suffering. */ ++ const gchar *at; ++ ++ at = strchr (address, '@'); ++ /* make sure we have an '@' and that it's not the first or last gchar */ ++ if (!at || at == address || *(at + 1) == '\0') ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static gchar * ++sanitize_user_mail (const gchar *user) ++{ ++ if (!user) ++ return NULL; ++ ++ if (strstr (user, "%40") != NULL) { ++ return g_strdup (user); ++ } else if (!is_email (user)) { ++ return g_strconcat (user, "%40gmail.com", NULL); ++ } else { ++ gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2)); ++ gchar *at = strchr (user, '@'); ++ ++ strncpy (tmp, user, at - user); ++ strcat (tmp, "%40"); ++ strcat (tmp, at + 1); ++ ++ return tmp; ++ } ++} ++ ++static void ++setup_yahoo_account (MailAccountView *mav) ++{ ++ GConfClient *gconf = gconf_client_get_default (); ++ ++ mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); ++ mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); ++ ++ if (mav->priv->do_calendar) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *calendar; ++ gchar *sanitize_uname, *abs_uri, *rel_uri; ++ GSList *ids, *temp; ++ const gchar *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS); ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://"); ++ if (!sgrp) { ++ sgrp = e_source_list_ensure_group (slist, _("CalDAV"), "caldav://", TRUE); ++ } ++ ++ printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp); ++ ++ /* FIXME: Not sure if we should localize 'Calendar' */ ++ calendar = e_source_new ("Yahoo", ""); ++ e_source_set_property (calendar, "ssl", "1"); ++ e_source_set_property (calendar, "refresh", "30"); ++ e_source_set_property (calendar, "refresh-type", "0"); ++ e_source_set_property (calendar, "auth", "1"); ++ e_source_set_property (calendar, "offline_sync", "1"); ++ e_source_set_property (calendar, "username", email); ++ e_source_set_property (calendar, "default", "true"); ++ e_source_set_property (calendar, "alarm", "true"); ++ ++ e_source_set_readonly (calendar, FALSE); ++ ++ sanitize_uname = sanitize_user_mail (email); ++ ++ abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); ++ e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Calendar", abs_uri); ++ ++ rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); ++ e_source_set_relative_uri (calendar, rel_uri); ++ ++ e_source_group_add_source (sgrp, calendar, -1); ++ e_source_list_sync (slist, NULL); ++ ++ ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); ++ ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); ++ gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); ++ temp = ids; ++ ++ for (; temp != NULL; temp = g_slist_next (temp)) ++ g_free (temp->data); ++ g_slist_free (ids); ++ ++ g_free(abs_uri); ++ g_free(rel_uri); ++ g_free(sanitize_uname); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(calendar); ++ } else ++ printf("Not setting up Yahoo Calendar\n"); ++ ++ if (mav->priv->do_gcontacts) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *abook; ++ gchar *rel_uri;; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); ++ ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ ++ /* FIXME: Not sure if we should localize 'Contacts' */ ++ abook = e_source_new ("Contacts", ""); ++ e_source_set_property (abook, "default", "true"); ++ e_source_set_property (abook, "offline_sync", "1"); ++ e_source_set_property (abook, "auth", "plain/password"); ++ e_source_set_property (abook, "use-ssl", "true"); ++ e_source_set_property (abook, "remember_password", "true"); ++ e_source_set_property (abook, "refresh-interval", "86400"); ++ e_source_set_property (abook, "completion", "true"); ++ e_source_set_property (abook, "username", mav->priv->username); ++ e_source_set_relative_uri (abook, mav->priv->username); ++ ++ rel_uri = g_strdup_printf("google://%s/", mav->priv->username); ++ e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Addressbook", rel_uri); ++ e_source_group_add_source (sgrp, abook, -1); ++ e_source_list_sync (slist, NULL); ++ ++ g_free(rel_uri); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(abook); ++ ++ } ++ ++ g_object_unref (gconf); ++} ++ ++static void ++setup_google_accounts (MailAccountView *mav) ++{ ++ GConfClient *gconf = gconf_client_get_default (); ++ ++ mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); ++ mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); ++ ++ if (mav->priv->do_calendar) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *calendar; ++ gchar *sanitize_uname, *abs_uri, *rel_uri; ++ GSList *ids, *temp; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ if (!sgrp) { ++ sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); ++ } ++ ++ printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp); ++ ++ /* FIXME: Not sure if we should localize 'Calendar' */ ++ calendar = e_source_new ("Calendar", ""); ++ e_source_set_property (calendar, "ssl", "1"); ++ e_source_set_property (calendar, "refresh", "30"); ++ e_source_set_property (calendar, "auth", "1"); ++ e_source_set_property (calendar, "offline_sync", "1"); ++ e_source_set_property (calendar, "username", mav->priv->username); ++ e_source_set_property (calendar, "setup-username", mav->priv->username); ++ e_source_set_property (calendar, "default", "true"); ++ e_source_set_readonly (calendar, FALSE); ++ ++ sanitize_uname = sanitize_user_mail (mav->priv->username); ++ ++ abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); ++ e_source_set_absolute_uri (calendar, abs_uri); ++ ++ e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Calendar", abs_uri); ++ rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); ++ e_source_set_relative_uri (calendar, rel_uri); ++ ++ e_source_group_add_source (sgrp, calendar, -1); ++ e_source_list_sync (slist, NULL); ++ ++ ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); ++ ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); ++ gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); ++ temp = ids; ++ ++ for (; temp != NULL; temp = g_slist_next (temp)) ++ g_free (temp->data); ++ g_slist_free (ids); ++ ++ g_free(abs_uri); ++ g_free(rel_uri); ++ g_free(sanitize_uname); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(calendar); ++ } else ++ printf("Not setting up Google Calendar\n"); ++ ++ if (mav->priv->do_gcontacts) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *abook; ++ gchar *rel_uri;; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); ++ ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ ++ /* FIXME: Not sure if we should localize 'Contacts' */ ++ abook = e_source_new ("Contacts", ""); ++ e_source_set_property (abook, "default", "true"); ++ e_source_set_property (abook, "offline_sync", "1"); ++ e_source_set_property (abook, "auth", "plain/password"); ++ e_source_set_property (abook, "use-ssl", "true"); ++ e_source_set_property (abook, "remember_password", "true"); ++ e_source_set_property (abook, "refresh-interval", "86400"); ++ e_source_set_property (abook, "completion", "true"); ++ e_source_set_property (abook, "username", mav->priv->username); ++ e_source_set_relative_uri (abook, mav->priv->username); ++ ++ rel_uri = g_strdup_printf("google://%s/", mav->priv->username); ++ e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Addressbook", rel_uri); ++ e_source_group_add_source (sgrp, abook, -1); ++ e_source_list_sync (slist, NULL); ++ ++ g_free(rel_uri); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(abook); ++ ++ } ++ ++ g_object_unref (gconf); ++} ++ ++#define INDENTATION 10 ++ + static GtkWidget * + create_review (MailAccountView *view) + { +@@ -181,124 +463,115 @@ + gtk_label_set_markup ((GtkLabel *)label, _("Personal details:")); + gtk_widget_show (label); + PACK_BOXF(label) +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Name:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new(e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME)); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Email address:")); + gtk_widget_show (label); + PACK_BOX(label) +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS)); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); ++ ++ label = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)label, _("Details:")); ++ gtk_widget_show (label); ++ PACK_BOXF(label); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (NULL); +- gtk_label_set_markup ((GtkLabel *)label, _("Receiving details:")); ++ gtk_label_set_markup ((GtkLabel *)label, _("Receiving")); + gtk_widget_show (label); + PACK_BOXF(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Server type:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->protocol); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Server address:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->host); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Username:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->user); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Use encryption:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); + entry = gtk_label_new (enc ? enc : _("never")); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + ++ view->priv->username = g_strdup(url->user); + camel_url_free(url); + uri =(gchar *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL); + if (!uri || (url = camel_url_new(uri, NULL)) == NULL) + return NULL; + + label = gtk_label_new (NULL); +- gtk_label_set_markup ((GtkLabel *)label, _("Sending details:")); ++ gtk_label_set_markup ((GtkLabel *)label, _("Sending")); + gtk_widget_show (label); + PACK_BOXF(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Server type:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->protocol); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Server address:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->host); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Username:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->user); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Use encryption:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); + entry = gtk_label_new (enc ? enc : _("never")); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + /* + label = gtk_label_new (_("Organization:")); + gtk_widget_show (label); + entry = gtk_entry_new (); + gtk_widget_show(entry); +- gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, 10, 3); +- gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, INDENTATION, 0); ++ gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + */ + + gtk_widget_show(table); +@@ -378,6 +651,25 @@ + g_free(uri); + camel_url_free(url); + } ++ ++ if (!mav->original) { ++ EAccount *account = em_account_editor_get_modified_account(mav->edit); ++ CamelURL *aurl; ++ gchar *surl; ++ /* Save the password ahead of time */ ++ aurl = camel_url_new (account->source->url, NULL); ++ surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL); ++ e_passwords_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Mail", surl); ++ camel_url_free(aurl); ++ g_free(surl); ++ } ++ ++ if (mav->priv->is_gmail && !mav->original) ++ setup_google_accounts (mav); ++ else if (mav->priv->is_yahoo && !mav->original) ++ setup_yahoo_account (mav); ++ + em_account_editor_commit (mav->edit); + g_signal_emit (mav, signals[VIEW_CLOSE], 0); + return; +@@ -393,6 +685,7 @@ + if (mav->current_page == MAV_LAST - 1) { + MAVPage *page = mav->pages[mav->current_page]; + GtkWidget *tmp; ++ EAccount *account = em_account_editor_get_modified_account(mav->edit); + + if (page->main) + gtk_widget_destroy (page->main); +@@ -403,6 +696,96 @@ + gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0); + gtk_widget_show(tmp); + gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3); ++ ++ if (mav->priv->is_gmail) { ++ gtk_widget_destroy (mav->priv->gcontacts); ++ gtk_widget_destroy (mav->priv->calendar); ++ gtk_widget_destroy (mav->priv->gmail_info_label); ++ } else if (mav->priv->is_yahoo) { ++ gtk_widget_destroy (mav->priv->calendar); ++ gtk_widget_destroy (mav->priv->gmail_info_label); ++ gtk_widget_destroy (mav->priv->yahoo_cal_entry); ++ } ++ ++ if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") || ++ g_strrstr(account->source->url, "googlemail"))) { ++ /* Google accounts*/ ++ GtkWidget *tmp; ++ mav->priv->is_gmail = TRUE; ++ ++ mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); ++ mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); ++ ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); ++ ++ mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access.")); ++ gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); ++ ++ gtk_widget_show (mav->priv->gcontacts); ++ gtk_widget_show (mav->priv->calendar); ++ gtk_widget_show (mav->priv->gmail_info_label); ++ ++ tmp = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); ++ gtk_widget_show(tmp); ++ ++#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++ ++ PACK_IN_BOX(page->box,tmp,12); ++ PACK_IN_BOX(page->box,mav->priv->gcontacts,24); ++ PACK_IN_BOX(page->box,mav->priv->calendar,24); ++#undef PACK_IN_BOX ++#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++ ++ PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); ++#undef PACK_IN_BOX ++ } else if (mav->original == NULL && ++ (g_strrstr(account->source->url, "yahoo.") || ++ g_strrstr(account->source->url, "ymail.") || ++ g_strrstr(account->source->url, "rocketmail."))) { ++ /* Yahoo accounts*/ ++ GtkWidget *tmp; ++ gchar *cal_name; ++ GtkWidget *tmpbox; ++ ++ mav->priv->is_yahoo = TRUE; ++ printf("Google account: %s\n", account->source->url); ++ mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution")); ++ ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); ++ ++ mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); ++ gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); ++ ++ gtk_widget_show (mav->priv->calendar); ++ gtk_widget_show (mav->priv->gmail_info_label); ++ ++ tmp = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)tmp, _("Yahoo account settings:")); ++ gtk_widget_show(tmp); ++ ++#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);} ++ ++ PACK_IN_BOX(page->box,tmp,12); ++ PACK_IN_BOX(page->box,mav->priv->calendar,24); ++ ++ mav->priv->yahoo_cal_entry = gtk_entry_new (); ++ gtk_widget_show (mav->priv->yahoo_cal_entry); ++ PACK_IN_BOX(page->box,mav->priv->gmail_info_label, 24); ++ PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0); ++ PACK_IN_BOX(page->box, tmpbox, 24); ++ cal_name = g_strdup(e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_NAME)); ++ cal_name = g_strdelimit(cal_name, " ", '_'); ++ gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name); ++ g_free (cal_name); ++#undef PACK_IN_BOX ++ } else { ++ mav->priv->is_gmail = FALSE; ++ mav->priv->is_yahoo = FALSE; ++ } ++ + } + + gtk_widget_show (mav->pages[mav->current_page]->box); +@@ -509,6 +892,9 @@ + gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0); + } + page->next = gtk_button_new (); ++ gtk_widget_set_can_default (page->next, TRUE); ++ g_signal_connect (page->next, "hierarchy-changed", ++ G_CALLBACK (gtk_widget_grab_default), NULL); + gtk_container_add ((GtkContainer *)page->next, box); + gtk_widget_show_all(page->next); + g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); +@@ -586,9 +972,16 @@ + } + + static void ++next_page (GtkWidget *entry, MailAccountView *mav) ++{ ++ mav_next_pressed (NULL, mav); ++} ++ ++static void + mail_account_view_construct (MailAccountView *view) + { + gint i; ++ EShell *shell; + + view->scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +@@ -616,8 +1009,29 @@ + em_account_editor_check (view->edit, mail_account_pages[0].path); + view->pages[0]->done = TRUE; + +- if (e_shell_get_express_mode (e_shell_get_default ())) ++ shell = e_shell_get_default (); ++ if (!shell || e_shell_get_express_mode (shell)) { ++ GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); ++ GtkWidget *label, *pwd; + gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); ++ ++ if (!view->original) { ++ label = gtk_label_new (_("Password:")); ++ pwd = gtk_entry_new (); ++ gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE); ++/* gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */ ++ g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view); ++ gtk_widget_show(label); ++ gtk_widget_show(pwd); ++ gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); ++ gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); ++ ++ view->password = pwd; ++ } ++ } ++ ++ /* assume the full name is known from the system */ ++ gtk_widget_grab_focus (em_account_editor_get_widget (view->edit, "identity_address")); + } + + MailAccountView * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-account-view.h evolution-2.30.3.new//capplet/settings/mail-account-view.h +--- evolution-2.30.3//capplet/settings/mail-account-view.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//capplet/settings/mail-account-view.h 2010-09-01 19:18:57.505184000 +0200 +@@ -75,6 +75,7 @@ + GtkWidget *wpages[6]; + gint current_page; + struct _EMAccountEditor *edit; ++ GtkWidget *password; + + MailAccountViewPrivate *priv; + } MailAccountView; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/abc.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/abc.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/abc.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/abc.plala.or.jp 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ abc.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ abc.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ abc.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/agate.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/agate.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/agate.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/agate.plala.or.jp 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ agate.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ agate.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ agate.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/amail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/amail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/amail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/amail.plala.or.jp 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ amail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ amail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ amail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/amber.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/amber.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/amber.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/amber.plala.or.jp 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ amber.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ amber.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ amber.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/a.memail.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/a.memail.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/a.memail.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/a.memail.jp 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,1423 @@ ++ ++ ++ ++ 007.biglobe.ne.jp ++ 2001.biglobe.ne.jp ++ 4649.biglobe.ne.jp ++ 777.biglobe.ne.jp ++ a.biglobe.ne.jp ++ a.memail.jp ++ ab.biglobe.ne.jp ++ ab.memail.jp ++ abashiri.eeyo.jp ++ abukuma.eeyo.jp ++ ace.biglobe.ne.jp ++ ace.memail.jp ++ achoo.biglobe.ne.jp ++ achoo.memail.jp ++ adachi.eeyo.jp ++ aizu.eeyo.jp ++ akan.eeyo.jp ++ aki.eeyo.jp ++ akita.eeyo.jp ++ alien.biglobe.ne.jp ++ alien.memail.jp ++ aloha.biglobe.ne.jp ++ aloha.memail.jp ++ amakusa.eeyo.jp ++ amami.eeyo.jp ++ amethyst.biglobe.ne.jp ++ amethyst.memail.jp ++ amigo.biglobe.ne.jp ++ amigo.memail.jp ++ angel.biglobe.ne.jp ++ angel.memail.jp ++ angler.biglobe.ne.jp ++ angler.memail.jp ++ aomori.eeyo.jp ++ appi.eeyo.jp ++ apricot.biglobe.ne.jp ++ apricot.memail.jp ++ aqua.biglobe.ne.jp ++ aqua.memail.jp ++ aquamarine.biglobe.ne.jp ++ aquamarine.memail.jp ++ aquarius.biglobe.ne.jp ++ aquarius.memail.jp ++ arashiyama.eeyo.jp ++ aries.biglobe.ne.jp ++ aries.memail.jp ++ arima.eeyo.jp ++ asahikawa.eeyo.jp ++ asakusa.eeyo.jp ++ asama.eeyo.jp ++ ashizuri.eeyo.jp ++ aso.eeyo.jp ++ asuka.eeyo.jp ++ atami.eeyo.jp ++ atsumi.eeyo.jp ++ autumn.biglobe.ne.jp ++ autumn.memail.jp ++ awa.eeyo.jp ++ awaji.eeyo.jp ++ ayu.biglobe.ne.jp ++ ayu.memail.jp ++ azumino.eeyo.jp ++ b.biglobe.ne.jp ++ b.memail.jp ++ bamboo.biglobe.ne.jp ++ bamboo.memail.jp ++ banana.biglobe.ne.jp ++ banana.memail.jp ++ bandai.eeyo.jp ++ baseball.biglobe.ne.jp ++ baseball.memail.jp ++ basil.biglobe.ne.jp ++ basil.memail.jp ++ basketball.biglobe.ne.jp ++ basketball.memail.jp ++ bass.biglobe.ne.jp ++ bass.memail.jp ++ bat.biglobe.ne.jp ++ bat.memail.jp ++ bazar.de.gozarre.jp ++ bcs.biglobe.ne.jp ++ bear.biglobe.ne.jp ++ bear.memail.jp ++ beat.biglobe.ne.jp ++ beat.memail.jp ++ beautiful.biglobe.ne.jp ++ beautiful.memail.jp ++ beer.biglobe.ne.jp ++ beer.memail.jp ++ believe.biglobe.ne.jp ++ believe.memail.jp ++ bell.biglobe.ne.jp ++ bell.memail.jp ++ beppu.eeyo.jp ++ bike.biglobe.ne.jp ++ bike.memail.jp ++ bingo.eeyo.jp ++ bird.biglobe.ne.jp ++ bird.memail.jp ++ bitchu.eeyo.jp ++ biwako.eeyo.jp ++ bizen.eeyo.jp ++ black.biglobe.ne.jp ++ black.memail.jp ++ blue.biglobe.ne.jp ++ blue.memail.jp ++ blues.biglobe.ne.jp ++ blues.memail.jp ++ bluesky.biglobe.ne.jp ++ bluesky.memail.jp ++ bma.biglobe.ne.jp ++ boar.biglobe.ne.jp ++ boar.memail.jp ++ bohemian.biglobe.ne.jp ++ bohemian.memail.jp ++ boso.eeyo.jp ++ bowwow.biglobe.ne.jp ++ bowwow.memail.jp ++ bqd.biglobe.ne.jp ++ bravo.biglobe.ne.jp ++ bravo.memail.jp ++ breeze.biglobe.ne.jp ++ breeze.memail.jp ++ bridge.biglobe.ne.jp ++ bridge.memail.jp ++ bro.biglobe.ne.jp ++ bro.memail.jp ++ bungo.eeyo.jp ++ butterfly.biglobe.ne.jp ++ butterfly.memail.jp ++ buzen.eeyo.jp ++ c.biglobe.ne.jp ++ c.memail.jp ++ cafe.biglobe.ne.jp ++ cafe.memail.jp ++ cake.biglobe.ne.jp ++ cake.memail.jp ++ cancer.biglobe.ne.jp ++ cancer.memail.jp ++ candy.biglobe.ne.jp ++ candy.memail.jp ++ capricorn.biglobe.ne.jp ++ capricorn.memail.jp ++ cat.biglobe.ne.jp ++ cat.memail.jp ++ catch.biglobe.ne.jp ++ catch.memail.jp ++ center.biglobe.ne.jp ++ center.memail.jp ++ chameleon.biglobe.ne.jp ++ chameleon.memail.jp ++ cheers.biglobe.ne.jp ++ cheers.memail.jp ++ cheetah.biglobe.ne.jp ++ cheetah.memail.jp ++ cherry.biglobe.ne.jp ++ cherry.memail.jp ++ chiba.eeyo.jp ++ chichibu.eeyo.jp ++ chikugo.eeyo.jp ++ chikuho.eeyo.jp ++ chikushi.eeyo.jp ++ chikuzen.eeyo.jp ++ chita.eeyo.jp ++ chocolate.biglobe.ne.jp ++ chocolate.memail.jp ++ chokaisan.eeyo.jp ++ chu.biglobe.ne.jp ++ chu.memail.jp ++ chubu.eeyo.jp ++ chugoku.eeyo.jp ++ ciao.biglobe.ne.jp ++ ciao.memail.jp ++ classical.biglobe.ne.jp ++ classical.memail.jp ++ clever.biglobe.ne.jp ++ clever.memail.jp ++ club.biglobe.ne.jp ++ club.memail.jp ++ cobra.biglobe.ne.jp ++ cobra.memail.jp ++ comet.biglobe.ne.jp ++ comet.memail.jp ++ condor.biglobe.ne.jp ++ condor.memail.jp ++ cool.biglobe.ne.jp ++ cool.memail.jp ++ coral.biglobe.ne.jp ++ coral.memail.jp ++ cow.biglobe.ne.jp ++ cow.memail.jp ++ crow.biglobe.ne.jp ++ crow.memail.jp ++ cute.biglobe.ne.jp ++ cute.memail.jp ++ d.biglobe.ne.jp ++ d.memail.jp ++ dad.biglobe.ne.jp ++ dad.memail.jp ++ daisen.eeyo.jp ++ daisuki.biglobe.ne.jp ++ daisuki.memail.jp ++ dance.biglobe.ne.jp ++ dance.memail.jp ++ darling.biglobe.ne.jp ++ darling.memail.jp ++ dazaifu.eeyo.jp ++ de.gozarre.jp ++ dear.biglobe.ne.jp ++ dear.memail.jp ++ denbe.biglobe.ne.jp ++ denbe.memail.jp ++ dewa.eeyo.jp ++ diamond.biglobe.ne.jp ++ diamond.memail.jp ++ dog.biglobe.ne.jp ++ dog.memail.jp ++ dogo.eeyo.jp ++ dokidoki.biglobe.ne.jp ++ dokidoki.memail.jp ++ doll.biglobe.ne.jp ++ doll.memail.jp ++ dolphin.biglobe.ne.jp ++ dolphin.memail.jp ++ dotonbori.eeyo.jp ++ dr.biglobe.ne.jp ++ dr.memail.jp ++ dragon.biglobe.ne.jp ++ dragon.memail.jp ++ dreamer.biglobe.ne.jp ++ dreamer.memail.jp ++ drum.biglobe.ne.jp ++ drum.memail.jp ++ duck.biglobe.ne.jp ++ duck.memail.jp ++ dunk.biglobe.ne.jp ++ dunk.memail.jp ++ e.biglobe.ne.jp ++ e.memail.jp ++ eagle.biglobe.ne.jp ++ eagle.memail.jp ++ earth.biglobe.ne.jp ++ earth.memail.jp ++ east.biglobe.ne.jp ++ east.memail.jp ++ echigo.eeyo.jp ++ echizen.eeyo.jp ++ edo.eeyo.jp ++ ehime.eeyo.jp ++ eight.biglobe.ne.jp ++ eight.memail.jp ++ elephant.biglobe.ne.jp ++ elephant.memail.jp ++ eleven.biglobe.ne.jp ++ eleven.memail.jp ++ emerald.biglobe.ne.jp ++ emerald.memail.jp ++ energy.biglobe.ne.jp ++ energy.memail.jp ++ enjoy.biglobe.ne.jp ++ enjoy.memail.jp ++ erimo.eeyo.jp ++ etchu.eeyo.jp ++ f.biglobe.ne.jp ++ f.memail.jp ++ fairy.biglobe.ne.jp ++ fairy.memail.jp ++ falcon.biglobe.ne.jp ++ falcon.memail.jp ++ fan.biglobe.ne.jp ++ fan.memail.jp ++ fantasy.biglobe.ne.jp ++ fantasy.memail.jp ++ fawn.biglobe.ne.jp ++ fawn.memail.jp ++ ferret.biglobe.ne.jp ++ ferret.memail.jp ++ fever.biglobe.ne.jp ++ fever.memail.jp ++ fight.biglobe.ne.jp ++ fight.memail.jp ++ fine.biglobe.ne.jp ++ fine.memail.jp ++ fire.biglobe.ne.jp ++ fire.memail.jp ++ first.biglobe.ne.jp ++ first.memail.jp ++ fish.biglobe.ne.jp ++ fish.memail.jp ++ fist.biglobe.ne.jp ++ fist.memail.jp ++ five.biglobe.ne.jp ++ five.memail.jp ++ folk.biglobe.ne.jp ++ folk.memail.jp ++ force.biglobe.ne.jp ++ force.memail.jp ++ forest.biglobe.ne.jp ++ forest.memail.jp ++ four.biglobe.ne.jp ++ four.memail.jp ++ fox.biglobe.ne.jp ++ fox.memail.jp ++ fresh.biglobe.ne.jp ++ fresh.memail.jp ++ fruit.biglobe.ne.jp ++ fruit.memail.jp ++ fuji.eeyo.jp ++ fukui.eeyo.jp ++ fukuoka.eeyo.jp ++ fukushima.eeyo.jp ++ fukuyama.eeyo.jp ++ funky.biglobe.ne.jp ++ funky.memail.jp ++ furano.eeyo.jp ++ future.biglobe.ne.jp ++ future.memail.jp ++ g.biglobe.ne.jp ++ g.memail.jp ++ gaia.biglobe.ne.jp ++ gaia.memail.jp ++ galaxy.biglobe.ne.jp ++ galaxy.memail.jp ++ gambler.biglobe.ne.jp ++ gambler.memail.jp ++ gamer.biglobe.ne.jp ++ gamer.memail.jp ++ garnet.biglobe.ne.jp ++ garnet.memail.jp ++ gassan.eeyo.jp ++ gem.biglobe.ne.jp ++ gem.memail.jp ++ gemini.biglobe.ne.jp ++ gemini.memail.jp ++ genius.biglobe.ne.jp ++ genius.memail.jp ++ genki.biglobe.ne.jp ++ genki.memail.jp ++ george.biglobe.ne.jp ++ gifu.eeyo.jp ++ ginga.biglobe.ne.jp ++ ginga.memail.jp ++ giraffe.biglobe.ne.jp ++ giraffe.memail.jp ++ glasses.biglobe.ne.jp ++ glasses.memail.jp ++ globe.biglobe.ne.jp ++ globe.memail.jp ++ gold.biglobe.ne.jp ++ gold.memail.jp ++ golden.biglobe.ne.jp ++ golden.memail.jp ++ golf.biglobe.ne.jp ++ golf.memail.jp ++ good.biglobe.ne.jp ++ good.memail.jp ++ grace.biglobe.ne.jp ++ grace.memail.jp ++ grandma.biglobe.ne.jp ++ grandma.memail.jp ++ grandpa.biglobe.ne.jp ++ grandpa.memail.jp ++ grazie.biglobe.ne.jp ++ grazie.memail.jp ++ great.biglobe.ne.jp ++ great.memail.jp ++ green.biglobe.ne.jp ++ green.memail.jp ++ groove.biglobe.ne.jp ++ groove.memail.jp ++ guitar.biglobe.ne.jp ++ guitar.memail.jp ++ gunma.eeyo.jp ++ guts.biglobe.ne.jp ++ guts.memail.jp ++ guy.biglobe.ne.jp ++ guy.memail.jp ++ h.biglobe.ne.jp ++ h.memail.jp ++ hachijo.eeyo.jp ++ hachinohe.eeyo.jp ++ hachioji.eeyo.jp ++ hagi.eeyo.jp ++ hakata.eeyo.jp ++ hakkoda.eeyo.jp ++ hakodate.eeyo.jp ++ hakone.eeyo.jp ++ hakuba.eeyo.jp ++ hakusan.eeyo.jp ++ hamamatsu.eeyo.jp ++ hamster.biglobe.ne.jp ++ hamster.memail.jp ++ hanabi.biglobe.ne.jp ++ hanabi.memail.jp ++ handsome.biglobe.ne.jp ++ handsome.memail.jp ++ happo.eeyo.jp ++ happy.biglobe.ne.jp ++ happy.memail.jp ++ harajuku.eeyo.jp ++ harima.eeyo.jp ++ harmony.biglobe.ne.jp ++ harmony.memail.jp ++ hawk.biglobe.ne.jp ++ hawk.memail.jp ++ heart.biglobe.ne.jp ++ heart.memail.jp ++ hello.biglobe.ne.jp ++ hello.memail.jp ++ hey.biglobe.ne.jp ++ hey.memail.jp ++ hi.biglobe.ne.jp ++ hi.memail.jp ++ hida.eeyo.jp ++ hidaka.eeyo.jp ++ hiei.eeyo.jp ++ higo.eeyo.jp ++ himeji.eeyo.jp ++ hiphop.biglobe.ne.jp ++ hiphop.memail.jp ++ hippo.biglobe.ne.jp ++ hippo.memail.jp ++ hirosaki.eeyo.jp ++ hiroshima.eeyo.jp ++ hit.biglobe.ne.jp ++ hit.memail.jp ++ hita.eeyo.jp ++ hitachi.eeyo.jp ++ hizen.eeyo.jp ++ hobby.biglobe.ne.jp ++ hobby.memail.jp ++ hockey.biglobe.ne.jp ++ hockey.memail.jp ++ hodaka.eeyo.jp ++ hokkaido.eeyo.jp ++ hokuriku.eeyo.jp ++ honey.biglobe.ne.jp ++ honey.memail.jp ++ hoop.biglobe.ne.jp ++ hoop.memail.jp ++ horse.biglobe.ne.jp ++ horse.memail.jp ++ hot.biglobe.ne.jp ++ hot.memail.jp ++ houki.eeyo.jp ++ hyoryugai.biglobe.ne.jp ++ hyuga.eeyo.jp ++ i.biglobe.ne.jp ++ i.memail.jp ++ ibusuki.eeyo.jp ++ ice.biglobe.ne.jp ++ ice.memail.jp ++ ichigo.biglobe.ne.jp ++ ichigo.memail.jp ++ ichihara.eeyo.jp ++ iga.eeyo.jp ++ ikaho.eeyo.jp ++ ikaruga.eeyo.jp ++ ikebukuro.eeyo.jp ++ iki.eeyo.jp ++ imari.eeyo.jp ++ inaba.eeyo.jp ++ iriomote.eeyo.jp ++ iron.biglobe.ne.jp ++ iron.memail.jp ++ ise.eeyo.jp ++ ishigaki.eeyo.jp ++ ishikari.eeyo.jp ++ ishikawa.eeyo.jp ++ ishizuchi.eeyo.jp ++ ivory.biglobe.ne.jp ++ ivory.memail.jp ++ ivy.biglobe.ne.jp ++ ivy.memail.jp ++ iwaki.eeyo.jp ++ iwami.eeyo.jp ++ iwashiro.eeyo.jp ++ iwata.eeyo.jp ++ iwate.eeyo.jp ++ iyo.eeyo.jp ++ izu.eeyo.jp ++ izuhara.eeyo.jp ++ izumi.eeyo.jp ++ izumo.eeyo.jp ++ j.biglobe.ne.jp ++ j.memail.jp ++ jambo.biglobe.ne.jp ++ jambo.memail.jp ++ jazz.biglobe.ne.jp ++ jazz.memail.jp ++ jewel.biglobe.ne.jp ++ jewel.memail.jp ++ joetsu.eeyo.jp ++ joke.biglobe.ne.jp ++ joke.memail.jp ++ joy.biglobe.ne.jp ++ joy.memail.jp ++ jr.biglobe.ne.jp ++ jr.memail.jp ++ jumbo.biglobe.ne.jp ++ jumbo.memail.jp ++ jump.biglobe.ne.jp ++ jump.memail.jp ++ jungle.biglobe.ne.jp ++ jungle.memail.jp ++ jupiter.biglobe.ne.jp ++ jupiter.memail.jp ++ k.biglobe.ne.jp ++ k.memail.jp ++ kaga.eeyo.jp ++ kagawa.eeyo.jp ++ kagoshima.eeyo.jp ++ kai.eeyo.jp ++ kamakura.eeyo.jp ++ kamikochi.eeyo.jp ++ kanazawa.eeyo.jp ++ kanto.eeyo.jp ++ karatsu.eeyo.jp ++ karuizawa.eeyo.jp ++ kashima.eeyo.jp ++ kashiwa.eeyo.jp ++ kasukabe.eeyo.jp ++ katsuyama.eeyo.jp ++ kawachi.eeyo.jp ++ kawasaki.eeyo.jp ++ kazusa.eeyo.jp ++ kba.biglobe.ne.jp ++ kbd.biglobe.ne.jp ++ kbe.biglobe.ne.jp ++ kbf.biglobe.ne.jp ++ kbh.biglobe.ne.jp ++ kca.biglobe.ne.jp ++ kcd.biglobe.ne.jp ++ kce.biglobe.ne.jp ++ kcf.biglobe.ne.jp ++ kch.biglobe.ne.jp ++ kde.biglobe.ne.jp ++ kdn.biglobe.ne.jp ++ kdp.biglobe.ne.jp ++ kdr.biglobe.ne.jp ++ kdt.biglobe.ne.jp ++ keb.biglobe.ne.jp ++ ked.biglobe.ne.jp ++ keh.biglobe.ne.jp ++ kej.biglobe.ne.jp ++ kem.biglobe.ne.jp ++ kfa.biglobe.ne.jp ++ kfd.biglobe.ne.jp ++ kfx.biglobe.ne.jp ++ kfy.biglobe.ne.jp ++ kfz.biglobe.ne.jp ++ kha.biglobe.ne.jp ++ khc.biglobe.ne.jp ++ khe.biglobe.ne.jp ++ khf.biglobe.ne.jp ++ khh.biglobe.ne.jp ++ kib.biglobe.ne.jp ++ kichijoji.eeyo.jp ++ kif.biglobe.ne.jp ++ kih.biglobe.ne.jp ++ kii.eeyo.jp ++ king.biglobe.ne.jp ++ king.memail.jp ++ kinki.eeyo.jp ++ kinugawa.eeyo.jp ++ kir.biglobe.ne.jp ++ kirigamine.eeyo.jp ++ kirishima.eeyo.jp ++ kiso.eeyo.jp ++ kiss.biglobe.ne.jp ++ kiss.memail.jp ++ kitakata.eeyo.jp ++ kitakyushu.eeyo.jp ++ kitami.eeyo.jp ++ kiu.biglobe.ne.jp ++ kiyosato.eeyo.jp ++ kjb.biglobe.ne.jp ++ kjc.biglobe.ne.jp ++ kjd.biglobe.ne.jp ++ kje.biglobe.ne.jp ++ kjf.biglobe.ne.jp ++ kkd.biglobe.ne.jp ++ kke.biglobe.ne.jp ++ kkf.biglobe.ne.jp ++ kkh.biglobe.ne.jp ++ kki.biglobe.ne.jp ++ kmd.biglobe.ne.jp ++ kme.biglobe.ne.jp ++ kmf.biglobe.ne.jp ++ kmh.biglobe.ne.jp ++ kmj.biglobe.ne.jp ++ kna.biglobe.ne.jp ++ knd.biglobe.ne.jp ++ kne.biglobe.ne.jp ++ knh.biglobe.ne.jp ++ kni.biglobe.ne.jp ++ knight.biglobe.ne.jp ++ knight.memail.jp ++ koala.biglobe.ne.jp ++ koala.memail.jp ++ kobe.eeyo.jp ++ kochi.eeyo.jp ++ kofu.eeyo.jp ++ koga.eeyo.jp ++ koiwai.eeyo.jp ++ konpira.eeyo.jp ++ kotohira.eeyo.jp ++ kozuke.eeyo.jp ++ kpa.biglobe.ne.jp ++ kpb.biglobe.ne.jp ++ kpd.biglobe.ne.jp ++ kpe.biglobe.ne.jp ++ kph.biglobe.ne.jp ++ kra.biglobe.ne.jp ++ krb.biglobe.ne.jp ++ krc.biglobe.ne.jp ++ krd.biglobe.ne.jp ++ krf.biglobe.ne.jp ++ ksf.biglobe.ne.jp ++ ksh.biglobe.ne.jp ++ ksj.biglobe.ne.jp ++ ksn.biglobe.ne.jp ++ kss.biglobe.ne.jp ++ kta.biglobe.ne.jp ++ ktb.biglobe.ne.jp ++ ktd.biglobe.ne.jp ++ ktf.biglobe.ne.jp ++ ktj.biglobe.ne.jp ++ kub.biglobe.ne.jp ++ kuc.biglobe.ne.jp ++ kud.biglobe.ne.jp ++ kuf.biglobe.ne.jp ++ kuh.biglobe.ne.jp ++ kuju.eeyo.jp ++ kumagaya.eeyo.jp ++ kumamoto.eeyo.jp ++ kumano.eeyo.jp ++ kunisaki.eeyo.jp ++ kurama.eeyo.jp ++ kurashiki.eeyo.jp ++ kurobe.eeyo.jp ++ kurume.eeyo.jp ++ kusatsu.eeyo.jp ++ kushiro.eeyo.jp ++ kvd.biglobe.ne.jp ++ kve.biglobe.ne.jp ++ kvf.biglobe.ne.jp ++ kvj.biglobe.ne.jp ++ kvp.biglobe.ne.jp ++ kxa.biglobe.ne.jp ++ kxb.biglobe.ne.jp ++ kxd.biglobe.ne.jp ++ kxe.biglobe.ne.jp ++ kxf.biglobe.ne.jp ++ kyf.biglobe.ne.jp ++ kyi.biglobe.ne.jp ++ kyj.biglobe.ne.jp ++ kym.biglobe.ne.jp ++ kyoto.eeyo.jp ++ kyp.biglobe.ne.jp ++ kyushu.eeyo.jp ++ kza.biglobe.ne.jp ++ kzc.biglobe.ne.jp ++ kzd.biglobe.ne.jp ++ kzf.biglobe.ne.jp ++ kzh.biglobe.ne.jp ++ l.biglobe.ne.jp ++ l.memail.jp ++ lady.biglobe.ne.jp ++ lady.memail.jp ++ lake.biglobe.ne.jp ++ lake.memail.jp ++ latin.biglobe.ne.jp ++ latin.memail.jp ++ lavender.biglobe.ne.jp ++ lavender.memail.jp ++ lavie.biglobe.ne.jp ++ lavie.memail.jp ++ leaf.biglobe.ne.jp ++ leaf.memail.jp ++ left.biglobe.ne.jp ++ left.memail.jp ++ lefty.biglobe.ne.jp ++ lefty.memail.jp ++ lemon.biglobe.ne.jp ++ lemon.memail.jp ++ leo.biglobe.ne.jp ++ leo.memail.jp ++ libra.biglobe.ne.jp ++ libra.memail.jp ++ lily.biglobe.ne.jp ++ lily.memail.jp ++ lime.biglobe.ne.jp ++ lime.memail.jp ++ lion.biglobe.ne.jp ++ lion.memail.jp ++ lonely.biglobe.ne.jp ++ lonely.memail.jp ++ long.biglobe.ne.jp ++ long.memail.jp ++ love.biglobe.ne.jp ++ love.memail.jp ++ lovelove.biglobe.ne.jp ++ lovelove.memail.jp ++ lovely.biglobe.ne.jp ++ lovely.memail.jp ++ lucky.biglobe.ne.jp ++ lucky.memail.jp ++ luna.biglobe.ne.jp ++ luna.memail.jp ++ m.biglobe.ne.jp ++ m.memail.jp ++ macho.biglobe.ne.jp ++ macho.memail.jp ++ magic.biglobe.ne.jp ++ magic.memail.jp ++ mama.biglobe.ne.jp ++ mama.memail.jp ++ mambo.biglobe.ne.jp ++ mambo.memail.jp ++ marine.biglobe.ne.jp ++ marine.memail.jp ++ maroon.biglobe.ne.jp ++ maroon.memail.jp ++ mars.biglobe.ne.jp ++ mars.memail.jp ++ matsue.eeyo.jp ++ matsumoto.eeyo.jp ++ matsusaka.eeyo.jp ++ matsushima.eeyo.jp ++ melody.biglobe.ne.jp ++ melody.memail.jp ++ melon.biglobe.ne.jp ++ melon.memail.jp ++ memoad.jp ++ meow.biglobe.ne.jp ++ meow.memail.jp ++ mercury.biglobe.ne.jp ++ mercury.memail.jp ++ mermaid.biglobe.ne.jp ++ mermaid.memail.jp ++ mie.eeyo.jp ++ mikawa.eeyo.jp ++ milk.biglobe.ne.jp ++ milk.memail.jp ++ mimasaka.eeyo.jp ++ minakami.eeyo.jp ++ mino.eeyo.jp ++ mint.biglobe.ne.jp ++ mint.memail.jp ++ miracle.biglobe.ne.jp ++ miracle.memail.jp ++ mito.eeyo.jp ++ miura.eeyo.jp ++ miyagi.eeyo.jp ++ miyajima.eeyo.jp ++ miyako.eeyo.jp ++ miyazaki.eeyo.jp ++ mocha.biglobe.ne.jp ++ mocha.memail.jp ++ mogami.eeyo.jp ++ momo.biglobe.ne.jp ++ momo.memail.jp ++ monkey.biglobe.ne.jp ++ monkey.memail.jp ++ moon.biglobe.ne.jp ++ moon.memail.jp ++ moonstone.biglobe.ne.jp ++ moonstone.memail.jp ++ motor.biglobe.ne.jp ++ motor.memail.jp ++ motto.biglobe.ne.jp ++ motto.memail.jp ++ mount.biglobe.ne.jp ++ mount.memail.jp ++ mouse.biglobe.ne.jp ++ mouse.memail.jp ++ mpd.biglobe.ne.jp ++ mqb.biglobe.ne.jp ++ mqc.biglobe.ne.jp ++ mqd.biglobe.ne.jp ++ mqe.biglobe.ne.jp ++ mqf.biglobe.ne.jp ++ mqg.biglobe.ne.jp ++ mqh.biglobe.ne.jp ++ mqi.biglobe.ne.jp ++ mqj.biglobe.ne.jp ++ mra.biglobe.ne.jp ++ mrb.biglobe.ne.jp ++ mrc.biglobe.ne.jp ++ mrd.biglobe.ne.jp ++ mre.biglobe.ne.jp ++ mrf.biglobe.ne.jp ++ mrg.biglobe.ne.jp ++ mrh.biglobe.ne.jp ++ mri.biglobe.ne.jp ++ mrj.biglobe.ne.jp ++ msa.biglobe.ne.jp ++ msb.biglobe.ne.jp ++ msc.biglobe.ne.jp ++ msd.biglobe.ne.jp ++ mse.biglobe.ne.jp ++ msf.biglobe.ne.jp ++ msg.biglobe.ne.jp ++ msh.biglobe.ne.jp ++ msi.biglobe.ne.jp ++ msj.biglobe.ne.jp ++ mta.biglobe.ne.jp ++ mtb.biglobe.ne.jp ++ mtc.biglobe.ne.jp ++ mtd.biglobe.ne.jp ++ mte.biglobe.ne.jp ++ mtf.biglobe.ne.jp ++ mtg.biglobe.ne.jp ++ mth.biglobe.ne.jp ++ mti.biglobe.ne.jp ++ mtj.biglobe.ne.jp ++ mua.biglobe.ne.jp ++ mub.biglobe.ne.jp ++ muc.biglobe.ne.jp ++ mud.biglobe.ne.jp ++ mue.biglobe.ne.jp ++ muf.biglobe.ne.jp ++ mug.biglobe.ne.jp ++ muh.biglobe.ne.jp ++ mui.biglobe.ne.jp ++ muj.biglobe.ne.jp ++ muroran.eeyo.jp ++ muroto.eeyo.jp ++ musashi.eeyo.jp ++ muscle.biglobe.ne.jp ++ muscle.memail.jp ++ mutsu.eeyo.jp ++ mva.biglobe.ne.jp ++ mvb.biglobe.ne.jp ++ mvc.biglobe.ne.jp ++ mvd.biglobe.ne.jp ++ mve.biglobe.ne.jp ++ mvf.biglobe.ne.jp ++ mvg.biglobe.ne.jp ++ mvh.biglobe.ne.jp ++ mvi.biglobe.ne.jp ++ mvj.biglobe.ne.jp ++ mwa.biglobe.ne.jp ++ mwb.biglobe.ne.jp ++ mwc.biglobe.ne.jp ++ mwd.biglobe.ne.jp ++ mwe.biglobe.ne.jp ++ myad.jp ++ myoko.eeyo.jp ++ n.biglobe.ne.jp ++ n.memail.jp ++ nada.eeyo.jp ++ naeba.eeyo.jp ++ nagano.eeyo.jp ++ nagaoka.eeyo.jp ++ nagara.eeyo.jp ++ nagasaki.eeyo.jp ++ nagato.eeyo.jp ++ nagoya.eeyo.jp ++ naniwa.eeyo.jp ++ nara.eeyo.jp ++ narashino.eeyo.jp ++ naruto.eeyo.jp ++ nasu.eeyo.jp ++ neko.biglobe.ne.jp ++ neko.memail.jp ++ nemuro.eeyo.jp ++ neptune.biglobe.ne.jp ++ neptune.memail.jp ++ nerima.eeyo.jp ++ nice.biglobe.ne.jp ++ nice.memail.jp ++ nigata.eeyo.jp ++ nikko.eeyo.jp ++ nine.biglobe.ne.jp ++ nine.memail.jp ++ no1.biglobe.ne.jp ++ no1.memail.jp ++ noboribetsu.eeyo.jp ++ noda.eeyo.jp ++ noodle.biglobe.ne.jp ++ noodle.memail.jp ++ north.biglobe.ne.jp ++ north.memail.jp ++ note.biglobe.ne.jp ++ note.memail.jp ++ noto.eeyo.jp ++ nozawa.eeyo.jp ++ numazu.eeyo.jp ++ o.biglobe.ne.jp ++ o.memail.jp ++ obihiro.eeyo.jp ++ octopus.biglobe.ne.jp ++ octopus.memail.jp ++ oga.eeyo.jp ++ ogasawara.eeyo.jp ++ ohara.eeyo.jp ++ ohu.eeyo.jp ++ oita.eeyo.jp ++ ok.biglobe.ne.jp ++ ok.memail.jp ++ okayama.eeyo.jp ++ oki.eeyo.jp ++ okinawa.eeyo.jp ++ ole.biglobe.ne.jp ++ ole.memail.jp ++ omi.eeyo.jp ++ omiya.eeyo.jp ++ one.biglobe.ne.jp ++ one.memail.jp ++ onomichi.eeyo.jp ++ opal.biglobe.ne.jp ++ opal.memail.jp ++ opera.biglobe.ne.jp ++ opera.memail.jp ++ orange.biglobe.ne.jp ++ orange.memail.jp ++ osaka.eeyo.jp ++ osumi.eeyo.jp ++ otaru.eeyo.jp ++ owari.eeyo.jp ++ owl.biglobe.ne.jp ++ owl.memail.jp ++ oyaji.biglobe.ne.jp ++ oyaji.memail.jp ++ oze.eeyo.jp ++ p.biglobe.ne.jp ++ p.memail.jp ++ pan.biglobe.ne.jp ++ pan.memail.jp ++ panda.biglobe.ne.jp ++ panda.memail.jp ++ pansy.biglobe.ne.jp ++ pansy.memail.jp ++ panther.biglobe.ne.jp ++ panther.memail.jp ++ papa.biglobe.ne.jp ++ papa.memail.jp ++ parapara.biglobe.ne.jp ++ parapara.memail.jp ++ passion.biglobe.ne.jp ++ passion.memail.jp ++ peace.biglobe.ne.jp ++ peace.memail.jp ++ peach.biglobe.ne.jp ++ peach.memail.jp ++ pearl.biglobe.ne.jp ++ pearl.memail.jp ++ pegasus.biglobe.ne.jp ++ pegasus.memail.jp ++ penguin.biglobe.ne.jp ++ penguin.memail.jp ++ peridot.biglobe.ne.jp ++ peridot.memail.jp ++ piano.biglobe.ne.jp ++ piano.memail.jp ++ pig.biglobe.ne.jp ++ pig.memail.jp ++ pine.biglobe.ne.jp ++ pine.memail.jp ++ pink.biglobe.ne.jp ++ pink.memail.jp ++ pisces.biglobe.ne.jp ++ pisces.memail.jp ++ piyo.biglobe.ne.jp ++ piyo.memail.jp ++ plum.biglobe.ne.jp ++ plum.memail.jp ++ pony.biglobe.ne.jp ++ pony.memail.jp ++ pops.biglobe.ne.jp ++ pops.memail.jp ++ potato.biglobe.ne.jp ++ potato.memail.jp ++ power.biglobe.ne.jp ++ power.memail.jp ++ pretty.biglobe.ne.jp ++ pretty.memail.jp ++ pride.biglobe.ne.jp ++ pride.memail.jp ++ private.biglobe.ne.jp ++ private.memail.jp ++ punk.biglobe.ne.jp ++ punk.memail.jp ++ puppy.biglobe.ne.jp ++ puppy.memail.jp ++ pure.biglobe.ne.jp ++ pure.memail.jp ++ purin.biglobe.ne.jp ++ purin.memail.jp ++ puripuri.biglobe.ne.jp ++ puripuri.memail.jp ++ q.biglobe.ne.jp ++ q.memail.jp ++ queen.biglobe.ne.jp ++ queen.memail.jp ++ r.biglobe.ne.jp ++ r.memail.jp ++ rabbit.biglobe.ne.jp ++ rabbit.memail.jp ++ raccoondog.biglobe.ne.jp ++ raccoondog.memail.jp ++ racer.biglobe.ne.jp ++ racer.memail.jp ++ rain.biglobe.ne.jp ++ rain.memail.jp ++ rainbow.biglobe.ne.jp ++ rainbow.memail.jp ++ rap.biglobe.ne.jp ++ rap.memail.jp ++ red.biglobe.ne.jp ++ red.memail.jp ++ rhythm.biglobe.ne.jp ++ rhythm.memail.jp ++ rice.biglobe.ne.jp ++ rice.memail.jp ++ rider.biglobe.ne.jp ++ rider.memail.jp ++ right.biglobe.ne.jp ++ right.memail.jp ++ rikuchu.eeyo.jp ++ rikuzen.eeyo.jp ++ river.biglobe.ne.jp ++ river.memail.jp ++ robin.biglobe.ne.jp ++ robin.memail.jp ++ rock.biglobe.ne.jp ++ rock.memail.jp ++ rokko.eeyo.jp ++ rookie.biglobe.ne.jp ++ rookie.memail.jp ++ rose.biglobe.ne.jp ++ rose.memail.jp ++ ruby.biglobe.ne.jp ++ ruby.memail.jp ++ runrun.biglobe.ne.jp ++ runrun.memail.jp ++ ryukyu.eeyo.jp ++ s.biglobe.ne.jp ++ s.memail.jp ++ sado.eeyo.jp ++ safari.biglobe.ne.jp ++ safari.memail.jp ++ saga.eeyo.jp ++ sagami.eeyo.jp ++ sagittarius.biglobe.ne.jp ++ sagittarius.memail.jp ++ saitama.eeyo.jp ++ sakai.eeyo.jp ++ sakura.biglobe.ne.jp ++ sakura.memail.jp ++ salt.biglobe.ne.jp ++ salt.memail.jp ++ samba.biglobe.ne.jp ++ samba.memail.jp ++ sanin.eeyo.jp ++ sanriku.eeyo.jp ++ sanuki.eeyo.jp ++ sanyo.eeyo.jp ++ sapphire.biglobe.ne.jp ++ sapphire.memail.jp ++ sapporo.eeyo.jp ++ sasebo.eeyo.jp ++ sata.eeyo.jp ++ satsuma.eeyo.jp ++ saturn.biglobe.ne.jp ++ saturn.memail.jp ++ scorpio.biglobe.ne.jp ++ scorpio.memail.jp ++ sea.biglobe.ne.jp ++ sea.memail.jp ++ seabass.biglobe.ne.jp ++ seabass.memail.jp ++ second.biglobe.ne.jp ++ second.memail.jp ++ seeya.biglobe.ne.jp ++ seeya.memail.jp ++ sendai.eeyo.jp ++ sepia.biglobe.ne.jp ++ sepia.memail.jp ++ setagaya.eeyo.jp ++ setouchi.eeyo.jp ++ settu.eeyo.jp ++ seven.biglobe.ne.jp ++ seven.memail.jp ++ sf.biglobe.ne.jp ++ sf.memail.jp ++ shake.biglobe.ne.jp ++ shake.memail.jp ++ shakotan.eeyo.jp ++ sheep.biglobe.ne.jp ++ sheep.memail.jp ++ shibuya.eeyo.jp ++ shiga.eeyo.jp ++ shikoku.eeyo.jp ++ shikotsu.eeyo.jp ++ shima.eeyo.jp ++ shimane.eeyo.jp ++ shimanto.eeyo.jp ++ shimizu.eeyo.jp ++ shimokita.eeyo.jp ++ shimotsuke.eeyo.jp ++ shimousa.eeyo.jp ++ shinagawa.eeyo.jp ++ shinano.eeyo.jp ++ shine.biglobe.ne.jp ++ shine.memail.jp ++ shinjuku.eeyo.jp ++ shiobara.eeyo.jp ++ shirahama.eeyo.jp ++ shirakami.eeyo.jp ++ shiretoko.eeyo.jp ++ shizuoka.eeyo.jp ++ shonai.eeyo.jp ++ shonan.eeyo.jp ++ shoot.biglobe.ne.jp ++ shoot.memail.jp ++ short.biglobe.ne.jp ++ short.memail.jp ++ shout.biglobe.ne.jp ++ shout.memail.jp ++ shrimp.biglobe.ne.jp ++ shrimp.memail.jp ++ silver.biglobe.ne.jp ++ silver.memail.jp ++ simplem.biglobe.ne.jp ++ simplem.memail.jp ++ six.biglobe.ne.jp ++ six.memail.jp ++ ski.biglobe.ne.jp ++ ski.memail.jp ++ sky.biglobe.ne.jp ++ sky.memail.jp ++ smart.biglobe.ne.jp ++ smart.memail.jp ++ smash.biglobe.ne.jp ++ smash.memail.jp ++ smile.biglobe.ne.jp ++ smile.memail.jp ++ snake.biglobe.ne.jp ++ snake.memail.jp ++ snowboard.biglobe.ne.jp ++ snowboard.memail.jp ++ snowy.biglobe.ne.jp ++ snowy.memail.jp ++ soccer.biglobe.ne.jp ++ soccer.memail.jp ++ sodegaura.eeyo.jp ++ soul.biglobe.ne.jp ++ soul.memail.jp ++ south.biglobe.ne.jp ++ south.memail.jp ++ soya.eeyo.jp ++ space.biglobe.ne.jp ++ space.memail.jp ++ spice.biglobe.ne.jp ++ spice.memail.jp ++ spider.biglobe.ne.jp ++ spider.memail.jp ++ spring.biglobe.ne.jp ++ spring.memail.jp ++ star.biglobe.ne.jp ++ star.memail.jp ++ step.biglobe.ne.jp ++ step.memail.jp ++ stone.biglobe.ne.jp ++ stone.memail.jp ++ storm.biglobe.ne.jp ++ storm.memail.jp ++ strawberry.biglobe.ne.jp ++ strawberry.memail.jp ++ string.biglobe.ne.jp ++ string.memail.jp ++ sugar.biglobe.ne.jp ++ sugar.memail.jp ++ summer.biglobe.ne.jp ++ summer.memail.jp ++ sunflower.biglobe.ne.jp ++ sunflower.memail.jp ++ sunshine.biglobe.ne.jp ++ sunshine.memail.jp ++ suo.eeyo.jp ++ super.biglobe.ne.jp ++ super.memail.jp ++ surfing.biglobe.ne.jp ++ surfing.memail.jp ++ suruga.eeyo.jp ++ suzuka.eeyo.jp ++ swallow.biglobe.ne.jp ++ swallow.memail.jp ++ swan.biglobe.ne.jp ++ swan.memail.jp ++ sweet.biglobe.ne.jp ++ sweet.memail.jp ++ swing.biglobe.ne.jp ++ swing.memail.jp ++ symphony.biglobe.ne.jp ++ symphony.memail.jp ++ t.biglobe.ne.jp ++ t.memail.jp ++ tai.biglobe.ne.jp ++ tai.memail.jp ++ tajima.eeyo.jp ++ takachiho.eeyo.jp ++ takamatsu.eeyo.jp ++ takayama.eeyo.jp ++ tama.eeyo.jp ++ tanba.eeyo.jp ++ tango.biglobe.ne.jp ++ tango.eeyo.jp ++ tango.memail.jp ++ tanzawa.eeyo.jp ++ tateshina.eeyo.jp ++ tateyama.eeyo.jp ++ taurus.biglobe.ne.jp ++ taurus.memail.jp ++ tazawako.eeyo.jp ++ tea.biglobe.ne.jp ++ tea.memail.jp ++ techno.biglobe.ne.jp ++ techno.memail.jp ++ ten.biglobe.ne.jp ++ ten.memail.jp ++ tender.biglobe.ne.jp ++ tender.memail.jp ++ tennis.biglobe.ne.jp ++ tennis.memail.jp ++ terra.biglobe.ne.jp ++ terra.memail.jp ++ test.test.biglobe.ne.jp ++ thanks.biglobe.ne.jp ++ thanks.memail.jp ++ third.biglobe.ne.jp ++ third.memail.jp ++ three.biglobe.ne.jp ++ three.memail.jp ++ thunder.biglobe.ne.jp ++ thunder.memail.jp ++ tiger.biglobe.ne.jp ++ tiger.memail.jp ++ tiny.biglobe.ne.jp ++ tiny.memail.jp ++ tochigi.eeyo.jp ++ togakushi.eeyo.jp ++ tohoku.eeyo.jp ++ toi.eeyo.jp ++ tokachi.eeyo.jp ++ tokai.eeyo.jp ++ tokoro.biglobe.ne.jp ++ tokorozawa.eeyo.jp ++ tokushima.eeyo.jp ++ tokyo.eeyo.jp ++ tone.eeyo.jp ++ tono.eeyo.jp ++ topaz.biglobe.ne.jp ++ topaz.memail.jp ++ tornado.biglobe.ne.jp ++ tornado.memail.jp ++ tosa.eeyo.jp ++ tosu.eeyo.jp ++ totoumi.eeyo.jp ++ tottori.eeyo.jp ++ tough.biglobe.ne.jp ++ tough.memail.jp ++ tourmaline.biglobe.ne.jp ++ tourmaline.memail.jp ++ towada.eeyo.jp ++ toya.eeyo.jp ++ toyama.eeyo.jp ++ toyohashi.eeyo.jp ++ traveler.biglobe.ne.jp ++ traveler.memail.jp ++ tree.biglobe.ne.jp ++ tree.memail.jp ++ tropical.biglobe.ne.jp ++ tropical.memail.jp ++ tsuchiura.eeyo.jp ++ tsugaike.eeyo.jp ++ tsugaru.eeyo.jp ++ tsukuba.eeyo.jp ++ tsumagoi.eeyo.jp ++ tsushima.eeyo.jp ++ tsuwano.eeyo.jp ++ tsuyama.eeyo.jp ++ tulip.biglobe.ne.jp ++ tulip.memail.jp ++ turbo.biglobe.ne.jp ++ turbo.memail.jp ++ turquoise.biglobe.ne.jp ++ turquoise.memail.jp ++ twelve.biglobe.ne.jp ++ twelve.memail.jp ++ twist.biglobe.ne.jp ++ twist.memail.jp ++ two.biglobe.ne.jp ++ two.memail.jp ++ typhoon.biglobe.ne.jp ++ typhoon.memail.jp ++ u.biglobe.ne.jp ++ u.memail.jp ++ ueno.eeyo.jp ++ ugo.eeyo.jp ++ uji.eeyo.jp ++ ultra.biglobe.ne.jp ++ ultra.memail.jp ++ ume.biglobe.ne.jp ++ ume.memail.jp ++ umeda.eeyo.jp ++ unicorn.biglobe.ne.jp ++ unicorn.memail.jp ++ unzen.eeyo.jp ++ uonuma.eeyo.jp ++ urawa.eeyo.jp ++ uwa.eeyo.jp ++ uzen.eeyo.jp ++ v.biglobe.ne.jp ++ v.memail.jp ++ valuestar.biglobe.ne.jp ++ valuestar.memail.jp ++ venus.biglobe.ne.jp ++ venus.memail.jp ++ violet.biglobe.ne.jp ++ violet.memail.jp ++ virgo.biglobe.ne.jp ++ virgo.memail.jp ++ viva.biglobe.ne.jp ++ viva.memail.jp ++ volleyball.biglobe.ne.jp ++ volleyball.memail.jp ++ w.biglobe.ne.jp ++ w.memail.jp ++ wakasa.eeyo.jp ++ wakayama.eeyo.jp ++ wakkanai.eeyo.jp ++ west.biglobe.ne.jp ++ west.memail.jp ++ whale.biglobe.ne.jp ++ whale.memail.jp ++ white.biglobe.ne.jp ++ white.memail.jp ++ wild.biglobe.ne.jp ++ wild.memail.jp ++ winter.biglobe.ne.jp ++ winter.memail.jp ++ with.biglobe.ne.jp ++ with.memail.jp ++ wolf.biglobe.ne.jp ++ wolf.memail.jp ++ wonder.biglobe.ne.jp ++ wonder.memail.jp ++ wood.biglobe.ne.jp ++ wood.memail.jp ++ x.biglobe.ne.jp ++ x.memail.jp ++ xqb.biglobe.ne.jp ++ xqd.biglobe.ne.jp ++ xqe.biglobe.ne.jp ++ xqg.biglobe.ne.jp ++ xqh.biglobe.ne.jp ++ xqj.biglobe.ne.jp ++ xrh.biglobe.ne.jp ++ xrj.biglobe.ne.jp ++ xsj.biglobe.ne.jp ++ xug.biglobe.ne.jp ++ xui.biglobe.ne.jp ++ xvb.biglobe.ne.jp ++ xvf.biglobe.ne.jp ++ xvg.biglobe.ne.jp ++ xvh.biglobe.ne.jp ++ y.biglobe.ne.jp ++ y.memail.jp ++ yaeyama.eeyo.jp ++ yakushima.eeyo.jp ++ yamagata.eeyo.jp ++ yamaguchi.eeyo.jp ++ yamame.biglobe.ne.jp ++ yamame.memail.jp ++ yamanashi.eeyo.jp ++ yamashiro.eeyo.jp ++ yamato.eeyo.jp ++ yeah.biglobe.ne.jp ++ yeah.memail.jp ++ yes.biglobe.ne.jp ++ yes.memail.jp ++ yodogawa.eeyo.jp ++ yokohama.eeyo.jp ++ yoron.eeyo.jp ++ yoshino.eeyo.jp ++ yours.biglobe.ne.jp ++ yours.memail.jp ++ yufuin.eeyo.jp ++ yuzawa.eeyo.jp ++ z.biglobe.ne.jp ++ z.memail.jp ++ zao.eeyo.jp ++ zoo.biglobe.ne.jp ++ zoo.memail.jp ++ zzz.biglobe.ne.jp ++ zzz.memail.jp ++ BIGLOBE ++ BIGLOBE ++ ++ mail.biglobe.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.biglobe.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/amethyst.broba.cc evolution-2.30.3.new//capplet/settings/mail-autoconfig/amethyst.broba.cc +--- evolution-2.30.3//capplet/settings/mail-autoconfig/amethyst.broba.cc 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/amethyst.broba.cc 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,27 @@ ++ ++ ++ ++ garnet.broba.cc ++ amethyst.broba.cc ++ coral.broba.ccv ++ diamond.broba.cc ++ ぷらら ++ ぷらら ++ ++ mail.broba.cc ++ 110 ++ plain ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.broba.cc ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/aol.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/aol.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/aol.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/aol.com 2010-09-01 19:18:57.505184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ aol.com ++ aim.com ++ ++ AOL ++ AOL ++ ++ ++ imap.aol.com ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.aol.com ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/apost.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/apost.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/apost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/apost.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ apost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ apost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ apost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/aqua.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/aqua.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/aqua.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/aqua.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ aqua.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ aqua.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ aqua.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/arcor.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/arcor.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/arcor.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/arcor.de 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,38 @@ ++ ++ ++ ++ ++ arcor.de ++ ++ Arcor ++ Arcor ++ ++ ++ imap.arcor.de ++ 993 ++ SSL ++ ++ plain ++ %EMAILLOCALPART% ++ ++ ++ ++ mail.arcor.de ++ 465 ++ SSL ++ ++ plain ++ %EMAILLOCALPART% ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ballade.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ballade.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ballade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ballade.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ballade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ballade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ballade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ bay.wind.ne.jp ++ bay.wind.jp ++ bay.wind.co.jp ++ bay.gunmanet.or.jp ++ bay.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ bay.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bay.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bb-niigata.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bb-niigata.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bb-niigata.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bb-niigata.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bb-niigata.jp ++ ＢＢにいがた ++ BB-NIIGATA ++ ++ pop.bb-niigata.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ pop.bb-niigata.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bc.iij4u.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bc.iij4u.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bc.iij4u.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bc.iij4u.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,35 @@ ++ ++ ++ ++ dd.iij4u.or.jp ++ ff.iij4u.or.jp ++ hh.iij4u.or.jp ++ kk.iij4u.or.jp ++ nn.iij4u.or.jp ++ pp.iij4u.or.jp ++ rr.iij4u.or.jp ++ ss.iij4u.or.jp ++ bc.iij4u.or.jp ++ bk.iij4u.or.jp ++ bp.iij4u.or.jp ++ bu.iij4u.or.jp ++ IIJ4U ++ IIJ4U ++ ++ mbox.iij4u.or.jp ++ 110 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ ++ ++ mbox.iij4u.or.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/beige.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/beige.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/beige.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/beige.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ beige.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ beige.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ beige.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/blue.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/blue.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/blue.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/blue.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ blue.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ blue.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ blue.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bmail.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bolero.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bolero.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bolero.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bolero.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bolero.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bolero.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bolero.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/bpost.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/bpost.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/bpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/bpost.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/brown.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/brown.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/brown.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/brown.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ brown.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ brown.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ brown.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/camel.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/camel.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/camel.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/camel.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ camel.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ camel.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ camel.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cameo.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cameo.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cameo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cameo.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cameo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cameo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cameo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cc9.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cc9.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cc9.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cc9.ne.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ cc9.ne.jp ++ CC9インターネットサービス ++ CC9 ++ ++ pop.cc9.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.cc9.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cek.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cek.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cek.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cek.ne.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ cek.ne.jp ++ エコーシティー・駒ケ岳 ++ CEK-Net ++ ++ mail.cek.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.cek.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/clio.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/clio.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/clio.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/clio.ne.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ clio.ne.jp ++ CLIO-Net移管サービス ++ CLIO-Net ++ ++ mail.clio.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.clio.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cmail.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/co1.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/co1.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/co1.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/co1.wind.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co1.wind.ne.jp ++ co1.wind.jp ++ 群馬インターネット ++ wind ++ ++ co1.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co1.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/co2.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/co2.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/co2.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/co2.wind.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co2.wind.ne.jp ++ co2.wind.jp ++ 群馬インターネット ++ wind ++ ++ co2.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co2.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/co3.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/co3.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/co3.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/co3.wind.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co3.wind.ne.jp ++ co3.wind.jp ++ 群馬インターネット ++ wind ++ ++ co3.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co3.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cocoa.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cocoa.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cocoa.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cocoa.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cocoa.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cocoa.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cocoa.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/coda.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/coda.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/coda.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/coda.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ coda.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ coda.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ coda.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/comcast.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/comcast.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/comcast.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/comcast.net 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ comcast.net ++ ++ Comcast ++ Comcast ++ ++ ++ mail.comcast.net ++ 110 ++ STARTTLS ++ %EMAILLOCALPART% ++ secure ++ ++ ++ ++ smtp.comcast.net ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/concerto.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/concerto.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/concerto.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/concerto.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ concerto.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ concerto.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ concerto.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/coral.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/coral.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/coral.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/coral.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ coral.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ coral.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ coral.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/courante.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/courante.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/courante.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/courante.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ courante.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ courante.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ courante.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cpost.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cpost.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cpost.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/cream.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/cream.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/cream.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/cream.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cream.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cream.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cream.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/dance.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/dance.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/dance.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/dance.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ dance.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ dance.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dance.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ dan.wind.ne.jp ++ dan.wind.jp ++ dan.wind.co.jp ++ dan.gunmanet.or.jp ++ dan.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ dan.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dan.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/dmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/dmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/dmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/dmail.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ dmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ dmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/e23.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/e23.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/e23.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/e23.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ iijmio-mail.jp ++ miomio.jp ++ miobox.jp ++ e23.jp ++ x-il.jp ++ IIJmio セーフティメール ++ IIJmio ++ ++ mbox.iijmio-mail.jp ++ 110 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ ++ ++ mbox.iijmio-mail.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/earthlink.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/earthlink.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/earthlink.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/earthlink.net 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ earthlink.net ++ ++ EarthLink ++ EarthLink ++ ++ ++ imap.earthlink.net ++ 143 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpauth.earthlink.net ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ebony.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ebony.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ebony.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ebony.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ebony.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ebony.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ebony.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/email.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/email.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/email.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/email.plala.or.jp 2010-09-01 19:18:57.509184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ email.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ email.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ email.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/fantasy.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/fantasy.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/fantasy.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/fantasy.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fantasy.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fantasy.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fantasy.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/flamenco.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/flamenco.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/flamenco.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/flamenco.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ flamenco.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ flamenco.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ flamenco.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/fmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/fmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/fmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/fmail.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/free.fr evolution-2.30.3.new//capplet/settings/mail-autoconfig/free.fr +--- evolution-2.30.3//capplet/settings/mail-autoconfig/free.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/free.fr 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ free.fr ++ ++ Free Telecom ++ free.fr ++ ++ ++ imap.free.fr ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.free.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ ++ true ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/freenet.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/freenet.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/freenet.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/freenet.de 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ freenet.de ++ ++ Freenet Mail ++ Freenet ++ ++ ++ mx.freenet.de ++ ++ 993 ++ SSL ++ secure ++ %EMAILADDRESS% ++ ++ ++ ++ mx.freenet.de ++ ++ 465 ++ SSL ++ secure ++ %EMAILADDRESS% ++ true ++ false ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/fuga.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/fuga.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/fuga.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/fuga.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fuga.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fuga.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fuga.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com imap evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com imap +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com imap 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com pop evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com pop +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.com pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.com pop 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,35 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ pop.googlemail.com ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ You need to enable POP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmail.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ gmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ gmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmx.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmx.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmx.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmx.com 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gmx.com ++ GMX Freemail ++ GMX ++ ++ imap.gmx.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.gmx.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gmx.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmx.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gmx.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gmx.net 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ gmx.de ++ gmx.net ++ gmx.ch ++ gmx.at ++ gmx.li ++ gmx.fr ++ gmx.it ++ gmx.co.uk ++ ++ ++ GMX Freemail ++ GMX ++ ++ ++ pop.gmx.net ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ mail.gmx.net ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/googlemail.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/googlemail.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/googlemail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/googlemail.com 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/goo.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/goo.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/goo.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/goo.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ goo.jp ++ goo メールアドバンス ++ goo ++ ++ pop.mail.goo.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.mail.goo.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/go.tvm.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/go.tvm.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/go.tvm.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/go.tvm.ne.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ go.tvm.ne.jp ++ テレビ松本ケーブルインターネットサービス ++ TVM-Net ++ ++ go.tvm.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ go.tvm.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/grape.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/grape.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/grape.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/grape.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ grape.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ grape.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ grape.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/gray.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/gray.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/gray.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/gray.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gray.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ gray.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ gray.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hal.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/hal.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hal.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hal.ne.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ hal.ne.jp ++ ハルインターネット ++ HAL ++ ++ mail.hal.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.hal.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hana.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/hana.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hana.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hana.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ hana.or.jp ++ きたうら花ねっと ++ 花ねっと ++ ++ mail.hana.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.hana.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.co.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.co.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.co.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.co.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,40 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.com 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.co.uk evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.co.uk +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.co.uk 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.co.uk 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.de 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.fr evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.fr +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.fr 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.it evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.it +--- evolution-2.30.3//capplet/settings/mail-autoconfig/hotmail.it 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/hotmail.it 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ic-net.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ic-net.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ic-net.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ic-net.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ic-net.or.jp ++ IC-NET ++ IC-NET ++ ++ mail.ic-net.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.ic-net.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ iiyama-catv.ne.jp ++ ケーブルテレビiネット飯山 ++ iネット飯山 ++ ++ mail.iiyama-catv.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.iiyama-catv.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/imail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/imail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/imail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/imail.plala.or.jp 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ imail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ imail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ imail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/inbox.lt evolution-2.30.3.new//capplet/settings/mail-autoconfig/inbox.lt +--- evolution-2.30.3//capplet/settings/mail-autoconfig/inbox.lt 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/inbox.lt 2010-09-01 19:18:57.513184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ inbox.lt ++ Inbox.lt ++ Inbox.lt ++ ++ mail.inbox.lt ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ 999 ++ ++ ++ ++ mail.inbox.lt ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/inbox.lv evolution-2.30.3.new//capplet/settings/mail-autoconfig/inbox.lv +--- evolution-2.30.3//capplet/settings/mail-autoconfig/inbox.lv 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/inbox.lv 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ inbox.lv ++ Inbox.lv ++ Inbox.lv ++ ++ mail.inbox.lv ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ 999 ++ ++ ++ ++ mail.inbox.lv ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/indigo.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/indigo.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/indigo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/indigo.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ indigo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ indigo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ indigo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/inet-shibata.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/inet-shibata.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/inet-shibata.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/inet-shibata.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ inet-shibata.or.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ po.inet-shibata.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.inet-shibata.or.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ivory.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ivory.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ivory.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ivory.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ivory.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ivory.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ivory.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/iwafune.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/iwafune.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/iwafune.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/iwafune.ne.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ iwafune.ne.jp ++ インターネットいわふね ++ IWAFUNE ++ ++ po.iwafune.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.iwafune.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/jade.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/jade.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/jade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/jade.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ jade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ jade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/janis.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/janis.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/janis.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/janis.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,44 @@ ++ ++ ++ ++ janis.or.jp ++ azm.janis.or.jp ++ ckm.janis.or.jp ++ dhk.janis.or.jp ++ dia.janis.or.jp ++ grn.janis.or.jp ++ ina.janis.or.jp ++ kis.janis.or.jp ++ mhl.janis.or.jp ++ mid.janis.or.jp ++ mis.janis.or.jp ++ miy.janis.or.jp ++ ngn.janis.or.jp ++ nkn.janis.or.jp ++ osk.janis.or.jp ++ sas.janis.or.jp ++ sko.janis.or.jp ++ swk.janis.or.jp ++ tgk.janis.or.jp ++ tyt.janis.or.jp ++ ued.janis.or.jp ++ ytg.janis.or.jp ++ JANIS ++ JANIS ++ ++ mail.%EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.%EMAILDOMAIN% ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp imap evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp imap +--- evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp imap 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ imap.jet.ne.jp ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp pop evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp pop +--- evolution-2.30.3//capplet/settings/mail-autoconfig/jet.ne.jp pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/jet.ne.jp pop 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ji.jet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ji.jet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ji.jet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ji.jet.ne.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop02.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp02.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/jmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/jmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/jmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/jmail.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ jmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ jmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/k1.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/k1.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/k1.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/k1.wind.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ kl.wind.ne.jp ++ kl.wind.jp ++ kl.wind.co.jp ++ kl.gunmanet.or.jp ++ kl.gunmanet.ne.jp ++ k1.wind.ne.jp ++ k1.wind.jp ++ k1.gunmanet.or.jp ++ k1.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ kl.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ kl.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/khaki.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/khaki.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/khaki.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/khaki.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ khaki.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ khaki.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ khaki.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/kmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/kmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/kmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/kmail.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ kmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ kmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ kmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/kokuyou.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/kokuyou.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/kokuyou.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/kokuyou.ne.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ kokuyou.ne.jp ++ 長和町黒耀の里ゆいねっと ++ ゆいねっと ++ ++ mail.kokuyou.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.kokuyou.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/lapis.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/lapis.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/lapis.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/lapis.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lapis.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lapis.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lapis.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/laposte.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/laposte.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/laposte.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/laposte.net 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ laposte.net ++ ++ LaPoste.net ++ LaPoste ++ ++ ++ imap.laposte.net ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.laposte.net ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/lemon.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/lemon.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/lemon.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/lemon.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lemon.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lemon.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lemon.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/lilac.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/lilac.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/lilac.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/lilac.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lilac.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lilac.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lilac.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/lime.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/lime.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/lime.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/lime.plala.or.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lime.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lime.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lime.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.co.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.co.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.co.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.co.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,40 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.com 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.co.uk evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.co.uk +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.co.uk 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.co.uk 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.de 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.fr evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.fr +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.fr 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/live.it evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.it +--- evolution-2.30.3//capplet/settings/mail-autoconfig/live.it 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/live.it 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp 2010-09-01 19:18:57.517184000 +0200 +@@ -0,0 +1,54 @@ ++ ++ ++ ++ mx1.tiki.ne.jp ++ mx2.et.tiki.ne.jp ++ mx2.tiki.ne.jp ++ mx2.wt.tiki.ne.jp ++ mx3.et.tiki.ne.jp ++ mx3.tiki.ne.jp ++ mx4.et.tiki.ne.jp ++ mx4.tiki.ne.jp ++ mx5.et.tiki.ne.jp ++ mx5.tiki.ne.jp ++ mx6.et.tiki.ne.jp ++ mx6.tiki.ne.jp ++ mx7.tiki.ne.jp ++ mx8.tiki.ne.jp ++ mx9.tiki.ne.jp ++ mx21.tiki.ne.jp ++ mx22.tiki.ne.jp ++ mx31.tiki.ne.jp ++ mx32.tiki.ne.jp ++ mx35.tiki.ne.jp ++ mx36.tiki.ne.jp ++ mx41.tiki.ne.jp ++ mx51.et.tiki.ne.jp ++ mx51.tiki.ne.jp ++ mx52.tiki.ne.jp ++ mx61.tiki.ne.jp ++ mx71.tiki.ne.jp ++ mx81.tiki.ne.jp ++ mx82.tiki.ne.jp ++ mx91.tiki.ne.jp ++ ma100.tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp-auth.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mac.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/mac.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mac.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mac.com 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ mac.com ++ me.com ++ ++ Apple MobileMe ++ Apple ++ ++ ++ mail.me.com ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.me.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mahoroba.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/mahoroba.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mahoroba.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mahoroba.ne.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mahoroba.ne.jp ++ インターネットまほろば ++ まほろば ++ ++ mail.mahoroba.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.mahoroba.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mail.gunmanet.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/mail.gunmanet.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mail.gunmanet.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mail.gunmanet.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ mail.wind.ne.jp ++ mail.wind.jp ++ mail.wind.co.jp ++ mail.gunmanet.or.jp ++ mail.gunmanet.ne.jp ++ mail.gunmanet.jp ++ 群馬インターネット ++ wind ++ ++ mail.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mail.iwafune.ne.jp ++ インターネットいわふね ++ IWAFUNE ++ ++ mail.iwafune.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.iwafune.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/Makefile.am evolution-2.30.3.new//capplet/settings/mail-autoconfig/Makefile.am +--- evolution-2.30.3//capplet/settings/mail-autoconfig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/Makefile.am 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,186 @@ ++autoconfig_DATA = \ ++ abc.plala.or.jp \ ++ agate.plala.or.jp \ ++ amail.plala.or.jp \ ++ amber.plala.or.jp \ ++ a.memail.jp \ ++ amethyst.broba.cc \ ++ aol.com \ ++ apost.plala.or.jp \ ++ aqua.plala.or.jp \ ++ arcor.de \ ++ ballade.plala.or.jp \ ++ bay.gunmanet.ne.jp \ ++ bb-niigata.jp \ ++ bc.iij4u.or.jp \ ++ beige.plala.or.jp \ ++ blue.plala.or.jp \ ++ bmail.plala.or.jp \ ++ bolero.plala.or.jp \ ++ bpost.plala.or.jp \ ++ brown.plala.or.jp \ ++ camel.plala.or.jp \ ++ cameo.plala.or.jp \ ++ cc9.ne.jp \ ++ cek.ne.jp \ ++ clio.ne.jp \ ++ cmail.plala.or.jp \ ++ co1.wind.jp \ ++ co2.wind.jp \ ++ co3.wind.jp \ ++ cocoa.plala.or.jp \ ++ coda.plala.or.jp \ ++ comcast.net \ ++ concerto.plala.or.jp \ ++ coral.plala.or.jp \ ++ courante.plala.or.jp \ ++ cpost.plala.or.jp \ ++ cream.plala.or.jp \ ++ dance.plala.or.jp \ ++ dan.gunmanet.ne.jp \ ++ dmail.plala.or.jp \ ++ e23.jp \ ++ earthlink.net \ ++ ebony.plala.or.jp \ ++ email.plala.or.jp \ ++ fantasy.plala.or.jp \ ++ flamenco.plala.or.jp \ ++ fmail.plala.or.jp \ ++ free.fr \ ++ freenet.de \ ++ fuga.plala.or.jp \ ++ gmail.com \ ++ gmail.plala.or.jp \ ++ gmx.com \ ++ gmx.net \ ++ googlemail.com \ ++ goo.jp \ ++ go.tvm.ne.jp \ ++ grape.plala.or.jp \ ++ gray.plala.or.jp \ ++ hal.ne.jp \ ++ hana.or.jp \ ++ hotmail.co.jp \ ++ hotmail.com \ ++ hotmail.co.uk \ ++ hotmail.de \ ++ hotmail.fr \ ++ hotmail.it \ ++ ic-net.or.jp \ ++ iiyama-catv.ne.jp \ ++ imail.plala.or.jp \ ++ inbox.lt \ ++ inbox.lv \ ++ indigo.plala.or.jp \ ++ inet-shibata.or.jp \ ++ ivory.plala.or.jp \ ++ iwafune.ne.jp \ ++ jade.plala.or.jp \ ++ janis.or.jp \ ++ jet.ne.jp \ ++ ji.jet.ne.jp \ ++ jmail.plala.or.jp \ ++ k1.wind.jp \ ++ khaki.plala.or.jp \ ++ kmail.plala.or.jp \ ++ kokuyou.ne.jp \ ++ lapis.plala.or.jp \ ++ laposte.net \ ++ lemon.plala.or.jp \ ++ lilac.plala.or.jp \ ++ lime.plala.or.jp \ ++ live.co.jp \ ++ live.com \ ++ live.co.uk \ ++ live.de \ ++ live.fr \ ++ live.it \ ++ ma100.tiki.ne.jp \ ++ mac.com \ ++ mahoroba.ne.jp \ ++ mail.gunmanet.jp \ ++ mail.iwafune.ne.jp \ ++ maroon.plala.or.jp \ ++ me.com \ ++ minuet.plala.or.jp \ ++ ml.murakami.ne.jp \ ++ ml.shibata.ne.jp \ ++ mnet.ne.jp \ ++ mopera.net \ ++ msn.com \ ++ navy.plala.or.jp \ ++ nifty.com \ ++ nsat.jp \ ++ olive.plala.or.jp \ ++ online.de \ ++ opal.plala.or.jp \ ++ orange.fr \ ++ orange.plala.or.jp \ ++ orchid.plala.or.jp \ ++ palette.plala.or.jp \ ++ pal.kijimadaira.jp \ ++ parabox.or.jp \ ++ peach.plala.or.jp \ ++ peoplepc.com \ ++ plum.plala.or.jp \ ++ po.dcn.ne.jp \ ++ polka.plala.or.jp \ ++ pop.shibata.ne.jp \ ++ po.wind.jp \ ++ purple.plala.or.jp \ ++ rainbow.plala.or.jp \ ++ red.plala.or.jp \ ++ rmail.plala.or.jp \ ++ rondo.plala.or.jp \ ++ rose.plala.or.jp \ ++ rouge.plala.or.jp \ ++ ruby.plala.or.jp \ ++ sakunet.ne.jp \ ++ sea.plala.or.jp \ ++ sepia.plala.or.jp \ ++ serenade.plala.or.jp \ ++ silk.plala.or.jp \ ++ silver.plala.or.jp \ ++ sky.plala.or.jp \ ++ smail.plala.or.jp \ ++ snow.plala.or.jp \ ++ sonata.plala.or.jp \ ++ so.wind.ne.jp \ ++ suite.plala.or.jp \ ++ symphony.plala.or.jp \ ++ taupe.plala.or.jp \ ++ tiki.ne.jp \ ++ tmail.plala.or.jp \ ++ toccata.plala.or.jp \ ++ t-online.de \ ++ topaz.plala.or.jp \ ++ trio.plala.or.jp \ ++ umail.plala.or.jp \ ++ verizon.net \ ++ violet.plala.or.jp \ ++ vm.aikis.or.jp \ ++ vmail.plala.or.jp \ ++ vp.tiki.ne.jp \ ++ waltz.plala.or.jp \ ++ wanadoo.fr \ ++ wave.plala.or.jp \ ++ web.de \ ++ white.plala.or.jp \ ++ wine.plala.or.jp \ ++ wmail.plala.or.jp \ ++ xmail.plala.or.jp \ ++ xpost.plala.or.jp \ ++ xp.wind.jp \ ++ xs4all.nl \ ++ yahoo.com \ ++ ybb.ne.jp \ ++ yellow.plala.or.jp \ ++ ymail.plala.or.jp \ ++ ypost.plala.or.jp \ ++ zmail.plala.or.jp ++ ++autoconfigdir = $(privdatadir)/mail-autoconfig ++ ++EXTRA_DIST = \ ++ $(autoconfig_DATA) \ ++ README +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/maroon.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/maroon.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/maroon.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/maroon.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ maroon.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ maroon.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ maroon.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/me.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/me.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/me.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/me.com 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ mac.com ++ me.com ++ ++ Apple MobileMe ++ Apple ++ ++ ++ mail.me.com ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.me.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/minuet.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/minuet.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/minuet.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/minuet.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ minuet.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ minuet.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ minuet.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ml.murakami.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ml.murakami.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ml.murakami.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ml.murakami.ne.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ ml.murakami.ne.jp ++ ++ インターネットいわふね ++ IWAFUNE ++ ++ ++ ml.murakami.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ ml.murakami.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ml.shibata.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ml.shibata.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ml.shibata.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ml.shibata.ne.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ pop.shibata.ne.jp ++ ml.shibata.ne.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ %EMAILDOMAIN% ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mnet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/mnet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mnet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mnet.ne.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mnet.ne.jp ++ Mnet メール サービス ++ Mnetメール ++ ++ mail.mnet.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.mnet.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/mopera.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/mopera.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/mopera.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/mopera.net 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mopera.net ++ mopera U ++ mopera U ++ ++ mail.mopera.net ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.mopera.net ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/msn.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/msn.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/msn.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/msn.com 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/navy.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/navy.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/navy.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/navy.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ navy.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ navy.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ navy.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/nifty.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/nifty.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/nifty.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/nifty.com 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ nifty.com ++ @nifty ++ @nifty ++ ++ pop.nifty.com ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.nifty.com ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/nsat.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/nsat.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/nsat.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/nsat.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ nsat.jp ++ ＢＢにいがた ++ NSAT ++ ++ mail.nsat.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.nsat.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/olive.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/olive.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/olive.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/olive.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ olive.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ olive.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ olive.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/online.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/online.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/online.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/online.de 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,43 @@ ++ ++ ++ ++ ++ online.de ++ onlinehome.de ++ sofortstart.de ++ sofort-start.de ++ sofortsurf.de ++ sofort-surf.de ++ go4more.de ++ ++ 1&1 ++ 1&1 ++ ++ ++ imap.1und1.de ++ 993 ++ SSL ++ ++ plain ++ %EMAILADDRESS% ++ ++ ++ ++ smtp.1und1.de ++ 587 ++ STARTTLS ++ plain ++ %EMAILADDRESS% ++ true ++ false ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/opal.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/opal.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/opal.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/opal.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ opal.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ opal.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ opal.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/orange.fr evolution-2.30.3.new//capplet/settings/mail-autoconfig/orange.fr +--- evolution-2.30.3//capplet/settings/mail-autoconfig/orange.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/orange.fr 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/orange.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/orange.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/orange.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/orange.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ orange.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ orange.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ orange.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/orchid.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/orchid.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/orchid.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/orchid.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ orchid.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ orchid.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ orchid.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/palette.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/palette.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/palette.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/palette.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ palette.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ palette.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ palette.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/pal.kijimadaira.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/pal.kijimadaira.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/pal.kijimadaira.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/pal.kijimadaira.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ pal.kijimadaira.jp ++ 木島平村FTTH ++ 木島平村FTTH ++ ++ mail.pal.kijimadaira.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.pal.kijimadaira.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/parabox.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/parabox.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/parabox.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/parabox.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ parabox.or.jp ++ パラボックス ++ PARABOX ++ ++ pop3.parabox.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.parabox.or.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/peach.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/peach.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/peach.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/peach.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ peach.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ peach.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ peach.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/peoplepc.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/peoplepc.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/peoplepc.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/peoplepc.com 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ peoplepc.com ++ ++ PeoplePC ++ PeoplePC ++ ++ ++ imap.peoplepc.com ++ 143 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpauth.peoplepc.com ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/plum.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/plum.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/plum.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/plum.plala.or.jp 2010-09-01 19:18:57.521184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ plum.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ plum.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ plum.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/po.dcn.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/po.dcn.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/po.dcn.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/po.dcn.ne.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ po.dcn.ne.jp ++ DCNインターネットサービス ++ DCN ++ ++ po.dcn.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.dcn.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/polka.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/polka.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/polka.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/polka.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ polka.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ polka.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ polka.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/pop.shibata.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/pop.shibata.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/pop.shibata.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/pop.shibata.ne.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ pop.shibata.ne.jp ++ ml.shibata.ne.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ %EMAILDOMAIN% ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/po.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/po.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/po.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/po.wind.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ po.wind.ne.jp ++ po.wind.jp ++ po.wind.co.jp ++ po.gunmanet.or.jp ++ po.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ po.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/purple.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/purple.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/purple.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/purple.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ purple.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ purple.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ purple.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/rainbow.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/rainbow.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/rainbow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/rainbow.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rainbow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rainbow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rainbow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/README evolution-2.30.3.new//capplet/settings/mail-autoconfig/README +--- evolution-2.30.3//capplet/settings/mail-autoconfig/README 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/README 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,12 @@ ++The files in this directory are used by Evolution's control center ++capplet to automatically configure email accounts. This so that you ++can tell it, "My mail is example@gmail.com" and it will automatically ++figure out that it must use imap.googlemail.com and smtp.googlemail.com. ++ ++These files are copied from ++http://live.mozillamessaging.com/autoconfig/ ++ ++We should update these files periodically, maybe. ++ ++ Federico Mena Quintero ++ March 2010 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/red.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/red.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/red.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/red.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ red.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ red.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ red.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/rmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/rmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/rmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/rmail.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/rondo.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/rondo.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/rondo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/rondo.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rondo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rondo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rondo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/rose.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/rose.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/rose.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/rose.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rose.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rose.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rose.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/rouge.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/rouge.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/rouge.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/rouge.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rouge.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rouge.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rouge.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ruby.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ruby.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ruby.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ruby.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ruby.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ruby.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ruby.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/sakunet.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/sakunet.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/sakunet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/sakunet.ne.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ sakunet.ne.jp ++ 佐久ケーブルテレビ ++ Saku-Net ++ ++ mail.sakunet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.sakunet.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/sea.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/sea.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/sea.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/sea.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sea.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sea.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sea.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/sepia.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/sepia.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/sepia.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/sepia.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sepia.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sepia.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sepia.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/serenade.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/serenade.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/serenade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/serenade.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ serenade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ serenade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ serenade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/silk.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/silk.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/silk.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/silk.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ silk.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ silk.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ silk.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/silver.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/silver.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/silver.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/silver.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ silver.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ silver.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ silver.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/sky.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/sky.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/sky.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/sky.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sky.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sky.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sky.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/smail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/smail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/smail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/smail.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ smail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ smail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/snow.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/snow.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/snow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/snow.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ snow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ snow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ snow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/sonata.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/sonata.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/sonata.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/sonata.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sonata.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sonata.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sonata.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/so.wind.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/so.wind.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/so.wind.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/so.wind.ne.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ so.wind.ne.jp ++ so.wind.jp ++ 群馬インターネット ++ wind ++ ++ so.wind.ne.jp ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ so.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/suite.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/suite.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/suite.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/suite.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ suite.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ suite.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ suite.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/symphony.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/symphony.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/symphony.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/symphony.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ symphony.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ symphony.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ symphony.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/taupe.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/taupe.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/taupe.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/taupe.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ taupe.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ taupe.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ taupe.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/tiki.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/tiki.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/tiki.ne.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ mx.tiki.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp-auth.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/tmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/tmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/tmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/tmail.plala.or.jp 2010-09-01 19:18:57.525184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ tmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ tmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ tmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/toccata.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/toccata.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/toccata.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/toccata.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ toccata.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ toccata.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ toccata.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ popmail.t-online.de ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpmail.t-online.de ++ 25 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de free evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de free +--- evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de free 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de free 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ popmail.t-online.de ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpmail.t-online.de ++ 25 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de imap ssl evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de imap ssl +--- evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de imap ssl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de imap ssl 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ secure-imap.t-online.de ++ 993 ++ SSL ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ securesmtp.googlemail.com ++ 25 ++ STARTTLS ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ You need to enable POP access ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de pop ssl evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de pop ssl +--- evolution-2.30.3//capplet/settings/mail-autoconfig/t-online.de pop ssl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/t-online.de pop ssl 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ securepop.t-online.de ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ securesmtp.t-online.de ++ 25 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/topaz.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/topaz.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/topaz.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/topaz.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ topaz.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ topaz.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ topaz.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/trio.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/trio.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/trio.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/trio.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ trio.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ trio.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ trio.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/umail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/umail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/umail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/umail.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ umail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ umail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ umail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/verizon.net evolution-2.30.3.new//capplet/settings/mail-autoconfig/verizon.net +--- evolution-2.30.3//capplet/settings/mail-autoconfig/verizon.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/verizon.net 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ verizon.net ++ ++ Verizon Online ++ Verizon ++ ++ ++ incoming.verizon.com ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ outgoing.verizon.net ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/violet.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/violet.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/violet.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/violet.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ violet.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ violet.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ violet.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/vm.aikis.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/vm.aikis.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/vm.aikis.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/vm.aikis.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vm.aikis.or.jp ++ aikis ++ aikis ++ ++ mail.aikis.or.jp ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.aikis.or.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/vmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/vmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/vmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/vmail.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ vmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ vmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/vp.tiki.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/vp.tiki.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/vp.tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/vp.tiki.ne.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vp.tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ vp.tiki.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ vs.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/waltz.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/waltz.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/waltz.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/waltz.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ waltz.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ waltz.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ waltz.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr imap evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr imap +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr imap 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ imap.orange.fr ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr pop evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr pop +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wanadoo.fr pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wanadoo.fr pop 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wave.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/wave.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wave.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wave.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wave.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wave.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wave.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/web.de evolution-2.30.3.new//capplet/settings/mail-autoconfig/web.de +--- evolution-2.30.3//capplet/settings/mail-autoconfig/web.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/web.de 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ web.de ++ ++ WEB.DE Freemail ++ Web.de ++ ++ ++ imap.web.de ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.web.de ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/white.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/white.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/white.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/white.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ white.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ white.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ white.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wine.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/wine.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wine.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wine.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wine.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wine.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wine.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/wmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/wmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/wmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/wmail.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/xmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/xmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/xmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/xmail.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ xmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/xpost.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/xpost.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/xpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/xpost.plala.or.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ xpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/xp.wind.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/xp.wind.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/xp.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/xp.wind.jp 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xp.wind.jp ++ 群馬インターネット ++ wind ++ ++ xp.wind.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xp.wind.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/xs4all.nl evolution-2.30.3.new//capplet/settings/mail-autoconfig/xs4all.nl +--- evolution-2.30.3//capplet/settings/mail-autoconfig/xs4all.nl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/xs4all.nl 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ xs4all.nl ++ ++ XS4All ++ XS4All ++ ++ ++ pops.xs4all.nl ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtps.xs4all.nl ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/yahoo.com evolution-2.30.3.new//capplet/settings/mail-autoconfig/yahoo.com +--- evolution-2.30.3//capplet/settings/mail-autoconfig/yahoo.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/yahoo.com 2010-09-01 19:18:57.529184000 +0200 +@@ -0,0 +1,36 @@ ++ ++ ++ ++ ++ yahoo.com ++ yahoo.de ++ yahoo.it ++ yahoo.fr ++ yahoo.co.uk ++ yahoo.com.br ++ ymail.com ++ rocketmail.com ++ ++ Yahoo! Mail ++ Yahoo ++ ++ ++ pop.mail.yahoo.com ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.mail.yahoo.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ybb.ne.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ybb.ne.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ybb.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ybb.ne.jp 2010-09-01 19:18:57.533184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ybb.ne.jp ++ Yahoo! BB ++ Yahoo! BB ++ ++ ybbpop.mail.yahoo.co.jp ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ybbsmtp.mail.yahoo.co.jp ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/yellow.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/yellow.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/yellow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/yellow.plala.or.jp 2010-09-01 19:18:57.533184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ yellow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ yellow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ yellow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ymail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ymail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ymail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ymail.plala.or.jp 2010-09-01 19:18:57.533184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ymail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ymail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ymail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/ypost.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/ypost.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/ypost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/ypost.plala.or.jp 2010-09-01 19:18:57.533184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ypost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ypost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ypost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-autoconfig/zmail.plala.or.jp evolution-2.30.3.new//capplet/settings/mail-autoconfig/zmail.plala.or.jp +--- evolution-2.30.3//capplet/settings/mail-autoconfig/zmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//capplet/settings/mail-autoconfig/zmail.plala.or.jp 2010-09-01 19:18:57.533184000 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ zmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ zmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ zmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/mail-guess-servers.c evolution-2.30.3.new//capplet/settings/mail-guess-servers.c +--- evolution-2.30.3//capplet/settings/mail-guess-servers.c 2010-06-20 14:16:51.000000000 +0200 ++++ evolution-2.30.3.new//capplet/settings/mail-guess-servers.c 2010-09-01 19:18:57.533184000 +0200 +@@ -42,6 +42,10 @@ + #include + #include + ++#include ++ ++#include ++ + #include "mail-guess-servers.h" + + static gchar * +@@ -158,13 +162,13 @@ + } + } + +-static void +-parse_msg (SoupMessage *msg, EmailProvider *provider) ++static gboolean ++parse_message (const gchar *msg, gint length, EmailProvider *provider) + { + xmlDocPtr doc; + xmlNodePtr node, top; + +- doc = xmlReadMemory (msg->response_body->data, msg->response_body->length, "file.xml", NULL, 0); ++ doc = xmlReadMemory (msg, length, "file.xml", NULL, 0); + + node = doc->children; + while (node) { +@@ -176,7 +180,7 @@ + + if (!node) { + g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); +- return; ++ return FALSE; + } + + node = node->children; +@@ -189,7 +193,7 @@ + + if (!node) { + g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); +- return; ++ return FALSE; + } + + top = node; +@@ -207,18 +211,48 @@ + } + + xmlFreeDoc(doc); ++ ++ return TRUE; + } + +-gboolean +-mail_guess_servers(EmailProvider *provider) ++static gboolean ++parse_soup_message (SoupMessage *msg, EmailProvider *provider) ++{ ++ return parse_message (msg->response_body->data, msg->response_body->length, provider); ++} ++ ++static gboolean ++is_online (void) ++{ ++ EShell *shell; ++ ++ shell = e_shell_get_default (); ++ if (!shell) { ++ /* FIXME: do we always have a shell? What do we do if one ++ * hasn't been created yet? e_shell_get_default() won't create ++ * a shell; it will just return one that has been created ++ * before. ++ */ ++ return FALSE; ++ } ++ ++ return e_shell_get_online (shell); ++} ++ ++static gboolean ++guess_when_online (EmailProvider *provider) + { + const gchar *cafile = NULL; + gchar *url; +- SoupURI *proxy = NULL, *parsed; ++ EProxy *proxy = NULL; ++ SoupURI *parsed; + SoupMessage *msg; + SoupSession *session; + +- url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); ++ proxy = e_proxy_new (); ++ e_proxy_setup_proxy (proxy); ++ ++ url = g_strdup_printf("%s/%s", "http://api.gnome.org/evolution/autoconfig", provider->domain); + parsed = soup_uri_new (url); + soup_uri_free (parsed); + +@@ -227,18 +261,20 @@ + SOUP_SESSION_USER_AGENT, "get ", + NULL); + +- if (proxy) { +- g_object_set (G_OBJECT (session), +- SOUP_SESSION_PROXY_URI, proxy, +- NULL); ++ if (e_proxy_require_proxy_for_uri (proxy, url)) { ++ SoupURI *proxy_uri = e_proxy_peek_uri_for (proxy, url); ++/* fprintf (stderr, "URL '%s' requires a proxy: '%s'\n", ++ url, soup_uri_to_string (proxy_uri, FALSE)); */ ++ g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); + } + + msg = get_url (session, url); + if (!msg) + return FALSE; + +- parse_msg(msg, provider); ++ parse_soup_message (msg, provider); + ++ g_object_unref (proxy); + g_object_unref (msg); + g_object_unref(session); + g_free(url); +@@ -247,6 +283,47 @@ + + } + ++static gchar * ++get_filename_for_offline_autoconfig (const gchar *domain) ++{ ++ return g_build_filename (EVOLUTION_PRIVDATADIR, "mail-autoconfig", domain, NULL); ++} ++ ++static gboolean ++guess_when_offline (EmailProvider *provider) ++{ ++ gchar *filename; ++ gchar *contents; ++ gsize length; ++ gboolean success; ++ ++ if (!provider->domain || provider->domain[0] == 0) ++ return FALSE; ++ ++ success = FALSE; ++ ++ filename = get_filename_for_offline_autoconfig (provider->domain); ++ if (!g_file_get_contents (filename, &contents, &length, NULL)) /* NULL-GError */ ++ goto out; ++ ++ success = parse_message (contents, (gint) length, provider); ++ ++out: ++ g_free (filename); ++ g_free (contents); ++ ++ return success; ++} ++ ++gboolean ++mail_guess_servers(EmailProvider *provider) ++{ ++ if (is_online () && guess_when_online (provider)) ++ return TRUE; ++ else ++ return guess_when_offline (provider); ++} ++ + #ifdef TEST + gint + main (gint argc, gchar **argv) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/settings/Makefile.am evolution-2.30.3.new//capplet/settings/Makefile.am +--- evolution-2.30.3//capplet/settings/Makefile.am 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.3.new//capplet/settings/Makefile.am 2010-09-01 19:18:57.533184000 +0200 +@@ -1,3 +1,4 @@ ++SUBDIRS = mail-autoconfig + + privsolib_LTLIBRARIES = libevolution-mail-settings.la + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-actions.c evolution-2.30.3.new//composer/e-composer-actions.c +--- evolution-2.30.3//composer/e-composer-actions.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-actions.c 2010-09-01 19:18:57.533184000 +0200 +@@ -381,14 +381,6 @@ + NULL, /* Handled by property bindings */ + FALSE }, + +- { "view-from", +- NULL, +- N_("_From Field"), +- NULL, +- N_("Toggles whether the From chooser is displayed"), +- NULL, /* Handled by property bindings */ +- FALSE }, +- + { "view-reply-to", + NULL, + N_("_Reply-To Field"), +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-actions.h evolution-2.30.3.new//composer/e-composer-actions.h +--- evolution-2.30.3//composer/e-composer-actions.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-actions.h 2010-09-01 19:18:57.533184000 +0200 +@@ -57,8 +57,6 @@ + E_COMPOSER_ACTION ((composer), "view-bcc") + #define E_COMPOSER_ACTION_VIEW_CC(composer) \ + E_COMPOSER_ACTION ((composer), "view-cc") +-#define E_COMPOSER_ACTION_VIEW_FROM(composer) \ +- E_COMPOSER_ACTION ((composer), "view-from") + #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \ + E_COMPOSER_ACTION ((composer), "view-reply-to") + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-from-header.c evolution-2.30.3.new//composer/e-composer-from-header.c +--- evolution-2.30.3//composer/e-composer-from-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-from-header.c 2010-09-01 19:18:57.533184000 +0200 +@@ -110,16 +110,6 @@ + "button", FALSE, NULL); + } + +-EComposerHeader * +-e_composer_from_header_new_with_action (const gchar *label, +- const gchar *action) +-{ +- return g_object_new ( +- E_TYPE_COMPOSER_FROM_HEADER, "label", label, +- "button", FALSE, "addaction_text", action, +- "addaction", action != NULL, NULL); +-} +- + EAccountList * + e_composer_from_header_get_account_list (EComposerFromHeader *header) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-from-header.h evolution-2.30.3.new//composer/e-composer-from-header.h +--- evolution-2.30.3//composer/e-composer-from-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-from-header.h 2010-09-01 19:18:57.533184000 +0200 +@@ -63,9 +63,6 @@ + + GType e_composer_from_header_get_type (void); + EComposerHeader * e_composer_from_header_new (const gchar *label); +-EComposerHeader * e_composer_from_header_new_with_action +- (const gchar *label, +- const gchar *action); + EAccountList * e_composer_from_header_get_account_list + (EComposerFromHeader *header); + void e_composer_from_header_set_account_list +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-header.c evolution-2.30.3.new//composer/e-composer-header.c +--- evolution-2.30.3//composer/e-composer-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-header.c 2010-09-01 19:18:57.533184000 +0200 +@@ -32,8 +32,6 @@ + PROP_0, + PROP_BUTTON, + PROP_LABEL, +- PROP_ADDACTION, +- PROP_ADDACTION_TEXT, + PROP_SENSITIVE, + PROP_VISIBLE + }; +@@ -47,8 +45,6 @@ + struct _EComposerHeaderPrivate { + gchar *label; + gboolean button; +- gchar *addaction_text; +- gboolean addaction; /*For Add button.*/ + GtkWidget *action_label; + + GtkWidget *add_icon; +@@ -71,15 +67,6 @@ + g_signal_emit (header, signal_ids[CLICKED], 0); + } + +-static void +-composer_header_addaction_clicked_cb (GtkButton *button, +- EComposerHeader *header) +-{ +- gboolean show = !e_composer_header_get_visible(header); +- +- e_composer_header_set_visible (header, show); +-} +- + static GObject * + composer_header_constructor (GType type, + guint n_construct_properties, +@@ -88,6 +75,7 @@ + GObject *object; + GtkWidget *widget; + EComposerHeader *header; ++ GtkWidget *label; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (parent_class)->constructor ( +@@ -102,51 +90,16 @@ + widget, "clicked", + G_CALLBACK (composer_header_button_clicked_cb), + header); ++ label = gtk_bin_get_child (GTK_BIN (widget)); + } else { + widget = gtk_label_new_with_mnemonic (header->priv->label); +- gtk_label_set_mnemonic_widget ( +- GTK_LABEL (widget), header->input_widget); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (widget), header->input_widget); ++ label = widget; + } + +- header->priv->action_label = NULL; +- if (header->priv->addaction) { +- GtkWidget *box, *tmp; +- gchar *str; +- +- header->priv->action_label = gtk_label_new (NULL); +- header->action_widget = gtk_button_new (); +- box = gtk_hbox_new (FALSE, 0); +- tmp = gtk_image_new_from_stock ( +- GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); +- header->priv->add_icon = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_image_new_from_stock ( +- GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); +- header->priv->remove_icon = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_label_new (NULL); +- str = g_strdup_printf ( +- "%s %s", _("Show"), +- header->priv->addaction_text); +- gtk_label_set_markup((GtkLabel *)tmp, str); +- g_free (str); +- header->priv->show_label = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_label_new (NULL); +- str = g_strdup_printf ( +- "%s %s", _("Hide"), +- header->priv->addaction_text); +- gtk_label_set_markup((GtkLabel *)tmp, str); +- header->priv->hide_label = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); ++ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + +- gtk_container_add((GtkContainer *)header->action_widget, box); +- gtk_widget_show_all(header->action_widget); +- g_signal_connect ( +- header->action_widget, "clicked", +- G_CALLBACK (composer_header_addaction_clicked_cb), +- header); +- } ++ header->priv->action_label = NULL; + + header->title_widget = g_object_ref_sink (widget); + +@@ -171,14 +124,6 @@ + priv->button = g_value_get_boolean (value); + return; + +- case PROP_ADDACTION: /* construct only */ +- priv->addaction = g_value_get_boolean (value); +- return; +- +- case PROP_ADDACTION_TEXT:/* construct only */ +- priv->addaction_text = g_value_dup_string (value); +- return; +- + case PROP_LABEL: /* construct only */ + priv->label = g_value_dup_string (value); + return; +@@ -199,15 +144,6 @@ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } + +-void +-e_composer_header_set_property (GObject *object, +- guint property_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- composer_header_set_property (object, property_id, value, pspec); +-} +- + static void + composer_header_get_property (GObject *object, + guint property_id, +@@ -223,15 +159,6 @@ + g_value_set_boolean (value, priv->button); + return; + +- case PROP_ADDACTION: /* construct only */ +- g_value_set_boolean (value, priv->button); +- return; +- +- case PROP_ADDACTION_TEXT: /* construct only */ +- g_value_take_string ( +- value, priv->addaction_text); +- return; +- + case PROP_LABEL: /* construct only */ + g_value_take_string ( + value, e_composer_header_get_label ( +@@ -298,28 +225,6 @@ + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + +- g_object_class_install_property ( +- object_class, +- PROP_ADDACTION, +- g_param_spec_boolean ( +- "addaction", +- NULL, +- NULL, +- FALSE, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, +- PROP_ADDACTION_TEXT, +- g_param_spec_string ( +- "addaction_text", +- NULL, +- NULL, +- NULL, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- + g_object_class_install_property ( + object_class, + PROP_LABEL, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-header.h evolution-2.30.3.new//composer/e-composer-header.h +--- evolution-2.30.3//composer/e-composer-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-header.h 2010-09-01 19:18:57.533184000 +0200 +@@ -49,7 +49,6 @@ + GObject parent; + GtkWidget *title_widget; + GtkWidget *input_widget; +- GtkWidget *action_widget; + EComposerHeaderPrivate *priv; + }; + +@@ -69,8 +68,6 @@ + gboolean e_composer_header_get_visible (EComposerHeader *header); + void e_composer_header_set_visible (EComposerHeader *header, + gboolean visible); +-void e_composer_header_set_property (GObject *object, guint property_id, +- const GValue *value, GParamSpec *pspec); + void e_composer_header_set_title_tooltip + (EComposerHeader *header, + const gchar *tooltip); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-header-table.c evolution-2.30.3.new//composer/e-composer-header-table.c +--- evolution-2.30.3//composer/e-composer-header-table.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-header-table.c 2010-09-01 19:18:57.533184000 +0200 +@@ -26,14 +26,13 @@ + #include "e-util/gconf-bridge.h" + #include "widgets/misc/e-signature-combo-box.h" + ++#include "e-msg-composer.h" + #include "e-composer-private.h" + #include "e-composer-from-header.h" + #include "e-composer-name-header.h" + #include "e-composer-post-header.h" + #include "e-composer-text-header.h" + +-extern gboolean composer_lite; +- + #define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate)) +@@ -69,7 +68,6 @@ + GtkWidget *signature_label; + GtkWidget *signature_combo_box; + ENameSelector *name_selector; +- GtkHBox *actions_container; + }; + + static gpointer parent_class; +@@ -159,11 +157,7 @@ + { + GtkWidget *parent; + +- if (composer_lite && strcmp (property_name, "destinations-to") == 0) +- parent = g_object_get_data ( +- G_OBJECT (header->input_widget), "parent"); +- else +- parent = gtk_widget_get_parent (header->input_widget); ++ parent = gtk_widget_get_parent (header->input_widget); + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (parent)); + g_object_notify (G_OBJECT (parent), property_name); + } +@@ -174,7 +168,7 @@ + { + GtkWidget *parent; + +- if (composer_lite) { ++ if (e_msg_composer_get_lite ()) { + parent = gtk_widget_get_parent (widget); + parent = g_object_get_data (G_OBJECT (parent), "pdata"); + } else +@@ -282,6 +276,27 @@ + return new_destinations; + } + ++static gint ++count_from_accounts (EComposerHeaderTable *table) ++{ ++ EComposerHeader *header; ++ EAccountComboBox *combo_box; ++ ++ header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_FROM); ++ combo_box = E_ACCOUNT_COMBO_BOX (header->input_widget); ++ ++ return e_account_combo_box_count_displayed_accounts (combo_box); ++} ++ ++static gboolean ++from_header_should_be_visible (EComposerHeaderTable *table) ++{ ++ gint num_accounts; ++ ++ num_accounts = count_from_accounts (table); ++ return (num_accounts > 1); ++} ++ + static void + composer_header_table_setup_mail_headers (EComposerHeaderTable *table) + { +@@ -294,6 +309,8 @@ + EComposerHeader *header; + const gchar *key; + guint binding_id; ++ gboolean sensitive; ++ gboolean visible; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); +@@ -310,10 +327,6 @@ + key = COMPOSER_GCONF_PREFIX "/show_mail_cc"; + break; + +- case E_COMPOSER_HEADER_FROM: +- key = COMPOSER_GCONF_PREFIX "/show_mail_from"; +- break; +- + case E_COMPOSER_HEADER_REPLY_TO: + key = COMPOSER_GCONF_PREFIX "/show_mail_reply_to"; + break; +@@ -324,22 +337,29 @@ + } + + switch (ii) { ++ case E_COMPOSER_HEADER_FROM: ++ sensitive = TRUE; ++ visible = from_header_should_be_visible (table); ++ break; ++ + case E_COMPOSER_HEADER_BCC: + case E_COMPOSER_HEADER_CC: +- case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + case E_COMPOSER_HEADER_TO: +- e_composer_header_set_sensitive (header, TRUE); +- e_composer_header_set_visible (header, TRUE); ++ sensitive = TRUE; ++ visible = TRUE; + break; + + default: +- e_composer_header_set_sensitive (header, FALSE); +- e_composer_header_set_visible (header, FALSE); ++ sensitive = FALSE; ++ visible = FALSE; + break; + } + ++ e_composer_header_set_sensitive (header, sensitive); ++ e_composer_header_set_visible (header, visible); ++ + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); +@@ -482,6 +502,17 @@ + composer_header_table_setup_mail_headers (table); + } + ++static gint ++get_row_padding (void) ++{ ++ /* For small screens, make the header-table's rows be packed closely together */ ++ ++ if (e_msg_composer_get_lite ()) ++ return 0; ++ else ++ return 3; ++} ++ + static GObject * + composer_header_table_constructor (GType type, + guint n_construct_properties, +@@ -490,6 +521,7 @@ + GObject *object; + EComposerHeaderTablePrivate *priv; + guint rows, ii; ++ gint row_padding; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (parent_class)->constructor ( +@@ -505,45 +537,18 @@ + /* Use "ypadding" instead of "row-spacing" because some rows may + * be invisible and we don't want spacing around them. */ + ++ row_padding = get_row_padding (); ++ + for (ii = 0; ii < rows; ii++) { + gtk_table_attach ( + GTK_TABLE (object), priv->headers[ii]->title_widget, +- 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, 3); +- if (composer_lite && ii == E_COMPOSER_HEADER_TO) { +- GtkWidget *box = gtk_hbox_new (FALSE, 0); +- g_object_set_data ( +- G_OBJECT (priv->headers[ii]->input_widget), +- "parent", object); +- gtk_box_pack_start ( +- GTK_BOX (box), priv->headers[ii]->input_widget, +- TRUE, TRUE, 3); +- gtk_box_pack_start ( +- GTK_BOX (box), +- GTK_WIDGET (priv->actions_container), +- FALSE, FALSE, 0); +- gtk_widget_show (box); +- gtk_table_attach ( +- GTK_TABLE (object), box, 1, 4, ii, ii + 1, +- GTK_FILL | GTK_EXPAND, 0, 0, 3); +- +- } else { +- gtk_table_attach ( +- GTK_TABLE (object), +- priv->headers[ii]->input_widget, 1, 4, +- ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); +- } +- if (composer_lite && priv->headers[ii]->action_widget) { +- /* Pack the widgets to the end. Helps formatting +- * when hiding the From field. */ +- gtk_box_pack_end ( +- GTK_BOX (priv->actions_container), +- priv->headers[ii]->action_widget, +- FALSE, FALSE, 6); +- } ++ 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, row_padding); ++ gtk_table_attach ( ++ GTK_TABLE (object), ++ priv->headers[ii]->input_widget, 1, 4, ++ ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, row_padding); + } + +- if (composer_lite) +- gtk_widget_show_all ((GtkWidget *)priv->actions_container); + ii = E_COMPOSER_HEADER_FROM; + + /* Leave room in the "From" row for signature stuff. */ +@@ -561,13 +566,13 @@ + priv->signature_combo_box, "visible"); + + /* Now add the signature stuff. */ +- if (!composer_lite) { ++ if (!e_msg_composer_get_lite ()) { + gtk_table_attach ( + GTK_TABLE (object), priv->signature_label, +- 2, 3, ii, ii + 1, 0, 0, 0, 3); ++ 2, 3, ii, ii + 1, 0, 0, 0, row_padding); + gtk_table_attach ( + GTK_TABLE (object), priv->signature_combo_box, +- 3, 4, ii, ii + 1, composer_lite ? GTK_FILL: 0, 0, 0, 3); ++ 3, 4, ii, ii + 1, e_msg_composer_get_lite () ? GTK_FILL: 0, 0, 0, row_padding); + } else { + GtkWidget *box = gtk_hbox_new (FALSE, 0); + +@@ -580,7 +585,7 @@ + g_object_set_data (G_OBJECT (box), "pdata", object); + gtk_table_attach ( + GTK_TABLE (object), box, +- 3, 4, ii, ii + 1, GTK_FILL, 0, 0, 3); ++ 3, 4, ii, ii + 1, GTK_FILL, 0, 0, row_padding); + gtk_widget_hide (box); + } + +@@ -954,9 +959,7 @@ + name_selector = e_name_selector_new (); + table->priv->name_selector = name_selector; + +- table->priv->actions_container = (GtkHBox *)gtk_hbox_new (FALSE, 6); +- +- header = e_composer_from_header_new_with_action (_("Fr_om:"), _("From")); ++ header = e_composer_from_header_new (_("Fr_om:")); + composer_header_table_bind_header ("account", "changed", header); + composer_header_table_bind_header ("account-list", "refreshed", header); + composer_header_table_bind_header ("account-name", "changed", header); +@@ -965,24 +968,21 @@ + composer_header_table_from_changed_cb), table); + table->priv->headers[E_COMPOSER_HEADER_FROM] = header; + +- header = e_composer_text_header_new_label (_("_Reply-To:"), ""); ++ header = e_composer_text_header_new_label (_("_Reply-To:")); + composer_header_table_bind_header ("reply-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header; + +- header = e_composer_name_header_new_with_label ( +- _("_To:"), name_selector); ++ header = e_composer_name_header_new (_("_To:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_TO); + composer_header_table_bind_header ("destinations-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_TO] = header; + +- header = e_composer_name_header_new_with_action ( +- _("_Cc:"), _("CC"), name_selector); ++ header = e_composer_name_header_new (_("_Cc:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_CC); + composer_header_table_bind_header ("destinations-cc", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_CC] = header; + +- header = e_composer_name_header_new_with_action ( +- _("_Bcc:"), _("BCC"), name_selector); ++ header = e_composer_name_header_new (_("_Bcc:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_BCC); + composer_header_table_bind_header ("destinations-bcc", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_BCC] = header; +@@ -991,7 +991,7 @@ + composer_header_table_bind_header ("post-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_POST_TO] = header; + +- header = e_composer_text_header_new_label (_("S_ubject:"), NULL); ++ header = e_composer_text_header_new_label (_("S_ubject:")); + composer_header_table_bind_header ("subject", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_SUBJECT] = header; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-name-header.c evolution-2.30.3.new//composer/e-composer-name-header.c +--- evolution-2.30.3//composer/e-composer-name-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-name-header.c 2010-09-01 19:18:57.537184000 +0200 +@@ -292,33 +292,11 @@ + { + g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); + +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, NULL); +-} +- +-EComposerHeader * +-e_composer_name_header_new_with_label (const gchar *label, +- ENameSelector *name_selector) +-{ +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, +- "addaction", FALSE, "visible", TRUE, NULL); +-} +- +-EComposerHeader * +-e_composer_name_header_new_with_action (const gchar *label, +- const gchar *action_label, +- ENameSelector *name_selector) +-{ +- g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); +- +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, +- "addaction_text", action_label, +- "addaction", action_label != NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_NAME_HEADER, ++ "label", label, ++ "button", TRUE, ++ "name-selector", name_selector, ++ NULL); + } + + ENameSelector * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-name-header.h evolution-2.30.3.new//composer/e-composer-name-header.h +--- evolution-2.30.3//composer/e-composer-name-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-name-header.h 2010-09-01 19:18:57.537184000 +0200 +@@ -62,14 +62,6 @@ + GType e_composer_name_header_get_type (void); + EComposerHeader * e_composer_name_header_new (const gchar *label, + ENameSelector *name_selector); +-/*No button. Just a label.*/ +-EComposerHeader * e_composer_name_header_new_with_label (const gchar *label, +- ENameSelector *name_selector); +- +-/*No button. Label with a Link button for show/hide.*/ +-EComposerHeader * e_composer_name_header_new_with_action (const gchar *label, +- const gchar *action, +- ENameSelector *name_selector); + + ENameSelector * e_composer_name_header_get_name_selector + (EComposerNameHeader *header); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-private.c evolution-2.30.3.new//composer/e-composer-private.c +--- evolution-2.30.3//composer/e-composer-private.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-private.c 2010-09-01 19:18:57.537184000 +0200 +@@ -145,9 +145,18 @@ + html = gtkhtml_editor_get_html (editor); + ui_manager = gtkhtml_editor_get_ui_manager (editor); + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { ++#if 0 ++ /* In the lite composer, for small screens, we are not ready yet ++ * to hide the menubar. It still has useful items like the ones ++ * to show/hide the various header fields, plus the security options. ++ * ++ * When we move those options out of the menu and into the composer's ++ * toplevel, we can probably get rid of the menu. ++ */ + widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu"); + gtk_widget_hide (widget); ++#endif + widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar"); + gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ); + gtk_widget_hide (widget); +@@ -243,8 +252,8 @@ + widget = e_composer_header_table_new (); + gtk_container_set_border_width (GTK_CONTAINER (widget), 6); + gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0); +- if (composer->lite) +- gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 0); ++ if (e_msg_composer_get_lite ()) ++ gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 1); + else + gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 2); + +@@ -253,7 +262,7 @@ + + /* Construct the attachment paned. */ + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { + e_attachment_paned_set_default_height (75); /* short attachment bar for Anjal */ + e_attachment_icon_view_set_default_icon_size (GTK_ICON_SIZE_BUTTON); + } +@@ -262,7 +271,7 @@ + priv->attachment_paned = g_object_ref (widget); + gtk_widget_show (widget); + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { + GtkWidget *tmp, *tmp1, *tmp_box, *container; + GtkWidget *combo; + +@@ -351,10 +360,6 @@ + action = ACTION (VIEW_CC); + break; + +- case E_COMPOSER_HEADER_FROM: +- action = ACTION (VIEW_FROM); +- break; +- + case E_COMPOSER_HEADER_REPLY_TO: + action = ACTION (VIEW_REPLY_TO); + break; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-text-header.c evolution-2.30.3.new//composer/e-composer-text-header.c +--- evolution-2.30.3//composer/e-composer-text-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-text-header.c 2010-09-01 19:18:57.537184000 +0200 +@@ -108,23 +108,21 @@ + } + + EComposerHeader * +-e_composer_text_header_new_label (const gchar *label, const gchar *action_label) ++e_composer_text_header_new_label (const gchar *label) + { +- return g_object_new ( +- E_TYPE_COMPOSER_TEXT_HEADER, "label", label, +- "button", FALSE, "addaction", action_label && *action_label, +- "addaction_text", action_label, +- "visible", action_label == NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, ++ "label", label, ++ "button", FALSE, ++ NULL); + } + + EComposerHeader * +-e_composer_text_header_new_button (const gchar *label, const gchar *action_label) ++e_composer_text_header_new_button (const gchar *label) + { +- return g_object_new ( +- E_TYPE_COMPOSER_TEXT_HEADER, "label", label, +- "button", TRUE, "addaction", action_label != NULL, +- "addaction_text", action_label, +- "visible", action_label == NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, ++ "label", label, ++ "button", TRUE, ++ NULL); + } + + const gchar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-composer-text-header.h evolution-2.30.3.new//composer/e-composer-text-header.h +--- evolution-2.30.3//composer/e-composer-text-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-composer-text-header.h 2010-09-01 19:18:57.537184000 +0200 +@@ -59,10 +59,10 @@ + GType e_composer_text_header_get_type (void); + + EComposerHeader * +-e_composer_text_header_new_label (const gchar *label, const gchar *action_label); ++e_composer_text_header_new_label (const gchar *label); + + EComposerHeader * +-e_composer_text_header_new_button (const gchar *label, const gchar *action_label); ++e_composer_text_header_new_button (const gchar *label); + + const gchar * e_composer_text_header_get_text (EComposerTextHeader *header); + void e_composer_text_header_set_text (EComposerTextHeader *header, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-msg-composer.c evolution-2.30.3.new//composer/e-msg-composer.c +--- evolution-2.30.3//composer/e-msg-composer.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-msg-composer.c 2010-09-01 19:18:57.537184000 +0200 +@@ -85,8 +85,6 @@ + LAST_SIGNAL + }; + +-gboolean composer_lite = FALSE; +- + static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +@@ -381,7 +379,7 @@ + } + + /* These functions builds a CamelMimeMessage for the message that the user has +- * composed in `composer'. ++ * composed in 'composer'. + */ + + static void +@@ -1695,6 +1693,7 @@ + g_signal_connect (object, "delete-event", + G_CALLBACK (msg_composer_delete_event_cb), NULL); + ++ e_shell_adapt_window_size (shell, GTK_WINDOW (composer)); + e_shell_watch_window (shell, GTK_WINDOW (object)); + + g_signal_connect (shell, "quit-requested", +@@ -1721,10 +1720,6 @@ + + /* Honor User Preferences */ + +- active = e_shell_settings_get_boolean ( +- shell_settings, "composer-format-html"); +- gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (composer), active); +- + action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); + active = e_shell_settings_get_boolean ( + shell_settings, "composer-request-receipt"); +@@ -2200,8 +2195,14 @@ + static void + msg_composer_init (EMsgComposer *composer) + { +- composer->lite = composer_lite; ++ EShell *shell = e_shell_get_default (); ++ + composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer); ++ ++ if (e_shell_get_express_mode (shell)) { ++ GtkWindow *window = e_shell_get_active_window(shell); ++ gtk_window_set_transient_for (GTK_WINDOW(composer), window); ++ } + } + + GType +@@ -2247,29 +2248,21 @@ + "html", e_web_view_new (), NULL); + } + +-void +-e_msg_composer_set_lite (void) +-{ +- composer_lite = TRUE; +-} +- ++/** ++ * e_msg_composer_get_lite: ++ * ++ * Used within the composer to see if it should be made suitable for small ++ * screens. ++ * ++ * Return value: whether the surrounding #EShell is in small screen mode. ++ */ + gboolean + e_msg_composer_get_lite (void) + { +- return composer_lite; +-} +- +-EMsgComposer * +-e_msg_composer_lite_new (void) +-{ +- EMsgComposer *composer; +- +- /* Init lite-composer for ever for the session */ +- composer_lite = TRUE; +- +- composer = e_msg_composer_new (); ++ EShell *shell; + +- return composer; ++ shell = e_shell_get_default (); ++ return e_shell_get_small_screen_mode (shell); + } + + EFocusTracker * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/e-msg-composer.h evolution-2.30.3.new//composer/e-msg-composer.h +--- evolution-2.30.3//composer/e-msg-composer.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.3.new//composer/e-msg-composer.h 2010-09-01 19:18:57.537184000 +0200 +@@ -63,7 +63,6 @@ + struct _EMsgComposer { + GtkhtmlEditor parent; + EMsgComposerPrivate *priv; +- gboolean lite; + }; + + struct _EMsgComposerClass { +@@ -72,9 +71,7 @@ + + GType e_msg_composer_get_type (void); + EMsgComposer * e_msg_composer_new (void); +-void e_msg_composer_set_lite (void); + gboolean e_msg_composer_get_lite (void); +-EMsgComposer * e_msg_composer_lite_new (void); + EMsgComposer * e_msg_composer_new_with_message (CamelMimeMessage *msg); + EMsgComposer * e_msg_composer_new_from_url (const gchar *url); + EMsgComposer * e_msg_composer_new_redirect (CamelMimeMessage *message, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/evolution-composer.ui evolution-2.30.3.new//composer/evolution-composer.ui +--- evolution-2.30.3//composer/evolution-composer.ui 2010-03-18 15:13:59.000000000 +0100 ++++ evolution-2.30.3.new//composer/evolution-composer.ui 2010-09-01 19:18:57.537184000 +0200 +@@ -22,7 +22,6 @@ + + + +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//composer/mail-composer.error.xml evolution-2.30.3.new//composer/mail-composer.error.xml +--- evolution-2.30.3//composer/mail-composer.error.xml 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.3.new//composer/mail-composer.error.xml 2010-09-01 19:18:57.537184000 +0200 +@@ -2,13 +2,13 @@ + + + +- <_primary>You cannot attach the file `{0}' to this message. ++ <_primary>You cannot attach the file n{0}' to this message. + + {1} + + + +- <_primary>The file `{0}' is not a regular file and cannot be sent in a message. ++ <_primary>The file '{0}' is not a regular file and cannot be sent in a message. + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//configure.ac evolution-2.30.3.new//configure.ac +--- evolution-2.30.3//configure.ac 2010-09-01 19:18:50.825184001 +0200 ++++ evolution-2.30.3.new//configure.ac 2010-09-01 19:18:57.541184000 +0200 +@@ -69,6 +69,7 @@ + -DGDK_PIXBUF_DISABLE_DEPRECATED + -DGDK_DISABLE_DEPRECATED + -DGTK_DISABLE_DEPRECATED ++ -DEDS_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES + -Wall -Wextra +@@ -1176,10 +1177,21 @@ + AC_SUBST(HAVE_SENS) + AC_SUBST(SENS_LIBS) + fi +- + AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes]) + + dnl ****************************** ++dnl Enable ConnMan support ? ++dnl ****************************** ++AC_ARG_ENABLE([connman], ++ [AS_HELP_STRING([--enable-connman], ++ [enable ConnMan support (default=no)])], ++ [enable_connman=$enableval],[enable_connman=no]) ++if test "x$enable_nm$enable_connman" = "xyesyes"; then ++ AC_MSG_ERROR([It is not possible to enable both ConnMan and NetworkManager]) ++fi ++AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) ++ ++dnl ****************************** + dnl Camel Flags + dnl ****************************** + EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) +@@ -1736,6 +1748,7 @@ + modules/calendar/Makefile + modules/mail/Makefile + modules/network-manager/Makefile ++modules/connman/Makefile + modules/plugin-lib/Makefile + modules/plugin-mono/Makefile + modules/plugin-python/Makefile +@@ -1787,6 +1800,7 @@ + sounds/Makefile + capplet/Makefile + capplet/settings/Makefile ++capplet/settings/mail-autoconfig/Makefile + evolution-zip + evolution-calendar.pc + evolution-mail.pc +@@ -1808,6 +1822,7 @@ + LDAP support: $msg_ldap + NetworkManager: $enable_nm + Windows SENS: $enable_sens ++ ConnMan: $enable_connman + Pilot conduits: $msg_pilot + Libnotify: $HAVE_LIBNOTIFY + Kerberos 5: $msg_krb5 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//data/evolution-alarm-notify.desktop.in.in evolution-2.30.3.new//data/evolution-alarm-notify.desktop.in.in +--- evolution-2.30.3//data/evolution-alarm-notify.desktop.in.in 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.3.new//data/evolution-alarm-notify.desktop.in.in 2010-09-01 19:18:57.541184000 +0200 +@@ -7,7 +7,8 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME;XFCE; ++OnlyShowIn=GNOME;XFCE;MOBLIN; ++X-Moblin-Priority=Low + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=evolution + X-GNOME-Bugzilla-Component=calendar +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/eshell-docs.sgml evolution-2.30.3.new//doc/reference/shell/eshell-docs.sgml +--- evolution-2.30.3//doc/reference/shell/eshell-docs.sgml 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/eshell-docs.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -37,7 +37,6 @@ + + + +- + + + +@@ -49,6 +48,13 @@ + + + ++ Extending Evolution ++ ++ ++ ++ ++ ++ + Actions + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/eshell-sections.txt evolution-2.30.3.new//doc/reference/shell/eshell-sections.txt +--- evolution-2.30.3//doc/reference/shell/eshell-sections.txt 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/eshell-sections.txt 2010-09-01 19:18:57.541184000 +0200 +@@ -70,12 +70,11 @@ + EShellContent + EShellContent + e_shell_content_new +-e_shell_content_get_searchbar ++e_shell_content_set_searchbar + e_shell_content_check_state + e_shell_content_get_shell_view + e_shell_content_get_view_id + e_shell_content_set_view_id +-e_shell_content_get_search_name + e_shell_content_run_advanced_search_dialog + e_shell_content_run_edit_searches_dialog + e_shell_content_run_save_search_dialog +@@ -98,11 +97,13 @@ + EShellSearchbar + e_shell_searchbar_new + e_shell_searchbar_get_shell_view ++e_shell_searchbar_get_express_mode ++e_shell_searchbar_set_express_mode + e_shell_searchbar_get_filter_combo_box + e_shell_searchbar_get_filter_visible + e_shell_searchbar_set_filter_visible +-e_shell_searchbar_get_label_visible +-e_shell_searchbar_set_label_visible ++e_shell_searchbar_get_labels_visible ++e_shell_searchbar_set_labels_visible + e_shell_searchbar_get_search_hint + e_shell_searchbar_set_search_hint + e_shell_searchbar_get_search_option +@@ -260,6 +261,8 @@ + e_shell_view_is_active + e_shell_view_get_page_num + e_shell_view_set_page_num ++e_shell_view_get_searchbar ++e_shell_view_get_search_name + e_shell_view_get_search_rule + e_shell_view_set_search_rule + e_shell_view_get_search_query +@@ -441,6 +444,41 @@ + + +
++e-extensible ++EExtensible ++EExtensible ++e_extensible_load_extensions ++e_extensible_list_extensions ++ ++E_EXTENSIBLE ++E_IS_EXTENSIBLE ++E_TYPE_EXTENSIBLE ++E_EXTENSIBLE_INTERFACE ++E_IS_EXTENSIBLE_INTERFACE ++E_EXTENSIBLE_GET_INTERFACE ++EExtensibleInterface ++e_extensible_get_type ++
++ ++
++e-extension ++EExtension ++EExtension ++e_extension_get_extensible ++ ++E_EXTENSION ++E_IS_EXTENSION ++E_TYPE_EXTENSION ++E_EXTENSION_CLASS ++E_IS_EXTENSION_CLASS ++E_EXTENSION_GET_CLASS ++EExtensionClass ++e_extension_get_type ++ ++EExtensionPrivate ++
++ ++
+ e-html-utils + Text to HTML Conversion + E_TEXT_TO_HTML_PRE +@@ -489,7 +527,7 @@ + +
+ e-module +-Generic Module Loader ++EModule + EModule + e_module_new + e_module_get_filename +@@ -610,6 +648,7 @@ + e-util + Miscellaneous Utilities + e_get_user_data_dir ++e_get_gnome2_user_dir + e_get_accels_filename + e_show_uri + e_display_help +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/eshell.types evolution-2.30.3.new//doc/reference/shell/eshell.types +--- evolution-2.30.3//doc/reference/shell/eshell.types 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/eshell.types 2010-09-01 19:18:57.541184000 +0200 +@@ -1,4 +1,6 @@ + e_bit_array_get_type ++e_extensible_get_type ++e_extension_get_type + e_logger_get_type + e_module_get_type + e_signature_get_type +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-account-utils.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-account-utils.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-account-utils.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-account-utils.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Mail Account Functions ++Mail Accounts + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-activity-handler.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-activity-handler.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-activity-handler.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-activity-handler.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +- +-EActivityHandler +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-categories-config.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-categories-config.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-categories-config.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-categories-config.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Category Functions ++Categories + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-config-upgrade.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-config-upgrade.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-config-upgrade.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-config-upgrade.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,32 +0,0 @@ +- +-e-config-upgrade +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@major: +-@minor: +-@revision: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-datetime-format.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-datetime-format.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-datetime-format.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-datetime-format.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Date and Time Formatting Functions ++Date and Time Formatting + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-dialog-utils.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-dialog-utils.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-dialog-utils.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-dialog-utils.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Dialog Window Functions (Legacy) ++Dialog Utilities (Legacy) + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-extensible.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-extensible.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-extensible.sgml 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-extensible.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -0,0 +1,46 @@ ++ ++EExtensible ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@extensible: ++ ++ ++ ++ ++ ++ ++ ++@extensible: ++@extension_type: ++@Returns: ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-extension.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-extension.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-extension.sgml 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-extension.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -0,0 +1,42 @@ ++ ++EExtension ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@extension: ++@Returns: ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-icon-factory.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-icon-factory.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-icon-factory.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-icon-factory.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Icon Functions (Legacy) ++Icon Utilities (Legacy) + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-module.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-module.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-module.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-module.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Generic Module Loader ++EModule + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-print.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-print.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-print.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-print.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -1,5 +1,5 @@ + +-Printing Functions ++Printing + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/es-event.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/es-event.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/es-event.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/es-event.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,147 +0,0 @@ +- +-ESEventHook +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@ES_EVENT_TARGET_STATE: +-@ES_EVENT_TARGET_UPGRADE: +-@ES_EVENT_TARGET_SHELL: +-@ES_EVENT_TARGET_COMPONENT: +- +- +- +- +- +- +-@target: +-@state: +- +- +- +- +- +- +-@target: +-@major: +-@minor: +-@revision: +- +- +- +- +- +- +-@target: +- +- +- +- +- +- +-@target: +-@id: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +- +-@eme: +-@Returns: +- +- +- +- +- +- +- +-@emp: +-@state: +-@Returns: +- +- +- +- +- +- +- +-@emp: +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +- +-@eme: +-@id: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-backend.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-backend.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-backend.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-backend.sgml 2010-09-01 19:18:57.541184000 +0200 +@@ -34,11 +34,6 @@ + @eshellbackend: the object which received the signal. + @arg1: + +- +- +- +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-common.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-common.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-common.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-common.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,21 +0,0 @@ +- +-e-shell-common +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-constants.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-constants.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-constants.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-constants.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,140 +0,0 @@ +- +-e-shell-constants +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-content.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-content.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-content.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-content.sgml 2010-09-01 19:18:57.545184000 +0200 +@@ -40,13 +40,13 @@ + @Returns: + + +- ++ + + + + + @shell_content: +-@Returns: ++@searchbar: + + + +@@ -85,15 +85,6 @@ + @view_id: + + +- +- +- +- +- +-@shell_content: +-@Returns: +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-marshal.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-marshal.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-marshal.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-marshal.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,41 +0,0 @@ +- +-e-shell-marshal +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@closure: +-@return_value: +-@n_param_values: +-@param_values: +-@invocation_hint: +-@marshal_data: +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-module.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-module.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-module.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-module.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,180 +0,0 @@ +- +-EShellModule +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@eshellmodule: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@name: +-@aliases: +-@schemes: +-@sort_order: +-@start: +-@is_busy: +-@shutdown: +-@migrate: +- +- +- +- +- +- +-@shell: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@shell_module_a: +-@shell_module_b: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@activity: +- +- +- +- +- +- +- +-@shell_module: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@info: +-@shell_view_type: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-searchbar.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-searchbar.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-searchbar.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-searchbar.sgml 2010-09-01 19:18:57.545184000 +0200 +@@ -26,6 +26,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -36,7 +41,7 @@ + + + +- ++ + + + +@@ -99,6 +104,24 @@ + @Returns: + + ++ ++ ++ ++ ++ ++@searchbar: ++@Returns: ++ ++ ++ ++ ++ ++ ++ ++@searchbar: ++@express_mode: ++ ++ + + + +@@ -126,7 +149,7 @@ + @filter_visible: + + +- ++ + + + +@@ -135,13 +158,13 @@ + @Returns: + + +- ++ + + + + + @searchbar: +-@label_visible: ++@labels_visible: + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell.sgml 2010-09-01 19:18:57.545184000 +0200 +@@ -32,7 +32,7 @@ + + + @eshell: the object which received the signal. +-@Param2: ++@arg1: + + + +@@ -107,6 +107,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -126,6 +131,11 @@ + + + ++ ++ ++ ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/eshell-unused.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/eshell-unused.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/eshell-unused.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/eshell-unused.sgml 2010-09-01 19:18:57.545184000 +0200 +@@ -1,2909 +1,46 @@ +- ++ + + + + + +- ++ + + + + +- +- +- +- +- +- +- +- +- +- +-Evolution-DataServer +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EActivityHandler +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-config-upgrade +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Error Dialog Functions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-common +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-constants +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-marshal +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Migration +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EShellModule +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Global Actions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-window-private +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ETestShellView +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ESEventHook +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporterClient +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporterListener +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionIntelligentImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-intelligent +- +- +- +- +- +- +- +-@E_CURSOR_NORMAL: +-@E_CURSOR_BUSY: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@target: +-@id: +- +- +- +- +- +- +-@target: +- +- +- +- +- +- +-@target: +-@state: +- +- +- +- +- +- +-@target: +-@major: +-@minor: +-@revision: +- +- +- +- +- +- +-@eshell: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@E_SHELL_LINE_STATUS_ONLINE: +-@E_SHELL_LINE_STATUS_GOING_OFFLINE: +-@E_SHELL_LINE_STATUS_OFFLINE: +-@E_SHELL_LINE_STATUS_FORCED_OFFLINE: +- +- +- +- +- +- +- +- +- +- +- +- +-@eshellmodule: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@name: +-@aliases: +-@schemes: +-@sort_order: +-@start: +-@is_busy: +-@shutdown: +-@migrate: +- +- +- +- +- +- +-@eshellview: the object which received the signal. +-@arg1: +- +- +- +- +- +- +-@eshellview: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@parent_type: +-@objref: +- +- +- +- +- +- +-@importer: +-@control: +-@closure: +- +- +- +- +- +- +-@importer: +-@closure: +-@Returns: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@listener: +-@result: +-@more_items: +-@closure: +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@listener: +-@closure: +-@ev: +- +- +- +- +- +- +-@EVOLUTION_IMPORTER_OK: +-@EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION: +-@EVOLUTION_IMPORTER_INTERRUPTED: +-@EVOLUTION_IMPORTER_BUSY: +-@EVOLUTION_IMPORTER_NOT_READY: +-@EVOLUTION_IMPORTER_UNKNOWN_DATA: +-@EVOLUTION_IMPORTER_BAD_DATA: +-@EVOLUTION_IMPORTER_BAD_FILE: +-@EVOLUTION_IMPORTER_UNKNOWN_ERROR: +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@ii: +-@closure: +-@Returns: +- +- +- +- +- +- +-@ii: +-@closure: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@_obj: +-@ev: +-@Returns: +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion__imethods_index: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_Logging_Error: +-@GNOME_Evolution_DataServer_Logging_Critical: +-@GNOME_Evolution_DataServer_Logging_Warning: +-@GNOME_Evolution_DataServer_Logging_Message: +-@GNOME_Evolution_DataServer_Logging_Info: +-@GNOME_Evolution_DataServer_Logging_Debug: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +-@d: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@GNOME_Evolution_DataServer_Config_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +-@_get_interfaceVersion: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@GNOME_Evolution_DataServer_InterfaceCheck_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@Bonobo_EventSource_epv: +-@GNOME_Evolution_DataServer_Logging_epv: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@alert: +- +- +- +- +- +- +-@parent: +-@alert: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +-@dialog: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@action_value: +- +- +- +- +- +- +-@shell_content: +-@action_value: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@group_name: +- +- +- +- +- +- +-@shell_content: +-@context: +- +- +- +- +- +- +-@shell_content: +-@filter_action: +- +- +- +- +- +- +-@shell_content: +-@filter_value: +- +- +- +- +- +- +-@shell_content: +-@filter_visible: +- +- +- +- +- +- +-@shell_content: +-@scope_action: +- +- +- +- +- +- +-@shell_content: +-@scope_value: +- +- +- +- +- +- +-@shell_content: +-@scope_visible: +- +- +- +- +- +- +-@shell_content: +-@search_hint: +- +- +- +- +- +- +-@shell_content: +-@search_rule: +- +- +- +- +- +- +-@shell_content: +-@search_text: +- +- +- +- +- +- +-@shell_content: +-@search_value: +- +- +- +- +- +- +-@shell_content: +-@search_visible: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@name: +-@Returns: +- +- +- +- +- +- +-@shell: +-@scheme: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@uri: +-@Returns: +- +- +- +- +- +- +-@shell_window: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@closure: +-@return_value: +-@n_param_values: +-@param_values: +-@invocation_hint: +-@marshal_data: +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@activity: +- +- +- +- +- +- +-@shell_module_a: +-@shell_module_b: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: ++@void: + @Returns: + +- ++ + + + + +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: +-@Returns: +- +- +- +- +- +- +-@shell: +-@filename: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@info: +-@shell_view_type: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +- +- +- +- +- +- +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: ++@shell_content: + @Returns: + +- ++ + + + + +-@online: ++@shell_content: + @Returns: + +- ++ + + + + + @searchbar: +-@group_name: +- +- +- +- +- +- +-@shell: +-@status: +- +- +- +- +- +- +-@shell: +-@online_mode: +- +- +- +- +- +- +-@shell_settings: +-@property_name: +-@gconf_key: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell_view: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +-@filename: +-@Returns: +- +- +- +- +- +- +-@filename: +-@filename_is_uri: +-@buffer: +-@read: +-@error: +-@Returns: +- +- +- +- +- +- +-@uri: +-@Returns: +- +- +- +- +- +- +-@filename: +-@data: +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@eme: +-@Returns: +- +- +- +- +- +- +-@eme: +-@id: +-@Returns: +- +- +- +- +- +- +-@emp: +-@state: +-@Returns: +- +- +- +- +- +- +-@emp: +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +-@ES_EVENT_TARGET_STATE: +-@ES_EVENT_TARGET_UPGRADE: +-@ES_EVENT_TARGET_SHELL: +-@ES_EVENT_TARGET_COMPONENT: +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +-@objref: +-@Returns: +- +- +- +- +- +- +-@id: +-@Returns: +- +- +- +- +- +- +-@client: +-@listener: +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +-@callback: +-@closure: +-@Returns: +- +- +- +- +- +- +-@create_control_fn: +-@support_format_fn: +-@load_file_fn: +-@process_item_fn: +-@get_error_fn: +-@closure: +-@Returns: +- +- +- +- +- +- +-@can_import_fn: +-@import_data_fn: +-@importername: +-@message: +-@closure: + @Returns: + +- ++ + + + + ++@searchbar: ++@label_visible: + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-view.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-view.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-view.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-view.sgml 2010-09-01 19:18:57.545184000 +0200 +@@ -136,6 +136,8 @@ + @new_shell_content: + @new_shell_sidebar: + @new_shell_taskbar: ++@construct_searchbar: ++@get_search_name: + @toggled: + @clear_search: + @custom_search: +@@ -223,6 +225,24 @@ + @page_num: + + ++ ++ ++ ++ ++ ++@shell_view: ++@Returns: ++ ++ ++ ++ ++ ++ ++ ++@shell_view: ++@Returns: ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-window-actions.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-window-actions.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-window-actions.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-window-actions.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,309 +0,0 @@ +- +-Global Actions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-shell-window-private.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-window-private.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-shell-window-private.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-shell-window-private.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,25 +0,0 @@ +- +-e-shell-window-private +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-signature-utils.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-signature-utils.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-signature-utils.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-signature-utils.sgml 2010-09-01 19:18:57.549184000 +0200 +@@ -1,5 +1,5 @@ + +-More Signature Functions ++More Signature Utilities + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/e-test-shell-view.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/e-test-shell-view.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/e-test-shell-view.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/e-test-shell-view.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,41 +0,0 @@ +- +-ETestShellView +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/Evolution-DataServer.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/Evolution-DataServer.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/Evolution-DataServer.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/Evolution-DataServer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,1139 +0,0 @@ +- +-Evolution-DataServer +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_Logging_Error: +-@GNOME_Evolution_DataServer_Logging_Critical: +-@GNOME_Evolution_DataServer_Logging_Warning: +-@GNOME_Evolution_DataServer_Logging_Message: +-@GNOME_Evolution_DataServer_Logging_Info: +-@GNOME_Evolution_DataServer_Logging_Debug: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +-@d: +- +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@_base_epv: +-@GNOME_Evolution_DataServer_Config_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@_private: +-@_get_interfaceVersion: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@GNOME_Evolution_DataServer_InterfaceCheck_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@Bonobo_EventSource_epv: +-@GNOME_Evolution_DataServer_Logging_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@_obj: +-@ev: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion__imethods_index: +- +- +- +- +- +- +-@m: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer-client.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer-client.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer-client.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer-client.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,94 +0,0 @@ +- +-EvolutionImporterClient +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent_type: +-@objref: +- +- +- +- +- +- +-@objref: +-@Returns: +- +- +- +- +- +- +- +-@id: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@listener: +- +- +- +- +- +- +- +-@client: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer-listener.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer-listener.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer-listener.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer-listener.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,56 +0,0 @@ +- +-EvolutionImporterListener +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@listener: +-@result: +-@more_items: +-@closure: +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@callback: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/evolution-importer.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-importer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,117 +0,0 @@ +- +-EvolutionImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@control: +-@closure: +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@importer: +-@listener: +-@closure: +-@ev: +- +- +- +- +- +- +- +-@importer: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@EVOLUTION_IMPORTER_OK: +-@EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION: +-@EVOLUTION_IMPORTER_INTERRUPTED: +-@EVOLUTION_IMPORTER_BUSY: +-@EVOLUTION_IMPORTER_NOT_READY: +-@EVOLUTION_IMPORTER_UNKNOWN_DATA: +-@EVOLUTION_IMPORTER_BAD_DATA: +-@EVOLUTION_IMPORTER_BAD_FILE: +-@EVOLUTION_IMPORTER_UNKNOWN_ERROR: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@create_control_fn: +-@support_format_fn: +-@load_file_fn: +-@process_item_fn: +-@get_error_fn: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,67 +0,0 @@ +- +-EvolutionIntelligentImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@ii: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@ii: +-@closure: +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@can_import_fn: +-@import_data_fn: +-@importername: +-@message: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//doc/reference/shell/tmpl/intelligent.sgml evolution-2.30.3.new//doc/reference/shell/tmpl/intelligent.sgml +--- evolution-2.30.3//doc/reference/shell/tmpl/intelligent.sgml 2010-08-11 23:23:38.000000000 +0200 ++++ evolution-2.30.3.new//doc/reference/shell/tmpl/intelligent.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,26 +0,0 @@ +- +-intelligent +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-account-utils.c evolution-2.30.3.new//e-util/e-account-utils.c +--- evolution-2.30.3//e-util/e-account-utils.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-account-utils.c 2010-09-01 19:18:57.549184000 +0200 +@@ -15,6 +15,11 @@ + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ + ++/** ++ * SECTION: e-account-utils ++ * @include: e-util/e-account-utils.h ++ **/ ++ + #include "e-account-utils.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-account-utils.h evolution-2.30.3.new//e-util/e-account-utils.h +--- evolution-2.30.3//e-util/e-account-utils.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-account-utils.h 2010-09-01 19:18:57.549184000 +0200 +@@ -15,11 +15,6 @@ + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ + +-/** +- * SECTION: e-account-utils +- * @include: e-util/e-account-utils.h +- **/ +- + #ifndef E_ACCOUNT_UTILS_H + #define E_ACCOUNT_UTILS_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-alert-dialog.c evolution-2.30.3.new//e-util/e-alert-dialog.c +--- evolution-2.30.3//e-util/e-alert-dialog.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-alert-dialog.c 2010-09-01 19:18:57.549184000 +0200 +@@ -215,7 +215,9 @@ + + if (e_alert_get_scroll (alert)) { + scroll = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (scroll), ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + } + w = gtk_label_new(NULL); + gtk_label_set_selectable((GtkLabel *)w, TRUE); +@@ -268,9 +270,12 @@ + } + + GtkWidget* +-e_alert_dialog_new (GtkWindow *parent, EAlert *alert) ++e_alert_dialog_new (GtkWindow *parent, ++ EAlert *alert) + { +- return (GtkWidget*) g_object_new (E_TYPE_ALERT_DIALOG, "parent", parent, "alert", alert, NULL); ++ return g_object_new ( ++ E_TYPE_ALERT_DIALOG, ++ "parent", parent, "alert", alert, NULL); + } + + GtkWidget* +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-binding.c evolution-2.30.3.new//e-util/e-binding.c +--- evolution-2.30.3//e-util/e-binding.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-binding.c 2010-09-01 19:18:57.549184000 +0200 +@@ -30,7 +30,7 @@ + const gchar *property_name) + { + g_warning ( +- "%s instances have no `%s' property to bind to", ++ "%s instances have no '%s' property to bind to", + G_OBJECT_TYPE_NAME (object), property_name); + + return NULL; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-dialog-utils.c evolution-2.30.3.new//e-util/e-dialog-utils.c +--- evolution-2.30.3//e-util/e-dialog-utils.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-dialog-utils.c 2010-09-01 19:18:57.549184000 +0200 +@@ -46,6 +46,7 @@ + + va_start (args, format); + str = g_strdup_vprintf (format, args); ++ + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + type, +@@ -55,8 +56,11 @@ + va_end (args); + g_free (str); + ++ if (parent && !gtk_widget_is_toplevel (parent)) ++ parent = gtk_widget_get_toplevel (parent); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); ++ + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-extensible.c evolution-2.30.3.new//e-util/e-extensible.c +--- evolution-2.30.3//e-util/e-extensible.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-extensible.c 2010-09-01 19:18:57.549184000 +0200 +@@ -16,11 +16,54 @@ + * + */ + ++/** ++ * SECTION: e-extensible ++ * @short_description: an interface for extending objects ++ * @include: e-util/e-extensible.h ++ * ++ * #EExtension objects can be tacked on to any #GObject instance that ++ * implements the #EExtensible interface. A #GObject type can be made ++ * extensible in two steps: ++ * ++ * 1. Add the #EExtensible interface when registering the #GType. ++ * There are no methods to implement. ++ * ++ * ++ * ++ * #include ++ * ++ * G_DEFINE_TYPE_WITH_CODE ( ++ * ECustomWidget, e_custom_widget, GTK_TYPE_WIDGET, ++ * G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ * ++ * ++ * ++ * 2. Load extensions for the class at some point during #GObject ++ * initialization. Generally this should be done toward the end of ++ * the initialization code, so extensions get a fully initialized ++ * object to work with. ++ * ++ * ++ * ++ * static void ++ * e_custom_widget_init (ECustomWidget *widget) ++ * { ++ * Initialization code goes here... ++ * ++ * e_extensible_load_extensions (E_EXTENSIBLE (widget)); ++ * } ++ * ++ * ++ **/ ++ + #include "e-extensible.h" + + #include + #include + ++#define IS_AN_EXTENSION_TYPE(type) \ ++ (g_type_is_a ((type), E_TYPE_EXTENSION)) ++ + static GQuark extensible_quark; + + static GPtrArray * +@@ -89,6 +132,15 @@ + return type; + } + ++/** ++ * e_extensible_load_extensions: ++ * @extensible: an #EExtensible ++ * ++ * Creates an instance of all instantiable subtypes of #EExtension which ++ * target the class of @extensible. The lifetimes of these newly created ++ * #EExtension objects are bound to @extensible such that they are finalized ++ * when @extensible is finalized. ++ **/ + void + e_extensible_load_extensions (EExtensible *extensible) + { +@@ -110,3 +162,44 @@ + E_TYPE_EXTENSION, (ETypeFunc) + extensible_load_extension, extensible); + } ++ ++/** ++ * e_extensible_list_extensions: ++ * @extensible: an #EExtensible ++ * @extension_type: the type of extensions to list ++ * ++ * Returns a list of #EExtension objects bound to @extensible whose ++ * types are ancestors of @extension_type. For a complete list of ++ * extension objects bound to @extensible, pass %E_TYPE_EXTENSION. ++ * ++ * The list itself should be freed with g_list_free(). The extension ++ * objects are owned by @extensible and should not be unreferenced. ++ * ++ * Returns: a list of extension objects derived from @extension_type ++ **/ ++GList * ++e_extensible_list_extensions (EExtensible *extensible, ++ GType extension_type) ++{ ++ GPtrArray *extensions; ++ GList *list = NULL; ++ guint ii; ++ ++ g_return_val_if_fail (E_IS_EXTENSIBLE (extensible), NULL); ++ g_return_val_if_fail (IS_AN_EXTENSION_TYPE (extension_type), NULL); ++ ++ e_extensible_load_extensions (extensible); ++ ++ extensions = extensible_get_extensions (extensible); ++ g_return_val_if_fail (extensions != NULL, NULL); ++ ++ for (ii = 0; ii < extensions->len; ii++) { ++ GObject *object; ++ ++ object = g_ptr_array_index (extensions, ii); ++ if (g_type_is_a (G_OBJECT_TYPE (object), extension_type)) ++ list = g_list_prepend (list, object); ++ } ++ ++ return g_list_reverse (list); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-extensible.h evolution-2.30.3.new//e-util/e-extensible.h +--- evolution-2.30.3//e-util/e-extensible.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-extensible.h 2010-09-01 19:18:57.549184000 +0200 +@@ -51,6 +51,8 @@ + + GType e_extensible_get_type (void); + void e_extensible_load_extensions (EExtensible *extensible); ++GList * e_extensible_list_extensions (EExtensible *extensible, ++ GType extension_type); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-extension.c evolution-2.30.3.new//e-util/e-extension.c +--- evolution-2.30.3//e-util/e-extension.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-extension.c 2010-09-01 19:18:57.553184000 +0200 +@@ -16,6 +16,29 @@ + * + */ + ++/** ++ * SECTION: e-extension ++ * @short_description: abstract base class for extensions ++ * @include: e-util/e-extension.h ++ * ++ * #EExtension provides a way to extend the functionality of objects ++ * that implement the #EExtensible interface. #EExtension subclasses ++ * can target a particular extensible object type. New instances of ++ * an extensible object type get paired with a new instance of each ++ * #EExtension subclass that targets the extensible object type. ++ * ++ * The first steps of writing a new extension are as follows: ++ * ++ * 1. Subclass #EExtension. ++ * ++ * 2. In the class initialization function, specify the #GType being ++ * extended. The #GType must implement the #EExtensible interface. ++ * ++ * 3. Register the extension's own #GType. If the extension is to ++ * be loaded dynamically using #GTypeModule, the type should be ++ * registered in the library module's e_module_load() function. ++ **/ ++ + #include "e-extension.h" + + #define E_EXTENSION_GET_PRIVATE(obj) \ +@@ -151,6 +174,14 @@ + extension->priv = E_EXTENSION_GET_PRIVATE (extension); + } + ++/** ++ * e_extension_get_extensible: ++ * @extension: an #EExtension ++ * ++ * Returns the object that @extension extends. ++ * ++ * Returns: the object being extended ++ **/ + EExtensible * + e_extension_get_extensible (EExtension *extension) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-extension.h evolution-2.30.3.new//e-util/e-extension.h +--- evolution-2.30.3//e-util/e-extension.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-extension.h 2010-09-01 19:18:57.553184000 +0200 +@@ -47,6 +47,12 @@ + typedef struct _EExtensionClass EExtensionClass; + typedef struct _EExtensionPrivate EExtensionPrivate; + ++/** ++ * EExtension: ++ * ++ * Contains only private data that should be read and manipulated using the ++ * functions below. ++ **/ + struct _EExtension { + GObject parent; + EExtensionPrivate *priv; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-folder-map.c evolution-2.30.3.new//e-util/e-folder-map.c +--- evolution-2.30.3//e-util/e-folder-map.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-folder-map.c 2010-09-01 19:18:57.553184000 +0200 +@@ -49,18 +49,18 @@ + + doc = e_xml_parse_file (metadata); + if (!doc) { +- g_warning ("Cannot parse `%s'", metadata); ++ g_warning ("Cannot parse '%s'", metadata); + return FALSE; + } + + if (!(node = xmlDocGetRootElement (doc))) { +- g_warning ("`%s' corrupt: document contains no root node", metadata); ++ g_warning ("'%s' corrupt: document contains no root node", metadata); + xmlFreeDoc (doc); + return FALSE; + } + + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { +- g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); ++ g_warning ("'%s' corrupt: root node is not 'efolder'", metadata); + xmlFreeDoc (doc); + return FALSE; + } +@@ -122,7 +122,7 @@ + } + + if (!(dir = g_dir_open (path, 0, &error))) { +- g_warning ("cannot open `%s': %s", path, error->message); ++ g_warning ("cannot open '%s': %s", path, error->message); + g_error_free (error); + g_free (path); + return; +@@ -158,7 +158,7 @@ + GError *error = NULL; + + if (!(dir = g_dir_open (local_dir, 0, &error))) { +- g_warning ("cannot open `%s': %s", local_dir, error->message); ++ g_warning ("cannot open '%s': %s", local_dir, error->message); + g_error_free (error); + return NULL; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-module.c evolution-2.30.3.new//e-util/e-module.c +--- evolution-2.30.3//e-util/e-module.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-module.c 2010-09-01 19:18:57.553184000 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-module ++ * @short_description: a module loader ++ * @include: e-util/e-module.h ++ **/ ++ + #include "e-module.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-module.h evolution-2.30.3.new//e-util/e-module.h +--- evolution-2.30.3//e-util/e-module.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-module.h 2010-09-01 19:18:57.553184000 +0200 +@@ -19,11 +19,6 @@ + * + */ + +-/** +- * SECTION: e-module +- * @include: e-util/e-module.h +- **/ +- + #ifndef E_MODULE_H + #define E_MODULE_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-selection.c evolution-2.30.3.new//e-util/e-selection.c +--- evolution-2.30.3//e-util/e-selection.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-selection.c 2010-09-01 19:18:57.553184000 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-selection ++ * @short_description: selection and clipboard utilities ++ * @include: e-util/e-selection.h ++ **/ ++ + #include "e-selection.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-selection.h evolution-2.30.3.new//e-util/e-selection.h +--- evolution-2.30.3//e-util/e-selection.h 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-selection.h 2010-09-01 19:18:57.553184000 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-selection +- * @short_description: selection and clipboard utilities +- * @include: e-util/e-selection.h +- **/ +- + #ifndef E_SELECTION_H + #define E_SELECTION_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-ui-manager.c evolution-2.30.3.new//e-util/e-ui-manager.c +--- evolution-2.30.3//e-util/e-ui-manager.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-ui-manager.c 2010-09-01 19:18:57.553184000 +0200 +@@ -16,6 +16,15 @@ + * + */ + ++/** ++ * SECTION: e-ui-manager ++ * @short_description: construct menus and toolbars from a UI definition ++ * @include: e-util/e-ui-manager.h ++ * ++ * This is a #GtkUIManager with support for Evolution's "express" mode, ++ * which influences the parsing of UI definitions. ++ **/ ++ + #include "e-ui-manager.h" + #include "e-util-private.h" + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-ui-manager.h evolution-2.30.3.new//e-util/e-ui-manager.h +--- evolution-2.30.3//e-util/e-ui-manager.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-ui-manager.h 2010-09-01 19:18:57.553184000 +0200 +@@ -16,15 +16,6 @@ + * + */ + +-/** +- * SECTION: e-ui-manager +- * @short_description: construct menus and toolbars from a UI definition +- * @include: e-util/e-ui-manager.h +- * +- * This is a #GtkUIManager with support for Evolution's "express" mode, +- * which influences the parsing of UI definitions. +- **/ +- + #ifndef E_UI_MANAGER_H + #define E_UI_MANAGER_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-util.c evolution-2.30.3.new//e-util/e-util.c +--- evolution-2.30.3//e-util/e-util.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-util.c 2010-09-01 19:18:57.553184000 +0200 +@@ -20,6 +20,11 @@ + * + */ + ++/** ++ * SECTION: e-util ++ * @include: e-util/e-util.h ++ **/ ++ + #include + + #include +@@ -237,7 +242,7 @@ + iter = g_list_next (iter); + } + +- g_critical ("%s: action `%s' not found", G_STRFUNC, action_name); ++ g_critical ("%s: action '%s' not found", G_STRFUNC, action_name); + + return NULL; + } +@@ -276,7 +281,7 @@ + iter = g_list_next (iter); + } + +- g_critical ("%s: action group `%s' not found", G_STRFUNC, group_name); ++ g_critical ("%s: action group '%s' not found", G_STRFUNC, group_name); + + return NULL; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-util.h evolution-2.30.3.new//e-util/e-util.h +--- evolution-2.30.3//e-util/e-util.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-util.h 2010-09-01 19:18:57.553184000 +0200 +@@ -20,11 +20,6 @@ + * + */ + +-/** +- * SECTION: e-util +- * @include: e-util/e-util.h +- **/ +- + #ifndef E_UTIL_H + #define E_UTIL_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//help/C/evolution.xml evolution-2.30.3.new//help/C/evolution.xml +--- evolution-2.30.3//help/C/evolution.xml 2010-08-11 23:25:01.000000000 +0200 ++++ evolution-2.30.3.new//help/C/evolution.xml 2010-09-01 19:18:57.557184000 +0200 +@@ -7036,7 +7036,7 @@ + Select this option to display weekends in one box instead of two in the month view. + + +- Show week numbers in date navigator: ++ Show week numbers: + Shows the week numbers next to the respective weeks in the calendar. + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-account-editor.c evolution-2.30.3.new//mail/em-account-editor.c +--- evolution-2.30.3//mail/em-account-editor.c 2010-09-01 19:18:50.505184000 +0200 ++++ evolution-2.30.3.new//mail/em-account-editor.c 2010-09-01 19:18:57.557184000 +0200 +@@ -835,7 +835,6 @@ + EShell *shell; + EShellSettings *shell_settings; + GtkWidget *editor; +- gboolean html_mode; + gpointer parent; + + shell = e_shell_get_default (); +@@ -844,11 +843,7 @@ + parent = gtk_widget_get_toplevel (widget); + parent = gtk_widget_is_toplevel (parent) ? parent : NULL; + +- html_mode = e_shell_settings_get_boolean ( +- shell_settings, "composer-format-html"); +- + editor = e_signature_editor_new (); +- gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (editor), html_mode); + gtk_window_set_transient_for (GTK_WINDOW (editor), parent); + gtk_widget_show (editor); + } +@@ -2185,7 +2180,9 @@ + gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity"))); + } + +- emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", "identity_optional_table", "identity_optional_frame", NULL); ++ emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", ++ "identity_optional_table", "identity_optional_frame", ++ "identity_address", NULL); + + g_object_unref (builder); + +@@ -3142,8 +3139,8 @@ + camel_url_set_protocol (url, "smtp"); + camel_url_set_param (url, "use_ssl", sdata->ssl); + camel_url_set_host (url, sdata->send); +- if (sdata->recv_port && *sdata->recv_port) +- camel_url_set_port (url, atoi(sdata->recv_port)); ++ if (sdata->send_port && *sdata->send_port) ++ camel_url_set_port (url, atoi(sdata->send_port)); + + if (sdata->send_user && *sdata->send_user) + camel_url_set_user (url, sdata->send_user); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/e-mail-backend.c evolution-2.30.3.new//mail/e-mail-backend.c +--- evolution-2.30.3//mail/e-mail-backend.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.3.new//mail/e-mail-backend.c 2010-09-01 19:18:57.561184000 +0200 +@@ -22,6 +22,7 @@ + * + */ + ++#include + #include "e-mail-backend.h" + + #include +@@ -284,6 +285,11 @@ + if (!e_shell_get_online (shell)) + return; + ++ /* In express mode, don't raise mail request in non mail window. */ ++ if (e_shell_get_express_mode(shell) && ++ strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0) ++ return; ++ + /* Check Outbox for any unsent messages. */ + + folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/e-mail-display.c evolution-2.30.3.new//mail/e-mail-display.c +--- evolution-2.30.3//mail/e-mail-display.c 2010-06-20 14:15:02.000000000 +0200 ++++ evolution-2.30.3.new//mail/e-mail-display.c 2010-09-01 19:18:57.561184000 +0200 +@@ -208,6 +208,22 @@ + } + + static void ++mail_display_load_string (EWebView *web_view, ++ const gchar *string) ++{ ++ EMailDisplayPrivate *priv; ++ ++ priv = E_MAIL_DISPLAY_GET_PRIVATE (web_view); ++ g_return_if_fail (priv->formatter != NULL); ++ ++ if (em_format_busy (EM_FORMAT (priv->formatter))) ++ return; ++ ++ /* Chain up to parent's load_string() method. */ ++ E_WEB_VIEW_CLASS (parent_class)->load_string (web_view, string); ++} ++ ++static void + mail_display_url_requested (GtkHTML *html, + const gchar *uri, + GtkHTMLStream *stream) +@@ -270,6 +286,7 @@ + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; ++ EWebViewClass *web_view_class; + GtkHTMLClass *html_class; + + parent_class = g_type_class_peek_parent (class); +@@ -284,6 +301,9 @@ + widget_class->realize = mail_display_realize; + widget_class->style_set = mail_display_style_set; + ++ web_view_class = E_WEB_VIEW_CLASS (class); ++ web_view_class->load_string = mail_display_load_string; ++ + html_class = GTK_HTML_CLASS (class); + html_class->url_requested = mail_display_url_requested; + html_class->link_clicked = mail_display_link_clicked; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/e-mail-migrate.c evolution-2.30.3.new//mail/e-mail-migrate.c +--- evolution-2.30.3//mail/e-mail-migrate.c 2010-06-20 14:15:02.000000000 +0200 ++++ evolution-2.30.3.new//mail/e-mail-migrate.c 2010-09-01 19:18:57.561184000 +0200 +@@ -1209,18 +1209,18 @@ + gchar *type; + + if (!(doc = xmlParseFile (metadata))) { +- g_warning ("Cannot parse `%s'", metadata); ++ g_warning ("Cannot parse '%s'", metadata); + return FALSE; + } + + if (!(node = xmlDocGetRootElement (doc))) { +- g_warning ("`%s' corrupt: document contains no root node", metadata); ++ g_warning ("'%s' corrupt: document contains no root node", metadata); + xmlFreeDoc (doc); + return FALSE; + } + + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { +- g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); ++ g_warning ("'%s' corrupt: root node is not 'efolder'", metadata); + xmlFreeDoc (doc); + return FALSE; + } +@@ -1591,7 +1591,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Unable to create new folder `%s': %s"), ++ _("Unable to create new folder '%s': %s"), + dest->str, g_strerror (errno)); + goto fatal; + } +@@ -1619,7 +1619,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Unable to copy folder `%s' to `%s': %s"), ++ _("Unable to copy folder '%s' to '%s': %s"), + src->str, dest->str, g_strerror (errno)); + goto fatal; + } +@@ -1815,7 +1815,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to scan for existing mailboxes at " +- "`%s': %s"), session->srcdir, g_strerror (errno)); ++ "'%s': %s"), session->srcdir, g_strerror (errno)); + return FALSE; + } + +@@ -2025,7 +2025,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to open old POP keep-on-server data " +- "`%s': %s"), cache_dir, g_strerror (errno)); ++ "'%s': %s"), cache_dir, g_strerror (errno)); + g_free (cache_dir); + return FALSE; + } +@@ -2041,7 +2041,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to create POP3 keep-on-server data " +- "directory `%s': %s"), cache_dir, ++ "directory '%s': %s"), cache_dir, + g_strerror (errno)); + g_string_free (oldpath, TRUE); + g_free (cache_dir); +@@ -2073,7 +2073,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to copy POP3 keep-on-server data " +- "`%s': %s"), oldpath->str, ++ "'%s': %s"), oldpath->str, + g_strerror (errno)); + success = FALSE; + } +@@ -2357,7 +2357,7 @@ + ppath_len++; /* For the separating slash. */ + + /* Take account of the fact that we need to translate every +- * separator into `subfolders/'. ++ * separator into 'subfolders/'. + */ + p = vpath; + while (1) { +@@ -2391,7 +2391,7 @@ + break; + } + +- memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too. */ ++ memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too. */ + dp += newp - p + 1; + + memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN); +@@ -2544,7 +2544,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Failed to create local mail storage " +- "`%s': %s"), path + 5, g_strerror (errno)); ++ "'%s': %s"), path + 5, g_strerror (errno)); + g_free (session->srcdir); + camel_object_unref (session); + g_free (path); +@@ -2557,7 +2557,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Failed to create local mail storage `%s': %s"), ++ _("Failed to create local mail storage '%s': %s"), + path, lex.desc); + g_free (session->srcdir); + camel_object_unref (session); +@@ -3028,7 +3028,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to create local mail folders at " +- "`%s': %s"), data_dir, g_strerror (errno)); ++ "'%s': %s"), data_dir, g_strerror (errno)); + return FALSE; + } + } +@@ -3046,7 +3046,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to read settings from previous " +- "Evolution install, `evolution/config.xmldb' " ++ "Evolution install, 'evolution/config.xmldb' " + "does not exist or is corrupt.")); + return FALSE; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/e-mail-reader.c evolution-2.30.3.new//mail/e-mail-reader.c +--- evolution-2.30.3//mail/e-mail-reader.c 2010-07-18 20:25:42.000000000 +0200 ++++ evolution-2.30.3.new//mail/e-mail-reader.c 2010-09-01 19:20:53.241184000 +0200 +@@ -1781,28 +1781,6 @@ + } + + static void +-update_webview_content (EMailReader *reader, const gchar *content) +-{ +- EMFormatHTMLDisplay *html_display; +- EWebView *web_view; +- +- g_return_if_fail (reader != NULL); +- g_return_if_fail (content != NULL); +- +- html_display = e_mail_reader_get_html_display (reader); +- g_return_if_fail (html_display != NULL); +- +- /* skip the progress message when it's formatting something */ +- if (em_format_busy (EM_FORMAT (html_display))) +- return; +- +- web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); +- g_return_if_fail (web_view != NULL); +- +- e_web_view_load_string (web_view, content); +-} +- +-static void + mail_reader_message_loaded_cb (CamelFolder *folder, + const gchar *message_uid, + CamelMimeMessage *message, +@@ -1816,6 +1794,7 @@ + EShellBackend *shell_backend; + EShellSettings *shell_settings; + EShell *shell; ++ EWebView *web_view; + EMEvent *event; + EMEventTargetMessage *target; + const gchar *cursor_uid; +@@ -1841,6 +1820,8 @@ + + cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + ++ web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); ++ + /* If the user picked a different message in the time it took + * to fetch this message, then don't bother rendering it. */ + if (g_strcmp0 (cursor_uid, message_uid) != 0) +@@ -1899,10 +1880,11 @@ + _("Unable to retrieve message"), + ex->desc); + } else { +- string = g_strdup_printf (_("Retrieving message '%s'"), cursor_uid); ++ string = g_strdup_printf ( ++ _("Retrieving message '%s'"), cursor_uid); + } + +- update_webview_content (reader, string); ++ e_web_view_load_string (web_view, string); + g_free (string); + + camel_exception_clear (ex); +@@ -1921,6 +1903,7 @@ + EMailReaderPrivate *priv; + EMFormatHTMLDisplay *html_display; + GtkWidget *message_list; ++ EWebView *web_view; + CamelFolder *folder; + const gchar *cursor_uid; + const gchar *format_uid; +@@ -1934,6 +1917,8 @@ + cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + format_uid = EM_FORMAT (html_display)->uid; + ++ web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); ++ + if (MESSAGE_LIST (message_list)->last_sel_single) { + GtkWidget *widget; + gboolean html_display_visible; +@@ -1956,8 +1941,9 @@ + gboolean store_async; + MailMsgDispatchFunc disp_func; + +- string = g_strdup_printf (_("Retrieving message '%s'"), cursor_uid); +- update_webview_content (reader, string); ++ string = g_strdup_printf ( ++ _("Retrieving message '%s'"), cursor_uid); ++ e_web_view_load_string (web_view, string); + g_free (string); + + store_async = folder->parent_store->flags & CAMEL_STORE_ASYNC; +@@ -2314,9 +2300,11 @@ + gtk_action_set_sensitive (action, sensitive); + + action_name = "mail-mark-junk"; +- sensitive = selection_has_not_junk_messages; ++ sensitive = ++ selection_has_not_junk_messages && ++ !(state & E_MAIL_READER_FOLDER_IS_JUNK); + action = e_mail_reader_get_action (reader, action_name); +- gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK)); ++ gtk_action_set_sensitive (action, sensitive); + + action_name = "mail-mark-notjunk"; + sensitive = selection_has_junk_messages; +@@ -2671,32 +2659,6 @@ + + /* Bind properties. */ + +- e_binding_new_full ( +- shell_settings, "mail-citation-color", +- html_display, "citation-color", +- e_binding_transform_string_to_color, +- NULL, NULL); +- +- e_binding_new ( +- shell_settings, "mail-image-loading-policy", +- html_display, "image-loading-policy"); +- +- e_binding_new ( +- shell_settings, "mail-only-local-photos", +- html_display, "only-local-photos"); +- +- e_binding_new ( +- shell_settings, "mail-show-animated-images", +- web_view, "animate"); +- +- e_binding_new ( +- shell_settings, "mail-show-sender-photo", +- html_display, "show-sender-photo"); +- +- e_binding_new ( +- shell_settings, "mail-show-real-date", +- html_display, "show-real-date"); +- + action_name = "mail-caret-mode"; + action = e_mail_reader_get_action (reader, action_name); + +@@ -2935,7 +2897,7 @@ + + if (action == NULL) + g_critical ( +- "%s: action `%s' not found", G_STRFUNC, action_name); ++ "%s: action '%s' not found", G_STRFUNC, action_name); + + return action; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/e-mail-reader-utils.c evolution-2.30.3.new//mail/e-mail-reader-utils.c +--- evolution-2.30.3//mail/e-mail-reader-utils.c 2010-07-18 19:42:22.000000000 +0200 ++++ evolution-2.30.3.new//mail/e-mail-reader-utils.c 2010-09-01 19:18:57.561184000 +0200 +@@ -675,7 +675,10 @@ + } + + static void +-headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailReader *reader) ++headers_changed_cb (GConfClient *gconf, ++ guint cnxn_id, ++ GConfEntry *entry, ++ EMailReader *reader) + { + EMFormat *emf; + EMFormatHTMLDisplay *emfhd; +@@ -691,16 +694,18 @@ + emf = EM_FORMAT (emfhd); + g_return_if_fail (emf != NULL); + +- header_config_list = gconf_client_get_list (gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL); ++ header_config_list = gconf_client_get_list ( ++ gconf, "/apps/evolution/mail/display/headers", ++ GCONF_VALUE_STRING, NULL); + em_format_clear_headers (emf); + for (p = header_config_list; p; p = g_slist_next(p)) { + EMailReaderHeader *h; + gchar *xml = (gchar *)p->data; + + h = e_mail_reader_header_from_xml (xml); +- if (h && h->enabled) { +- em_format_add_header (emf, h->name, EM_FORMAT_HEADER_BOLD); +- } ++ if (h && h->enabled) ++ em_format_add_header ( ++ emf, h->name, EM_FORMAT_HEADER_BOLD); + + e_mail_reader_header_free (h); + } +@@ -744,10 +749,16 @@ + GConfClient *gconf = mail_config_get_gconf_client (); + guint notify_id; + +- gconf_client_add_dir (gconf, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); +- notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/headers", (GConfClientNotifyFunc) headers_changed_cb, reader, NULL, NULL); +- +- g_object_set_data_full (G_OBJECT (reader), "reader-header-notify-id", GINT_TO_POINTER (notify_id), remove_header_notify_cb); ++ gconf_client_add_dir ( ++ gconf, "/apps/evolution/mail/display", ++ GCONF_CLIENT_PRELOAD_NONE, NULL); ++ notify_id = gconf_client_notify_add ( ++ gconf, "/apps/evolution/mail/display/headers", ++ (GConfClientNotifyFunc) headers_changed_cb, ++ reader, NULL, NULL); ++ g_object_set_data_full ( ++ G_OBJECT (reader), "reader-header-notify-id", ++ GINT_TO_POINTER (notify_id), remove_header_notify_cb); + + headers_changed_cb (gconf, 0, NULL, reader); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-composer-utils.c evolution-2.30.3.new//mail/em-composer-utils.c +--- evolution-2.30.3//mail/em-composer-utils.c 2010-07-18 19:42:22.000000000 +0200 ++++ evolution-2.30.3.new//mail/em-composer-utils.c 2010-09-01 19:18:57.565184000 +0200 +@@ -715,16 +715,14 @@ + /* Composing messages... */ + + static EMsgComposer * +-create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite) ++create_new_composer (const gchar *subject, const gchar *fromuri) + { + EMsgComposer *composer; + EComposerHeaderTable *table; + EAccount *account = NULL; + +- if (lite) +- composer = e_msg_composer_lite_new (); +- else +- composer = e_msg_composer_new (); ++ composer = e_msg_composer_new (); ++ + table = e_msg_composer_get_header_table (composer); + + if (fromuri != NULL) { +@@ -754,7 +752,7 @@ + { + GtkWidget *composer; + +- composer = (GtkWidget *) create_new_composer ("", fromuri, FALSE); ++ composer = (GtkWidget *) create_new_composer ("", fromuri); + if (composer == NULL) + return; + +@@ -774,7 +772,7 @@ + { + GtkWidget *composer; + +- composer = (GtkWidget *) create_new_composer ("", fromuri, TRUE); ++ composer = (GtkWidget *) create_new_composer ("", fromuri); + if (composer == NULL) + return NULL; + +@@ -811,10 +809,8 @@ + + composer_set_no_change (composer); + +- if (!e_msg_composer_get_lite ()) { +- gtk_widget_show ((GtkWidget *) composer); +- gdk_window_raise (((GtkWidget *) composer)->window); +- } ++ gtk_widget_show ((GtkWidget *) composer); ++ gdk_window_raise (((GtkWidget *) composer)->window); + + return composer; + } +@@ -993,8 +989,7 @@ + + composer_set_no_change (composer); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return (GtkWidget *)composer; + } +@@ -1143,7 +1138,7 @@ + { + EMsgComposer *composer; + +- composer = create_new_composer (subject, fromuri, FALSE); ++ composer = create_new_composer (subject, fromuri); + if (composer == NULL) + return NULL; + +@@ -1154,8 +1149,7 @@ + + composer_set_no_change (composer); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return composer; + } +@@ -1225,7 +1219,7 @@ + text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found); + + if (text) { +- composer = create_new_composer (subject, fromuri, FALSE); ++ composer = create_new_composer (subject, fromuri); + + if (composer) { + if (CAMEL_IS_MULTIPART(camel_medium_get_content_object((CamelMedium *)message))) +@@ -1242,8 +1236,7 @@ + + emu_update_composers_security (composer, validity_found); + composer_set_no_change (composer); +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + } + g_free (text); + } +@@ -2289,8 +2282,7 @@ + + composer_set_no_change (composer); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return composer; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-composer-utils.h evolution-2.30.3.new//mail/em-composer-utils.h +--- evolution-2.30.3//mail/em-composer-utils.h 2010-06-20 14:15:01.000000000 +0200 ++++ evolution-2.30.3.new//mail/em-composer-utils.h 2010-09-01 19:18:57.565184000 +0200 +@@ -33,7 +33,6 @@ + G_BEGIN_DECLS + + void em_utils_compose_new_message (const gchar *fromuri); +-EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); + + /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ + EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-folder-tree-model.c evolution-2.30.3.new//mail/em-folder-tree-model.c +--- evolution-2.30.3//mail/em-folder-tree-model.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.3.new//mail/em-folder-tree-model.c 2010-09-01 19:18:57.565184000 +0200 +@@ -37,10 +37,13 @@ + + #include + ++#include "e-mail-store.h" ++ + #include "mail-config.h" + #include "mail-session.h" + #include "mail-tools.h" + #include "mail-mt.h" ++#include "mail-ops.h" + + /* sigh, these 2 only needed for outbox total count checking - a mess */ + #include "mail-folder-cache.h" +@@ -80,6 +83,7 @@ + + gulong account_changed_id; + gulong account_removed_id; ++ gulong account_added_id; + }; + + enum { +@@ -256,6 +260,29 @@ + em_folder_tree_model_remove_store (model, si->store); + } + ++/* HACK: FIXME: the component should listen to the account object directly */ ++static void ++add_new_store (gchar *uri, CamelStore *store, gpointer user_data) ++{ ++ EAccount *account = user_data; ++ ++ if (store == NULL) ++ return; ++ ++ e_mail_store_add (store, account->name); ++} ++ ++static void ++account_added_cb (EAccountList *accounts, ++ EAccount *account, ++ EMFolderTreeModel *model) ++{ ++ const gchar *uri; ++ ++ uri = e_account_get_string (account, E_ACCOUNT_SOURCE_URL); ++ mail_get_store (uri, NULL, add_new_store, account); ++} ++ + static void + folder_tree_model_selection_finalized_cb (EMFolderTreeModel *model) + { +@@ -332,6 +359,8 @@ + priv->accounts, priv->account_changed_id); + g_signal_handler_disconnect ( + priv->accounts, priv->account_removed_id); ++ g_signal_handler_disconnect ( ++ priv->accounts, priv->account_added_id); + + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); +@@ -512,6 +541,9 @@ + model->priv->account_removed_id = g_signal_connect ( + model->priv->accounts, "account-removed", + G_CALLBACK (account_removed_cb), model); ++ model->priv->account_added_id = g_signal_connect ( ++ model->priv->accounts, "account-added", ++ G_CALLBACK (account_added_cb), model); + + g_signal_connect (mail_folder_cache_get_default (), + "folder-unread-updated", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-folder-utils.c evolution-2.30.3.new//mail/em-folder-utils.c +--- evolution-2.30.3//mail/em-folder-utils.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.3.new//mail/em-folder-utils.c 2010-09-01 19:18:57.565184000 +0200 +@@ -504,7 +504,7 @@ + static gchar * + emfu_create_folder__desc (struct _EMCreateFolder *m) + { +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); ++ return g_strdup_printf (_("Creating folder '%s'"), m->full_name); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/em-format-html.c evolution-2.30.3.new//mail/em-format-html.c +--- evolution-2.30.3//mail/em-format-html.c 2010-06-20 14:15:05.000000000 +0200 ++++ evolution-2.30.3.new//mail/em-format-html.c 2010-09-01 19:18:57.565184000 +0200 +@@ -47,6 +47,7 @@ + #include "e-util/e-icon-factory.h" + #include "e-util/e-util-private.h" + #include "e-util/e-util.h" ++#include "e-util/e-extensible.h" + + #include + #include +@@ -965,6 +966,8 @@ + g_signal_connect_swapped ( + efh, "notify::mark-citations", + G_CALLBACK (em_format_redraw), NULL); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (efh)); + } + + GType +@@ -986,9 +989,18 @@ + NULL /* value_table */ + }; + ++ static const GInterfaceInfo extensible_info = { ++ (GInterfaceInitFunc) NULL, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL /* interface_data */ ++ }; ++ + type = g_type_register_static ( + em_format_get_type(), "EMFormatHTML", + &type_info, G_TYPE_FLAG_ABSTRACT); ++ ++ g_type_add_interface_static ( ++ type, E_TYPE_EXTENSIBLE, &extensible_info); + } + + return type; +@@ -1383,7 +1395,7 @@ + camel_http_stream_set_proxy ((CamelHttpStream *)instream, proxy); + g_free (proxy); + } +- camel_operation_start(NULL, _("Retrieving `%s'"), job->u.uri); ++ camel_operation_start(NULL, _("Retrieving '%s'"), job->u.uri); + tmp_stream = (CamelHttpStream *)instream; + content_type = camel_http_stream_get_content_type(tmp_stream); + length = camel_header_raw_find(&tmp_stream->headers, "Content-Length", NULL); +@@ -1392,7 +1404,7 @@ + total = atoi(length); + camel_content_type_unref(content_type); + } else +- camel_operation_start_transient(NULL, _("Retrieving `%s'"), job->u.uri); ++ camel_operation_start_transient(NULL, _("Retrieving '%s'"), job->u.uri); + + camel_url_free(url); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/evolution-mail.schemas.in evolution-2.30.3.new//mail/evolution-mail.schemas.in +--- evolution-2.30.3//mail/evolution-mail.schemas.in 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.3.new//mail/evolution-mail.schemas.in 2010-09-01 19:18:57.565184000 +0200 +@@ -160,21 +160,6 @@ + + + +- /schemas/apps/evolution/mail/composer/show_mail_from +- /apps/evolution/mail/composer/show_mail_from +- evolution-mail +- bool +- true +- +- Show "From" field when sending a mail message +- +- Show the "From" field when sending a mail message. This is +- controlled from the View menu when a mail account is chosen. +- +- +- +- +- + /schemas/apps/evolution/mail/composer/show_mail_reply_to + /apps/evolution/mail/composer/show_mail_reply_to + evolution-mail +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/importers/mail-importer.c evolution-2.30.3.new//mail/importers/mail-importer.c +--- evolution-2.30.3//mail/importers/mail-importer.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.3.new//mail/importers/mail-importer.c 2010-09-01 19:18:57.565184000 +0200 +@@ -152,7 +152,7 @@ + if (m->cancel) + oldcancel = camel_operation_register(m->cancel); + +- camel_operation_start(NULL, _("Importing `%s'"), folder->full_name); ++ camel_operation_start(NULL, _("Importing '%s'"), folder->full_name); + camel_folder_freeze(folder); + while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) { + CamelMimeMessage *msg; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/mail-config.ui evolution-2.30.3.new//mail/mail-config.ui +--- evolution-2.30.3//mail/mail-config.ui 2010-09-01 19:18:50.785184001 +0200 ++++ evolution-2.30.3.new//mail/mail-config.ui 2010-09-01 19:18:57.569184000 +0200 +@@ -2923,7 +2923,7 @@ + + + +- ++ + True + 4 + +@@ -2972,7 +2972,7 @@ + + + +- ++ + True + + +@@ -4483,7 +4483,7 @@ + True + 2 + +- ++ + True + vertical + 8 +@@ -4542,7 +4542,7 @@ + + + +- ++ + True + 0 + Alerts +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/mail-folder-cache.c evolution-2.30.3.new//mail/mail-folder-cache.c +--- evolution-2.30.3//mail/mail-folder-cache.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.3.new//mail/mail-folder-cache.c 2010-09-01 19:18:57.569184000 +0200 +@@ -23,6 +23,11 @@ + * + */ + ++/** ++ * SECTION: mail-folder-cache ++ * @short_description: Stores information about open folders ++ **/ ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/mail-folder-cache.h evolution-2.30.3.new//mail/mail-folder-cache.h +--- evolution-2.30.3//mail/mail-folder-cache.h 2010-06-20 14:15:05.000000000 +0200 ++++ evolution-2.30.3.new//mail/mail-folder-cache.h 2010-09-01 19:18:57.569184000 +0200 +@@ -31,11 +31,6 @@ + + G_BEGIN_DECLS + +-/** +- * SECTION: mail-folder-cache +- * @short_description: Stores information about open folders +- **/ +- + #define MAIL_TYPE_FOLDER_CACHE mail_folder_cache_get_type() + #define MAIL_FOLDER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCache)) + #define MAIL_FOLDER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass)) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/mail-ops.c evolution-2.30.3.new//mail/mail-ops.c +--- evolution-2.30.3//mail/mail-ops.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.3.new//mail/mail-ops.c 2010-09-01 19:18:57.569184000 +0200 +@@ -594,7 +594,7 @@ + folder = mail_tool_uri_to_folder (sent_folder_uri, 0, ex); + if (camel_exception_is_set(ex)) { + g_string_append_printf (err, _("Failed to append to %s: %s\n" +- "Appending to local `Sent' folder instead."), ++ "Appending to local 'Sent' folder instead."), + sent_folder_uri, camel_exception_get_description (ex)); + camel_exception_clear (ex); + } +@@ -621,7 +621,7 @@ + if (err->len) + g_string_append(err, "\n\n"); + g_string_append_printf (err, _("Failed to append to %s: %s\n" +- "Appending to local `Sent' folder instead."), ++ "Appending to local 'Sent' folder instead."), + name, camel_exception_get_description (ex)); + camel_object_ref (sent_folder); + camel_object_unref (folder); +@@ -637,7 +637,7 @@ + + if (err->len) + g_string_append(err, "\n\n"); +- g_string_append_printf (err, _("Failed to append to local `Sent' folder: %s"), ++ g_string_append_printf (err, _("Failed to append to local 'Sent' folder: %s"), + camel_exception_get_description (ex)); + } + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//mail/mail-tools.c evolution-2.30.3.new//mail/mail-tools.c +--- evolution-2.30.3//mail/mail-tools.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.3.new//mail/mail-tools.c 2010-09-01 19:18:57.569184000 +0200 +@@ -120,7 +120,7 @@ + path = g_build_filename (data_dir, "spool", NULL); + + if (g_stat(path, &st) == -1 && g_mkdir_with_parents(path, 0700) == -1) { +- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory `%s': %s"), ++ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory '%s': %s"), + path, g_strerror(errno)); + g_free(path); + return NULL; +@@ -150,7 +150,7 @@ + if (strcmp(uri->protocol, "mbox") != 0) { + /* This is really only an internal error anyway */ + camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID, +- _("Trying to movemail a non-mbox source `%s'"), ++ _("Trying to movemail a non-mbox source '%s'"), + source_url); + camel_url_free(uri); + return NULL; +@@ -298,7 +298,7 @@ + /* FIXME?: the filter:get_folder callback should do this itself? */ + curi = em_uri_to_camel(uri); + if (uri == NULL) { +- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: `%s'"), uri); ++ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: '%s'"), uri); + return NULL; + } + uri = curi; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/addressbook/e-book-shell-content.c evolution-2.30.3.new//modules/addressbook/e-book-shell-content.c +--- evolution-2.30.3//modules/addressbook/e-book-shell-content.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.3.new//modules/addressbook/e-book-shell-content.c 2010-09-01 19:18:57.569184000 +0200 +@@ -629,6 +629,7 @@ + EShellSearchbar * + e_book_shell_content_get_searchbar (EBookShellContent *book_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -636,7 +637,8 @@ + E_IS_BOOK_SHELL_CONTENT (book_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (book_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/addressbook/e-book-shell-migrate.c evolution-2.30.3.new//modules/addressbook/e-book-shell-migrate.c +--- evolution-2.30.3//modules/addressbook/e-book-shell-migrate.c 2010-06-20 14:14:47.000000000 +0200 ++++ evolution-2.30.3.new//modules/addressbook/e-book-shell-migrate.c 2010-09-01 19:18:57.573184000 +0200 +@@ -370,7 +370,7 @@ + if (!e_book_add_contact (new_book, + contact, + &e)) +- g_warning ("contact add failed: `%s'", e->message); ++ g_warning ("contact add failed: '%s'", e->message); + + num_added ++; + +@@ -400,14 +400,14 @@ + old_book = e_book_new (old_source, &e); + if (!old_book + || !e_book_open (old_book, TRUE, &e)) { +- g_warning ("failed to load source book for migration: `%s'", e->message); ++ g_warning ("failed to load source book for migration: '%s'", e->message); + goto finish; + } + + new_book = e_book_new (new_source, &e); + if (!new_book + || !e_book_open (new_book, FALSE, &e)) { +- g_warning ("failed to load destination book for migration: `%s'", e->message); ++ g_warning ("failed to load destination book for migration: '%s'", e->message); + goto finish; + } + +@@ -809,7 +809,7 @@ + e_source_set_property (source, "completion", "true"); + } + else { +- g_warning ("found completion folder with uri `%s' that " ++ g_warning ("found completion folder with uri '%s' that " + "doesn't correspond to anything we migrated.", physical_uri); + } + +@@ -886,7 +886,7 @@ + if (!e_book_commit_contact (book, + contact, + &e)) +- g_warning ("contact commit failed: `%s'", e->message); ++ g_warning ("contact commit failed: '%s'", e->message); + } + + num_converted ++; +@@ -989,7 +989,7 @@ + if (!e_book_commit_contact (book, + contact, + &e)) +- g_warning ("contact commit failed: `%s'", e->message); ++ g_warning ("contact commit failed: '%s'", e->message); + } + + num_converted ++; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-calendar-item.c evolution-2.30.3.new//modules/calendar/e-cal-config-calendar-item.c +--- evolution-2.30.3//modules/calendar/e-cal-config-calendar-item.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-calendar-item.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-calendar-item.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-calendar-item.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_calendar_item_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_calendar_item_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_calendar_item_constructed; ++ ++ class->extensible_type = E_TYPE_CALENDAR_ITEM; ++} ++ ++void ++e_cal_config_calendar_item_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_calendar_item_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigCalendarItem", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-calendar-item.h evolution-2.30.3.new//modules/calendar/e-cal-config-calendar-item.h +--- evolution-2.30.3//modules/calendar/e-cal-config-calendar-item.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-calendar-item.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-calendar-item.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_CALENDAR_ITEM_H ++#define E_CAL_CONFIG_CALENDAR_ITEM_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_calendar_item_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_CALENDAR_ITEM_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-date-edit.c evolution-2.30.3.new//modules/calendar/e-cal-config-date-edit.c +--- evolution-2.30.3//modules/calendar/e-cal-config-date-edit.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-date-edit.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-date-edit.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-date-edit.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_date_edit_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_date_edit_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_date_edit_constructed; ++ ++ class->extensible_type = E_TYPE_DATE_EDIT; ++} ++ ++void ++e_cal_config_date_edit_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_date_edit_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigDateEdit", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-date-edit.h evolution-2.30.3.new//modules/calendar/e-cal-config-date-edit.h +--- evolution-2.30.3//modules/calendar/e-cal-config-date-edit.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-date-edit.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-date-edit.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_DATE_EDIT_H ++#define E_CAL_CONFIG_DATE_EDIT_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_date_edit_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_DATE_EDIT_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-meeting-store.c evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-store.c +--- evolution-2.30.3//modules/calendar/e-cal-config-meeting-store.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-store.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-meeting-store.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-meeting-store.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_meeting_store_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-free-busy-template", ++ extensible, "free-busy-template"); ++ ++ e_binding_new ( ++ shell_settings, "cal-timezone", ++ extensible, "timezone"); ++} ++ ++static void ++cal_config_meeting_store_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_meeting_store_constructed; ++ ++ class->extensible_type = E_TYPE_MEETING_STORE; ++} ++ ++void ++e_cal_config_meeting_store_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_meeting_store_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigMeetingStore", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-meeting-store.h evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-store.h +--- evolution-2.30.3//modules/calendar/e-cal-config-meeting-store.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-store.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-meeting-store.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MEETING_STORE_H ++#define E_CAL_CONFIG_MEETING_STORE_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_meeting_store_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MEETING_STORE_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-meeting-time-selector.c evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-time-selector.c +--- evolution-2.30.3//modules/calendar/e-cal-config-meeting-time-selector.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-time-selector.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,83 @@ ++/* ++ * e-cal-config-meeting-time-selector.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-meeting-time-selector.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_meeting_time_selector_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-use-24-hour-format", ++ extensible, "use-24-hour-format"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_meeting_time_selector_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_meeting_time_selector_constructed; ++ ++ class->extensible_type = E_TYPE_MEETING_TIME_SELECTOR; ++} ++ ++void ++e_cal_config_meeting_time_selector_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_meeting_time_selector_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigMeetingTimeSelector", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-meeting-time-selector.h evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-time-selector.h +--- evolution-2.30.3//modules/calendar/e-cal-config-meeting-time-selector.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-meeting-time-selector.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-meeting-time-selector.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MEETING_TIME_SELECTOR_H ++#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_meeting_time_selector_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MEETING_TIME_SELECTOR_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-model.c evolution-2.30.3.new//modules/calendar/e-cal-config-model.c +--- evolution-2.30.3//modules/calendar/e-cal-config-model.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-model.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,99 @@ ++/* ++ * e-cal-config-model.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-model.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_model_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /*** ECalModel ***/ ++ ++ e_binding_new ( ++ shell_settings, "cal-timezone", ++ extensible, "timezone"); ++ ++ e_binding_new ( ++ shell_settings, "cal-use-24-hour-format", ++ extensible, "use-24-hour-format"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++ ++ /*** ECalModelTasks ***/ ++ ++ if (E_IS_CAL_MODEL_TASKS (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-tasks-color-due-today", ++ extensible, "color-due-today"); ++ ++ e_binding_new ( ++ shell_settings, "cal-tasks-color-overdue", ++ extensible, "color-overdue"); ++ } ++} ++ ++static void ++cal_config_model_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_model_constructed; ++ ++ class->extensible_type = E_TYPE_CAL_MODEL; ++} ++ ++void ++e_cal_config_model_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_model_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigModel", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-model.h evolution-2.30.3.new//modules/calendar/e-cal-config-model.h +--- evolution-2.30.3//modules/calendar/e-cal-config-model.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-model.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-model.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MODEL_H ++#define E_CAL_CONFIG_MODEL_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_model_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MODEL_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-view.c evolution-2.30.3.new//modules/calendar/e-cal-config-view.c +--- evolution-2.30.3//modules/calendar/e-cal-config-view.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-view.c 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,130 @@ ++/* ++ * e-cal-config-view.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-view.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_view_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /*** EDayView ***/ ++ ++ if (E_IS_DAY_VIEW (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ E_DAY_VIEW (extensible)->week_number_label, "visible"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-show-line", ++ extensible, "marcus-bains-show-line"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-day-view-color", ++ extensible, "marcus-bains-day-view-color"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-time-bar-color", ++ extensible, "marcus-bains-time-bar-color"); ++ ++ e_binding_new ( ++ shell_settings, "cal-time-divisions", ++ extensible, "mins-per-row"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-end-hour", ++ extensible, "work-day-end-hour"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-end-minute", ++ extensible, "work-day-end-minute"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-start-hour", ++ extensible, "work-day-start-hour"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-start-minute", ++ extensible, "work-day-start-minute"); ++ ++ e_binding_new ( ++ shell_settings, "cal-working-days-bitset", ++ extensible, "working-days"); ++ } ++ ++ /*** EWeekView ***/ ++ ++ if (E_IS_WEEK_VIEW (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-compress-weekend", ++ extensible, "compress-weekend"); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-event-end-times", ++ extensible, "show-event-end-times"); ++ } ++} ++ ++static void ++cal_config_view_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_view_constructed; ++ ++ class->extensible_type = E_TYPE_CALENDAR_VIEW; ++} ++ ++void ++e_cal_config_view_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_view_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigView", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-config-view.h evolution-2.30.3.new//modules/calendar/e-cal-config-view.h +--- evolution-2.30.3//modules/calendar/e-cal-config-view.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/calendar/e-cal-config-view.h 2010-09-01 19:18:57.573184000 +0200 +@@ -0,0 +1,31 @@ ++/* ++ * e-cal-config-view.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_VIEW_H ++#define E_CAL_CONFIG_VIEW_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_view_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_VIEW_H */ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-backend.c evolution-2.30.3.new//modules/calendar/e-cal-shell-backend.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-backend.c 2010-06-24 19:16:02.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-backend.c 2010-09-01 19:18:57.573184000 +0200 +@@ -133,6 +133,8 @@ + + name = _("On This Computer"); + ++ name = _("On This Computer"); ++ + if (on_this_computer != NULL) { + GSList *sources, *iter; + const gchar *group_base_uri; +@@ -629,7 +631,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-content.c evolution-2.30.3.new//modules/calendar/e-cal-shell-content.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-content.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-content.c 2010-09-01 19:18:57.573184000 +0200 +@@ -314,11 +314,10 @@ + { + ECalShellContentPrivate *priv; + ECalendarView *calendar_view; +- ECalModel *memo_model; +- ECalModel *task_model; ++ ECalModel *memo_model=NULL; ++ ECalModel *task_model=NULL; + EShell *shell; + EShellContent *shell_content; +- EShellSettings *shell_settings; + EShellView *shell_view; + EShellWindow *shell_window; + EShellContent *foreign_content; +@@ -342,51 +341,57 @@ + shell_window = e_shell_view_get_shell_window (shell_view); + + shell = e_shell_window_get_shell (shell_window); +- shell_settings = e_shell_get_shell_settings (shell); + + /* We borrow the memopad and taskpad models from the memo + * and task views, loading the views if necessary. */ +- +- foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); +- foreign_content = e_shell_view_get_shell_content (foreign_view); +- g_object_get (foreign_content, "model", &memo_model, NULL); +- +- foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); +- foreign_content = e_shell_view_get_shell_content (foreign_view); +- g_object_get (foreign_content, "model", &task_model, NULL); +- ++ if (!e_shell_get_express_mode (shell)) { ++ foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); ++ foreign_content = e_shell_view_get_shell_content (foreign_view); ++ g_object_get (foreign_content, "model", &memo_model, NULL); ++ ++ foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); ++ foreign_content = e_shell_view_get_shell_content (foreign_view); ++ g_object_get (foreign_content, "model", &task_model, NULL); ++ } + /* Build content widgets. */ + + container = GTK_WIDGET (object); + +- widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->hpaned = g_object_ref (widget); +- gtk_widget_show (widget); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->hpaned = g_object_ref (widget); ++ gtk_widget_show (widget); + +- container = priv->hpaned; ++ container = priv->hpaned; ++ } + + widget = gtk_notebook_new (); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE); ++ if (!e_shell_get_express_mode (shell)) ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE); ++ else ++ gtk_container_add (GTK_CONTAINER (container), widget); + priv->notebook = g_object_ref (widget); + gtk_widget_show (widget); + +- /* FIXME Need to deal with saving and restoring the position. +- * Month view has its own position. */ +- widget = e_paned_new (GTK_ORIENTATION_VERTICAL); +- e_paned_set_fixed_resize (E_PANED (widget), FALSE); +- gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); +- priv->vpaned = g_object_ref (widget); +- gtk_widget_show (widget); ++ if (!e_shell_get_express_mode (shell)) { ++ /* FIXME Need to deal with saving and restoring the position. ++ * Month view has its own position. */ ++ widget = e_paned_new (GTK_ORIENTATION_VERTICAL); ++ e_paned_set_fixed_resize (E_PANED (widget), FALSE); ++ gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); ++ priv->vpaned = g_object_ref (widget); ++ gtk_widget_show (widget); ++ } + + container = priv->notebook; + + /* Add views in the order defined by GnomeCalendarViewType, such + * that the notebook page number corresponds to the view type. */ + +- priv->calendar = gnome_calendar_new (shell_settings); ++ priv->calendar = gnome_calendar_new (); + calendar = GNOME_CALENDAR (priv->calendar); + + for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) { +@@ -404,86 +409,90 @@ + + container = priv->vpaned; + +- widget = gtk_vbox_new (FALSE, 0); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = gtk_hseparator_new (); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- +- widget = gtk_label_new (NULL); +- markup = g_strdup_printf ("%s", _("Tasks")); +- gtk_label_set_markup (GTK_LABEL (widget), markup); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- g_free (markup); +- +- widget = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ( +- GTK_SCROLLED_WINDOW (widget), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type ( +- GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = e_task_table_new (shell_view, task_model); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->task_table = g_object_ref (widget); +- gtk_widget_show (widget); +- +- cal_shell_content_load_table_state (shell_content, E_TABLE (widget)); +- +- g_signal_connect_swapped ( +- widget, "open-component", +- G_CALLBACK (e_cal_shell_view_taskpad_open_task), +- shell_view); +- +- container = priv->vpaned; +- +- widget = gtk_vbox_new (FALSE, 0); +- gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = gtk_label_new (NULL); +- markup = g_strdup_printf ("%s", _("Memos")); +- gtk_label_set_markup (GTK_LABEL (widget), markup); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- g_free (markup); +- +- widget = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ( +- GTK_SCROLLED_WINDOW (widget), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type ( +- GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = e_memo_table_new (shell_view, memo_model); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->memo_table = g_object_ref (widget); +- gtk_widget_show (widget); +- +- cal_shell_content_load_table_state (shell_content, E_TABLE (widget)); +- +- e_cal_model_set_default_time_func ( +- memo_model, gc_get_default_time, calendar); +- +- g_signal_connect_swapped ( +- widget, "open-component", +- G_CALLBACK (e_cal_shell_view_memopad_open_memo), +- shell_view); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = gtk_vbox_new (FALSE, 0); ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = gtk_hseparator_new (); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ widget = gtk_label_new (NULL); ++ markup = g_strdup_printf ("%s", _("Tasks")); ++ gtk_label_set_markup (GTK_LABEL (widget), markup); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ g_free (markup); ++ ++ widget = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (widget), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type ( ++ GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); ++ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = e_task_table_new (shell_view, task_model); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->task_table = g_object_ref (widget); ++ gtk_widget_show (widget); ++ ++ cal_shell_content_load_table_state ( ++ shell_content, E_TABLE (widget)); ++ ++ g_signal_connect_swapped ( ++ widget, "open-component", ++ G_CALLBACK (e_cal_shell_view_taskpad_open_task), ++ shell_view); ++ ++ container = priv->vpaned; ++ ++ widget = gtk_vbox_new (FALSE, 0); ++ gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = gtk_label_new (NULL); ++ markup = g_strdup_printf ("%s", _("Memos")); ++ gtk_label_set_markup (GTK_LABEL (widget), markup); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ g_free (markup); ++ ++ widget = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (widget), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type ( ++ GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); ++ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = e_memo_table_new (shell_view, memo_model); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->memo_table = g_object_ref (widget); ++ gtk_widget_show (widget); ++ ++ cal_shell_content_load_table_state ( ++ shell_content, E_TABLE (widget)); ++ ++ e_cal_model_set_default_time_func ( ++ memo_model, gc_get_default_time, calendar); ++ ++ g_signal_connect_swapped ( ++ widget, "open-component", ++ G_CALLBACK (e_cal_shell_view_memopad_open_memo), ++ shell_view); ++ } + + /* Load the view instance. */ + +@@ -496,21 +505,23 @@ + * The GtkWidget::map() callback below explains why. */ + priv->view_instance = view_instance; + +- g_signal_connect_swapped ( +- shell_view, "notify::view-id", +- G_CALLBACK (cal_shell_content_notify_view_id_cb), +- object); +- +- /* Bind GObject properties to GConf keys. */ +- +- bridge = gconf_bridge_get (); +- +- object = G_OBJECT (priv->vpaned); +- key = "/apps/evolution/calendar/display/tag_vpane_position"; +- gconf_bridge_bind_property_delayed (bridge, key, object, "proportion"); ++ if (!e_shell_get_express_mode (shell)) { ++ g_signal_connect_swapped ( ++ shell_view, "notify::view-id", ++ G_CALLBACK (cal_shell_content_notify_view_id_cb), ++ object); ++ ++ bridge = gconf_bridge_get (); ++ ++ object = G_OBJECT (priv->vpaned); ++ key = "/apps/evolution/calendar/display/tag_vpane_position"; ++ gconf_bridge_bind_property_delayed (bridge, key, object, "proportion"); ++ } + +- g_object_unref (memo_model); +- g_object_unref (task_model); ++ if (memo_model) ++ g_object_unref (memo_model); ++ if (task_model) ++ g_object_unref (task_model); + } + + static void +@@ -669,6 +680,7 @@ + EShellSearchbar * + e_cal_shell_content_get_searchbar (ECalShellContent *cal_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -676,7 +688,8 @@ + E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (cal_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-migrate.c evolution-2.30.3.new//modules/calendar/e-cal-shell-migrate.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-migrate.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-migrate.c 2010-09-01 19:18:57.573184000 +0200 +@@ -82,7 +82,7 @@ + + static e_gconf_map_t calendar_datenavigator_map[] = { + /* /Calendar/DateNavigator */ +- { "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL }, ++ { "ShowWeekNumbers", "calendar/display/show_week_numbers", E_GCONF_MAP_BOOL }, + { NULL }, + }; + +@@ -690,7 +690,7 @@ + + if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) { + /* FIXME: domain/code */ +- g_set_error(error, 0, 0, _("Unable to migrate calendar `%s'"), source_name); ++ g_set_error(error, 0, 0, _("Unable to migrate calendar '%s'"), source_name); + g_free(source_name); + goto fail; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-settings.c evolution-2.30.3.new//modules/calendar/e-cal-shell-settings.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-settings.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-settings.c 2010-09-01 19:18:57.577184000 +0200 +@@ -491,8 +491,8 @@ + "/apps/evolution/calendar/prompts/confirm_purge"); + + e_shell_settings_install_property_for_key ( +- "cal-day-view-show-week-numbers", +- "/apps/evolution/calendar/display/day_view_show_week_number"); ++ "cal-show-week-numbers", ++ "/apps/evolution/calendar/display/show_week_numbers"); + + e_shell_settings_install_property_for_key ( + "cal-free-busy-template", +@@ -539,10 +539,6 @@ + "/apps/evolution/calendar/display/show_event_end"); + + e_shell_settings_install_property_for_key ( +- "cal-show-week-numbers", +- "/apps/evolution/calendar/date_navigator/show_week_numbers"); +- +- e_shell_settings_install_property_for_key ( + "cal-tasks-color-due-today", + "/apps/evolution/calendar/tasks/colors/due_today"); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-sidebar.c evolution-2.30.3.new//modules/calendar/e-cal-shell-sidebar.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-sidebar.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-sidebar.c 2010-09-01 19:18:57.577184000 +0200 +@@ -33,6 +33,7 @@ + #include "calendar/gui/calendar-config.h" + #include "calendar/gui/e-calendar-selector.h" + #include "calendar/gui/misc.h" ++#include "calendar/gui/dialogs/calendar-setup.h" + + #include "e-cal-shell-view.h" + #include "e-cal-shell-backend.h" +@@ -476,7 +477,7 @@ + bridge = gconf_bridge_get (); + + object = G_OBJECT (priv->paned); +- key = "/apps/evolution/calendar/display/date_navigator_vpane_position"; ++ key = "/apps/evolution/calendar/display/date_navigator_pane_position"; + gconf_bridge_bind_property_delayed (bridge, key, object, "vposition"); + } + +@@ -559,6 +560,21 @@ + } + + static void ++new_calendar_clicked (GtkButton *button, ++ EShellSidebar *shell_sidebar) ++{ ++ EShellView *shell_view; ++ EShellWindow *shell_window; ++ EShellBackend *shell_backend; ++ ++ shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); ++ shell_backend = e_shell_view_get_shell_backend (shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ ++ calendar_setup_new_calendar (GTK_WINDOW (shell_window)); ++} ++ ++static void + cal_shell_sidebar_constructed (GObject *object) + { + ECalShellSidebarPrivate *priv; +@@ -605,7 +621,21 @@ + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type ( + GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ if (!e_shell_get_express_mode(e_shell_get_default())) { ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ } else { ++ GtkWidget *button; ++ ++ container = gtk_vbox_new (FALSE, 6); ++ gtk_box_pack_start (GTK_BOX(container), widget, TRUE, TRUE, 0); ++ ++ button = gtk_button_new_with_label (_("New Calendar...")); ++ gtk_box_pack_start (GTK_BOX(container), button, FALSE, FALSE, 0); ++ g_signal_connect (button, "clicked", G_CALLBACK(new_calendar_clicked), shell_sidebar); ++ ++ gtk_paned_pack1 (GTK_PANED (priv->paned), container, TRUE, TRUE); ++ gtk_widget_show_all (container); ++ } + gtk_widget_show (widget); + + container = widget; +@@ -624,7 +654,8 @@ + calitem = E_CALENDAR (widget)->calitem; + e_calendar_item_set_days_start_week_sel (calitem, 9); + e_calendar_item_set_max_days_sel (calitem, 42); +- gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); ++ gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE); ++ gtk_widget_set_size_request (widget, -1, 200); + priv->date_navigator = g_object_ref (widget); + gtk_widget_show (widget); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-view-actions.c evolution-2.30.3.new//modules/calendar/e-cal-shell-view-actions.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-view-actions.c 2010-06-20 14:14:47.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-view-actions.c 2010-09-01 19:18:57.577184000 +0200 +@@ -1196,6 +1196,25 @@ + edit_event_as (cal_shell_view, TRUE); + } + ++ static void ++quit_calendar_cb (GtkAction *action, ++ ECalShellView *cal_shell_view) ++{ ++ EShellView *shell_view; ++ EShellWindow *shell_window; ++ GdkEvent *event; ++ ++ shell_view = E_SHELL_VIEW (cal_shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ ++ /* Synthesize a delete_event on this window. */ ++ event = gdk_event_new (GDK_DELETE); ++ event->any.window = g_object_ref (((GtkWidget *) shell_window)->window); ++ event->any.send_event = TRUE; ++ gtk_main_do_event (event); ++ gdk_event_free (event); ++} ++ + static void + action_event_schedule_appointment_cb (GtkAction *action, + ECalShellView *cal_shell_view) +@@ -1428,6 +1447,13 @@ + N_("Converts a meeting to an appointment"), + G_CALLBACK (action_event_schedule_appointment_cb) }, + ++ { "quit-calendar", ++ GTK_STOCK_CLOSE, ++ N_("Quit"), ++ NULL, ++ NULL, /* XXX Add a tooltip! */ ++ G_CALLBACK (quit_calendar_cb) }, ++ + /*** Menus ***/ + + { "calendar-actions-menu", +@@ -1710,8 +1736,9 @@ + /* Advanced Search Action */ + action = ACTION (CALENDAR_SEARCH_ADVANCED_HIDDEN); + gtk_action_set_visible (action, FALSE); +- e_shell_searchbar_set_search_option ( +- searchbar, GTK_RADIO_ACTION (action)); ++ if (searchbar) ++ e_shell_searchbar_set_search_option ( ++ searchbar, GTK_RADIO_ACTION (action)); + + /* Lockdown Printing Actions */ + action_group = ACTION_GROUP (LOCKDOWN_PRINTING); +@@ -1833,18 +1860,20 @@ + + cal_shell_content = cal_shell_view->priv->cal_shell_content; + searchbar = e_cal_shell_content_get_searchbar (cal_shell_content); +- combo_box = e_shell_searchbar_get_filter_combo_box (searchbar); ++ if (searchbar) { ++ combo_box = e_shell_searchbar_get_filter_combo_box (searchbar); + +- e_shell_view_block_execute_search (shell_view); ++ e_shell_view_block_execute_search (shell_view); + +- /* Use any action in the group; doesn't matter which. */ +- e_action_combo_box_set_action (combo_box, radio_action); ++ /* Use any action in the group; doesn't matter which. */ ++ e_action_combo_box_set_action (combo_box, radio_action); + +- ii = CALENDAR_FILTER_UNMATCHED; +- e_action_combo_box_add_separator_after (combo_box, ii); ++ ii = CALENDAR_FILTER_UNMATCHED; ++ e_action_combo_box_add_separator_after (combo_box, ii); + +- ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS; +- e_action_combo_box_add_separator_after (combo_box, ii); ++ ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS; ++ e_action_combo_box_add_separator_after (combo_box, ii); + +- e_shell_view_unblock_execute_search (shell_view); ++ e_shell_view_unblock_execute_search (shell_view); ++ } + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-view-actions.h evolution-2.30.3.new//modules/calendar/e-cal-shell-view-actions.h +--- evolution-2.30.3//modules/calendar/e-cal-shell-view-actions.h 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-view-actions.h 2010-09-01 19:18:57.609184001 +0200 +@@ -89,6 +89,8 @@ + E_SHELL_WINDOW_ACTION ((window), "event-reply-all") + #define E_SHELL_WINDOW_ACTION_EVENT_OCCURRENCE_MOVABLE(window) \ + E_SHELL_WINDOW_ACTION ((window), "event-occurrence-movable") ++#define E_SHELL_WINDOW_ACTION_EVENT_MEETING_NEW(window) \ ++ E_SHELL_WINDOW_ACTION ((window), "event-meeting-new") + + /* Memo Pad Actions */ + #define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_FORWARD(window) \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-view.c evolution-2.30.3.new//modules/calendar/e-cal-shell-view.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-view.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-view.c 2010-09-01 19:18:57.609184001 +0200 +@@ -283,6 +283,7 @@ + GtkAction *action; + GList *list, *iter; + gboolean sensitive; ++ gboolean visible; + guint32 state; + gint n_selected; + +@@ -303,6 +304,26 @@ + + shell_window = e_shell_view_get_shell_window (shell_view); + ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ GtkWidget *widget, *item; ++ ++ /* Hack: Get rid of New and Send/Receive in toolbar ++ * while in express mode */ ++ widget = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar"); ++ ++ item = (GtkWidget *)gtk_toolbar_get_nth_item ((GtkToolbar *)widget, 0); ++ gtk_widget_hide(item); ++ ++ widget = e_shell_window_get_managed_widget ( ++ shell_window, "/main-menu"); ++ gtk_widget_hide(widget); ++ ++ item = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar/send-receive"); ++ if (item) ++ gtk_widget_hide(item); ++ } + cal_shell_content = priv->cal_shell_content; + calendar = e_cal_shell_content_get_calendar (cal_shell_content); + view_type = gnome_calendar_get_view (calendar); +@@ -444,6 +465,10 @@ + action = ACTION (EVENT_REPLY_ALL); + sensitive = (n_selected == 1) && is_meeting; + gtk_action_set_sensitive (action, sensitive); ++ ++ action = ACTION (EVENT_MEETING_NEW); ++ visible = itip_addresses_get_default() != NULL; ++ gtk_action_set_visible (action, visible); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-cal-shell-view-private.c evolution-2.30.3.new//modules/calendar/e-cal-shell-view-private.c +--- evolution-2.30.3//modules/calendar/e-cal-shell-view-private.c 2010-06-20 14:17:50.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-cal-shell-view-private.c 2010-09-01 19:18:57.609184001 +0200 +@@ -28,6 +28,16 @@ + + #define CHECK_NB 5 + ++/* be compatible with older e-d-s for MeeGo */ ++#ifndef ETC_TIMEZONE ++# define ETC_TIMEZONE "/etc/timezone" ++# define ETC_TIMEZONE_MAJ "/etc/TIMEZONE" ++# define ETC_RC_CONF "/etc/rc.conf" ++# define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock" ++# define ETC_CONF_D_CLOCK "/etc/conf.d/clock" ++# define ETC_LOCALTIME "/etc/localtime" ++#endif ++ + static const gchar * files_to_check [CHECK_NB] = { + ETC_TIMEZONE, + ETC_TIMEZONE_MAJ, +@@ -610,35 +620,41 @@ + G_CALLBACK (cal_shell_view_selector_client_removed_cb), + cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "popup-event", +- G_CALLBACK (cal_shell_view_memopad_popup_event_cb), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "popup-event", ++ G_CALLBACK (cal_shell_view_memopad_popup_event_cb), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "selection-change", +- G_CALLBACK (e_cal_shell_view_memopad_actions_update), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "selection-change", ++ G_CALLBACK (e_cal_shell_view_memopad_actions_update), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "status-message", +- G_CALLBACK (e_cal_shell_view_memopad_set_status_message), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "status-message", ++ G_CALLBACK (e_cal_shell_view_memopad_set_status_message), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "popup-event", +- G_CALLBACK (cal_shell_view_taskpad_popup_event_cb), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "popup-event", ++ G_CALLBACK (cal_shell_view_taskpad_popup_event_cb), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "status-message", +- G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "status-message", ++ G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "selection-change", +- G_CALLBACK (e_cal_shell_view_taskpad_actions_update), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "selection-change", ++ G_CALLBACK (e_cal_shell_view_taskpad_actions_update), ++ cal_shell_view); + + e_categories_add_change_hook ( + (GHookFunc) e_cal_shell_view_update_search_filter, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-memo-shell-backend.c evolution-2.30.3.new//modules/calendar/e-memo-shell-backend.c +--- evolution-2.30.3//modules/calendar/e-memo-shell-backend.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-memo-shell-backend.c 2010-09-01 19:18:57.609184001 +0200 +@@ -419,7 +419,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-memo-shell-content.c evolution-2.30.3.new//modules/calendar/e-memo-shell-content.c +--- evolution-2.30.3//modules/calendar/e-memo-shell-content.c 2010-07-30 05:34:38.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-memo-shell-content.c 2010-09-01 19:18:57.609184001 +0200 +@@ -418,7 +418,7 @@ + shell = e_shell_backend_get_shell (shell_backend); + shell_settings = e_shell_get_shell_settings (shell); + +- priv->memo_model = e_cal_model_memos_new (shell_settings); ++ priv->memo_model = e_cal_model_memos_new (); + + timezone = e_shell_settings_get_pointer ( + shell_settings, "cal-timezone"); +@@ -730,6 +730,7 @@ + EShellSearchbar * + e_memo_shell_content_get_searchbar (EMemoShellContent *memo_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -737,7 +738,8 @@ + E_IS_MEMO_SHELL_CONTENT (memo_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (memo_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-task-shell-backend.c evolution-2.30.3.new//modules/calendar/e-task-shell-backend.c +--- evolution-2.30.3//modules/calendar/e-task-shell-backend.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-task-shell-backend.c 2010-09-01 19:18:57.609184001 +0200 +@@ -424,7 +424,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-task-shell-content.c evolution-2.30.3.new//modules/calendar/e-task-shell-content.c +--- evolution-2.30.3//modules/calendar/e-task-shell-content.c 2010-07-30 05:34:38.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-task-shell-content.c 2010-09-01 19:18:57.609184001 +0200 +@@ -415,7 +415,7 @@ + shell = e_shell_window_get_shell (shell_window); + shell_settings = e_shell_get_shell_settings (shell); + +- priv->task_model = e_cal_model_tasks_new (shell_settings); ++ priv->task_model = e_cal_model_tasks_new (); + + timezone = e_shell_settings_get_pointer ( + shell_settings, "cal-timezone"); +@@ -752,6 +752,7 @@ + EShellSearchbar * + e_task_shell_content_get_searchbar (ETaskShellContent *task_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -759,7 +760,8 @@ + E_IS_TASK_SHELL_CONTENT (task_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (task_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/e-task-shell-migrate.c evolution-2.30.3.new//modules/calendar/e-task-shell-migrate.c +--- evolution-2.30.3//modules/calendar/e-task-shell-migrate.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/e-task-shell-migrate.c 2010-09-01 19:18:57.609184001 +0200 +@@ -617,7 +617,7 @@ + + if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) { + /* FIXME: domain/code */ +- g_set_error(error, 0, 0, _("Unable to migrate tasks `%s'"), source_name); ++ g_set_error(error, 0, 0, _("Unable to migrate tasks '%s'"), source_name); + g_free(source_name); + goto fail; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/evolution-module-calendar.c evolution-2.30.3.new//modules/calendar/evolution-module-calendar.c +--- evolution-2.30.3//modules/calendar/evolution-module-calendar.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/evolution-module-calendar.c 2010-09-01 19:18:57.613184001 +0200 +@@ -39,6 +39,13 @@ + #include "e-task-shell-sidebar.h" + #include "e-task-shell-view.h" + ++#include "e-cal-config-calendar-item.h" ++#include "e-cal-config-date-edit.h" ++#include "e-cal-config-meeting-store.h" ++#include "e-cal-config-meeting-time-selector.h" ++#include "e-cal-config-model.h" ++#include "e-cal-config-view.h" ++ + /* Module Entry Points */ + void e_module_load (GTypeModule *type_module); + void e_module_unload (GTypeModule *type_module); +@@ -67,6 +74,13 @@ + e_task_shell_content_register_type (type_module); + e_task_shell_sidebar_register_type (type_module); + e_task_shell_view_register_type (type_module); ++ ++ e_cal_config_calendar_item_register_type (type_module); ++ e_cal_config_date_edit_register_type (type_module); ++ e_cal_config_meeting_store_register_type (type_module); ++ e_cal_config_meeting_time_selector_register_type (type_module); ++ e_cal_config_model_register_type (type_module); ++ e_cal_config_view_register_type (type_module); + } + + G_MODULE_EXPORT void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/calendar/Makefile.am evolution-2.30.3.new//modules/calendar/Makefile.am +--- evolution-2.30.3//modules/calendar/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.3.new//modules/calendar/Makefile.am 2010-09-01 19:18:57.613184001 +0200 +@@ -14,8 +14,20 @@ + evolution-module-calendar.c \ + e-cal-attachment-handler.c \ + e-cal-attachment-handler.h \ ++ e-cal-config-calendar-item.c \ ++ e-cal-config-calendar-item.h \ ++ e-cal-config-date-edit.c \ ++ e-cal-config-date-edit.h \ + e-cal-config-hook.c \ + e-cal-config-hook.h \ ++ e-cal-config-meeting-store.c \ ++ e-cal-config-meeting-store.h \ ++ e-cal-config-meeting-time-selector.c \ ++ e-cal-config-meeting-time-selector.h \ ++ e-cal-config-model.c \ ++ e-cal-config-model.h \ ++ e-cal-config-view.c \ ++ e-cal-config-view.h \ + e-cal-event-hook.c \ + e-cal-event-hook.h \ + e-cal-shell-backend.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/connman/evolution-connman.c evolution-2.30.3.new//modules/connman/evolution-connman.c +--- evolution-2.30.3//modules/connman/evolution-connman.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/connman/evolution-connman.c 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,209 @@ ++/* ++ * evolution-connman.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++#define CM_DBUS_SERVICE "org.moblin.connman" ++#define CM_DBUS_INTERFACE "org.moblin.connman.Manager" ++#define CM_DBUS_PATH "/" ++ ++/* Standard GObject macros */ ++#define E_TYPE_CONNMAN \ ++ (e_connman_get_type ()) ++#define E_CONNMAN(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_CONNMAN, EConnMan)) ++ ++typedef struct { ++ EExtension parent; ++ DBusConnection *connection; ++} EConnMan; ++typedef EExtensionClass EConnManClass; ++ ++/* Module Entry Points */ ++void e_module_load (GTypeModule *type_module); ++void e_module_unload (GTypeModule *type_module); ++ ++/* Forward Declarations */ ++GType e_connman_get_type (void); ++static gboolean network_manager_connect (EConnMan *extension); ++ ++G_DEFINE_DYNAMIC_TYPE (EConnMan, e_connman, E_TYPE_EXTENSION) ++ ++static void ++extension_set_state (EConnMan *extension, const gchar *state) ++{ ++ EExtensible *extensible; ++ ++ extensible = e_extension_get_extensible (E_EXTENSION (extension)); ++ g_return_if_fail (E_IS_SHELL (extensible)); ++ ++ e_shell_set_network_available (E_SHELL (extensible), !g_strcmp0 (state, "online")); ++} ++ ++static DBusHandlerResult ++connman_monitor (DBusConnection *connection G_GNUC_UNUSED, ++ DBusMessage *message, ++ gpointer user_data) ++{ ++ gchar *value; ++ EConnMan *extension = user_data; ++ DBusError error = DBUS_ERROR_INIT; ++ DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ ++ if (!dbus_message_has_path (message, CM_DBUS_PATH) || ++ !dbus_message_has_interface (message, CM_DBUS_INTERFACE) || ++ !dbus_message_has_member (message, "StateChanged")) ++ goto err_exit; ++ ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &value, ++ DBUS_TYPE_INVALID)) ++ goto err_exit; ++ ++ extension_set_state (extension, value); ++ ret = DBUS_HANDLER_RESULT_HANDLED; ++ ++ err_exit: ++ return ret; ++} ++ ++static void ++connman_check_initial_state (EConnMan *extension) ++{ ++ DBusMessage *message = NULL; ++ DBusMessage *response = NULL; ++ DBusError error = DBUS_ERROR_INIT; ++ ++ message = dbus_message_new_method_call ( ++ CM_DBUS_SERVICE, CM_DBUS_PATH, CM_DBUS_INTERFACE, "GetState"); ++ ++ /* XXX Assuming this should be safe to call synchronously. */ ++ response = dbus_connection_send_with_reply_and_block ( ++ extension->connection, message, 100, &error); ++ ++ if (response != NULL) { ++ const gchar *value; ++ if (dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &value, ++ DBUS_TYPE_INVALID)) ++ extension_set_state (extension, value); ++ } else { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ dbus_message_unref (message); ++ dbus_message_unref (response); ++} ++ ++static gboolean ++network_manager_connect (EConnMan *extension) ++{ ++ DBusError error = DBUS_ERROR_INIT; ++ ++ /* This is a timeout callback, so the return value denotes ++ * whether to reschedule, not whether we're successful. */ ++ ++ if (extension->connection != NULL) ++ return FALSE; ++ ++ extension->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); ++ if (extension->connection == NULL) { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ return TRUE; ++ } ++ ++ dbus_connection_setup_with_g_main (extension->connection, NULL); ++ dbus_connection_set_exit_on_disconnect (extension->connection, FALSE); ++ ++ if (!dbus_connection_add_filter ( ++ extension->connection, connman_monitor, extension, NULL)) ++ goto fail; ++ ++ dbus_bus_add_match ( ++ extension->connection, ++ "type='signal'," ++ "interface='" CM_DBUS_INTERFACE "'," ++ "sender='" CM_DBUS_SERVICE "'," ++ "member='StateChanged'," ++ "path='" CM_DBUS_PATH "'", ++ &error); ++ if (dbus_error_is_set (&error)) { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ goto fail; ++ } ++ ++ connman_check_initial_state (extension); ++ ++ return FALSE; ++ ++fail: ++ dbus_connection_unref (extension->connection); ++ extension->connection = NULL; ++ ++ return TRUE; ++} ++ ++static void ++network_manager_constructed (GObject *object) ++{ ++ network_manager_connect (E_CONNMAN (object)); ++} ++ ++static void ++e_connman_class_init (EConnManClass *class) ++{ ++ GObjectClass *object_class; ++ EExtensionClass *extension_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = network_manager_constructed; ++ ++ extension_class = E_EXTENSION_CLASS (class); ++ extension_class->extensible_type = E_TYPE_SHELL; ++} ++ ++static void ++e_connman_class_finalize (EConnManClass *class) ++{ ++} ++ ++static void ++e_connman_init (EConnMan *extension) ++{ ++} ++ ++G_MODULE_EXPORT void ++e_module_load (GTypeModule *type_module) ++{ ++ e_connman_register_type (type_module); ++} ++ ++G_MODULE_EXPORT void ++e_module_unload (GTypeModule *type_module) ++{ ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/connman/Makefile.am evolution-2.30.3.new//modules/connman/Makefile.am +--- evolution-2.30.3//modules/connman/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/connman/Makefile.am 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,22 @@ ++module_LTLIBRARIES = libevolution-module-connman.la ++ ++libevolution_module_connman_la_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -I$(top_srcdir) \ ++ -DG_LOG_DOMAIN=\"evolution-connman\" \ ++ $(GNOME_PLATFORM_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) ++ ++libevolution_module_connman_la_SOURCES = \ ++ evolution-connman.c ++ ++libevolution_module_connman_la_LIBADD = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ ++ $(GNOME_PLATFORM_LIBS) \ ++ $(DBUS_GLIB_LIBS) ++ ++libevolution_module_connman_la_LDFLAGS = \ ++ -module -avoid-version $(NO_UNDEFINED) ++ ++-include $(top_srcdir)/git.mk +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-config-format-html.c evolution-2.30.3.new//modules/mail/e-mail-config-format-html.c +--- evolution-2.30.3//modules/mail/e-mail-config-format-html.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/mail/e-mail-config-format-html.c 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,93 @@ ++/* ++ * e-mail-config-format-html.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-mail-config-format-html.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++mail_config_format_html_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new_full ( ++ shell_settings, "mail-citation-color", ++ extensible, "citation-color", ++ e_binding_transform_string_to_color, ++ NULL, NULL); ++ ++ e_binding_new ( ++ shell_settings, "mail-image-loading-policy", ++ extensible, "image-loading-policy"); ++ ++ e_binding_new ( ++ shell_settings, "mail-only-local-photos", ++ extensible, "only-local-photos"); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-sender-photo", ++ extensible, "show-sender-photo"); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-real-date", ++ extensible, "show-real-date"); ++} ++ ++static void ++mail_config_format_html_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = mail_config_format_html_constructed; ++ ++ class->extensible_type = EM_TYPE_FORMAT_HTML; ++} ++ ++void ++e_mail_config_format_html_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) mail_config_format_html_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "EMailConfigFormatHTML", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-config-format-html.h evolution-2.30.3.new//modules/mail/e-mail-config-format-html.h +--- evolution-2.30.3//modules/mail/e-mail-config-format-html.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/mail/e-mail-config-format-html.h 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-mail-config-format-html.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_MAIL_CONFIG_FORMAT_HTML_H ++#define E_MAIL_CONFIG_FORMAT_HTML_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_mail_config_format_html_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_MAIL_CONFIG_FORMAT_HTML_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-config-web-view.c evolution-2.30.3.new//modules/mail/e-mail-config-web-view.c +--- evolution-2.30.3//modules/mail/e-mail-config-web-view.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/mail/e-mail-config-web-view.c 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,100 @@ ++/* ++ * e-mail-config-web-view.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-mail-config-web-view.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++mail_config_web_view_realize (GtkWidget *widget) ++{ ++ EShell *shell; ++ EShellSettings *shell_settings; ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-animated-images", ++ widget, "animate"); ++ ++ e_binding_new ( ++ shell_settings, "composer-inline-spelling", ++ widget, "inline-spelling"); ++ ++ e_binding_new ( ++ shell_settings, "composer-magic-links", ++ widget, "magic-links"); ++ ++ e_binding_new ( ++ shell_settings, "composer-magic-smileys", ++ widget, "magic-smileys"); ++} ++ ++static void ++mail_config_web_view_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ /* Wait to bind shell settings until the EWebView is realized ++ * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI. ++ * Otherwise our settings will have no effect. */ ++ ++ g_signal_connect ( ++ extensible, "realize", ++ G_CALLBACK (mail_config_web_view_realize), NULL); ++} ++ ++static void ++mail_config_web_view_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = mail_config_web_view_constructed; ++ ++ class->extensible_type = E_TYPE_WEB_VIEW; ++} ++ ++void ++e_mail_config_web_view_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) mail_config_web_view_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "EMailConfigWebView", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-config-web-view.h evolution-2.30.3.new//modules/mail/e-mail-config-web-view.h +--- evolution-2.30.3//modules/mail/e-mail-config-web-view.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//modules/mail/e-mail-config-web-view.h 2010-09-01 19:18:57.613184001 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-mail-config-web-view.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_MAIL_CONFIG_WEB_VIEW_H ++#define E_MAIL_CONFIG_WEB_VIEW_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_mail_config_web_view_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_MAIL_CONFIG_WEB_VIEW_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-shell-backend.c evolution-2.30.3.new//modules/mail/e-mail-shell-backend.c +--- evolution-2.30.3//modules/mail/e-mail-shell-backend.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/e-mail-shell-backend.c 2010-09-01 19:18:57.613184001 +0200 +@@ -409,32 +409,28 @@ + GtkWindow *window, + EShellBackend *shell_backend) + { +- EShellSettings *shell_settings; + static gboolean first_time = TRUE; + const gchar *backend_name; + +- shell_settings = e_shell_get_shell_settings (shell); +- + /* This applies to both the composer and signature editor. */ + if (GTKHTML_IS_EDITOR (window)) { ++ EShellSettings *shell_settings; + GList *spell_languages; +- +- e_binding_new ( +- shell_settings, "composer-inline-spelling", +- window, "inline-spelling"); +- +- e_binding_new ( +- shell_settings, "composer-magic-links", +- window, "magic-links"); +- +- e_binding_new ( +- shell_settings, "composer-magic-smileys", +- window, "magic-smileys"); ++ gboolean active = TRUE; + + spell_languages = e_load_spell_languages (); + gtkhtml_editor_set_spell_languages ( + GTKHTML_EDITOR (window), spell_languages); + g_list_free (spell_languages); ++ ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /* Express mode does not honor this setting. */ ++ if (!e_shell_get_express_mode (shell)) ++ active = e_shell_settings_get_boolean ( ++ shell_settings, "composer-format-html"); ++ ++ gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + } + + if (E_IS_MSG_COMPOSER (window)) { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-shell-content.c evolution-2.30.3.new//modules/mail/e-mail-shell-content.c +--- evolution-2.30.3//modules/mail/e-mail-shell-content.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/e-mail-shell-content.c 2010-09-01 19:18:57.613184001 +0200 +@@ -608,7 +608,7 @@ + key = STATE_KEY_GROUP_BY_THREADS; + value = g_key_file_get_boolean (key_file, group_name, key, &error); + if (error != NULL) { +- value = FALSE; ++ value = TRUE; + g_clear_error (&error); + } + +@@ -868,6 +868,7 @@ + EShellSearchbar * + e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -875,7 +876,8 @@ + E_IS_MAIL_SHELL_CONTENT (mail_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (mail_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/e-mail-shell-sidebar.c evolution-2.30.3.new//modules/mail/e-mail-shell-sidebar.c +--- evolution-2.30.3//modules/mail/e-mail-shell-sidebar.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/e-mail-shell-sidebar.c 2010-09-01 19:18:57.613184001 +0200 +@@ -201,11 +201,12 @@ + #else + if (toplevel && GTK_WIDGET_REALIZED (toplevel)) + #endif +- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (toplevel)); ++ monitor = gdk_screen_get_monitor_at_window ( ++ screen, gtk_widget_get_window (toplevel)); + else { + /* We don't know in which monitor the window manager +- * will put us. So we will just use the geometry of the +- * first monitor. ++ * will put us. So we will just use the geometry of ++ * the first monitor. + */ + monitor = 0; + } +@@ -256,7 +257,8 @@ + + screen_width = guess_screen_width (sidebar); + +- border = 2 * style->xthickness + 4; /* Thickness of frame shadow plus some slack for padding */ ++ /* Thickness of frame shadow plus some slack for padding. */ ++ border = 2 * style->xthickness + 4; + sidebar_width = ink_rect.width + border; + sidebar_width = MIN (sidebar_width, screen_width / 4); + requisition->width = MAX (requisition->width, sidebar_width); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/em-composer-prefs.c evolution-2.30.3.new//modules/mail/em-composer-prefs.c +--- evolution-2.30.3//modules/mail/em-composer-prefs.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/em-composer-prefs.c 2010-09-01 19:18:57.617184001 +0200 +@@ -36,6 +36,7 @@ + + #include "em-composer-prefs.h" + #include "composer/e-msg-composer.h" ++#include "shell/e-shell-utils.h" + + #include + +@@ -398,10 +399,15 @@ + /* General tab */ + + /* Default Behavior */ ++ ++ /* Express mode does not honor this setting. */ + widget = e_builder_get_widget (prefs->builder, "chkSendHTML"); +- e_mutual_binding_new ( +- shell_settings, "composer-format-html", +- widget, "active"); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (widget); ++ else ++ e_mutual_binding_new ( ++ shell_settings, "composer-format-html", ++ widget, "active"); + + widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject"); + e_mutual_binding_new ( +@@ -517,9 +523,11 @@ + widget, "editor-created", + G_CALLBACK (e_shell_watch_window), shell); + +- e_binding_new ( +- shell_settings, "composer-format-html", +- widget, "prefer-html"); ++ /* Express mode does not honor this setting. */ ++ if (!e_shell_get_express_mode (shell)) ++ e_binding_new ( ++ shell_settings, "composer-format-html", ++ widget, "prefer-html"); + + #ifndef G_OS_WIN32 + e_binding_new_with_negation ( +@@ -545,6 +553,14 @@ + signature_tree_view, "selected", + widget, "signature"); + ++ /* Sanitize the dialog for Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "chkOutlookFilenames", ++ "vboxTopPosting", ++ "labelAlerts", ++ "chkPromptEmptySubject", ++ NULL); ++ + /* get our toplevel widget */ + target = em_config_target_new_prefs (ec, client); + e_config_set_target ((EConfig *)ec, (EConfigTarget *)target); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/em-mailer-prefs.c evolution-2.30.3.new//modules/mail/em-mailer-prefs.c +--- evolution-2.30.3//modules/mail/em-mailer-prefs.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/em-mailer-prefs.c 2010-09-01 19:18:57.617184001 +0200 +@@ -43,6 +43,7 @@ + #include "e-util/e-datetime-format.h" + #include "e-util/e-util-private.h" + #include "widgets/misc/e-charset-combo-box.h" ++#include "shell/e-shell-utils.h" + + #include "e-mail-label-manager.h" + #include "e-mail-reader-utils.h" +@@ -1207,6 +1208,15 @@ + g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs); + g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs); + ++ /* Sanitize the dialog for Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "hboxReadTimeout", ++ "hboxMailSizeLimit", ++ "hboxShrinkAddresses", ++ "magic_spacebar_checkbox", ++ "hboxEnableSearchFolders", ++ NULL); ++ + /* get our toplevel widget */ + target = em_config_target_new_prefs(ec, prefs->gconf); + e_config_set_target((EConfig *)ec, (EConfigTarget *)target); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/evolution-module-mail.c evolution-2.30.3.new//modules/mail/evolution-module-mail.c +--- evolution-2.30.3//modules/mail/evolution-module-mail.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/evolution-module-mail.c 2010-09-01 19:18:57.617184001 +0200 +@@ -30,6 +30,9 @@ + #include "e-mail-shell-sidebar.h" + #include "e-mail-shell-view.h" + ++#include "e-mail-config-format-html.h" ++#include "e-mail-config-web-view.h" ++ + /* Module Entry Points */ + void e_module_load (GTypeModule *type_module); + void e_module_unload (GTypeModule *type_module); +@@ -50,6 +53,9 @@ + e_mail_shell_content_register_type (type_module); + e_mail_shell_sidebar_register_type (type_module); + e_mail_shell_view_register_type (type_module); ++ ++ e_mail_config_format_html_register_type (type_module); ++ e_mail_config_web_view_register_type (type_module); + } + + G_MODULE_EXPORT void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/mail/Makefile.am evolution-2.30.3.new//modules/mail/Makefile.am +--- evolution-2.30.3//modules/mail/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.3.new//modules/mail/Makefile.am 2010-09-01 19:18:57.617184001 +0200 +@@ -17,8 +17,12 @@ + evolution-module-mail.c \ + e-mail-attachment-handler.c \ + e-mail-attachment-handler.h \ ++ e-mail-config-format-html.c \ ++ e-mail-config-format-html.h \ + e-mail-config-hook.c \ + e-mail-config-hook.h \ ++ e-mail-config-web-view.c \ ++ e-mail-config-web-view.h \ + e-mail-event-hook.c \ + e-mail-event-hook.h \ + e-mail-junk-hook.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/Makefile.am evolution-2.30.3.new//modules/Makefile.am +--- evolution-2.30.3//modules/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.3.new//modules/Makefile.am 2010-09-01 19:18:57.617184001 +0200 +@@ -10,6 +10,10 @@ + NETWORK_MANAGER_DIR = network-manager + endif + ++if ENABLE_CONNMAN ++CONNMAN_DIR = connman ++endif ++ + if ENABLE_WINDOWS_SENS + WINDOWS_SENS_DIR = windows-sens + endif +@@ -22,6 +26,7 @@ + $(MONO_DIR) \ + $(PYTHON_DIR) \ + $(NETWORK_MANAGER_DIR) \ +- $(WINDOWS_SENS_DIR) ++ $(WINDOWS_SENS_DIR) \ ++ $(CONNMAN_DIR) + + -include $(top_srcdir)/git.mk +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//modules/network-manager/Makefile.am evolution-2.30.3.new//modules/network-manager/Makefile.am +--- evolution-2.30.3//modules/network-manager/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.3.new//modules/network-manager/Makefile.am 2010-09-01 19:18:57.617184001 +0200 +@@ -12,8 +12,8 @@ + evolution-network-manager.c + + libevolution_module_network_manager_la_LIBADD = \ +- $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(GNOME_PLATFORM_LIBS) \ + $(DBUS_GLIB_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/bbdb/gaimbuddies.c evolution-2.30.3.new//plugins/bbdb/gaimbuddies.c +--- evolution-2.30.3//plugins/bbdb/gaimbuddies.c 2010-06-20 14:14:43.000000000 +0200 ++++ evolution-2.30.3.new//plugins/bbdb/gaimbuddies.c 2010-09-01 19:18:57.617184001 +0200 +@@ -40,7 +40,6 @@ + #include + + #include +-#include + #include + + #include +@@ -75,15 +74,29 @@ + static gchar * + get_md5_as_string (const gchar *filename) + { +- guchar d[16]; ++ GMappedFile *mapped_file; ++ const gchar *contents; ++ gchar *digest; ++ gsize length; ++ GError *error = NULL; + + g_return_val_if_fail (filename != NULL, NULL); + +- md5_get_digest_from_file (filename, d); ++ mapped_file = g_mapped_file_new (filename, FALSE, &error); ++ if (mapped_file == NULL) { ++ g_warning ("%s", error->message); ++ return NULL; ++ } + +- return g_strdup_printf ("%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x", +- d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], +- d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); ++ contents = g_mapped_file_get_contents (mapped_file); ++ length = g_mapped_file_get_length (mapped_file); ++ ++ digest = g_compute_checksum_for_data ( ++ G_CHECKSUM_MD5, (guchar *) contents, length); ++ ++ g_mapped_file_unref (mapped_file); ++ ++ return digest; + } + + void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/bogo-junk-plugin/bf-junk-filter.c evolution-2.30.3.new//plugins/bogo-junk-plugin/bf-junk-filter.c +--- evolution-2.30.3//plugins/bogo-junk-plugin/bf-junk-filter.c 2010-06-20 14:14:44.000000000 +0200 ++++ evolution-2.30.3.new//plugins/bogo-junk-plugin/bf-junk-filter.c 2010-09-01 19:18:57.617184001 +0200 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include "shell/e-shell.h" + + #ifndef BOGOFILTER_BINARY + #define BOGOFILTER_BINARY "/usr/bin/bogofilter" +@@ -388,6 +389,7 @@ + GtkWidget * + org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) + { ++ EShell *shell; + GtkWidget *check; + guint i = ((GtkTable *)data->parent)->nrows; + +@@ -399,7 +401,13 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); + gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); +- gtk_widget_show (check); +- return (GtkWidget *)check; ++ ++ shell = e_shell_get_default (); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (check); ++ else ++ gtk_widget_show (check); ++ ++ return check; + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/bogo-junk-plugin/Makefile.am evolution-2.30.3.new//plugins/bogo-junk-plugin/Makefile.am +--- evolution-2.30.3//plugins/bogo-junk-plugin/Makefile.am 2010-03-18 15:14:02.000000000 +0100 ++++ evolution-2.30.3.new//plugins/bogo-junk-plugin/Makefile.am 2010-09-01 19:18:57.617184001 +0200 +@@ -18,6 +18,7 @@ + liborg_gnome_bogo_junk_plugin_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/groupwise-features/share-folder-common.c evolution-2.30.3.new//plugins/groupwise-features/share-folder-common.c +--- evolution-2.30.3//plugins/groupwise-features/share-folder-common.c 2010-06-20 14:14:43.000000000 +0200 ++++ evolution-2.30.3.new//plugins/groupwise-features/share-folder-common.c 2010-09-01 19:18:57.617184001 +0200 +@@ -138,7 +138,7 @@ + static gchar * + create_folder_desc (struct _EMCreateFolder *m) + { +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); ++ return g_strdup_printf (_("Creating folder '%s'"), m->full_name); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/profiler/profiler.c evolution-2.30.3.new//plugins/profiler/profiler.c +--- evolution-2.30.3//plugins/profiler/profiler.c 2010-06-20 14:14:42.000000000 +0200 ++++ evolution-2.30.3.new//plugins/profiler/profiler.c 2010-09-01 19:18:57.617184001 +0200 +@@ -45,7 +45,7 @@ + name = g_strdup_printf("eprofile.%ld", (glong) getpid()); + fp = fopen(name, "w"); + if (fp) +- fprintf(stderr, "Generating profiling data in `%s'\n", name); ++ fprintf(stderr, "Generating profiling data in '%s'\n", name); + g_free(name); + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/pst-import/pst-importer.c evolution-2.30.3.new//plugins/pst-import/pst-importer.c +--- evolution-2.30.3//plugins/pst-import/pst-importer.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.3.new//plugins/pst-import/pst-importer.c 2010-09-01 19:18:57.617184001 +0200 +@@ -453,7 +453,7 @@ + filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); + m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ + +- camel_operation_start (NULL, _("Importing `%s'"), filename); ++ camel_operation_start (NULL, _("Importing '%s'"), filename); + + if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-mail"))) { + mail_tool_uri_to_folder (m->parent_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); +@@ -559,7 +559,7 @@ + + if (item->folder != NULL) { + pst_process_folder (m, item); +- camel_operation_start (NULL, _("Importing `%s'"), item->file_as.str); ++ camel_operation_start (NULL, _("Importing '%s'"), item->file_as.str); + } else { + if (m->folder_count && (m->current_item < m->folder_count)) { + camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/sa-junk-plugin/em-junk-filter.c evolution-2.30.3.new//plugins/sa-junk-plugin/em-junk-filter.c +--- evolution-2.30.3//plugins/sa-junk-plugin/em-junk-filter.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.3.new//plugins/sa-junk-plugin/em-junk-filter.c 2010-09-01 19:18:57.621184001 +0200 +@@ -47,6 +47,7 @@ + + #include + #include "mail/em-config.h" ++#include "shell/e-shell.h" + + #include + +@@ -926,6 +927,7 @@ + GtkWidget * + org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) + { ++ EShell *shell; + GtkWidget *check, *vbox, *label; + gchar *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); + guint i = ((GtkTable *)data->parent)->nrows; +@@ -944,7 +946,13 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); + gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); +- gtk_widget_show_all (vbox); +- return (GtkWidget *)vbox; ++ ++ shell = e_shell_get_default (); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (vbox); ++ else ++ gtk_widget_show_all (vbox); ++ ++ return vbox; + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/sa-junk-plugin/Makefile.am evolution-2.30.3.new//plugins/sa-junk-plugin/Makefile.am +--- evolution-2.30.3//plugins/sa-junk-plugin/Makefile.am 2010-03-18 15:14:03.000000000 +0100 ++++ evolution-2.30.3.new//plugins/sa-junk-plugin/Makefile.am 2010-09-01 19:18:57.621184001 +0200 +@@ -18,6 +18,7 @@ + liborg_gnome_sa_junk_plugin_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//plugins/startup-wizard/startup-wizard.c evolution-2.30.3.new//plugins/startup-wizard/startup-wizard.c +--- evolution-2.30.3//plugins/startup-wizard/startup-wizard.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.3.new//plugins/startup-wizard/startup-wizard.c 2010-09-01 19:18:57.621184001 +0200 +@@ -60,12 +60,21 @@ + void + startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) + { ++ EShell *shell; + GtkWidget *start_page; + GtkLabel *start_page_label; + GConfClient *client; + GSList *accounts; + EConfig *config; + EMAccountEditor *emae; ++ const gchar *req_view; ++ ++ shell = e_shell_get_default (); ++ req_view = e_shell_get_startup_view (shell); ++ ++ if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) { ++ return; ++ } + + client = gconf_client_get_default (); + accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); +@@ -78,7 +87,7 @@ + return; + } + +- if (e_shell_get_express_mode (e_shell_get_default ())) { ++ if (e_shell_get_express_mode (shell)) { + start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE); + gtk_widget_show (start_page); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-backend.c evolution-2.30.3.new//shell/e-shell-backend.c +--- evolution-2.30.3//shell/e-shell-backend.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-backend.c 2010-09-01 19:18:57.621184001 +0200 +@@ -21,6 +21,12 @@ + * Copyright (C) 2009 Intel Corporation + */ + ++/** ++ * SECTION: e-shell-backend ++ * @short_description: dynamically loaded capabilities ++ * @include: shell/e-shell-backend.h ++ **/ ++ + #include "e-shell-backend.h" + + #include +@@ -37,8 +43,6 @@ + + struct _EShellBackendPrivate { + +- gpointer shell; /* weak pointer */ +- + /* We keep a reference to corresponding EShellView subclass + * since it keeps a reference back to us. This ensures the + * subclass is not finalized before we are, otherwise it +@@ -52,63 +56,38 @@ + }; + + enum { +- PROP_0, +- PROP_SHELL +-}; +- +-enum { + ACTIVITY_ADDED, + LAST_SIGNAL + }; + +-static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +-static void +-shell_backend_set_shell (EShellBackend *shell_backend, +- EShell *shell) +-{ +- g_return_if_fail (shell_backend->priv->shell == NULL); ++G_DEFINE_ABSTRACT_TYPE (EShellBackend, e_shell_backend, E_TYPE_EXTENSION) + +- shell_backend->priv->shell = shell; +- +- g_object_add_weak_pointer ( +- G_OBJECT (shell_backend), +- &shell_backend->priv->shell); +-} ++static GObject * ++shell_backend_constructor (GType type, ++ guint n_construct_properties, ++ GObjectConstructParam *construct_properties) ++{ ++ EShellBackendPrivate *priv; ++ EShellBackendClass *class; ++ EShellViewClass *shell_view_class; ++ GObject *object; + +-static void +-shell_backend_set_property (GObject *object, +- guint property_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- switch (property_id) { +- case PROP_SHELL: +- shell_backend_set_shell ( +- E_SHELL_BACKEND (object), +- g_value_get_object (value)); +- return; +- } ++ /* Chain up to parent's construct() method. */ ++ object = G_OBJECT_CLASS (e_shell_backend_parent_class)->constructor ( ++ type, n_construct_properties, construct_properties); + +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +-} ++ class = E_SHELL_BACKEND_GET_CLASS (object); ++ priv = E_SHELL_BACKEND_GET_PRIVATE (object); + +-static void +-shell_backend_get_property (GObject *object, +- guint property_id, +- GValue *value, +- GParamSpec *pspec) +-{ +- switch (property_id) { +- case PROP_SHELL: +- g_value_set_object ( +- value, e_shell_backend_get_shell ( +- E_SHELL_BACKEND (object))); +- return; +- } ++ /* Install a reference to ourselves in the ++ * corresponding EShellViewClass structure. */ ++ shell_view_class = g_type_class_ref (class->shell_view_type); ++ shell_view_class->shell_backend = g_object_ref (object); ++ priv->shell_view_class = shell_view_class; + +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++ return object; + } + + static void +@@ -118,19 +97,13 @@ + + priv = E_SHELL_BACKEND_GET_PRIVATE (object); + +- if (priv->shell != NULL) { +- g_object_remove_weak_pointer ( +- G_OBJECT (priv->shell), &priv->shell); +- priv->shell = NULL; +- } +- + if (priv->shell_view_class != NULL) { + g_type_class_unref (priv->shell_view_class); + priv->shell_view_class = NULL; + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_backend_parent_class)->dispose (object); + } + + static void +@@ -144,7 +117,7 @@ + g_free (priv->data_dir); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_backend_parent_class)->finalize (object); + } + + static const gchar * +@@ -189,39 +162,25 @@ + } + + static void +-shell_backend_class_init (EShellBackendClass *class) ++e_shell_backend_class_init (EShellBackendClass *class) + { + GObjectClass *object_class; ++ EExtensionClass *extension_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellBackendPrivate)); + + object_class = G_OBJECT_CLASS (class); +- object_class->set_property = shell_backend_set_property; +- object_class->get_property = shell_backend_get_property; ++ object_class->constructor = shell_backend_constructor; + object_class->dispose = shell_backend_dispose; + object_class->finalize = shell_backend_finalize; + ++ extension_class = E_EXTENSION_CLASS (class); ++ extension_class->extensible_type = E_TYPE_SHELL; ++ + class->get_config_dir = shell_backend_get_config_dir; + class->get_data_dir = shell_backend_get_data_dir; + + /** +- * EShellBackend:shell +- * +- * The #EShell singleton. +- **/ +- g_object_class_install_property ( +- object_class, +- PROP_SHELL, +- g_param_spec_object ( +- "shell", +- _("Shell"), +- _("The EShell singleton"), +- E_TYPE_SHELL, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- /** + * EShellBackend::activity-added + * @shell_backend: the #EShellBackend that emitted the signal + * @activity: an #EActivity +@@ -239,44 +198,9 @@ + } + + static void +-shell_backend_init (EShellBackend *shell_backend, +- EShellBackendClass *class) ++e_shell_backend_init (EShellBackend *shell_backend) + { +- EShellViewClass *shell_view_class; +- + shell_backend->priv = E_SHELL_BACKEND_GET_PRIVATE (shell_backend); +- +- /* Install a reference to ourselves in the corresponding +- * EShellViewClass structure, */ +- shell_view_class = g_type_class_ref (class->shell_view_type); +- shell_view_class->shell_backend = g_object_ref (shell_backend); +- shell_backend->priv->shell_view_class = shell_view_class; +-} +- +-GType +-e_shell_backend_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- const GTypeInfo type_info = { +- sizeof (EShellBackendClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_backend_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellBackend), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_backend_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- G_TYPE_OBJECT, "EShellBackend", &type_info, 0); +- } +- +- return type; + } + + /** +@@ -358,9 +282,13 @@ + EShell * + e_shell_backend_get_shell (EShellBackend *shell_backend) + { ++ EExtensible *extensible; ++ + g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), NULL); + +- return E_SHELL (shell_backend->priv->shell); ++ extensible = e_extension_get_extensible (E_EXTENSION (shell_backend)); ++ ++ return E_SHELL (extensible); + } + + /** +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-backend.h evolution-2.30.3.new//shell/e-shell-backend.h +--- evolution-2.30.3//shell/e-shell-backend.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-backend.h 2010-09-01 19:18:57.621184001 +0200 +@@ -19,17 +19,12 @@ + * + */ + +-/** +- * SECTION: e-shell-backend +- * @short_description: dynamically loaded capabilities +- * @include: shell/e-shell-backend.h +- **/ +- + #ifndef E_SHELL_BACKEND_H + #define E_SHELL_BACKEND_H + + #include + #include ++#include + + /* Standard GObject macros */ + #define E_TYPE_SHELL_BACKEND \ +@@ -66,7 +61,7 @@ + * functions below. + **/ + struct _EShellBackend { +- GObject parent; ++ EExtension parent; + EShellBackendPrivate *priv; + }; + +@@ -100,7 +95,7 @@ + * #EShellBackendClass contains a number of important settings for subclasses. + **/ + struct _EShellBackendClass { +- GObjectClass parent_class; ++ EExtensionClass parent_class; + + GType shell_view_type; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell.c evolution-2.30.3.new//shell/e-shell.c +--- evolution-2.30.3//shell/e-shell.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell.c 2010-09-01 19:18:57.621184001 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell ++ * @short_description: the backbone of Evolution ++ * @include: shell/e-shell.h ++ **/ ++ + #include "e-shell.h" + + #include +@@ -46,7 +52,7 @@ + GtkWidget *preferences_window; + + /* Shell Backends */ +- GList *loaded_backends; ++ GList *loaded_backends; /* not referenced */ + GHashTable *backends_by_name; + GHashTable *backends_by_scheme; + +@@ -56,17 +62,23 @@ + gchar *geometry; + gchar *module_directory; + ++ gchar *startup_view; ++ + guint auto_reconnect : 1; + guint network_available : 1; + guint online : 1; + guint quit_cancelled : 1; + guint safe_mode : 1; + guint express_mode : 1; ++ guint meego_mode : 1; ++ guint small_screen_mode : 1; + }; + + enum { + PROP_0, + PROP_EXPRESS_MODE, ++ PROP_MEEGO_MODE, ++ PROP_SMALL_SCREEN_MODE, + PROP_GEOMETRY, + PROP_MODULE_DIRECTORY, + PROP_NETWORK_AVAILABLE, +@@ -401,23 +413,14 @@ + } + + static void +-shell_add_backend (GType type, +- EShell *shell) ++shell_process_backend (EShellBackend *shell_backend, ++ EShell *shell) + { + EShellBackendClass *class; +- EShellBackend *shell_backend; + GHashTable *backends_by_name; + GHashTable *backends_by_scheme; + const gchar *string; + +- shell_backend = g_object_new (type, "shell", shell, NULL); +- +- shell->priv->loaded_backends = g_list_insert_sorted ( +- shell->priv->loaded_backends, shell_backend, +- (GCompareFunc) e_shell_backend_compare); +- +- /* Bookkeeping */ +- + class = E_SHELL_BACKEND_GET_CLASS (shell_backend); + backends_by_name = shell->priv->backends_by_name; + backends_by_scheme = shell->priv->backends_by_scheme; +@@ -474,6 +477,18 @@ + } + + static void ++shell_set_meego_mode (EShell *shell, gboolean is_meego) ++{ ++ shell->priv->meego_mode = is_meego; ++} ++ ++static void ++shell_set_small_screen_mode (EShell *shell, gboolean small_screen) ++{ ++ shell->priv->small_screen_mode = small_screen; ++} ++ ++static void + shell_set_geometry (EShell *shell, + const gchar *geometry) + { +@@ -504,6 +519,18 @@ + g_value_get_boolean (value)); + return; + ++ case PROP_MEEGO_MODE: ++ shell_set_meego_mode ( ++ E_SHELL (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_SMALL_SCREEN_MODE: ++ shell_set_small_screen_mode ( ++ E_SHELL (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_GEOMETRY: + shell_set_geometry ( + E_SHELL (object), +@@ -545,6 +572,18 @@ + E_SHELL (object))); + return; + ++ case PROP_MEEGO_MODE: ++ g_value_set_boolean ( ++ value, e_shell_get_meego_mode ( ++ E_SHELL (object))); ++ return; ++ ++ case PROP_SMALL_SCREEN_MODE: ++ g_value_set_boolean ( ++ value, e_shell_get_small_screen_mode ( ++ E_SHELL (object))); ++ return; ++ + case PROP_MODULE_DIRECTORY: + g_value_set_string ( + value, e_shell_get_module_directory ( +@@ -580,6 +619,11 @@ + + priv = E_SHELL_GET_PRIVATE (object); + ++ if (priv->startup_view != NULL) { ++ g_free (priv->startup_view); ++ priv->startup_view = NULL; ++ } ++ + if (priv->settings != NULL) { + g_object_unref (priv->settings); + priv->settings = NULL; +@@ -595,10 +639,6 @@ + priv->preferences_window = NULL; + } + +- g_list_foreach (priv->loaded_backends, (GFunc) g_object_unref, NULL); +- g_list_free (priv->loaded_backends); +- priv->loaded_backends = NULL; +- + if (priv->preparing_for_line_change != NULL) { + g_object_remove_weak_pointer ( + G_OBJECT (priv->preparing_for_line_change), +@@ -623,6 +663,8 @@ + if (!unique_app_is_running (UNIQUE_APP (object))) + e_file_lock_destroy (); + ++ g_list_free (priv->loaded_backends); ++ + g_free (priv->geometry); + g_free (priv->module_directory); + +@@ -634,6 +676,7 @@ + shell_constructed (GObject *object) + { + EShellPrivate *priv; ++ GList *list; + + priv = E_SHELL_GET_PRIVATE (object); + +@@ -653,11 +696,13 @@ + + shell_load_modules (E_SHELL (object)); + +- e_type_traverse ( +- E_TYPE_SHELL_BACKEND, (ETypeFunc) +- shell_add_backend, object); +- +- e_extensible_load_extensions (E_EXTENSIBLE (object)); ++ /* Process shell backends. */ ++ list = g_list_sort ( ++ e_extensible_list_extensions ( ++ E_EXTENSIBLE (object), E_TYPE_SHELL_BACKEND), ++ (GCompareFunc) e_shell_backend_compare); ++ g_list_foreach (list, (GFunc) shell_process_backend, object); ++ priv->loaded_backends = list; + } + + static UniqueResponse +@@ -791,6 +836,40 @@ + G_PARAM_CONSTRUCT_ONLY)); + + /** ++ * EShell:meego ++ * ++ * Are we running under meego - if so, adapt ourselves ++ * to fit in well with their theming. ++ **/ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MEEGO_MODE, ++ g_param_spec_boolean ( ++ "meego-mode", ++ "Meego Mode", ++ "Whether meego mode is enabled", ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY)); ++ ++ /** ++ * EShell:small-screen ++ * ++ * Are we running with a small (1024x600) screen - if so, start ++ * throwing the babies overboard to fit onto that screen size. ++ **/ ++ g_object_class_install_property ( ++ object_class, ++ PROP_SMALL_SCREEN_MODE, ++ g_param_spec_boolean ( ++ "small-screen-mode", ++ "Small Screen Mode", ++ "Whether we run on a rather small screen", ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY)); ++ ++ /** + * EShell:geometry + * + * User-specified initial window geometry string to apply +@@ -1081,6 +1160,8 @@ + shell->priv->backends_by_scheme = backends_by_scheme; + shell->priv->safe_mode = e_file_lock_exists (); + ++ shell->priv->startup_view = NULL; ++ + g_object_ref_sink (shell->priv->preferences_window); + + /* Add our icon directory to the theme's search path +@@ -1582,6 +1663,38 @@ + } + + /** ++ * e_shell_get_meego_mode: ++ * @shell: an #EShell ++ * ++ * Returns %TRUE if Evolution is in MeeGo mode. ++ * ++ * Returns: %TRUE if Evolution is in MeeGo mode ++ **/ ++gboolean ++e_shell_get_meego_mode (EShell *shell) ++{ ++ g_return_val_if_fail (E_IS_SHELL (shell), FALSE); ++ ++ return shell->priv->meego_mode; ++} ++ ++/** ++ * e_shell_get_small_screen_mode: ++ * @shell: an #EShell ++ * ++ * Returns %TRUE if Evolution is in small (netbook) screen mode. ++ * ++ * Returns: %TRUE if Evolution is in small screen mode ++ **/ ++gboolean ++e_shell_get_small_screen_mode (EShell *shell) ++{ ++ g_return_val_if_fail (E_IS_SHELL (shell), FALSE); ++ ++ return shell->priv->small_screen_mode; ++} ++ ++/** + * e_shell_get_module_directory: + * @shell: an #EShell + * +@@ -1799,3 +1912,49 @@ + + g_signal_stop_emission (shell, signals[QUIT_REQUESTED], 0); + } ++ ++/** ++ * e_shell_adapt_window_size: ++ * @shell: an #EShell ++ * @window: a #GtkWindow to adapt to full-screen ++ * ++ * This is used to adapt to window's size to be optimal for ++ * the platform. The shell settings are used to determine if ++ * a window should be set to full screen etc. ++ * ++ * This method is best called when the widget is realized on ++ * a given screen. ++ **/ ++void ++e_shell_adapt_window_size (EShell *shell, ++ GtkWindow *window) ++{ ++ gint monitor; ++ GdkScreen *scr; ++ GdkRectangle rect; ++ ++ if (!e_shell_get_meego_mode (shell) || ++ !e_shell_get_small_screen_mode (shell)) ++ return; ++ ++ scr = gdk_screen_get_default (); ++ monitor = gdk_screen_get_monitor_at_window (scr, GTK_WIDGET (window)->window); ++ gdk_screen_get_monitor_geometry (scr, monitor, &rect); ++ ++ gtk_window_set_default_size (window, rect.width, rect.height); ++ gtk_window_set_decorated (window, FALSE); ++ gtk_window_maximize (window); ++} ++ ++void ++e_shell_set_startup_view (EShell *shell, ++ const gchar *view) ++{ ++ shell->priv->startup_view = g_strdup(view); ++} ++ ++const gchar * ++e_shell_get_startup_view (EShell *shell) ++{ ++ return shell->priv->startup_view; ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-content.c evolution-2.30.3.new//shell/e-shell-content.c +--- evolution-2.30.3//shell/e-shell-content.c 2010-07-10 15:44:57.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-content.c 2010-09-01 19:18:57.621184001 +0200 +@@ -19,11 +19,18 @@ + * + */ + ++/** ++ * SECTION: e-shell-content ++ * @short_description: the right side of the main window ++ * @include: shell/e-shell-content.h ++ **/ ++ + #include "e-shell-content.h" + + #include + + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + #include "e-util/e-alert-dialog.h" + #include "filter/e-rule-editor.h" +@@ -41,9 +48,9 @@ + + struct _EShellContentPrivate { + +- gpointer shell_view; /* weak pointer */ ++ gpointer shell_view; /* weak pointer */ + +- GtkWidget *searchbar; ++ GtkWidget *searchbar; /* not referenced */ + + /* Custom search rules. */ + gchar *user_filename; +@@ -54,7 +61,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellContent, e_shell_content, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)); + + static void + shell_content_dialog_rule_changed (GtkWidget *dialog, +@@ -131,17 +140,15 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_content_parent_class)->dispose (object); + } + + static void + shell_content_constructed (GObject *object) + { +- EShellContentClass *class; + EShellContent *shell_content; + EShellBackend *shell_backend; + EShellView *shell_view; +- GtkWidget *widget; + const gchar *data_dir; + + shell_content = E_SHELL_CONTENT (object); +@@ -156,37 +163,7 @@ + shell_content->priv->user_filename = + g_build_filename (data_dir, "searches.xml", NULL); + +- class = E_SHELL_CONTENT_GET_CLASS (shell_content); +- if (class->construct_searchbar != NULL) +- widget = class->construct_searchbar (shell_content); +- else +- widget = NULL; +- if (widget != NULL) { +- gtk_widget_set_parent (widget, GTK_WIDGET (shell_content)); +- shell_content->priv->searchbar = g_object_ref (widget); +- gtk_widget_show (widget); +- } +-} +- +-static void +-shell_content_destroy (GtkObject *gtk_object) +-{ +- EShellContentPrivate *priv; +- +- priv = E_SHELL_CONTENT_GET_PRIVATE (gtk_object); +- +- /* Unparent the widget before destroying it to avoid +- * writing a custom GtkContainer::remove() method. */ +- +- if (priv->searchbar != NULL) { +- gtk_widget_unparent (priv->searchbar); +- gtk_widget_destroy (priv->searchbar); +- g_object_unref (priv->searchbar); +- priv->searchbar = NULL; +- } +- +- /* Chain up to parent's destroy() method. */ +- GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object); ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +@@ -251,6 +228,26 @@ + } + + static void ++shell_content_remove (GtkContainer *container, ++ GtkWidget *widget) ++{ ++ GtkContainerClass *container_class; ++ EShellContentPrivate *priv; ++ ++ priv = E_SHELL_CONTENT_GET_PRIVATE (container); ++ ++ if (widget == priv->searchbar) { ++ gtk_widget_unparent (priv->searchbar); ++ priv->searchbar = NULL; ++ return; ++ } ++ ++ /* Chain up to parent's remove() method. */ ++ container_class = GTK_CONTAINER_CLASS (e_shell_content_parent_class); ++ container_class->remove (container, widget); ++} ++ ++static void + shell_content_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, +@@ -265,51 +262,17 @@ + callback (priv->searchbar, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_content_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + +-static gchar * +-shell_content_get_search_name (EShellContent *shell_content) +-{ +- EShellSearchbar *searchbar; +- EShellView *shell_view; +- EFilterRule *rule; +- const gchar *search_text; +- +- shell_view = e_shell_content_get_shell_view (shell_content); +- +- rule = e_shell_view_get_search_rule (shell_view); +- g_return_val_if_fail (E_IS_FILTER_RULE (rule), NULL); +- +- searchbar = E_SHELL_SEARCHBAR (shell_content->priv->searchbar); +- search_text = e_shell_searchbar_get_search_text (searchbar); +- +- if (search_text == NULL || *search_text == '\0') +- search_text = "''"; +- +- return g_strdup_printf ("%s %s", rule->name, search_text); +-} +- +-static GtkWidget * +-shell_content_construct_searchbar (EShellContent *shell_content) +-{ +- EShellView *shell_view; +- +- shell_view = e_shell_content_get_shell_view (shell_content); +- +- return e_shell_searchbar_new (shell_view); +-} +- + static void +-shell_content_class_init (EShellContentClass *class) ++e_shell_content_class_init (EShellContentClass *class) + { + GObjectClass *object_class; +- GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellContentPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -318,19 +281,14 @@ + object_class->dispose = shell_content_dispose; + object_class->constructed = shell_content_constructed; + +- gtk_object_class = GTK_OBJECT_CLASS (class); +- gtk_object_class->destroy = shell_content_destroy; +- + widget_class = GTK_WIDGET_CLASS (class); + widget_class->size_request = shell_content_size_request; + widget_class->size_allocate = shell_content_size_allocate; + + container_class = GTK_CONTAINER_CLASS (class); ++ container_class->remove = shell_content_remove; + container_class->forall = shell_content_forall; + +- class->get_search_name = shell_content_get_search_name; +- class->construct_searchbar = shell_content_construct_searchbar; +- + /** + * EShellContent:shell-view + * +@@ -349,39 +307,13 @@ + } + + static void +-shell_content_init (EShellContent *shell_content) ++e_shell_content_init (EShellContent *shell_content) + { + shell_content->priv = E_SHELL_CONTENT_GET_PRIVATE (shell_content); + + GTK_WIDGET_SET_FLAGS (shell_content, GTK_NO_WINDOW); + } + +-GType +-e_shell_content_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellContentClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_content_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellContent), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_content_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellContent", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_content_new: + * @shell_view: an #EShellView +@@ -400,21 +332,34 @@ + } + + /** +- * e_shell_content_get_searchbar: ++ * e_shell_content_set_searchbar: + * @shell_content: an #EShellContent ++ * @searchbar: a #GtkWidget, or %NULL + * +- * Returns the search bar widget returned by the +- * construct_searchbar method in +- * #EShellContentClass. +- * +- * Returns: the search bar widget ++ * Packs @searchbar at the top of @shell_content. + **/ +-GtkWidget * +-e_shell_content_get_searchbar (EShellContent *shell_content) ++void ++e_shell_content_set_searchbar (EShellContent *shell_content, ++ GtkWidget *searchbar) + { +- g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL); ++ g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); ++ ++ if (searchbar != NULL) { ++ g_return_if_fail (GTK_IS_WIDGET (searchbar)); ++ g_object_ref_sink (searchbar); ++ } + +- return shell_content->priv->searchbar; ++ if (shell_content->priv->searchbar != NULL) ++ gtk_container_remove ( ++ GTK_CONTAINER (shell_content), ++ shell_content->priv->searchbar); ++ ++ shell_content->priv->searchbar = searchbar; ++ ++ if (searchbar != NULL) ++ gtk_widget_set_parent (searchbar, GTK_WIDGET (shell_content)); ++ ++ gtk_widget_queue_resize (GTK_WIDGET (shell_content)); + } + + /** +@@ -459,29 +404,6 @@ + return E_SHELL_VIEW (shell_content->priv->shell_view); + } + +-/** +- * e_shell_content_get_search_name: +- * @shell_content: an #EShellContent +- * +- * Returns a newly-allocated string containing a suitable name for the +- * current search criteria. This is used as the suggested name in the +- * Save Search dialog. Free the returned string with g_free(). +- * +- * Returns: a name for the current search criteria +- **/ +-gchar * +-e_shell_content_get_search_name (EShellContent *shell_content) +-{ +- EShellContentClass *class; +- +- g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL); +- +- class = E_SHELL_CONTENT_GET_CLASS (shell_content); +- g_return_val_if_fail (class->get_search_name != NULL, NULL); +- +- return class->get_search_name (shell_content); +-} +- + void + e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) + { +@@ -607,7 +529,7 @@ + g_return_if_fail (E_IS_FILTER_RULE (rule)); + rule = e_filter_rule_clone (rule); + +- search_name = e_shell_content_get_search_name (shell_content); ++ search_name = e_shell_view_get_search_name (shell_view); + e_filter_rule_set_name (rule, search_name); + g_free (search_name); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-content.h evolution-2.30.3.new//shell/e-shell-content.h +--- evolution-2.30.3//shell/e-shell-content.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-content.h 2010-09-01 19:18:57.621184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-content +- * @short_description: the right side of the main window +- * @include: shell/e-shell-content.h +- **/ +- + #ifndef E_SHELL_CONTENT_H + #define E_SHELL_CONTENT_H + +@@ -74,22 +68,18 @@ + + /* Methods */ + guint32 (*check_state) (EShellContent *shell_content); +- gchar * (*get_search_name) (EShellContent *shell_content); +- +- /* This is a protected method. Not for public use. */ +- GtkWidget * (*construct_searchbar) (EShellContent *shell_content); + }; + + GType e_shell_content_get_type (void); + GtkWidget * e_shell_content_new (struct _EShellView *shell_view); +-GtkWidget * e_shell_content_get_searchbar (EShellContent *shell_content); ++void e_shell_content_set_searchbar (EShellContent *shell_content, ++ GtkWidget *searchbar); + guint32 e_shell_content_check_state (EShellContent *shell_content); + struct _EShellView * + e_shell_content_get_shell_view (EShellContent *shell_content); + const gchar * e_shell_content_get_view_id (EShellContent *shell_content); + void e_shell_content_set_view_id (EShellContent *shell_content, + const gchar *view_id); +-gchar * e_shell_content_get_search_name (EShellContent *shell_content); + void e_shell_content_run_advanced_search_dialog + (EShellContent *shell_content); + void e_shell_content_run_edit_searches_dialog +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell.h evolution-2.30.3.new//shell/e-shell.h +--- evolution-2.30.3//shell/e-shell.h 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell.h 2010-09-01 19:18:57.621184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell +- * @short_description: the backbone of Evolution +- * @include: shell/e-shell.h +- **/ +- + #ifndef E_SHELL_H + #define E_SHELL_H + +@@ -114,7 +108,9 @@ + GtkWindow * e_shell_get_active_window (EShell *shell); + void e_shell_send_receive (EShell *shell, + GtkWindow *parent); ++gboolean e_shell_get_meego_mode (EShell *shell); + gboolean e_shell_get_express_mode (EShell *shell); ++gboolean e_shell_get_small_screen_mode (EShell *shell); + const gchar * e_shell_get_module_directory (EShell *shell); + gboolean e_shell_get_network_available (EShell *shell); + void e_shell_set_network_available (EShell *shell, +@@ -129,6 +125,12 @@ + gboolean e_shell_quit (EShell *shell); + void e_shell_cancel_quit (EShell *shell); + ++void e_shell_adapt_window_size (EShell *shell, ++ GtkWindow *window); ++void e_shell_set_startup_view (EShell *shell, ++ const gchar *view); ++const gchar * e_shell_get_startup_view (EShell *shell); ++ + G_END_DECLS + + #endif /* E_SHELL_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-meego.c evolution-2.30.3.new//shell/e-shell-meego.c +--- evolution-2.30.3//shell/e-shell-meego.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//shell/e-shell-meego.c 2010-09-01 19:18:57.621184001 +0200 +@@ -0,0 +1,157 @@ ++/* ++ * e-shell-meego.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * Inspired by mx's mx-application.c by ++ * Thomas Wood , ++ * Chris Lord ++ */ ++ ++#include ++#include ++ ++#ifndef G_OS_WIN32 ++#include ++#include ++#endif ++ ++#ifdef G_OS_WIN32 ++void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) ++{ ++ *is_meego = *small_screen = FALSE; ++} ++#else ++void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) ++{ ++ Window *wm_window_v = NULL; ++ guchar *moblin_string = NULL; ++ GModule *module = NULL; ++ /* ++ * Wow - this is unpleasant, but it is hard to link directly ++ * to the X libraries, and we have to use XGetWindowProperty ++ * to get to the (mind-mashed) 'supporting' window. ++ */ ++ struct { ++ gint (*XFree) (gpointer); ++ gint (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool, ++ Atom, Atom *, gint *, unsigned long*, ++ unsigned long*, guchar **); ++ } fns = { 0, 0 }; ++ ++ *is_meego = *small_screen = FALSE; ++ ++ moblin_string = (guchar *)g_getenv ("EVO_MEEGO"); ++ if (!moblin_string) { ++ GdkScreen *screen; ++ GdkDisplay *display; ++ GdkAtom wm_win, mob_atom; ++ Atom dummy_t; ++ unsigned long dummy_l; ++ gint dummy_i; ++ ++ if (!gdk_display_get_default ()) ++ return; ++ ++ wm_win = gdk_atom_intern ("_NET_SUPPORTING_WM_CHECK", TRUE); ++ mob_atom = gdk_atom_intern ("_MOBLIN", TRUE); ++ if (!wm_win || !mob_atom) ++ return; ++ ++ module = g_module_open (NULL, 0); ++ if (!module) ++ return; ++ g_module_symbol (module, "XFree", (gpointer) &fns.XFree); ++ g_module_symbol (module, "XGetWindowProperty", ++ (gpointer) &fns.XGetWindowProperty); ++ if (!fns.XFree || !fns.XGetWindowProperty) { ++ fprintf (stderr, "defective X server\n"); ++ goto exit; ++ } ++ ++ display = gdk_display_get_default (); ++ screen = gdk_display_get_default_screen (gdk_display_get_default()); ++ ++ gdk_error_trap_push (); ++ ++ /* get the window manager's supporting window */ ++ fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), ++ GDK_WINDOW_XID (gdk_screen_get_root_window (screen)), ++ gdk_x11_atom_to_xatom_for_display (display, wm_win), ++ 0, 1, False, XA_WINDOW, &dummy_t, &dummy_i, ++ &dummy_l, &dummy_l, (guchar **)(&wm_window_v)); ++ ++ /* get the '_Moblin' setting */ ++ if (wm_window_v && (*wm_window_v != None)) ++ fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v, ++ gdk_x11_atom_to_xatom_for_display (display, mob_atom), ++ 0, 8192, False, XA_STRING, ++ &dummy_t, &dummy_i, &dummy_l, &dummy_l, ++ &moblin_string); ++ ++ gdk_error_trap_pop (); ++ } ++ ++ if (moblin_string) { ++ gint i; ++ gchar **props; ++ ++ g_warning ("prop '%s'", moblin_string); ++ ++ /* use meego theming tweaks */ ++ *is_meego = TRUE; ++ ++ props = g_strsplit ((gchar *)moblin_string, ":", -1); ++ for (i = 0; props && props[i]; i++) { ++ gchar **pair = g_strsplit (props[i], "=", 2); ++ ++ g_warning ("pair '%s'='%s'", pair ? pair[0] : "", ++ pair && pair[0] ? pair[1] : ""); ++ ++ /* Hunt for session-type=small-screen */ ++ if (pair && pair[0] && !g_ascii_strcasecmp (pair[0], "session-type")) ++ *small_screen = !g_ascii_strcasecmp (pair[1], "small-screen"); ++ g_strfreev (pair); ++ } ++ g_strfreev (props); ++ if (fns.XFree) ++ fns.XFree (moblin_string); ++ } ++ ++ exit: ++ if (wm_window_v) ++ fns.XFree (wm_window_v); ++ if (module) ++ g_module_close (module); ++} ++#endif ++ ++#ifdef TEST_APP ++/* gcc -g -O0 -Wall -I. -DTEST_APP `pkg-config --cflags --libs gtk+-2.0` e-shell-meego.c && ./a.out */ ++#include ++ ++gint main (gint argc, gchar **argv) ++{ ++ gboolean is_meego, small_screen; ++ ++ gtk_init (&argc, &argv); ++ ++ e_shell_detect_meego (&is_meego, &small_screen); ++ fprintf (stderr, "Meego ? %d small ? %d\n", is_meego, small_screen); ++ ++ return 0; ++} ++#endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-meego.h evolution-2.30.3.new//shell/e-shell-meego.h +--- evolution-2.30.3//shell/e-shell-meego.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.3.new//shell/e-shell-meego.h 2010-09-01 19:18:57.625184001 +0200 +@@ -0,0 +1,24 @@ ++/* ++ * e-shell-meego.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ */ ++#ifndef E_SHELL_MEEGO_H ++#define E_SHELL_MEEGO_H ++ ++extern void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen); ++ ++#endif /* E_SHELL_MEEGO_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-searchbar.c evolution-2.30.3.new//shell/e-shell-searchbar.c +--- evolution-2.30.3//shell/e-shell-searchbar.c 2010-06-24 14:20:30.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-searchbar.c 2010-09-01 19:18:57.625184001 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-searchbar ++ * @short_description: quick search interface ++ * @include: shell/e-shell-searchbar.h ++ **/ ++ + #include "e-shell-searchbar.h" + + #include +@@ -26,6 +32,7 @@ + + #include "e-util/e-util.h" + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "widgets/misc/e-action-combo-box.h" + #include "widgets/misc/e-hinted-entry.h" + +@@ -60,8 +67,9 @@ + /* State Key File */ + gchar *state_group; + ++ guint express_mode : 1; + guint filter_visible : 1; +- guint label_visible : 1; ++ guint labels_visible : 1; + guint search_visible : 1; + guint scope_visible : 1; + guint state_dirty : 1; +@@ -69,9 +77,10 @@ + + enum { + PROP_0, ++ PROP_EXPRESS_MODE, + PROP_FILTER_COMBO_BOX, + PROP_FILTER_VISIBLE, +- PROP_LABEL_VISIBLE, ++ PROP_LABELS_VISIBLE, + PROP_SEARCH_HINT, + PROP_SEARCH_OPTION, + PROP_SEARCH_TEXT, +@@ -82,7 +91,9 @@ + PROP_STATE_GROUP + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSearchbar, e_shell_searchbar, GTK_TYPE_BOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_searchbar_save_search_filter (EShellSearchbar *searchbar) +@@ -465,14 +476,20 @@ + GParamSpec *pspec) + { + switch (property_id) { ++ case PROP_EXPRESS_MODE: ++ e_shell_searchbar_set_express_mode ( ++ E_SHELL_SEARCHBAR (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_FILTER_VISIBLE: + e_shell_searchbar_set_filter_visible ( + E_SHELL_SEARCHBAR (object), + g_value_get_boolean (value)); + return; + +- case PROP_LABEL_VISIBLE: +- e_shell_searchbar_set_label_visible ( ++ case PROP_LABELS_VISIBLE: ++ e_shell_searchbar_set_labels_visible ( + E_SHELL_SEARCHBAR (object), + g_value_get_boolean (value)); + return; +@@ -530,15 +547,21 @@ + GParamSpec *pspec) + { + switch (property_id) { ++ case PROP_EXPRESS_MODE: ++ g_value_set_boolean ( ++ value, e_shell_searchbar_get_express_mode ( ++ E_SHELL_SEARCHBAR (object))); ++ return; ++ + case PROP_FILTER_COMBO_BOX: + g_value_set_object ( + value, e_shell_searchbar_get_filter_combo_box ( + E_SHELL_SEARCHBAR (object))); + return; + +- case PROP_LABEL_VISIBLE: ++ case PROP_LABELS_VISIBLE: + g_value_set_boolean ( +- value, e_shell_searchbar_get_label_visible ( ++ value, e_shell_searchbar_get_labels_visible ( + E_SHELL_SEARCHBAR (object))); + return; + +@@ -622,7 +645,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_searchbar_parent_class)->dispose (object); + } + + static void +@@ -695,13 +718,15 @@ + + widget = GTK_WIDGET (searchbar); + gtk_size_group_add_widget (size_group, widget); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void + shell_searchbar_map (GtkWidget *widget) + { + /* Chain up to parent's map() method. */ +- GTK_WIDGET_CLASS (parent_class)->map (widget); ++ GTK_WIDGET_CLASS (e_shell_searchbar_parent_class)->map (widget); + + /* Load state after constructed() so we don't derail + * subclass initialization. We wait until map() so we +@@ -710,12 +735,11 @@ + } + + static void +-shell_searchbar_class_init (EShellSearchbarClass *class) ++e_shell_searchbar_class_init (EShellSearchbarClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSearchbarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -729,6 +753,17 @@ + + g_object_class_install_property ( + object_class, ++ PROP_EXPRESS_MODE, ++ g_param_spec_boolean ( ++ "express-mode", ++ NULL, ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); ++ ++ g_object_class_install_property ( ++ object_class, + PROP_FILTER_COMBO_BOX, + g_param_spec_object ( + "filter-combo-box", +@@ -739,9 +774,9 @@ + + g_object_class_install_property ( + object_class, +- PROP_LABEL_VISIBLE, ++ PROP_LABELS_VISIBLE, + g_param_spec_boolean ( +- "label-visible", ++ "labels-visible", + NULL, + NULL, + TRUE, +@@ -855,7 +890,7 @@ + } + + static void +-shell_searchbar_init (EShellSearchbar *searchbar) ++e_shell_searchbar_init (EShellSearchbar *searchbar) + { + GtkBox *box; + GtkLabel *label; +@@ -886,6 +921,10 @@ + gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + ++ e_binding_new ( ++ searchbar, "labels-visible", ++ widget, "visible"); ++ + label = GTK_LABEL (widget); + + widget = e_action_combo_box_new (); +@@ -913,11 +952,12 @@ + gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + +- label = GTK_LABEL (widget); + e_binding_new ( +- searchbar, "label-visible", ++ searchbar, "labels-visible", + widget, "visible"); + ++ label = GTK_LABEL (widget); ++ + widget = e_hinted_entry_new (); + gtk_label_set_mnemonic_widget (label, widget); + gtk_box_pack_start (box, widget, TRUE, TRUE, 0); +@@ -991,32 +1031,6 @@ + G_CONNECT_AFTER | G_CONNECT_SWAPPED); + } + +-GType +-e_shell_searchbar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSearchbarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_searchbar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSearchbar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_searchbar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BOX, "EShellSearchbar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_searchbar_new: + * @shell_view: an #EShellView +@@ -1050,6 +1064,31 @@ + return E_SHELL_VIEW (searchbar->priv->shell_view); + } + ++gboolean ++e_shell_searchbar_get_express_mode (EShellSearchbar *searchbar) ++{ ++ g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); ++ ++ return searchbar->priv->express_mode; ++} ++ ++void ++e_shell_searchbar_set_express_mode (EShellSearchbar *searchbar, ++ gboolean express_mode) ++{ ++ g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar)); ++ ++ searchbar->priv->express_mode = express_mode; ++ ++ /* Emit "notify" on all the properties we override. */ ++ g_object_freeze_notify (G_OBJECT (searchbar)); ++ g_object_notify (G_OBJECT (searchbar), "express-mode"); ++ g_object_notify (G_OBJECT (searchbar), "labels-visible"); ++ g_object_notify (G_OBJECT (searchbar), "filter-visible"); ++ g_object_notify (G_OBJECT (searchbar), "scope-visible"); ++ g_object_thaw_notify (G_OBJECT (searchbar)); ++} ++ + EActionComboBox * + e_shell_searchbar_get_filter_combo_box (EShellSearchbar *searchbar) + { +@@ -1059,22 +1098,26 @@ + } + + gboolean +-e_shell_searchbar_get_label_visible (EShellSearchbar *searchbar) ++e_shell_searchbar_get_labels_visible (EShellSearchbar *searchbar) + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + +- return searchbar->priv->label_visible; ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ ++ return searchbar->priv->labels_visible; + } + + void +-e_shell_searchbar_set_label_visible (EShellSearchbar *searchbar, +- gboolean label_visible) ++e_shell_searchbar_set_labels_visible (EShellSearchbar *searchbar, ++ gboolean labels_visible) + { + g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar)); + +- searchbar->priv->label_visible = label_visible; ++ searchbar->priv->labels_visible = labels_visible; + +- g_object_notify (G_OBJECT (searchbar), "label-visible"); ++ g_object_notify (G_OBJECT (searchbar), "labels-visible"); + } + + gboolean +@@ -1082,6 +1125,10 @@ + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ + return searchbar->priv->filter_visible; + } + +@@ -1222,6 +1269,10 @@ + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ + return searchbar->priv->scope_visible; + } + +@@ -1275,6 +1326,7 @@ + GKeyFile *key_file; + GtkAction *action; + GtkWidget *widget; ++ gboolean express_mode; + const gchar *search_text; + const gchar *state_group; + const gchar *key; +@@ -1290,6 +1342,8 @@ + key_file = e_shell_view_get_state_key_file (shell_view); + shell_window = e_shell_view_get_shell_window (shell_view); + ++ express_mode = e_shell_searchbar_get_express_mode (searchbar); ++ + /* Changing the combo boxes triggers searches, so block + * the search action until the state is fully restored. */ + action = E_SHELL_WINDOW_ACTION_SEARCH_QUICK (shell_window); +@@ -1301,7 +1355,7 @@ + + key = STATE_KEY_SEARCH_FILTER; + string = g_key_file_get_string (key_file, state_group, key, NULL); +- if (string != NULL && *string != '\0') ++ if (string != NULL && *string != '\0' && !express_mode) + action = e_shell_window_get_action (shell_window, string); + else + action = NULL; +@@ -1346,7 +1400,7 @@ + + key = STATE_KEY_SEARCH_SCOPE; + string = g_key_file_get_string (key_file, state_group, key, NULL); +- if (string != NULL && *string != '\0') ++ if (string != NULL && *string != '\0' && !express_mode) + action = e_shell_window_get_action (shell_window, string); + else + action = NULL; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-searchbar.h evolution-2.30.3.new//shell/e-shell-searchbar.h +--- evolution-2.30.3//shell/e-shell-searchbar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-searchbar.h 2010-09-01 19:18:57.625184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-searchbar +- * @short_description: quick search interface +- * @include: shell/e-shell-searchbar.h +- **/ +- + #ifndef E_SHELL_SEARCHBAR_H + #define E_SHELL_SEARCHBAR_H + +@@ -75,6 +69,11 @@ + GType e_shell_searchbar_get_type (void); + GtkWidget * e_shell_searchbar_new (EShellView *shell_view); + EShellView * e_shell_searchbar_get_shell_view(EShellSearchbar *searchbar); ++gboolean e_shell_searchbar_get_express_mode ++ (EShellSearchbar *searchbar); ++void e_shell_searchbar_set_express_mode ++ (EShellSearchbar *searchbar, ++ gboolean express_mode); + EActionComboBox * + e_shell_searchbar_get_filter_combo_box + (EShellSearchbar *searchbar); +@@ -83,11 +82,11 @@ + void e_shell_searchbar_set_filter_visible + (EShellSearchbar *searchbar, + gboolean filter_visible); +-gboolean e_shell_searchbar_get_label_visible ++gboolean e_shell_searchbar_get_labels_visible + (EShellSearchbar *searchbar); +-void e_shell_searchbar_set_label_visible ++void e_shell_searchbar_set_labels_visible + (EShellSearchbar *searchbar, +- gboolean label_visible); ++ gboolean labels_visible); + const gchar * e_shell_searchbar_get_search_hint + (EShellSearchbar *searchbar); + void e_shell_searchbar_set_search_hint +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-settings.c evolution-2.30.3.new//shell/e-shell-settings.c +--- evolution-2.30.3//shell/e-shell-settings.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-settings.c 2010-09-01 19:18:57.625184001 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-settings ++ * @short_description: settings management ++ * @include: shell/e-shell-settings.h ++ **/ ++ + #include "e-shell-settings.h" + + #include "e-util/gconf-bridge.h" +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-settings.h evolution-2.30.3.new//shell/e-shell-settings.h +--- evolution-2.30.3//shell/e-shell-settings.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-settings.h 2010-09-01 19:18:57.625184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-settings +- * @short_description: settings management +- * @include: shell/e-shell-settings.h +- **/ +- + #ifndef E_SHELL_SETTINGS_H + #define E_SHELL_SETTINGS_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-sidebar.c evolution-2.30.3.new//shell/e-shell-sidebar.c +--- evolution-2.30.3//shell/e-shell-sidebar.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-sidebar.c 2010-09-01 19:18:57.625184001 +0200 +@@ -19,9 +19,16 @@ + * + */ + ++/** ++ * SECTION: e-shell-sidebar ++ * @short_description: the left side of the main window ++ * @include: shell/e-shell-sidebar.h ++ **/ ++ + #include "e-shell-sidebar.h" + + #include ++#include + #include + #include + +@@ -48,7 +55,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSidebar, e_shell_sidebar, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_sidebar_set_shell_view (EShellSidebar *shell_sidebar, +@@ -147,7 +156,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_sidebar_parent_class)->dispose (object); + } + + static void +@@ -162,7 +171,7 @@ + g_free (priv->secondary_text); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_sidebar_parent_class)->finalize (object); + } + + static void +@@ -191,6 +200,8 @@ + g_object_get (action, "label", &label, NULL); + e_shell_sidebar_set_primary_text (shell_sidebar, label); + g_free (label); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +@@ -211,7 +222,7 @@ + } + + /* Chain up to parent's destroy() method. */ +- GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object); ++ GTK_OBJECT_CLASS (e_shell_sidebar_parent_class)->destroy (gtk_object); + } + + static void +@@ -282,19 +293,18 @@ + callback (priv->event_box, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_sidebar_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + + static void +-shell_sidebar_class_init (EShellSidebarClass *class) ++e_shell_sidebar_class_init (EShellSidebarClass *class) + { + GObjectClass *object_class; + GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSidebarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -378,7 +388,7 @@ + } + + static void +-shell_sidebar_init (EShellSidebar *shell_sidebar) ++e_shell_sidebar_init (EShellSidebar *shell_sidebar) + { + GtkStyle *style; + GtkWidget *widget; +@@ -446,32 +456,6 @@ + e_binding_new (shell_sidebar, "secondary-text", widget, "label"); + } + +-GType +-e_shell_sidebar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSidebarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_sidebar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSidebar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_sidebar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellSidebar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_sidebar_new: + * @shell_view: an #EShellView +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-sidebar.h evolution-2.30.3.new//shell/e-shell-sidebar.h +--- evolution-2.30.3//shell/e-shell-sidebar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-sidebar.h 2010-09-01 19:18:57.625184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-sidebar +- * @short_description: the left side of the main window +- * @include: shell/e-shell-sidebar.h +- **/ +- + #ifndef E_SHELL_SIDEBAR_H + #define E_SHELL_SIDEBAR_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-switcher.c evolution-2.30.3.new//shell/e-shell-switcher.c +--- evolution-2.30.3//shell/e-shell-switcher.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-switcher.c 2010-09-01 19:18:57.625184001 +0200 +@@ -19,9 +19,16 @@ + * + */ + ++/** ++ * SECTION: e-shell-switcher ++ * @short_description: buttons for switching views ++ * @include: shell/e-shell-switcher.h ++ **/ ++ + #include "e-shell-switcher.h" + + #include ++#include + + #define E_SHELL_SWITCHER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ +@@ -50,9 +57,17 @@ + LAST_SIGNAL + }; + +-static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + ++/* Forward Declarations */ ++static void shell_switcher_tool_shell_iface_init (GtkToolShellIface *iface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSwitcher, e_shell_switcher, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (GTK_TYPE_TOOL_SHELL, ++ shell_switcher_tool_shell_iface_init)) ++ + static gint + shell_switcher_layout_actions (EShellSwitcher *switcher) + { +@@ -223,7 +238,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_switcher_parent_class)->dispose (object); + } + + static void +@@ -346,7 +361,8 @@ + } + + /* Chain up to parent's remove() method. */ +- GTK_CONTAINER_CLASS (parent_class)->remove (container, widget); ++ GTK_CONTAINER_CLASS (e_shell_switcher_parent_class)->remove ( ++ container, widget); + } + + static void +@@ -364,7 +380,7 @@ + priv->proxies, (GFunc) callback, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_switcher_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + +@@ -410,13 +426,12 @@ + } + + static void +-shell_switcher_class_init (EShellSwitcherClass *class) ++e_shell_switcher_class_init (EShellSwitcherClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSwitcherPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -487,11 +502,13 @@ + } + + static void +-shell_switcher_init (EShellSwitcher *switcher) ++e_shell_switcher_init (EShellSwitcher *switcher) + { + switcher->priv = E_SHELL_SWITCHER_GET_PRIVATE (switcher); + + GTK_WIDGET_SET_FLAGS (switcher, GTK_NO_WINDOW); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (switcher)); + } + + static void +@@ -503,41 +520,6 @@ + iface->get_relief_style = shell_switcher_get_relief_style; + } + +-GType +-e_shell_switcher_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSwitcherClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_switcher_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSwitcher), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_switcher_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo tool_shell_info = { +- (GInterfaceInitFunc) shell_switcher_tool_shell_iface_init, +- (GInterfaceFinalizeFunc) NULL, +- NULL /* interface_data */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellSwitcher", &type_info, 0); +- +- g_type_add_interface_static ( +- type, GTK_TYPE_TOOL_SHELL, &tool_shell_info); +- } +- +- return type; +-} +- + /** + * e_shell_switcher_new: + * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-switcher.h evolution-2.30.3.new//shell/e-shell-switcher.h +--- evolution-2.30.3//shell/e-shell-switcher.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-switcher.h 2010-09-01 19:18:57.625184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-switcher +- * @short_description: buttons for switching views +- * @include: shell/e-shell-switcher.h +- **/ +- + #ifndef E_SHELL_SWITCHER_H + #define E_SHELL_SWITCHER_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-taskbar.c evolution-2.30.3.new//shell/e-shell-taskbar.c +--- evolution-2.30.3//shell/e-shell-taskbar.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-taskbar.c 2010-09-01 19:18:57.625184001 +0200 +@@ -19,11 +19,18 @@ + * + */ + ++/** ++ * SECTION: e-shell-taskbar ++ * @short_description: the bottom of the main window ++ * @include: shell/e-shell-taskbar.h ++ **/ ++ + #include "e-shell-taskbar.h" + + #include + +-#include ++#include ++#include + + #define E_SHELL_TASKBAR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ +@@ -49,7 +56,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellTaskbar, e_shell_taskbar, GTK_TYPE_HBOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_taskbar_activity_remove (EShellTaskbar *shell_taskbar, +@@ -204,7 +213,7 @@ + object); + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_taskbar_parent_class)->dispose (object); + } + + static void +@@ -217,7 +226,7 @@ + g_hash_table_destroy (priv->proxy_table); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_taskbar_parent_class)->finalize (object); + } + + static void +@@ -239,16 +248,17 @@ + shell_backend, "activity-added", + G_CALLBACK (shell_taskbar_activity_add), shell_taskbar); + +- /* to not enlarge window width on new activities */ ++ /* Do not enlarge window width on new activities. */ + gtk_widget_set_size_request (GTK_WIDGET (shell_taskbar), 0, -1); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +-shell_taskbar_class_init (EShellTaskbarClass *class) ++e_shell_taskbar_class_init (EShellTaskbarClass *class) + { + GObjectClass *object_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellTaskbarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -292,7 +302,7 @@ + } + + static void +-shell_taskbar_init (EShellTaskbar *shell_taskbar) ++e_shell_taskbar_init (EShellTaskbar *shell_taskbar) + { + GtkWidget *widget; + GHashTable *proxy_table; +@@ -328,32 +338,6 @@ + GTK_WIDGET (shell_taskbar), -1, (height * 2)); + } + +-GType +-e_shell_taskbar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellTaskbarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_taskbar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellTaskbar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_taskbar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_HBOX, "EShellTaskbar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_taskbar_new: + * @shell_view: an #EShellView +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-taskbar.h evolution-2.30.3.new//shell/e-shell-taskbar.h +--- evolution-2.30.3//shell/e-shell-taskbar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-taskbar.h 2010-09-01 19:18:57.625184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-taskbar +- * @short_description: the bottom of the main window +- * @include: shell/e-shell-taskbar.h +- **/ +- + #ifndef E_SHELL_TASKBAR_H + #define E_SHELL_TASKBAR_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-utils.c evolution-2.30.3.new//shell/e-shell-utils.c +--- evolution-2.30.3//shell/e-shell-utils.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-utils.c 2010-09-01 19:18:57.629184001 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-utils ++ * @short_description: high-level utilities with shell integration ++ * @include: shell/e-shell-utils.h ++ **/ ++ + #include "e-shell-utils.h" + + #include +@@ -342,3 +348,59 @@ + + return g_strv_length (uris); + } ++ ++/** ++ * e_shell_hide_widgets_for_express_mode: ++ * @shell: an #EShell ++ * @builder: a #GtkBuilder ++ * @widget_name: NULL-terminated list of strings ++ * ++ * If Evolution is running in Express mode (i.e. if the specified @shell is ++ * in Express mode), then this function will hide a list of widgets, based ++ * on their specified names. The list of names must be NULL-terminated, ++ * and each element of that list must be the name of a widget present in ++ * @builder. Those widgets will then get hidden. ++ * ++ * This can be used to simplify preference dialogs and such in an easy ++ * fashion, for use in Express mode. ++ * ++ * If Evolution is not running in Express mode, this function does nothing. ++ */ ++void ++e_shell_hide_widgets_for_express_mode (EShell *shell, ++ GtkBuilder *builder, ++ const gchar *widget_name, ++ ...) ++{ ++ va_list args; ++ const gchar *name; ++ ++ g_return_if_fail (E_IS_SHELL (shell)); ++ g_return_if_fail (GTK_IS_BUILDER (builder)); ++ g_return_if_fail (widget_name != NULL); ++ ++ if (!e_shell_get_express_mode (shell)) ++ return; ++ ++ va_start (args, widget_name); ++ ++ name = va_arg (args, const gchar *); ++ while (name) { ++ GObject *object; ++ ++ object = gtk_builder_get_object (builder, name); ++ if (!GTK_IS_WIDGET (object)) { ++ g_error ( ++ "Object '%s' was not found in the builder " ++ "file, or it is not a GtkWidget", name); ++ g_assert_not_reached (); ++ } ++ ++ gtk_widget_hide (GTK_WIDGET (object)); ++ ++ name = va_arg (args, const gchar *); ++ } ++ ++ va_end (args); ++} ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-utils.h evolution-2.30.3.new//shell/e-shell-utils.h +--- evolution-2.30.3//shell/e-shell-utils.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-utils.h 2010-09-01 19:18:57.629184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-utils +- * @short_description: high-level utilities with shell integration +- * @include: shell/e-shell-utils.h +- **/ +- + #ifndef E_SHELL_UTILS_H + #define E_SHELL_UTILS_H + +@@ -56,6 +50,11 @@ + gchar **uris, + gboolean preview); + ++void e_shell_hide_widgets_for_express_mode (EShell *shell, ++ GtkBuilder *builder, ++ const gchar *widget_name, ++ ...) G_GNUC_NULL_TERMINATED; ++ + G_END_DECLS + + #endif /* E_SHELL_UTILS_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-view.c evolution-2.30.3.new//shell/e-shell-view.c +--- evolution-2.30.3//shell/e-shell-view.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-view.c 2010-09-01 19:18:57.629184001 +0200 +@@ -19,24 +19,34 @@ + * + */ + ++/** ++ * SECTION: e-shell-view ++ * @short_description: views within the main window ++ * @include: shell/e-shell-view.h ++ **/ ++ + #include "e-shell-view.h" + + #include + #include + +-#include "e-util/e-util-private.h" +-#include "e-util/e-util.h" ++#include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-file-utils.h" + #include "e-util/e-plugin-ui.h" + #include "e-util/e-ui-manager.h" ++#include "e-util/e-util-private.h" ++#include "e-util/e-util.h" + #include "filter/e-rule-context.h" + ++#include "e-shell-searchbar.h" + #include "e-shell-window-actions.h" + + #define E_SHELL_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL_VIEW, EShellViewPrivate)) + ++#define SIMPLE_SEARCHBAR_WIDTH 300 + #define STATE_SAVE_TIMEOUT_SECONDS 3 + + struct _EShellViewPrivate { +@@ -57,6 +67,7 @@ + GtkWidget *shell_content; + GtkWidget *shell_sidebar; + GtkWidget *shell_taskbar; ++ GtkWidget *searchbar; + + EFilterRule *search_rule; + guint execute_search_blocked; +@@ -69,6 +80,7 @@ + PROP_0, + PROP_ACTION, + PROP_PAGE_NUM, ++ PROP_SEARCHBAR, + PROP_SEARCH_RULE, + PROP_SHELL_BACKEND, + PROP_SHELL_CONTENT, +@@ -345,8 +357,9 @@ + + static void + shell_view_set_shell_window (EShellView *shell_view, +- GtkWidget *shell_window) ++ EShellWindow *shell_window) + { ++ g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + g_return_if_fail (shell_view->priv->shell_window == NULL); + + shell_view->priv->shell_window = shell_window; +@@ -422,6 +435,12 @@ + E_SHELL_VIEW (object))); + return; + ++ case PROP_SEARCHBAR: ++ g_value_set_object ( ++ value, e_shell_view_get_searchbar ( ++ E_SHELL_VIEW (object))); ++ return; ++ + case PROP_SEARCH_RULE: + g_value_set_object ( + value, e_shell_view_get_search_rule ( +@@ -522,6 +541,11 @@ + priv->shell_taskbar = NULL; + } + ++ if (priv->searchbar != NULL) { ++ g_object_unref (priv->searchbar); ++ priv->searchbar = NULL; ++ } ++ + if (priv->search_rule != NULL) { + g_object_unref (priv->search_rule); + priv->search_rule = NULL; +@@ -575,9 +599,108 @@ + shell_view->priv->shell_sidebar = g_object_ref_sink (widget); + gtk_widget_show (widget); + ++ if (shell_view_class->construct_searchbar != NULL) { ++ widget = shell_view_class->construct_searchbar (shell_view); ++ shell_view->priv->searchbar = g_object_ref_sink (widget); ++ } ++ + /* Size group should be safe to unreference now. */ + g_object_unref (shell_view->priv->size_group); + shell_view->priv->size_group = NULL; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); ++} ++ ++static GtkWidget * ++shell_view_construct_searchbar (EShellView *shell_view) ++{ ++ EShell *shell; ++ EShellWindow *shell_window; ++ EShellContent *shell_content; ++ EShellSearchbar *shell_searchbar; ++ GtkToolItem *item; ++ GtkAction *action; ++ GtkWidget *main_toolbar; ++ GtkWidget *widget; ++ ++ shell_content = e_shell_view_get_shell_content (shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ shell = e_shell_window_get_shell (shell_window); ++ ++ widget = e_shell_searchbar_new (shell_view); ++ ++ /* In normal mode, we hand the searchbar off to EShellContent. */ ++ if (!e_shell_get_express_mode (shell)) { ++ e_shell_content_set_searchbar (shell_content, widget); ++ gtk_widget_show (widget); ++ return widget; ++ } ++ ++ /* Express mode is more complicated. We append a heavily simplified ++ * version of it to the main toolbar, but only show it when this shell ++ * view is active. So each view still gets its own searchbar. */ ++ ++ shell_searchbar = E_SHELL_SEARCHBAR (widget); ++ e_shell_searchbar_set_express_mode (shell_searchbar, TRUE); ++ ++ /* XXX Hardcoded sizes are evil, but what should the width be ++ * relative to. Window width? The other toolbar width? */ ++ gtk_widget_set_size_request (widget, SIMPLE_SEARCHBAR_WIDTH, -1); ++ ++ main_toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/search-toolbar"); ++ ++ item = gtk_tool_item_new (); ++ gtk_container_add (GTK_CONTAINER (item), widget); ++ gtk_widget_show (GTK_WIDGET (item)); ++ ++ action = e_shell_view_get_action (shell_view); ++ e_binding_new (action, "active", widget, "visible"); ++ ++ gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, -1); ++ ++ if (e_shell_get_small_screen_mode (shell)) { ++ GtkWidget *image; ++ GtkWidget *container; ++ GtkAction *action; ++ GtkToolItem *item; ++ ++ action = e_shell_window_get_action ( ++ shell_window, "close-window"); ++ image = gtk_image_new_from_icon_name ( ++ "window-close-hover", GTK_ICON_SIZE_DIALOG); ++ item = gtk_tool_button_new ( ++ image, gtk_action_get_label (action)); ++ gtk_widget_set_name (GTK_WIDGET (item), "MeeGoCloseButton"); ++ gtk_activatable_set_related_action ( ++ GTK_ACTIVATABLE (item), action); ++ container = e_shell_window_get_menu_bar_box (shell_window); ++ gtk_box_pack_start ( ++ GTK_BOX (container), ++ GTK_WIDGET (item), FALSE, FALSE, 0); ++ gtk_widget_show_all (GTK_WIDGET (item)); ++ } ++ ++ return widget; ++} ++ ++static gchar * ++shell_view_get_search_name (EShellView *shell_view) ++{ ++ EShellSearchbar *searchbar; ++ EFilterRule *rule; ++ const gchar *search_text; ++ ++ rule = e_shell_view_get_search_rule (shell_view); ++ g_return_val_if_fail (E_IS_FILTER_RULE (rule), NULL); ++ ++ searchbar = E_SHELL_SEARCHBAR (shell_view->priv->searchbar); ++ search_text = e_shell_searchbar_get_search_text (searchbar); ++ ++ if (search_text == NULL || *search_text == '\0') ++ search_text = "''"; ++ ++ return g_strdup_printf ("%s %s", rule->name, search_text); + } + + static void +@@ -663,6 +786,9 @@ + class->new_shell_sidebar = e_shell_sidebar_new; + class->new_shell_taskbar = e_shell_taskbar_new; + ++ class->construct_searchbar = shell_view_construct_searchbar; ++ class->get_search_name = shell_view_get_search_name; ++ + class->toggled = shell_view_toggled; + class->clear_search = shell_view_clear_search; + class->custom_search = shell_view_custom_search; +@@ -976,9 +1102,18 @@ + NULL /* value_table */ + }; + ++ const GInterfaceInfo extensible_info = { ++ (GInterfaceInitFunc) NULL, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL /* interface_data */ ++ }; ++ + type = g_type_register_static ( + G_TYPE_OBJECT, "EShellView", + &type_info, G_TYPE_FLAG_ABSTRACT); ++ ++ g_type_add_interface_static ( ++ type, E_TYPE_EXTENSIBLE, &extensible_info); + } + + return type; +@@ -1201,6 +1336,29 @@ + } + + /** ++ * e_shell_view_get_search_name: ++ * @shell_view: an #EShellView ++ * ++ * Returns a newly-allocated string containing a suitable name for the ++ * current search criteria. This is used as the suggested name in the ++ * Save Search dialog. Free the returned string with g_free(). ++ * ++ * Returns: a name for the current search criteria ++ **/ ++gchar * ++e_shell_view_get_search_name (EShellView *shell_view) ++{ ++ EShellViewClass *class; ++ ++ g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL); ++ ++ class = E_SHELL_VIEW_GET_CLASS (shell_view); ++ g_return_val_if_fail (class->get_search_name != NULL, NULL); ++ ++ return class->get_search_name (shell_view); ++} ++ ++/** + * e_shell_view_get_search_rule: + * @shell_view: an #EShellView + * +@@ -1217,6 +1375,20 @@ + } + + /** ++ * e_shell_view_get_searchbar: ++ * @shell_view: an #EShellView ++ * ++ * Returns the searchbar widget for @shell_view. ++ **/ ++GtkWidget * ++e_shell_view_get_searchbar (EShellView *shell_view) ++{ ++ g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL); ++ ++ return shell_view->priv->searchbar; ++} ++ ++/** + * e_shell_view_set_search_rule: + * @shell_view: an #EShellView + * @search_rule: an #EFilterRule +@@ -1574,7 +1746,8 @@ + g_return_if_fail (shell_view->priv->update_actions_blocked > 0); + + shell_view->priv->update_actions_blocked--; +- if (!shell_view->priv->update_actions_blocked && shell_view->priv->update_actions_called) { ++ if (!shell_view->priv->update_actions_blocked && ++ shell_view->priv->update_actions_called) { + shell_view->priv->update_actions_called = FALSE; + e_shell_view_update_actions (shell_view); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-view.h evolution-2.30.3.new//shell/e-shell-view.h +--- evolution-2.30.3//shell/e-shell-view.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-view.h 2010-09-01 19:18:57.629184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-view +- * @short_description: views within the main window +- * @include: shell/e-shell-view.h +- **/ +- + #ifndef E_SHELL_VIEW_H + #define E_SHELL_VIEW_H + +@@ -172,6 +166,10 @@ + GtkWidget * (*new_shell_sidebar) (EShellView *shell_view); + GtkWidget * (*new_shell_taskbar) (EShellView *shell_view); + ++ /* Create, configure and pack a search bar widget. */ ++ GtkWidget * (*construct_searchbar) (EShellView *shell_view); ++ gchar * (*get_search_name) (EShellView *shell_view); ++ + /* Signals */ + void (*toggled) (EShellView *shell_view); + void (*clear_search) (EShellView *shell_view); +@@ -194,6 +192,8 @@ + gint e_shell_view_get_page_num (EShellView *shell_view); + void e_shell_view_set_page_num (EShellView *shell_view, + gint page_num); ++GtkWidget * e_shell_view_get_searchbar (EShellView *shell_view); ++gchar * e_shell_view_get_search_name (EShellView *shell_view); + EFilterRule * e_shell_view_get_search_rule (EShellView *shell_view); + void e_shell_view_set_search_rule (EShellView *shell_view, + EFilterRule *search_rule); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-window-actions.c evolution-2.30.3.new//shell/e-shell-window-actions.c +--- evolution-2.30.3//shell/e-shell-window-actions.c 2010-09-01 19:18:50.725184001 +0200 ++++ evolution-2.30.3.new//shell/e-shell-window-actions.c 2010-09-01 19:18:57.629184001 +0200 +@@ -928,10 +928,17 @@ + shell_backend = e_shell_view_get_shell_backend (shell_view); + shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend); + +- if (shell_backend_class->preferences_page != NULL) +- e_preferences_window_show_page ( +- E_PREFERENCES_WINDOW (preferences_window), +- shell_backend_class->preferences_page); ++ if (shell_backend_class->preferences_page != NULL) { ++ if (e_shell_get_express_mode (shell)) { ++ e_preferences_window_filter_page ( ++ E_PREFERENCES_WINDOW (preferences_window), ++ shell_backend_class->preferences_page); ++ } else { ++ e_preferences_window_show_page ( ++ E_PREFERENCES_WINDOW (preferences_window), ++ shell_backend_class->preferences_page); ++ } ++ } + } + + /** +@@ -1448,6 +1455,20 @@ + N_("Close this window"), + G_CALLBACK (action_close_cb) }, + ++ { "close-window-menu", ++ GTK_STOCK_CLOSE, ++ NULL, ++ "w", ++ N_("Close this window"), ++ G_CALLBACK (action_close_cb) }, ++ ++ { "close-window", ++ GTK_STOCK_CLOSE, ++ N_("_Close Window"), ++ "w", ++ N_("Close this window"), ++ G_CALLBACK (action_close_cb) }, ++ + { "contents", + GTK_STOCK_HELP, + N_("_Contents"), +@@ -2082,9 +2103,11 @@ + + /* Add menu separators. */ + +- separator = gtk_separator_menu_item_new (); +- new_item_actions = g_list_prepend (new_item_actions, separator); +- gtk_widget_show (GTK_WIDGET (separator)); ++ if (new_item_actions != NULL) { ++ separator = gtk_separator_menu_item_new (); ++ new_item_actions = g_list_prepend (new_item_actions, separator); ++ gtk_widget_show (GTK_WIDGET (separator)); ++ } + + if (new_source_actions != NULL) { + separator = gtk_separator_menu_item_new (); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-window.c evolution-2.30.3.new//shell/e-shell-window.c +--- evolution-2.30.3//shell/e-shell-window.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-window.c 2010-09-01 19:18:57.629184001 +0200 +@@ -19,10 +19,17 @@ + * + */ + ++/** ++ * SECTION: e-shell-window ++ * @short_description: the main window ++ * @include: shell/e-shell-window.h ++ **/ ++ + #include "e-shell-window-private.h" + + #include + ++#include + #include + #include + +@@ -45,9 +52,12 @@ + LAST_SIGNAL + }; + +-static gpointer parent_class; + static gulong signals[LAST_SIGNAL]; + ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellWindow, e_shell_window, GTK_TYPE_WINDOW, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ + static void + shell_window_menubar_update_new_menu (EShellWindow *shell_window) + { +@@ -299,7 +309,7 @@ + e_shell_window_private_dispose (E_SHELL_WINDOW (object)); + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_window_parent_class)->dispose (object); + } + + static void +@@ -308,13 +318,21 @@ + e_shell_window_private_finalize (E_SHELL_WINDOW (object)); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_window_parent_class)->finalize (object); + } + + static void + shell_window_constructed (GObject *object) + { +- e_shell_window_private_constructed (E_SHELL_WINDOW (object)); ++ EShellWindow *shell_window = E_SHELL_WINDOW (object); ++ ++ e_shell_window_private_constructed (shell_window); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); ++ ++ if (e_shell_get_meego_mode (shell_window->priv->shell) && ++ e_shell_get_small_screen_mode (shell_window->priv->shell)) ++ gtk_window_set_decorated (GTK_WINDOW (object), FALSE); + } + + static GtkWidget * +@@ -326,6 +344,23 @@ + shell_window, "/main-menu"); + gtk_widget_show (main_menu); + ++ if (e_shell_get_small_screen_mode (shell_window->priv->shell)) { ++ GtkWidget *parent, *child; ++ ++ parent = gtk_widget_get_parent (main_menu); ++ g_object_ref (parent); ++ gtk_container_remove ((GtkContainer *)parent, main_menu); ++ child = gtk_hbox_new (FALSE, 0); ++ gtk_box_pack_start ((GtkBox *)child, main_menu, TRUE, TRUE, 0); ++ gtk_widget_show (child); ++ gtk_container_add ((GtkContainer *)parent, child); ++ shell_window->priv->menubar_box = child; ++ ++ e_mutual_binding_new (main_menu, "visible", ++ child, "visible"); ++ main_menu = child; ++ } ++ + g_signal_connect ( + shell_window, "notify::active-view", + G_CALLBACK (shell_window_menubar_update_new_menu), NULL); +@@ -333,21 +368,34 @@ + return main_menu; + } + ++GtkWidget * ++e_shell_window_get_menu_bar_box (EShellWindow *shell_window) ++{ ++ return shell_window->priv->menubar_box; ++} ++ + static GtkWidget * + shell_window_construct_toolbar (EShellWindow *shell_window) + { + GtkUIManager *ui_manager; +- GtkWidget *main_toolbar; ++ GtkWidget *toolbar; ++ GtkWidget *box; + GtkToolItem *item; + + ui_manager = e_shell_window_get_ui_manager (shell_window); + +- main_toolbar = e_shell_window_get_managed_widget ( +- shell_window, "/main-toolbar"); ++ box = gtk_hbox_new (FALSE, 0); ++ gtk_widget_show (box); + + e_binding_new ( + shell_window, "toolbar-visible", +- main_toolbar, "visible"); ++ box, "visible"); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar"); ++ ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + + /* XXX Having this separator in the UI definition doesn't work + * because GtkUIManager is unaware of the "New" button, so +@@ -360,7 +408,7 @@ + * convinced having it proxy some new type of GtkAction + * is worth the extra effort. */ + item = gtk_separator_tool_item_new (); +- gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, 0); ++ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0); + gtk_widget_show (GTK_WIDGET (item)); + + item = e_menu_tool_button_new (_("New")); +@@ -369,7 +417,7 @@ + GTK_WIDGET (item), "clicked", + gtk_ui_manager_get_accel_group (ui_manager), + GDK_N, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); +- gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, 0); ++ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0); + gtk_widget_show (GTK_WIDGET (item)); + + g_signal_connect ( +@@ -377,7 +425,23 @@ + G_CALLBACK (shell_window_toolbar_update_new_menu), + GTK_MENU_TOOL_BUTTON (item)); + +- return main_toolbar; ++ gtk_box_pack_start (GTK_BOX (box), toolbar, TRUE, TRUE, 0); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/search-toolbar"); ++ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); ++ gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/close-toolbar"); ++ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); ++ gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); ++ ++ return box; + } + + static GtkWidget * +@@ -582,11 +646,24 @@ + } + + static void +-shell_window_class_init (EShellWindowClass *class) ++shell_window_realize (GtkWidget *widget) ++{ ++ EShellWindow *shell_window; ++ ++ shell_window = E_SHELL_WINDOW (widget); ++ e_shell_adapt_window_size (shell_window->priv->shell, ++ GTK_WINDOW (widget)); ++ ++ /* Chain up to parent's dispose() method. */ ++ GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget); ++} ++ ++static void ++e_shell_window_class_init (EShellWindowClass *class) + { + GObjectClass *object_class; ++ GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellWindowPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -596,6 +673,9 @@ + object_class->finalize = shell_window_finalize; + object_class->constructed = shell_window_constructed; + ++ widget_class = GTK_WIDGET_CLASS (class); ++ widget_class->realize = shell_window_realize; ++ + class->construct_menubar = shell_window_construct_menubar; + class->construct_toolbar = shell_window_construct_toolbar; + class->construct_sidebar = shell_window_construct_sidebar; +@@ -779,39 +859,13 @@ + } + + static void +-shell_window_init (EShellWindow *shell_window) ++e_shell_window_init (EShellWindow *shell_window) + { + shell_window->priv = E_SHELL_WINDOW_GET_PRIVATE (shell_window); + + e_shell_window_private_init (shell_window); + } + +-GType +-e_shell_window_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- const GTypeInfo type_info = { +- sizeof (EShellWindowClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_window_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellWindow), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_window_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_WINDOW, "EShellWindow", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_window_new: + * @shell: an #EShell +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-window.h evolution-2.30.3.new//shell/e-shell-window.h +--- evolution-2.30.3//shell/e-shell-window.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-window.h 2010-09-01 19:18:57.629184001 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-window +- * @short_description: the main window +- * @include: shell/e-shell-window.h +- **/ +- + #ifndef E_SHELL_WINDOW_H + #define E_SHELL_WINDOW_H + +@@ -152,6 +146,7 @@ + const gchar *backend_name, + GtkActionEntry *entries, + guint n_entries); ++GtkWidget * e_shell_window_get_menu_bar_box (EShellWindow *shell_window); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-window-private.c evolution-2.30.3.new//shell/e-shell-window-private.c +--- evolution-2.30.3//shell/e-shell-window-private.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-window-private.c 2010-09-01 19:18:57.629184001 +0200 +@@ -432,7 +432,9 @@ + + object = G_OBJECT (shell_window); + key = "/apps/evolution/shell/view_defaults/component_id"; +- gconf_bridge_bind_property (bridge, key, object, "active-view"); ++ g_object_set (object, "active-view", ++ gconf_client_get_string (e_shell_get_gconf_client (shell), key, NULL), ++ NULL); + + object = G_OBJECT (priv->content_pane); + key = "/apps/evolution/shell/view_defaults/folder_bar/width"; +@@ -442,14 +444,17 @@ + key = "/apps/evolution/shell/view_defaults/sidebar_visible"; + gconf_bridge_bind_property (bridge, key, object, "sidebar-visible"); + +- object = G_OBJECT (shell_window); +- key = "/apps/evolution/shell/view_defaults/statusbar_visible"; +- gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); +- + if (e_shell_get_express_mode (shell)) { ++ const gchar *active_view = e_shell_window_get_active_view (shell_window); + e_shell_window_set_switcher_visible (shell_window, FALSE); ++ e_shell_window_set_taskbar_visible (shell_window, active_view && ++ !strcmp (active_view, "mail")); + } else { + object = G_OBJECT (shell_window); ++ key = "/apps/evolution/shell/view_defaults/statusbar_visible"; ++ gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); ++ ++ object = G_OBJECT (shell_window); + key = "/apps/evolution/shell/view_defaults/buttons_visible"; + gconf_bridge_bind_property (bridge, key, object, "switcher-visible"); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-window-private.h evolution-2.30.3.new//shell/e-shell-window-private.h +--- evolution-2.30.3//shell/e-shell-window-private.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/e-shell-window-private.h 2010-09-01 19:18:57.629184001 +0200 +@@ -93,6 +93,7 @@ + GtkWidget *status_notebook; + + /* Miscellaneous */ ++ GtkWidget *menubar_box; + + /* Shell signal handlers. */ + GArray *signal_handler_ids; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/main.c evolution-2.30.3.new//shell/main.c +--- evolution-2.30.3//shell/main.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.3.new//shell/main.c 2010-09-01 19:18:57.633184001 +0200 +@@ -49,6 +49,7 @@ + + #include "e-shell.h" + #include "e-shell-migrate.h" ++#include "e-shell-meego.h" + #include "e-config-upgrade.h" + #include "es-event.h" + +@@ -393,6 +394,7 @@ + gboolean online = TRUE; + const gchar *key; + GError *error = NULL; ++ gboolean is_meego = FALSE, small_screen = FALSE; + + client = gconf_client_get_default (); + +@@ -427,6 +429,9 @@ + if (!express_mode) + express_mode = gconf_client_get_bool (client, key, &error); + ++ if (express_mode) ++ e_shell_detect_meego (&is_meego, &small_screen); ++ + if (error != NULL) { + g_warning ("%s", error->message); + g_clear_error (&error); +@@ -437,7 +442,9 @@ + "name", "org.gnome.Evolution", + "geometry", geometry, + "module-directory", EVOLUTION_MODULEDIR, ++ "meego-mode", is_meego, + "express-mode", express_mode, ++ "small-screen-mode", small_screen, + "online", online, + NULL); + +@@ -630,6 +637,11 @@ + e_plugin_load_plugins (); + } + ++ if (requested_view) ++ e_shell_set_startup_view(shell, requested_view); ++ else if (express_mode) ++ e_shell_set_startup_view(shell, "mail"); ++ + /* Attempt migration -after- loading all modules and plugins, + * as both shell backends and certain plugins hook into this. */ + e_shell_migrate_attempt (shell); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/Makefile.am evolution-2.30.3.new//shell/Makefile.am +--- evolution-2.30.3//shell/Makefile.am 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.3.new//shell/Makefile.am 2010-09-01 19:18:57.633184001 +0200 +@@ -58,6 +58,8 @@ + e-shell.c \ + e-shell-backend.c \ + e-shell-content.c \ ++ e-shell-meego.c \ ++ e-shell-meego.h \ + e-shell-searchbar.c \ + e-shell-settings.c \ + e-shell-sidebar.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//smime/gui/component.c evolution-2.30.3.new//smime/gui/component.c +--- evolution-2.30.3//smime/gui/component.c 2010-06-20 14:14:40.000000000 +0200 ++++ evolution-2.30.3.new//smime/gui/component.c 2010-09-01 19:18:57.633184001 +0200 +@@ -43,7 +43,7 @@ + + g_strchomp (slot_name); + +- prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name); ++ prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name); + g_free (slot_name); + + *passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//smime/lib/e-cert-db.c evolution-2.30.3.new//smime/lib/e-cert-db.c +--- evolution-2.30.3//smime/lib/e-cert-db.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.3.new//smime/lib/e-cert-db.c 2010-09-01 19:18:57.633184001 +0200 +@@ -1164,7 +1164,7 @@ + rv = FALSE; + } + else { +- printf ("importing %d bytes from `%s'\n", bytes_read, file_path); ++ printf ("importing %d bytes from '%s'\n", bytes_read, file_path); + + switch (cert_type) { + case E_CERT_CA: +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//smime/lib/e-pkcs12.c evolution-2.30.3.new//smime/lib/e-pkcs12.c +--- evolution-2.30.3//smime/lib/e-pkcs12.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.3.new//smime/lib/e-pkcs12.c 2010-09-01 19:18:57.633184001 +0200 +@@ -167,7 +167,7 @@ + fp = g_fopen (path, "rb"); + if (!fp) { + /* XXX gerror */ +- printf ("couldn't open `%s'\n", path); ++ printf ("couldn't open '%s'\n", path); + return FALSE; + } + +@@ -319,7 +319,7 @@ + gboolean wantRetry; + PK11SlotInfo *slot; + +- printf ("importing pkcs12 from `%s'\n", path); ++ printf ("importing pkcs12 from '%s'\n", path); + + slot = PK11_GetInternalKeySlot(); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-calendars.ui evolution-2.30.3.new//ui/evolution-calendars.ui +--- evolution-2.30.3//ui/evolution-calendars.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.3.new//ui/evolution-calendars.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -5,8 +5,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -28,20 +30,41 @@ + + + ++#if !EXPRESS ++ ++ + + + ++#endif + + + ++#if !EXPRESS + + ++#endif + + + ++#if !EXPRESS + ++#endif ++ + ++#if !EXPRESS + ++#endif ++#if EXPRESS ++ ++ ++#endif ++ ++ ++#if EXPRESS ++ ++ ++#endif + + + +@@ -59,12 +82,15 @@ + + + ++#if !EXPRESS + + + + ++#endif + + ++#if !EXPRESS + + + +@@ -76,24 +102,31 @@ + + + ++#endif + + + + ++#if !EXPRESS + ++#endif + + + + ++#if !EXPRESS + + + ++#endif + + + ++#if !EXPRESS + + + ++#endif + + + +@@ -108,7 +141,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +@@ -124,7 +159,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-contacts.ui evolution-2.30.3.new//ui/evolution-contacts.ui +--- evolution-2.30.3//ui/evolution-contacts.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.3.new//ui/evolution-contacts.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -7,8 +7,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -46,7 +48,11 @@ + + + ++#if !EXPRESS ++ ++ + ++#endif + + + +@@ -66,7 +72,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-mail.ui evolution-2.30.3.new//ui/evolution-mail.ui +--- evolution-2.30.3//ui/evolution-mail.ui 2010-04-30 03:11:08.000000000 +0200 ++++ evolution-2.30.3.new//ui/evolution-mail.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -61,11 +61,13 @@ + + + +-#if EXPRESS + ++ ++ ++#if EXPRESS + +- + #endif ++ + + #if !EXPRESS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-memos.ui evolution-2.30.3.new//ui/evolution-memos.ui +--- evolution-2.30.3//ui/evolution-memos.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.3.new//ui/evolution-memos.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -29,14 +29,16 @@ + + + +- +- +- +- +- +- +- +- ++#if !EXPRESS ++ ++ ++#endif ++ ++ ++ ++ ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-shell.ui evolution-2.30.3.new//ui/evolution-shell.ui +--- evolution-2.30.3//ui/evolution-shell.ui 2010-09-01 19:18:50.765184001 +0200 ++++ evolution-2.30.3.new//ui/evolution-shell.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -10,8 +10,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -90,8 +92,9 @@ + + + +- +- + + ++ ++ ++ + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//ui/evolution-tasks.ui evolution-2.30.3.new//ui/evolution-tasks.ui +--- evolution-2.30.3//ui/evolution-tasks.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.3.new//ui/evolution-tasks.ui 2010-09-01 19:18:57.633184001 +0200 +@@ -39,6 +39,10 @@ + + + ++#if !EXPRESS ++ ++ ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-account-combo-box.c evolution-2.30.3.new//widgets/misc/e-account-combo-box.c +--- evolution-2.30.3//widgets/misc/e-account-combo-box.c 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-account-combo-box.c 2010-09-01 19:18:57.633184001 +0200 +@@ -41,6 +41,7 @@ + struct _EAccountComboBoxPrivate { + EAccountList *account_list; + GHashTable *index; ++ gint num_displayed_accounts; + }; + + static gpointer parent_class; +@@ -150,6 +151,8 @@ + GList *list = NULL; + GList *iter; + ++ combo_box->priv->num_displayed_accounts = 0; ++ + store = gtk_list_store_new (2, G_TYPE_STRING, E_TYPE_ACCOUNT); + model = GTK_TREE_MODEL (store); + index = combo_box->priv->index; +@@ -182,6 +185,7 @@ + gchar *string; + + account = iter->data; ++ combo_box->priv->num_displayed_accounts++; + + /* Show the account name for duplicate email addresses. */ + if (account_combo_box_has_dupes (list, account->id->address)) +@@ -514,3 +518,21 @@ + + return e_account_combo_box_set_active (combo_box, account); + } ++ ++/** ++ * e_account_combo_box_count_displayed_accounts: ++ * @combo_box: an #EAccountComboBox ++ * ++ * Counts the number of accounts that are displayed in the @combo_box. This may not ++ * be the actual number of accounts that are configured, as some of those accounts ++ * may be disabled by the user. ++ * ++ * Return value: number of active and valid accounts as shown in the @combo_box. ++ */ ++gint ++e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box) ++{ ++ g_return_val_if_fail (E_IS_ACCOUNT_COMBO_BOX (combo_box), -1); ++ ++ return combo_box->priv->num_displayed_accounts; ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-account-combo-box.h evolution-2.30.3.new//widgets/misc/e-account-combo-box.h +--- evolution-2.30.3//widgets/misc/e-account-combo-box.h 2010-06-20 14:14:34.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-account-combo-box.h 2010-09-01 19:18:57.633184001 +0200 +@@ -78,6 +78,8 @@ + (EAccountComboBox *combo_box, + const gchar *account_name); + ++gint e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box); ++ + G_END_DECLS + + #endif /* E_ACCOUNT_COMBO_BOX_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-calendar-item.c evolution-2.30.3.new//widgets/misc/e-calendar-item.c +--- evolution-2.30.3//widgets/misc/e-calendar-item.c 2010-06-24 19:16:02.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-calendar-item.c 2010-09-01 19:18:57.637184001 +0200 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + static const gint e_calendar_item_days_in_month[12] = { + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +@@ -228,7 +229,9 @@ + + static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 }; + +-G_DEFINE_TYPE (ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM) ++G_DEFINE_TYPE_WITH_CODE ( ++ ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + e_calendar_item_class_init (ECalendarItemClass *class) +@@ -844,6 +847,8 @@ + calitem = E_CALENDAR_ITEM (item); + + e_calendar_item_style_set (GTK_WIDGET(item->canvas), calitem); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (calitem)); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-calendar-item.h evolution-2.30.3.new//widgets/misc/e-calendar-item.h +--- evolution-2.30.3//widgets/misc/e-calendar-item.h 2010-06-24 19:16:02.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-calendar-item.h 2010-09-01 19:18:57.637184001 +0200 +@@ -109,12 +109,24 @@ + typedef struct tm (*ECalendarItemGetTimeCallback) (ECalendarItem *calitem, + gpointer data); + +-#define E_CALENDAR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ +- e_calendar_item_get_type (), ECalendarItem)) +-#define E_CALENDAR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\ +- e_calendar_item_get_type ())) +-#define E_IS_CALENDAR_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ +- e_calendar_item_get_type ())) ++/* Standard GObject macros */ ++#define E_TYPE_CALENDAR_ITEM \ ++ (e_calendar_item_get_type ()) ++#define E_CALENDAR_ITEM(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_CALENDAR_ITEM, ECalendarItem)) ++#define E_CALENDAR_ITEM_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_CAST \ ++ ((cls), E_TYPE_CALENDAR_ITEM, ECalendarItemClass)) ++#define E_IS_CALENDAR_ITEM(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE \ ++ ((obj), E_TYPE_CALENDAR_ITEM)) ++#define E_IS_CALENDAR_ITEM_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_TYPE \ ++ ((cls), E_TYPE_CALENDAR_ITEM)) ++#define E_CALENDAR_ITEM_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS \ ++ ((obj), E_TYPE_CALENDAR_ITEM, ECalendarItemClass)) + + struct _ECalendarItem + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-dateedit.c evolution-2.30.3.new//widgets/misc/e-dateedit.c +--- evolution-2.30.3//widgets/misc/e-dateedit.c 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-dateedit.c 2010-09-01 19:18:57.637184001 +0200 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include "e-calendar.h" + + #define E_DATE_EDIT_GET_PRIVATE(obj) \ +@@ -205,9 +206,12 @@ + gint hour, + gint minute); + +-static gpointer parent_class; + static gint signals[LAST_SIGNAL]; + ++G_DEFINE_TYPE_WITH_CODE ( ++ EDateEdit, e_date_edit, GTK_TYPE_HBOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ + static void + date_edit_set_property (GObject *object, + guint property_id, +@@ -334,16 +338,15 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_date_edit_parent_class)->dispose (object); + } + + static void +-date_edit_class_init (EDateEditClass *class) ++e_date_edit_class_init (EDateEditClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EDateEditPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -448,7 +451,7 @@ + } + + static void +-date_edit_init (EDateEdit *dedit) ++e_date_edit_init (EDateEdit *dedit) + { + dedit->priv = E_DATE_EDIT_GET_PRIVATE (dedit); + +@@ -476,32 +479,8 @@ + + /* Set it to the current time. */ + e_date_edit_set_time (dedit, 0); +-} +- +-GType +-e_date_edit_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EDateEditClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) date_edit_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EDateEdit), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) date_edit_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_HBOX, "EDateEdit", &type_info, 0); +- } + +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (dedit)); + } + + /** +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-preferences-window.c evolution-2.30.3.new//widgets/misc/e-preferences-window.c +--- evolution-2.30.3//widgets/misc/e-preferences-window.c 2010-06-20 14:14:32.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-preferences-window.c 2010-09-01 19:18:57.637184001 +0200 +@@ -33,11 +33,17 @@ + + struct _EPreferencesWindowPrivate { + GtkWidget *icon_view; ++ GtkWidget *scroll; + GtkWidget *notebook; + GHashTable *index; ++ ++ GtkListStore *store; ++ GtkTreeModelFilter *filter; ++ const gchar *filter_view; + }; + + enum { ++ COLUMN_ID, /* G_TYPE_STRING */ + COLUMN_TEXT, /* G_TYPE_STRING */ + COLUMN_PIXBUF, /* GDK_TYPE_PIXBUF */ + COLUMN_PAGE, /* G_TYPE_INT */ +@@ -102,7 +108,7 @@ + if (list == NULL) + return; + +- model = gtk_icon_view_get_model (icon_view); ++ model = GTK_TREE_MODEL (window->priv->store); + gtk_tree_model_get_iter (model, &iter, list->data); + gtk_tree_model_get (model, &iter, COLUMN_PAGE, &page, -1); + +@@ -190,6 +196,40 @@ + widget_class->show = preferences_window_show; + } + ++static gboolean ++filter_view (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ gpointer data) ++{ ++ EPreferencesWindow *window = (EPreferencesWindow *)data; ++ gchar *str; ++ gboolean visible = FALSE; ++ ++ if (!window->priv->filter_view) ++ return TRUE; ++ ++ gtk_tree_model_get (model, iter, COLUMN_ID, &str, -1); ++ if (strncmp(window->priv->filter_view, "mail", 4) == 0) { ++ /* Show everything except calendar */ ++ if (str && (strncmp (str, "cal", 3) == 0)) ++ visible = FALSE; ++ else ++ visible = TRUE; ++ } else if (strncmp(window->priv->filter_view, "cal", 3) == 0) { ++ /* Show only calendar and nothing else */ ++ if (str && (strncmp (str, "cal", 3) != 0)) ++ visible = FALSE; ++ else ++ visible = TRUE; ++ ++ } else /* In any other case, show everything */ ++ visible = TRUE; ++ ++ g_free (str); ++ ++ return visible; ++} ++ + static void + preferences_window_init (EPreferencesWindow *window) + { +@@ -209,11 +249,19 @@ + + window->priv = E_PREFERENCES_WINDOW_GET_PRIVATE (window); + window->priv->index = index; ++ window->priv->filter_view = NULL; + + store = gtk_list_store_new ( +- 4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT); ++ 5, G_TYPE_STRING, G_TYPE_STRING, ++ GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT); + gtk_tree_sortable_set_sort_column_id ( + GTK_TREE_SORTABLE (store), COLUMN_SORT, GTK_SORT_ASCENDING); ++ window->priv->store = store; ++ ++ window->priv->filter = (GtkTreeModelFilter *) ++ gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); ++ gtk_tree_model_filter_set_visible_func ( ++ window->priv->filter, filter_view, window, NULL); + + title = _("Evolution Preferences"); + gtk_window_set_title (GTK_WINDOW (window), title); +@@ -243,11 +291,12 @@ + gtk_scrolled_window_set_shadow_type ( + GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0); ++ window->priv->scroll = widget; + gtk_widget_show (widget); + + container = widget; + +- widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store)); ++ widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (window->priv->filter)); + gtk_icon_view_set_columns (GTK_ICON_VIEW (widget), 1); + gtk_icon_view_set_text_column (GTK_ICON_VIEW (widget), COLUMN_TEXT); + gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (widget), COLUMN_PIXBUF); +@@ -359,13 +408,14 @@ + notebook = GTK_NOTEBOOK (window->priv->notebook); + + page = gtk_notebook_get_n_pages (notebook); +- model = gtk_icon_view_get_model (icon_view); ++ model = GTK_TREE_MODEL (window->priv->store); + pixbuf = preferences_window_load_pixbuf (icon_name); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, ++ COLUMN_ID, page_name, + COLUMN_TEXT, caption, COLUMN_PIXBUF, pixbuf, + COLUMN_PAGE, page, COLUMN_SORT, sort_order, -1); + +@@ -405,3 +455,35 @@ + gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0); + gtk_tree_path_free (path); + } ++ ++void ++e_preferences_window_filter_page (EPreferencesWindow *window, ++ const gchar *page_name) ++{ ++ GtkTreeRowReference *reference; ++ GtkIconView *icon_view; ++ GtkTreePath *path; ++ ++ g_return_if_fail (E_IS_PREFERENCES_WINDOW (window)); ++ g_return_if_fail (page_name != NULL); ++ ++ icon_view = GTK_ICON_VIEW (window->priv->icon_view); ++ reference = g_hash_table_lookup (window->priv->index, page_name); ++ g_return_if_fail (reference != NULL); ++ ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_icon_view_select_path (icon_view, path); ++ gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0); ++ gtk_tree_path_free (path); ++ ++ window->priv->filter_view = page_name; ++ gtk_tree_model_filter_refilter (window->priv->filter); ++ ++ /* XXX: We need a better solution to hide the icon view when ++ * there is just one entry */ ++ if (strncmp(page_name, "cal", 3) == 0) { ++ gtk_widget_hide (window->priv->scroll); ++ } else ++ gtk_widget_show (window->priv->scroll); ++} ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-preferences-window.h evolution-2.30.3.new//widgets/misc/e-preferences-window.h +--- evolution-2.30.3//widgets/misc/e-preferences-window.h 2010-06-20 14:14:31.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-preferences-window.h 2010-09-01 19:18:57.637184001 +0200 +@@ -68,6 +68,8 @@ + gint sort_order); + void e_preferences_window_show_page (EPreferencesWindow *window, + const gchar *page_name); ++void e_preferences_window_filter_page(EPreferencesWindow *window, ++ const gchar *page_name); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-web-view.c evolution-2.30.3.new//widgets/misc/e-web-view.c +--- evolution-2.30.3//widgets/misc/e-web-view.c 2010-06-24 14:45:27.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-web-view.c 2010-09-01 19:18:57.637184001 +0200 +@@ -28,9 +28,10 @@ + #include + #include + +-#include "e-util/e-util.h" +-#include "e-util/e-binding.h" +-#include "e-util/e-plugin-ui.h" ++#include ++#include ++#include ++#include + + #include "e-popup-action.h" + #include "e-selectable.h" +@@ -75,6 +76,9 @@ + PROP_DISABLE_PRINTING, + PROP_DISABLE_SAVE_TO_DISK, + PROP_EDITABLE, ++ PROP_INLINE_SPELLING, ++ PROP_MAGIC_LINKS, ++ PROP_MAGIC_SMILEYS, + PROP_OPEN_PROXY, + PROP_PASTE_TARGET_LIST, + PROP_PRINT_PROXY, +@@ -118,6 +122,14 @@ + " " + ""; + ++/* Forward Declarations */ ++static void e_web_view_selectable_init (ESelectableInterface *interface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EWebView, e_web_view, GTK_TYPE_HTML, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (E_TYPE_SELECTABLE, e_web_view_selectable_init)) ++ + static EWebViewRequest * + web_view_request_new (EWebView *web_view, + const gchar *uri, +@@ -507,6 +519,24 @@ + g_value_get_boolean (value)); + return; + ++ case PROP_INLINE_SPELLING: ++ e_web_view_set_inline_spelling ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_MAGIC_LINKS: ++ e_web_view_set_magic_links ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_MAGIC_SMILEYS: ++ e_web_view_set_magic_smileys ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_OPEN_PROXY: + e_web_view_set_open_proxy ( + E_WEB_VIEW (object), +@@ -578,6 +608,24 @@ + E_WEB_VIEW (object))); + return; + ++ case PROP_INLINE_SPELLING: ++ g_value_set_boolean ( ++ value, e_web_view_get_inline_spelling ( ++ E_WEB_VIEW (object))); ++ return; ++ ++ case PROP_MAGIC_LINKS: ++ g_value_set_boolean ( ++ value, e_web_view_get_magic_links ( ++ E_WEB_VIEW (object))); ++ return; ++ ++ case PROP_MAGIC_SMILEYS: ++ g_value_set_boolean ( ++ value, e_web_view_get_magic_smileys ( ++ E_WEB_VIEW (object))); ++ return; ++ + case PROP_OPEN_PROXY: + g_value_set_object ( + value, e_web_view_get_open_proxy ( +@@ -813,6 +861,16 @@ + } + + static void ++web_view_load_string (EWebView *web_view, ++ const gchar *string) ++{ ++ if (string != NULL && *string != '\0') ++ gtk_html_load_from_string (GTK_HTML (web_view), string, -1); ++ else ++ e_web_view_clear (web_view); ++} ++ ++static void + web_view_copy_clipboard (EWebView *web_view) + { + gtk_html_command (GTK_HTML (web_view), "copy"); +@@ -1008,7 +1066,7 @@ + } + + static void +-web_view_class_init (EWebViewClass *class) ++e_web_view_class_init (EWebViewClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; +@@ -1034,6 +1092,7 @@ + html_class->iframe_created = web_view_iframe_created; + + class->extract_uri = web_view_extract_uri; ++ class->load_string = web_view_load_string; + class->copy_clipboard = web_view_copy_clipboard; + class->cut_clipboard = web_view_cut_clipboard; + class->paste_clipboard = web_view_paste_clipboard; +@@ -1076,7 +1135,8 @@ + "Disable Printing", + NULL, + FALSE, +- G_PARAM_READWRITE)); ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); + + g_object_class_install_property ( + object_class, +@@ -1086,7 +1146,8 @@ + "Disable Save-to-Disk", + NULL, + FALSE, +- G_PARAM_READWRITE)); ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); + #endif + + g_object_class_install_property ( +@@ -1101,6 +1162,36 @@ + + g_object_class_install_property ( + object_class, ++ PROP_INLINE_SPELLING, ++ g_param_spec_boolean ( ++ "inline-spelling", ++ "Inline Spelling", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MAGIC_LINKS, ++ g_param_spec_boolean ( ++ "magic-links", ++ "Magic Links", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MAGIC_SMILEYS, ++ g_param_spec_boolean ( ++ "magic-smileys", ++ "Magic Smileys", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, + PROP_OPEN_PROXY, + g_param_spec_object ( + "open-proxy", +@@ -1213,7 +1304,7 @@ + } + + static void +-web_view_selectable_init (ESelectableInterface *interface) ++e_web_view_selectable_init (ESelectableInterface *interface) + { + interface->update_actions = web_view_selectable_update_actions; + interface->cut_clipboard = web_view_selectable_cut_clipboard; +@@ -1223,7 +1314,7 @@ + } + + static void +-web_view_init (EWebView *web_view) ++e_web_view_init (EWebView *web_view) + { + GtkUIManager *ui_manager; + GtkActionGroup *action_group; +@@ -1339,41 +1430,8 @@ + id = "org.gnome.evolution.webview"; + e_plugin_ui_register_manager (ui_manager, id, web_view); + e_plugin_ui_enable_manager (ui_manager, id); +-} +- +-GType +-e_web_view_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EWebViewClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) web_view_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EWebView), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) web_view_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo selectable_info = { +- (GInterfaceInitFunc) web_view_selectable_init, +- (GInterfaceFinalizeFunc) NULL, +- NULL /* interface_data */ +- }; + +- type = g_type_register_static ( +- GTK_TYPE_HTML, "EWebView", &type_info, 0); +- +- g_type_add_interface_static ( +- type, E_TYPE_SELECTABLE, &selectable_info); +- } +- +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (web_view)); + } + + GtkWidget * +@@ -1394,12 +1452,14 @@ + e_web_view_load_string (EWebView *web_view, + const gchar *string) + { ++ EWebViewClass *class; ++ + g_return_if_fail (E_IS_WEB_VIEW (web_view)); + +- if (string != NULL && *string != '\0') +- gtk_html_load_from_string (GTK_HTML (web_view), string, -1); +- else +- e_web_view_clear (web_view); ++ class = E_WEB_VIEW_GET_CLASS (web_view); ++ g_return_if_fail (class->load_string != NULL); ++ ++ class->load_string (web_view, string); + } + + gboolean +@@ -1526,6 +1586,84 @@ + g_object_notify (G_OBJECT (web_view), "editable"); + } + ++gboolean ++e_web_view_get_inline_spelling (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_inline_spelling(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_inline_spelling (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_inline_spelling (EWebView *web_view, ++ gboolean inline_spelling) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_inline_spelling() ++ * so we get a "notify::inline-spelling" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_inline_spelling (GTK_HTML (web_view), inline_spelling); ++ ++ g_object_notify (G_OBJECT (web_view), "inline-spelling"); ++} ++ ++gboolean ++e_web_view_get_magic_links (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_magic_links(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_magic_links (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_magic_links (EWebView *web_view, ++ gboolean magic_links) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_magic_links() ++ * so we can get a "notify::magic-links" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_magic_links (GTK_HTML (web_view), magic_links); ++ ++ g_object_notify (G_OBJECT (web_view), "magic-links"); ++} ++ ++gboolean ++e_web_view_get_magic_smileys (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_magic_smileys(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_magic_smileys (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_magic_smileys (EWebView *web_view, ++ gboolean magic_smileys) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_magic_smileys() ++ * so we can get a "notify::magic-smileys" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_magic_smileys (GTK_HTML (web_view), magic_smileys); ++ ++ g_object_notify (G_OBJECT (web_view), "magic-smileys"); ++} ++ + const gchar * + e_web_view_get_selected_uri (EWebView *web_view) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/misc/e-web-view.h evolution-2.30.3.new//widgets/misc/e-web-view.h +--- evolution-2.30.3//widgets/misc/e-web-view.h 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.3.new//widgets/misc/e-web-view.h 2010-09-01 19:18:57.641184001 +0200 +@@ -69,6 +69,8 @@ + gchar * (*extract_uri) (EWebView *web_view, + GdkEventButton *event, + GtkHTML *frame); ++ void (*load_string) (EWebView *web_view, ++ const gchar *load_string); + + /* Signals */ + void (*copy_clipboard) (EWebView *web_view); +@@ -106,6 +108,15 @@ + gboolean e_web_view_get_editable (EWebView *web_view); + void e_web_view_set_editable (EWebView *web_view, + gboolean editable); ++gboolean e_web_view_get_inline_spelling (EWebView *web_view); ++void e_web_view_set_inline_spelling (EWebView *web_view, ++ gboolean inline_spelling); ++gboolean e_web_view_get_magic_links (EWebView *web_view); ++void e_web_view_set_magic_links (EWebView *web_view, ++ gboolean magic_links); ++gboolean e_web_view_get_magic_smileys (EWebView *web_view); ++void e_web_view_set_magic_smileys (EWebView *web_view, ++ gboolean magic_smileys); + const gchar * e_web_view_get_selected_uri (EWebView *web_view); + void e_web_view_set_selected_uri (EWebView *web_view, + const gchar *selected_uri); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//widgets/table/e-cell-text.c evolution-2.30.3.new//widgets/table/e-cell-text.c +--- evolution-2.30.3//widgets/table/e-cell-text.c 2010-06-20 14:14:37.000000000 +0200 ++++ evolution-2.30.3.new//widgets/table/e-cell-text.c 2010-09-01 19:18:57.641184001 +0200 +@@ -1421,7 +1421,7 @@ + * should be 16 + 4. + * Height of some special font is much higher than others, + * such as Arabic. So leave some more margin for cell. +-` */ ++ */ + return 16 + 8; + } + --- evolution-2.30.3.orig/debian/patches/91_git_additional_chinese_translations.patch +++ evolution-2.30.3/debian/patches/91_git_additional_chinese_translations.patch @@ -0,0 +1,14389 @@ +From f3faa077093912674aacf91905136375f03a44d2 Mon Sep 17 00:00:00 2001 +From: Aron Xu +Date: Sat, 21 Aug 2010 08:39:25 +0000 +Subject: Merge Simplified Chinese help translation from master. + +--- +diff --git a/help/Makefile.am b/help/Makefile.am +index 956e94a..98d33c5 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -77,7 +77,7 @@ DOC_FIGURES = \ + figures/stock_search.png \ + figures/ver_view_a.png + +-DOC_LINGUAS = cs de el en_GB es eu fr oc ru sv mk ++DOC_LINGUAS = cs de el en_GB es eu fr oc ru sv mk zh_CN + + check: + xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml +diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po +new file mode 100644 +index 0000000..2fe549a +--- a/dev/null ++++ b/help/zh_CN/zh_CN.po +@@ -0,0 +1,14362 @@ ++# Simplified Chinese translation of evolution-help. ++# Copyright (C) 2009 Free Software Foundation, Inc. ++# This file is distributed under the same license as the evolution package. ++# Zhang Miao , 2009. ++# 朱涛 , 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: evolution master\n" ++"POT-Creation-Date: 2010-08-11 22:02+0000\n" ++"PO-Revision-Date: 2010-08-21 16:33+0800\n" ++"Last-Translator: 朱涛 \n" ++"Language-Team: Chinese (simplified) \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:445(None) ++msgid "" ++"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2" ++msgstr "" ++"@@image: 'figures/evo_gwreceive_a.png'; md5=ef64e581e652d0f03e4e6dd4a3b6d5a2" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:455(None) ++msgid "@@image: 'figures/evo_mereceive_a.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "@@image: 'figures/evo_mereceive_a.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:576(None) ++msgid "" ++"@@image: 'figures/evo_exchng_mapi.png'; md5=e994b432c31237e2dc8b5ffaabbd2962" ++msgstr "" ++"@@image: 'figures/evo_exchng_mapi.png'; md5=e994b432c31237e2dc8b5ffaabbd2962" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:587(None) ++msgid "" ++"@@image: 'figures/evo_imapreceive_a.png'; " ++"md5=abaf292ea7b663824123f1f7f171b014" ++msgstr "" ++"@@image: 'figures/evo_imapreceive_a.png'; " ++"md5=abaf292ea7b663824123f1f7f171b014" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:630(None) ++msgid "" ++"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273" ++msgstr "" ++"@@image: 'figures/evo_popreceive_a.png'; md5=a635f0e8d9bb4f0bcda34221c258f273" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:652(None) ++msgid "" ++"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f" ++msgstr "" ++"@@image: 'figures/evo_usereceive_a.png'; md5=3c14cafdde81fca95d480851aee9db0f" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:702(None) ++msgid "" ++"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189" ++msgstr "" ++"@@image: 'figures/evo_mhreceive_a.png'; md5=c7b97b4a2e9b9cf1c550244cca15a189" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:723(None) ++msgid "" ++"@@image: 'figures/evo_maildirreceive_a.png'; " ++"md5=bdd9dfc00800338dc906e2fd12b07f62" ++msgstr "" ++"@@image: 'figures/evo_maildirreceive_a.png'; " ++"md5=bdd9dfc00800338dc906e2fd12b07f62" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:745(None) C/evolution.xml:768(None) ++msgid "" ++"@@image: 'figures/evo_mboxreceive_a.png'; " ++"md5=a04753f7615eab6ac349f50caa39a7a8" ++msgstr "" ++"@@image: 'figures/evo_mboxreceive_a.png'; " ++"md5=a04753f7615eab6ac349f50caa39a7a8" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:796(None) ++msgid "" ++"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42" ++msgstr "" ++"@@image: 'figures/evo_send_setup_a.png'; md5=82760a1733ccb49ffa8424d265278b42" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:870(None) ++msgid "" ++"@@image: 'figures/evo_mail_callout_a.png'; " ++"md5=4fa6dda9663d554197736dd2feb79575" ++msgstr "" ++"@@image: 'figures/evo_mail_callout_a.png'; " ++"md5=4fa6dda9663d554197736dd2feb79575" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1045(None) ++msgid "@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701" ++msgstr "" ++"@@image: 'figures/evo_mail_a.png'; md5=cf315e85737412c6ee3c3202b8807701" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1063(None) ++msgid "" ++"@@image: 'figures/evo_cal_callout_a.png'; " ++"md5=6de000ad9c7b3fe42ed1996cad46432f" ++msgstr "" ++"@@image: 'figures/evo_cal_callout_a.png'; " ++"md5=6de000ad9c7b3fe42ed1996cad46432f" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1083(None) ++msgid "" ++"@@image: 'figures/contacts_mainwindow_a.png'; " ++"md5=41335f17f056cb0b06e3df4900d08865" ++msgstr "" ++"@@image: 'figures/contacts_mainwindow_a.png'; " ++"md5=41335f17f056cb0b06e3df4900d08865" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1099(None) ++msgid "" ++"@@image: 'figures/evo_backup_warning.png'; " ++"md5=c05e6d67bae4ae0b9e7fcb9701cbdfe6" ++msgstr "" ++"@@image: 'figures/evo_backup_warning.png'; " ++"md5=c05e6d67bae4ae0b9e7fcb9701cbdfe6" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1107(None) ++msgid "" ++"@@image: 'figures/evo_backup_prgsbar.png'; " ++"md5=9df6295eb38525fbbfc64cb8928d7fb0" ++msgstr "" ++"@@image: 'figures/evo_backup_prgsbar.png'; " ++"md5=9df6295eb38525fbbfc64cb8928d7fb0" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1125(None) ++msgid "@@image: 'figures/evo_restore.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "@@image: 'figures/evo_restore.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1297(None) ++msgid "" ++"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000" ++msgstr "" ++"@@image: 'figures/evo_newmail.png'; md5=426590d03b7b0bc88b16cc61b2ec1000" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1299(None) ++msgid "" ++"@@image: 'figures/evo_mailnotification.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "" ++"@@image: 'figures/evo_mailnotification.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1309(None) ++msgid "" ++"@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa" ++msgstr "" ++"@@image: 'figures/folder_plus.png'; md5=61548b886beadeec26ef258f2cb1c2aa" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1375(None) ++msgid "@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b" ++msgstr "" ++"@@image: 'figures/ver_view_a.png'; md5=f3075b70b9eebf8f2b8f3b587143ef8b" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1524(None) ++msgid "" ++"@@image: 'figures/evo_newmess_a.png'; md5=8d34b2fa682b559f7150e769e0079d17" ++msgstr "" ++"@@image: 'figures/evo_newmess_a.png'; md5=8d34b2fa682b559f7150e769e0079d17" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1582(None) ++msgid "@@image: 'figures/evo_customheader.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "@@image: 'figures/evo_customheader.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1635(None) ++msgid "" ++"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb" ++msgstr "" ++"@@image: 'figures/evo_offline.png'; md5=1efa5688aaa2aa59a37e614e32c4f7eb" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1679(None) ++msgid "" ++"@@image: 'figures/attach_reminder_a.png'; " ++"md5=e0c90f77e6df9ad52589af09fdbbfdd7" ++msgstr "" ++"@@image: 'figures/attach_reminder_a.png'; " ++"md5=e0c90f77e6df9ad52589af09fdbbfdd7" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:1692(None) ++msgid "" ++"@@image: 'figures/evo_attachreminder_plugin.png'; " ++"md5=25f7db7cd7d310110847354c62702ecf" ++msgstr "" ++"@@image: 'figures/evo_attachreminder_plugin.png'; " ++"md5=25f7db7cd7d310110847354c62702ecf" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:2786(None) ++msgid "" ++"@@image: 'figures/evo_flag_follow_up_a.png'; " ++"md5=6a4790a789cf4b3b8b73cb43aa8d065b" ++msgstr "" ++"@@image: 'figures/evo_flag_follow_up_a.png'; " ++"md5=6a4790a789cf4b3b8b73cb43aa8d065b" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:2967(None) ++msgid "" ++"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c" ++msgstr "" ++"@@image: 'figures/evo_adv_search_a.png'; md5=676d35d686745650c9bcfa832763362c" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:2997(None) ++msgid "" ++"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8" ++msgstr "" ++"@@image: 'figures/evo_edit_search.png'; md5=2ce150b3eb63cc4ec0f0292e13167be8" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3029(None) ++msgid "" ++"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578" ++msgstr "" ++"@@image: 'figures/filter-new-fig.png'; md5=75a2b8ccfe0f7a4982859827c867d578" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3277(None) ++msgid "@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa" ++msgstr "" ++"@@image: 'figures/evo_rule_a.png'; md5=5f8fb34b77c0d3abe7aff767edd53aaa" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3457(None) ++msgid "" ++"@@image: 'figures/evo_contacteditor_a.png'; " ++"md5=fba5d6ebd22fceb554dabb0fc8c02cd3" ++msgstr "" ++"@@image: 'figures/evo_contacteditor_a.png'; " ++"md5=fba5d6ebd22fceb554dabb0fc8c02cd3" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3495(None) ++msgid "" ++"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252" ++msgstr "" ++"@@image: 'figures/quick_add_a.png'; md5=2a3d3007ec4cd18bb7e3a208bcbfb252" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3800(None) ++msgid "" ++"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77" ++msgstr "" ++"@@image: 'figures/categories_a.png'; md5=362ebe93a74beec4fd820776c7f2db77" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:3992(None) ++msgid "" ++"@@image: 'figures/evo_Wcal_prop_a.png'; md5=dcd10f32a1ac7cbcb44d67e1a4b71a78" ++msgstr "" ++"@@image: 'figures/evo_Wcal_prop_a.png'; md5=dcd10f32a1ac7cbcb44d67e1a4b71a78" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:4001(None) ++msgid "" ++"@@image: 'figures/google_cal_view.png'; md5=e9ad85fb604b18447bcf9be09a540989" ++msgstr "" ++"@@image: 'figures/google_cal_view.png'; md5=e9ad85fb604b18447bcf9be09a540989" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:4108(None) ++msgid "" ++"@@image: 'figures/evo_calender_appointmnt.png'; " ++"md5=743dd472bfd9dcda1e7f8021dda97114" ++msgstr "" ++"@@image: 'figures/evo_calender_appointmnt.png'; " ++"md5=743dd472bfd9dcda1e7f8021dda97114" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:4641(None) ++msgid "" ++"@@image: 'figures/local_ics_calendar.png'; " ++"md5=2ff81d975384c97ad1b73e8c66bc407d" ++msgstr "" ++"@@image: 'figures/local_ics_calendar.png'; " ++"md5=2ff81d975384c97ad1b73e8c66bc407d" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:4960(None) ++msgid "@@image: 'figures/evo_memo_a.png'; md5=29e23aefd253747b3a42f182825b75bd" ++msgstr "" ++"@@image: 'figures/evo_memo_a.png'; md5=29e23aefd253747b3a42f182825b75bd" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5362(None) ++msgid "" ++"@@image: 'figures/exchng-rec-mails.png'; md5=b56dfa570c8d1c9b942c6493fd973d68" ++msgstr "" ++"@@image: 'figures/exchng-rec-mails.png'; md5=b56dfa570c8d1c9b942c6493fd973d68" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5369(None) ++msgid "" ++"@@image: 'figures/exchng-rec-options.png'; " ++"md5=31a2bbe7ef9de1dc79da40949e0dc7ae" ++msgstr "" ++"@@image: 'figures/exchng-rec-options.png'; " ++"md5=31a2bbe7ef9de1dc79da40949e0dc7ae" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5467(None) ++msgid "" ++"@@image: 'figures/evo_send_option_a.png'; " ++"md5=c1cca904625d1a7de13c851cd15235f6" ++msgstr "" ++"@@image: 'figures/evo_send_option_a.png'; " ++"md5=c1cca904625d1a7de13c851cd15235f6" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5547(None) ++msgid "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7" ++msgstr "@@image: 'figures/delgt-add.png'; md5=9bf1f22c67551ad910cd3749f216c2b7" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5556(None) ++msgid "" ++"@@image: 'figures/evo_delegate_permission_a.png'; " ++"md5=05df38ad69b20f9bd7c1e14044ca10fd" ++msgstr "" ++"@@image: 'figures/evo_delegate_permission_a.png'; " ++"md5=05df38ad69b20f9bd7c1e14044ca10fd" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5733(None) ++msgid "" ++"@@image: 'figures/folder_size_preference.png'; " ++"md5=8d9067996afa74c865417b5b9171d4c0" ++msgstr "" ++"@@image: 'figures/folder_size_preference.png'; " ++"md5=8d9067996afa74c865417b5b9171d4c0" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:5737(None) ++msgid "" ++"@@image: 'figures/folder_size_mapi.png'; md5=4b20ea9d82999051360f14da27e7c15d" ++msgstr "" ++"@@image: 'figures/folder_size_mapi.png'; md5=4b20ea9d82999051360f14da27e7c15d" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6060(None) ++msgid "" ++"@@image: 'figures/evo_shd_memo_a.png'; md5=9a72b7725da27ce1970592cff67f4bbd" ++msgstr "" ++"@@image: 'figures/evo_shd_memo_a.png'; md5=9a72b7725da27ce1970592cff67f4bbd" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6097(None) ++msgid "" ++"@@image: 'figures/groupwise_resend.png'; md5=697ce252ac6f3f2f4f361039818d1262" ++msgstr "" ++"@@image: 'figures/groupwise_resend.png'; md5=697ce252ac6f3f2f4f361039818d1262" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6113(None) ++msgid "" ++"@@image: 'figures/groupwise_resend_retract.png'; " ++"md5=4eac3186389940b8305cf676f9fc3ef4" ++msgstr "" ++"@@image: 'figures/groupwise_resend_retract.png'; " ++"md5=4eac3186389940b8305cf676f9fc3ef4" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6171(None) ++msgid "" ++"@@image: 'figures/evo_gwstatustrack.png'; " ++"md5=d4eb84e2d55870af1408c430ce8c0e66" ++msgstr "" ++"@@image: 'figures/evo_gwstatustrack.png'; " ++"md5=d4eb84e2d55870af1408c430ce8c0e66" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6225(None) ++msgid "" ++"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705" ++msgstr "" ++"@@image: 'figures/evo_sendstatus_a.png'; md5=36ca2211056c859eb776124bfc364705" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6292(None) ++msgid "" ++"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353" ++msgstr "" ++"@@image: 'figures/evo_calstatus_a.png'; md5=99fb98faa3e644f6433c078ba71a0353" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6433(None) ++msgid "" ++"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad" ++msgstr "" ++"@@image: 'figures/evo_proxyadd_a.png'; md5=51357617967f0610eb95dab5814540ad" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6606(None) ++msgid "" ++"@@image: 'figures/mailer_preferences.png'; " ++"md5=d5b47aa5da56ec9b94188e0f71fc43b1" ++msgstr "" ++"@@image: 'figures/mailer_preferences.png'; " ++"md5=d5b47aa5da56ec9b94188e0f71fc43b1" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6683(None) ++msgid "" ++"@@image: 'figures/evolution_contact_preference.png'; " ++"md5=cfa45a42e19ea3b09587f08990cf178f" ++msgstr "" ++"@@image: 'figures/evolution_contact_preference.png'; " ++"md5=cfa45a42e19ea3b09587f08990cf178f" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6713(None) ++msgid "@@image: 'figures/evo_imapheader_a.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "@@image: 'figures/evo_imapheader_a.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6808(None) ++msgid "" ++"@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3" ++msgstr "" ++"@@image: 'figures/evo_labels_a.png'; md5=e136d81754f7c859713674c09af56ca3" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6834(None) ++msgid "" ++"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa" ++msgstr "" ++"@@image: 'figures/evo_label_a.png'; md5=bc5d8fe2485b9678a4911ac6e1469dfa" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6853(None) ++msgid "" ++"@@image: 'figures/evolution_mail_preference.png'; " ++"md5=191c1e890aa1cded550c9579d1af06e9" ++msgstr "" ++"@@image: 'figures/evolution_mail_preference.png'; " ++"md5=191c1e890aa1cded550c9579d1af06e9" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6884(None) ++msgid "@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9" ++msgstr "" ++"@@image: 'figures/evo_junk_a.png'; md5=635a83cb310a374a041da9e5dad017c9" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:6988(None) ++msgid "" ++"@@image: 'figures/evo_caltasks_a.png'; md5=88a894d8414c9205da0a6bab34de018c" ++msgstr "" ++"@@image: 'figures/evo_caltasks_a.png'; md5=88a894d8414c9205da0a6bab34de018c" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:7082(None) ++msgid "@@image: 'figures/network_pref.png'; md5=THIS FILE DOESN'T EXIST" ++msgstr "@@image: 'figures/network_pref.png'; md5=THIS FILE DOESN'T EXIST" ++ ++#. When image changes, this message will be marked fuzzy or untranslated for you. ++#. It doesn't matter what you translate it to: it's not used at all. ++#: C/evolution.xml:7505(None) ++msgid "" ++"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5" ++msgstr "" ++"@@image: 'figures/quick_reference.png'; md5=86fe7457150de2e7efe735c10cd324f5" ++ ++#: C/evolution.xml:18(firstname) C/evolution.xml:20(corpauthor) ++#: C/evolution.xml:33(para) C/evolution.xml:41(para) C/evolution.xml:49(para) ++#: C/evolution.xml:57(para) C/evolution.xml:65(para) C/evolution.xml:73(para) ++msgid "Novell, Inc" ++msgstr "Novell, Inc" ++ ++#: C/evolution.xml:24(date) ++msgid "2002-2009" ++msgstr "2002-2009" ++ ++#: C/evolution.xml:29(revnumber) C/evolution.xml:88(productnumber) ++msgid "2.30" ++msgstr "2.30" ++ ++#: C/evolution.xml:30(date) C/evolution.xml:38(date) ++msgid "September 2009" ++msgstr "2009年9月" ++ ++#: C/evolution.xml:32(para) ++msgid "Akhil Laddha" ++msgstr "Akhil Laddha" ++ ++#: C/evolution.xml:37(revnumber) ++msgid "2.28" ++msgstr "2.28" ++ ++#: C/evolution.xml:40(para) C/evolution.xml:48(para) C/evolution.xml:56(para) ++#: C/evolution.xml:72(para) ++msgid "Radhika PC" ++msgstr "Radhika PC" ++ ++#: C/evolution.xml:45(revnumber) ++msgid "2.26" ++msgstr "2.26" ++ ++#: C/evolution.xml:46(date) ++msgid "March 2009" ++msgstr "2009 年 3 月" ++ ++#: C/evolution.xml:53(revnumber) ++msgid "2.12" ++msgstr "2.12" ++ ++#: C/evolution.xml:54(date) ++msgid "September 2007" ++msgstr "2007 年 9 月" ++ ++#: C/evolution.xml:61(revnumber) ++msgid "2.10" ++msgstr "2.10" ++ ++#: C/evolution.xml:62(date) ++msgid "November 20, 2006" ++msgstr "2006 年 11 月 20 日" ++ ++#: C/evolution.xml:64(para) ++msgid "Francisco Serrador" ++msgstr "Francisco Serrador" ++ ++#: C/evolution.xml:69(revnumber) ++msgid "2.8" ++msgstr "2.8" ++ ++#: C/evolution.xml:70(date) ++msgid "October 5, 2006" ++msgstr "2006 年 10 月 5 日" ++ ++#: C/evolution.xml:78(releaseinfo) ++msgid "This manual describes version 2.30 of Evolution" ++msgstr "本手册描述的是 2.30 版的 Evolution" ++ ++#: C/evolution.xml:82(para) ++msgid "" ++"A user's guide to Evolution which explains how to use its mail, calendar, " ++"address book, and task list features." ++msgstr "Evolution 用户指南，解释如何使用它的邮件，日历，地址簿，任务列表特性。" ++ ++#: C/evolution.xml:87(productname) C/evolution.xml:5869(para) ++#: C/evolution.xml:7692(glossterm) ++msgid "Evolution" ++msgstr "Evolution" ++ ++#: C/evolution.xml:89(invpartnumber) ++msgid "February 2008" ++msgstr "2008 年 2 月" ++ ++#: C/evolution.xml:90(title) C/evolution.xml:7883(para) ++msgid "Evolution 2.30 User Guide" ++msgstr "Evolution 2.30 用户指南" ++ ++#: C/evolution.xml:95(title) ++msgid "About This Guide" ++msgstr "关于本指南" ++ ++#: C/evolution.xml:96(para) ++msgid "" ++"This guide describes how to use and manage Evolution " ++"2.30 client software. This guide is intended for users and is divided into " ++"the following sections:" ++msgstr "" ++"本指南描述了如何使用与管理 Evolution 2.30客户端软件。" ++"本指南面向普通用户，并分为如下部分：" ++ ++#: C/evolution.xml:99(link) C/evolution.xml:160(title) ++msgid "Getting Started" ++msgstr "启动" ++ ++#: C/evolution.xml:102(link) C/evolution.xml:1223(title) ++msgid "Sending and Receiving Email" ++msgstr "收发邮件" ++ ++#: C/evolution.xml:105(link) C/evolution.xml:2506(title) ++msgid "Organizing Your Email" ++msgstr "组织您的邮件" ++ ++#: C/evolution.xml:108(link) C/evolution.xml:3398(title) ++msgid "Evolution Contacts: the Address Book" ++msgstr "Evolution 通讯：地址簿" ++ ++#: C/evolution.xml:111(link) C/evolution.xml:3856(title) ++msgid "Evolution Calendar" ++msgstr "Evolution 日历" ++ ++#: C/evolution.xml:114(link) C/evolution.xml:5176(title) ++msgid "Connecting to Exchange Servers" ++msgstr "连接到 Exchange Servers" ++ ++#: C/evolution.xml:117(link) C/evolution.xml:5744(title) ++msgid "Connecting to GroupWise" ++msgstr "连接到到 GroupWise" ++ ++#: C/evolution.xml:120(link) C/evolution.xml:6577(title) ++msgid "Advanced Configuration" ++msgstr "高级配置" ++ ++#: C/evolution.xml:123(link) C/evolution.xml:7367(title) ++msgid "Synchronizing Your Handheld Device" ++msgstr "同步您的手持设备" ++ ++#: C/evolution.xml:126(link) C/evolution.xml:7424(title) ++msgid "Migration from Outlook to Evolution" ++msgstr "由 Outlook 迁移到 Evolution" ++ ++#: C/evolution.xml:129(link) C/evolution.xml:7486(title) ++msgid "Quick Reference" ++msgstr "快速参考" ++ ++#: C/evolution.xml:132(link) C/evolution.xml:7600(title) ++msgid "Known Bugs and Limitations" ++msgstr "已知的错误与缺陷" ++ ++#: C/evolution.xml:135(link) C/evolution.xml:7606(title) ++msgid "Authors" ++msgstr "作者" ++ ++#: C/evolution.xml:138(link) C/evolution.xml:7653(title) ++msgid "Glossary" ++msgstr "术语表" ++ ++#: C/evolution.xml:142(title) ++msgid "Additional Documentation:" ++msgstr "附属文档：" ++ ++#: C/evolution.xml:143(para) ++msgid "You can find additional help in three places:" ++msgstr "在 3 个地方可以找到附加的帮助：" ++ ++#: C/evolution.xml:147(para) ++msgid "" ++"Evolution has a number of command line options that you can use. For " ++"information about command line options, open a terminal window and type " ++"evolution --help." ++msgstr "" ++"Evolution 有许多有用的命令行参数。获取命令行参数的信息，需打开终端窗口，并输" ++"入 evolution --help。" ++ ++#: C/evolution.xml:150(para) ++msgid "In the Evolution interface, click Help > Contents." ++msgstr "在 Evolution 界面下，点击“帮助”> “目录”。" ++ ++#: C/evolution.xml:154(title) ++msgid "Documentation Conventions:" ++msgstr "文档约定：" ++ ++#: C/evolution.xml:155(para) ++msgid "" ++"In Novell documentation, a greater-than symbol (>) is used to separate " ++"actions within a step and items in a cross-reference path. A trademark " ++"symbol (, , etc.) denotes a " ++"Novell trademark. An asterisk (*) denotes a third-party trademark." ++msgstr "" ++"在 Novell 文档中,大于号(>)用于分隔同一步骤中的各项操作,以及交叉引用路径中" ++"的各个项目。商标符号(, , etc.)用" ++"于表示 Novell 商标。星号(*)表示第三方商标。" ++ ++#: C/evolution.xml:161(para) ++msgid "" ++"Evolution is a groupware application that helps you work in a group by handling email, address, " ++"memos, tasks, and one or more calendars. This makes the tasks of storing, " ++"organizing, and retrieving your personal information easy, so you can work " ++"and communicate effectively with others." ++msgstr "" ++"Evolution 是一个群件应用程序，能够帮助您通过处理电子邮件，地址簿，备忘录，任务，一个或多个日" ++"历来群体协作。这能够使存储、组织、存取个人信息的任务变得容易，所以您可以与其" ++"他人有效的工作交流。" ++ ++#: C/evolution.xml:164(link) C/evolution.xml:172(title) ++msgid "Starting Evolution for the First Time" ++msgstr "第一次启动 Evolution" ++ ++#: C/evolution.xml:167(link) C/evolution.xml:868(title) ++msgid "Using Evolution: An Overview" ++msgstr "使用 Evolution：概览" ++ ++#: C/evolution.xml:175(para) ++msgid "Start the Evolution client." ++msgstr "启动 Evolution 客户端。" ++ ++#: C/evolution.xml:183(para) ++msgid "GNOME:" ++msgstr "GNOME：" ++ ++#: C/evolution.xml:186(para) ++msgid "Click Applications > Office > Evolution." ++msgstr "点击 应用程序 > 办公软件 > Evolution。" ++ ++#: C/evolution.xml:191(para) ++msgid "KDE:" ++msgstr "KDE:" ++ ++#: C/evolution.xml:194(para) ++msgid "Click the K menu > Office > More Programs > Evolution." ++msgstr "点击 K 菜单 > 办公软件 > 更多程序 > Evolution。" ++ ++#: C/evolution.xml:199(para) ++msgid "Command Line:" ++msgstr "命令行：" ++ ++#: C/evolution.xml:202(para) ++msgid "Enter evolution." ++msgstr "键入evolution。" ++ ++#: C/evolution.xml:212(title) ++msgid "Using the First-Run Assistant" ++msgstr "使用首次运行向导" ++ ++#: C/evolution.xml:213(para) ++msgid "" ++"The first time you run Evolution, it creates a directory named ." ++"evolution in your home directory, where it stores all of its " ++"local data. Then, it opens a First-Run Assistant to help you set up email " ++"accounts and import data from other applications." ++msgstr "" ++"第一次运行 Evolution，会在您的 home 目录下创建目录.evolution，该目录用于存放程序的本地数据。然后，它会打开首次运行向导，帮助您设" ++"置电子邮件帐号，并从其他应用程序导入数据。" ++ ++#: C/evolution.xml:214(para) ++msgid "Using the first-run assistant takes two to five minutes." ++msgstr "使用首次运行向导需要 2 到 5 分钟。" ++ ++#: C/evolution.xml:215(para) ++msgid "" ++"Later on, if you want to change this account, or if you want to create a new " ++"one, click Edit > Preferences, then click Mail Accounts. Select the " ++"account you want to change, then click Edit. Alternately, add a new account " ++"by clicking Add. See Mail Preferences for details." ++msgstr "" ++"然后，如果您想要改变此帐号或者创建新帐号，点击“编辑”> “首选项”，然后点" ++"击“邮件帐号”。选择要改变的帐号，然后点击“编辑”。或者，点击“添加”以添加新帐" ++"号。详细信息参见邮件首选项。" ++ ++#: C/evolution.xml:216(para) ++msgid "" ++"The First-Run Assistant helps you provide the information Evolution needs to " ++"get started." ++msgstr "首次运行向导能够帮助您提供 Evolution 启动需要的信息。" ++ ++#: C/evolution.xml:219(link) C/evolution.xml:239(title) ++msgid "Defining Your Identity" ++msgstr "定义您的身份" ++ ++#: C/evolution.xml:222(link) C/evolution.xml:268(title) ++msgid "Receiving Mail" ++msgstr "接受邮件" ++ ++#: C/evolution.xml:225(link) C/evolution.xml:380(title) ++msgid "Receiving Mail Options" ++msgstr "接受邮件选项" ++ ++#: C/evolution.xml:228(link) C/evolution.xml:777(title) ++msgid "Sending Mail" ++msgstr "发送邮件" ++ ++#: C/evolution.xml:231(link) C/evolution.xml:831(title) ++msgid "Account Management" ++msgstr "账号管理" ++ ++#: C/evolution.xml:234(link) C/evolution.xml:837(title) ++msgid "Time Zone" ++msgstr "时区" ++ ++#: C/evolution.xml:240(para) ++msgid "The Identity window is the first step in the assistant." ++msgstr "身份窗口是向导的第一个步骤。" ++ ++#: C/evolution.xml:241(para) ++msgid "" ++"Here, you enter some basic personal information. You can define multiple " ++"identities later by clicking Edit > Preferences, then clicking Mail " ++"Accounts." ++msgstr "" ++"在这里，您需要键入一些基本个人信息。您稍后可以通过点击“编辑”>“首选项”定义" ++"多个身份，然后点击“邮件帐号”。" ++ ++#: C/evolution.xml:242(para) ++msgid "" ++"When the First-Run Assistant starts, the Welcome page is displayed. Click " ++"Forward to proceed to the Identity window." ++msgstr "当首次运行向导启动，会显示欢迎页面。点击“下一步”可以进入身份窗口。" ++ ++#: C/evolution.xml:245(para) ++msgid "Type your full name in the Full Name field." ++msgstr "在全名字段处键入您的全名。" ++ ++#: C/evolution.xml:248(para) ++msgid "Type your email address in the Email Address field." ++msgstr "在邮件地址字段处键入您的邮件地址。" ++ ++#: C/evolution.xml:251(para) ++msgid "(Optional) Select if this account is your default account." ++msgstr "(可选)选择是否将此帐号设为默认帐号。" ++ ++#: C/evolution.xml:254(para) ++msgid "(Optional) Type a reply to address in the Reply-To field." ++msgstr "(可选)在“回复到”字段内键入回复地址。" ++ ++#: C/evolution.xml:255(para) ++msgid "" ++"Use this field if you want replies to messages sent to a different address." ++msgstr "如果您要回复发送到不同地址的信息时使用此字段。" ++ ++#: C/evolution.xml:258(para) ++msgid "(Optional) Type your organization name in the Organization field." ++msgstr "(可选)在组织字段内键入您的组织名称。" ++ ++#: C/evolution.xml:259(para) ++msgid "" ++"This is the company where you work, or the organization you represent when " ++"you send email." ++msgstr "这里是指发送邮件时您工作的公司，或者您所在的组织。" ++ ++#: C/evolution.xml:262(para) C/evolution.xml:366(para) ++#: C/evolution.xml:444(para) C/evolution.xml:487(para) ++#: C/evolution.xml:622(para) C/evolution.xml:644(para) ++#: C/evolution.xml:668(para) C/evolution.xml:683(para) ++#: C/evolution.xml:701(para) C/evolution.xml:722(para) ++#: C/evolution.xml:744(para) C/evolution.xml:767(para) ++#: C/evolution.xml:823(para) C/evolution.xml:2577(para) ++#: C/evolution.xml:2602(para) ++msgid "Click Forward." ++msgstr "点击“前进”。" ++ ++#: C/evolution.xml:269(para) ++msgid "The Receiving Email option lets you determine where you get your email." ++msgstr "“接收邮件”选项让您决定获取邮件的地点。" ++ ++#: C/evolution.xml:270(para) ++msgid "" ++"You need to specify the type of server you want to receive mail with. If you " ++"are unsure about the type of server to choose, ask your system administrator " ++"or ISP." ++msgstr "" ++"您需要指定接受邮件服务器的类型。如果您不确定要选择的服务器类型，请询问系统管" ++"理员或 ISP。" ++ ++#: C/evolution.xml:273(para) ++msgid "Select a server type in the Server Type list." ++msgstr "在服务器类型列表中选择服务器类型。" ++ ++#: C/evolution.xml:274(para) ++msgid "The following is a list of server types that are available:" ++msgstr "以下是可用的服务器类型列表：" ++ ++#: C/evolution.xml:276(title) ++msgid "Novell GroupWise:" ++msgstr "Novell GroupWise：" ++ ++#: C/evolution.xml:277(para) ++msgid "" ++"Select this option if you connect to a Novell GroupWise server." ++msgstr "" ++"如果您连接到一个 Novell GroupWise 服务器，请选择此选项。" ++ ++#: C/evolution.xml:279(para) C/evolution.xml:285(para) ++#: C/evolution.xml:295(para) C/evolution.xml:300(para) ++#: C/evolution.xml:305(para) ++msgid "" ++"For configuration instructions, see Remote " ++"Configuration Options." ++msgstr "查看配置说明，参见远程配置选项。" ++ ++#: C/evolution.xml:281(title) ++msgid "Microsoft Exchange:" ++msgstr "Microsoft Exchange：" ++ ++#: C/evolution.xml:282(para) ++msgid "" ++"Available only if the evolution-exchange package is installed. Select this " ++"option if you connect to a Microsoft Exchange 2000 or 2003 server." ++msgstr "" ++"仅当 evolution-exchange 软件包安装后才可用。如果连接到Microsoft Exchange " ++"2000 或 2003 服务器，请选择此选项。" ++ ++#: C/evolution.xml:284(para) C/evolution.xml:290(para) ++msgid "Email, calendar, and contact information are stored on the server." ++msgstr "电子邮件、日历以及联系信息存放于服务器。" ++ ++#: C/evolution.xml:287(title) ++msgid "MAPI Exchange:" ++msgstr "MAPI Exchange：" ++ ++#: C/evolution.xml:288(para) ++msgid "" ++"Available only if you have installed the evolution-mapi package and if the " ++"Exchange MAPI plugin from the Edit > Plugins menu is enabled. It allows " ++"you to connect to a Microsoft Exchange 2007 server." ++msgstr "" ++"仅当您安装了 evolution-mapi 软件包并且从“编辑” >“插件” 菜单中启用 " ++"Exchange MAPI 插件后才可用。它允许您连接到Microsoft Exchange 2007 服务器。" ++ ++#: C/evolution.xml:292(title) ++msgid "IMAP:" ++msgstr "IMAP：" ++ ++#: C/evolution.xml:293(para) ++msgid "" ++"Keeps the email on your server so you can access your email from multiple " ++"systems." ++msgstr "将邮件置于服务器上以使能从多系统存取邮件。" ++ ++#: C/evolution.xml:297(title) ++msgid "POP:" ++msgstr "POP:" ++ ++#: C/evolution.xml:298(para) ++msgid "" ++"Downloads your email to your hard disk for permanent storage, freeing up " ++"space on the email server." ++msgstr "下载邮件到你的硬盘以便永久存储，释放邮件服务器上的空间。" ++ ++#: C/evolution.xml:302(title) ++msgid "USENET News:" ++msgstr "USENET News:" ++ ++#: C/evolution.xml:303(para) ++msgid "" ++"Connects to a news server and downloads a list of available news digests." ++msgstr "连接到新闻服务器，并下载可用的新闻摘要列表。" ++ ++#: C/evolution.xml:307(title) ++msgid "Local Delivery:" ++msgstr "Local Delivery:" ++ ++#: C/evolution.xml:308(para) ++msgid "" ++"Choose this option if you want to move email from the spool (the location " ++"where mail waits for delivery) and store it in your home directory. You need " ++"to provide the path to the mail spool you want to use. If you want to leave " ++"email in your system's spool files, choose the Standard Unix Mbox Spool " ++"option instead." ++msgstr "" ++"如果您要从存储队列(邮件等待投递的地方)中移动邮件并存放在 home 目录下，请选择" ++"此选项。您需要提供要使用的邮件存储队列路径。如果您想要将邮件置于系统邮件存储" ++"队列文件中，选择“标准 Unix Mbox Spool”选项。" ++ ++#: C/evolution.xml:310(para) C/evolution.xml:316(para) ++#: C/evolution.xml:322(para) C/evolution.xml:327(para) ++#: C/evolution.xml:332(para) ++msgid "" ++"For configuration instructions, see Local " ++"Configuration Options." ++msgstr "查看配置说明，参见 本地配置选项。" ++ ++#: C/evolution.xml:312(title) ++msgid "MH Format Mail Directories:" ++msgstr "MH 格式邮件目录：" ++ ++#: C/evolution.xml:313(para) ++msgid "" ++"If you download your email using MH or another MH-style program, you should " ++"use this option." ++msgstr "如果通过 MH 或其他 MH 类型的程序下载邮件，需使用此选项。" ++ ++#: C/evolution.xml:315(para) C/evolution.xml:321(para) ++msgid "You need to provide the path to the mail directory you want to use." ++msgstr "您需要提供要使用的邮件目录路径。" ++ ++#: C/evolution.xml:318(title) ++msgid "Maildir Format Mail Directories:" ++msgstr "Maildir 格式邮件目录：" ++ ++#: C/evolution.xml:319(para) ++msgid "" ++"If you download your email using Qmail or another Maildir-style program, you " ++"should use this option." ++msgstr "若通过 Qmail 或其他 Maildir 类型程序下载邮件，请使用此选项。" ++ ++#: C/evolution.xml:324(title) ++msgid "Standard Unix mbox Spool File:" ++msgstr "标准 Unix mbox Spool 文件：" ++ ++#: C/evolution.xml:325(para) ++msgid "" ++"If you want to read and store email in the mail spool file on your local " ++"system, choose this option. You need to provide the path to the mail spool " ++"file you want to use." ++msgstr "" ++"如果您要在本地系统邮件存储队列中阅读存储邮件，选择此选项。需要提供要使用的邮" ++"件存储队列路径。" ++ ++#: C/evolution.xml:329(title) ++msgid "Standard Unix mbox Spool Directory:" ++msgstr "Standard Unix mbox Spool 目录：" ++ ++#: C/evolution.xml:330(para) ++msgid "" ++"If you want to read and store email in the mail spool directory on your " ++"local system, choose this option. You need to provide the path to the mail " ++"spool directory you want to use." ++msgstr "" ++"如果您想要在本地系统邮件存储队列目录中阅读存储邮件，请选择此选项。您需要提供" ++"想要使用的邮件存储队列目录路径。" ++ ++#: C/evolution.xml:334(title) C/evolution.xml:5562(title) ++msgid "None:" ++msgstr "无：" ++ ++#: C/evolution.xml:335(para) ++msgid "" ++"Select this if you do not plan to check email with this account. If you " ++"select this, there are no configuration options." ++msgstr "如果您不打算检查此帐号的邮件，选择本选项。如果选择本项，没有配置选项。" ++ ++#: C/evolution.xml:341(title) ++msgid "Remote Configuration Options" ++msgstr "远程配置选项" ++ ++#: C/evolution.xml:342(para) ++msgid "" ++"If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, " ++"you need to specify additional information." ++msgstr "" ++"如果您选择 Novell GroupWise，IMAP, POP, or USENET News 作为您的服务器，您需要" ++"指定附加信息。" ++ ++#: C/evolution.xml:345(para) C/evolution.xml:799(para) ++msgid "Type the server name of your email server in the Server field." ++msgstr "在服务器字段中键入邮件服务器的服务器名称。" ++ ++#: C/evolution.xml:346(para) C/evolution.xml:800(para) ++msgid "" ++"If you are unsure what your server address is, contact your system " ++"administrator." ++msgstr "如果您不确定服务器地址，请联系您的系统管理员。" ++ ++#: C/evolution.xml:349(para) C/evolution.xml:812(para) ++msgid "Type your username in the Username field." ++msgstr "在用户名字段键入您的用户名。" ++ ++#: C/evolution.xml:352(para) C/evolution.xml:820(para) ++msgid "Select if you want to use a secure connection (SSL or TLS)." ++msgstr "选择您是否要使用安全连接 (SSL 或 TLS)。" ++ ++#: C/evolution.xml:353(para) ++msgid "You should enable this option if your server supports it." ++msgstr "如果您的服务器支持它，应当启用该选项。" ++ ++#: C/evolution.xml:354(para) C/evolution.xml:360(para) ++msgid "" ++"Free webmail providers usually supply information about which of these " ++"options can be used. If you are in an organizational environment, you may " ++"want to contact your system administrator for more information." ++msgstr "" ++"免费的网络邮件提供者通常会提供这些使用选项的信息。如果您处在组织化环境，您可" ++"能要联系您的系统管理员以获得更多信息。" ++ ++#: C/evolution.xml:357(para) C/evolution.xml:807(para) ++#: C/evolution.xml:5394(para) ++msgid "Select your authentication type in the Authentication list." ++msgstr "在认证列表中选择您的认证类型。" ++ ++#: C/evolution.xml:358(para) C/evolution.xml:808(para) ++#: C/evolution.xml:841(para) C/evolution.xml:2084(para) ++#: C/evolution.xml:2309(para) C/evolution.xml:2317(para) ++#: C/evolution.xml:2487(para) C/evolution.xml:3267(para) ++#: C/evolution.xml:3272(para) C/evolution.xml:3750(para) ++#: C/evolution.xml:3765(para) C/evolution.xml:3773(para) ++#: C/evolution.xml:4098(para) C/evolution.xml:4100(para) ++#: C/evolution.xml:4102(para) C/evolution.xml:4122(para) ++#: C/evolution.xml:4133(para) C/evolution.xml:4138(para) ++#: C/evolution.xml:4159(para) C/evolution.xml:4167(para) ++#: C/evolution.xml:4282(para) C/evolution.xml:4293(para) ++#: C/evolution.xml:4298(para) C/evolution.xml:4309(para) ++#: C/evolution.xml:4317(para) C/evolution.xml:4322(para) ++#: C/evolution.xml:4700(para) C/evolution.xml:4719(para) ++#: C/evolution.xml:4751(para) C/evolution.xml:4764(para) ++#: C/evolution.xml:4984(para) C/evolution.xml:6477(para) ++#: C/evolution.xml:7273(para) C/evolution.xml:7339(para) ++msgid "or" ++msgstr "或" ++ ++#: C/evolution.xml:359(para) C/evolution.xml:809(para) ++msgid "" ++"Click Check for Supported Types to have Evolution check for supported " ++"authentication mechanisms. Some servers do not announce the authentication " ++"mechanisms they support, so clicking this button is not a guarantee that " ++"available mechanisms actually work." ++msgstr "" ++"点击\"检查支持的类型\"让Evolution程序自动检查支持的认证类型。 由于一些邮件服" ++"务器不公开它们支持的认证类型，所以该操作并不能保证对所有的认证类型都有效。" ++ ++#: C/evolution.xml:363(para) C/evolution.xml:815(para) ++msgid "Select if you want Evolution to remember your password." ++msgstr "选择是否要 Evolution 记住密码。" ++ ++#: C/evolution.xml:369(para) ++msgid "" ++"(Conditional) If you chose Microsoft Exchange as the server type, provide " ++"your username in the Username field and your Outlook Web Access (OWA) URL in " ++"the OWA URL field. The URL and the usernames should use the Outlook format. " ++"If the mailbox path is different from the username, the OWA path should also " ++"include mailbox path, for example http://server name/" ++"exchange/mail box path." ++msgstr "" ++"(条件)如果您选择了 Microsoft Exchange 作为服务器类型，请在“用户名”一栏填入您" ++"的用户名，在“OWA网址”一栏填入您的 Outlook Web Access (OWA) 网址。 网址和用户" ++"名应该使用 Outlook 格式。 如果邮箱路径和用户名不同， 则OWA路径还应该包括邮箱" ++"路径，例如 http://server name/exchange/mail box " ++"path" ++ ++#: C/evolution.xml:370(para) ++msgid "" ++"When you have finished, continue with Receiving Mail Options." ++msgstr "" ++"当您完成操作，接下来是 接收邮件选项。" ++ ++#: C/evolution.xml:374(title) ++msgid "Local Configuration Options" ++msgstr "本地配置选项" ++ ++#: C/evolution.xml:375(para) ++msgid "" ++"If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format " ++"Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool " ++"directory, you must specify the path to the local files in the path field. " ++"Continue with Receiving Mail Options." ++msgstr "" ++"如果您选择了本地发送，MH-格式的邮件目录，Maildir-格式的邮件目录，标准Unix " ++"mbox spool文件或标准Unix mbox spool目录，您应该在“路径”一栏中配置本地文件的路" ++"径。 完成配置后前进至接受选项." ++ ++#: C/evolution.xml:381(para) ++msgid "" ++"After you have selected a mail delivery mechanism, you can set some " ++"preferences for its behavior." ++msgstr "当您选择了一种邮件发送机制后，您可以对它的行为作些设置。" ++ ++#: C/evolution.xml:384(link) C/evolution.xml:413(title) ++msgid "Novell GroupWise Receiving Options" ++msgstr "Novell GroupWise 接收选项" ++ ++#: C/evolution.xml:387(link) C/evolution.xml:453(title) ++msgid "Microsoft Exchange Receiving Options" ++msgstr "Microsoft Exchange 接收选项" ++ ++#: C/evolution.xml:390(link) C/evolution.xml:585(title) ++msgid "IMAP Receiving Options" ++msgstr "IMAP 接收选项" ++ ++#: C/evolution.xml:393(link) C/evolution.xml:629(title) ++msgid "POP Receiving Options" ++msgstr "POP 接收选项" ++ ++#: C/evolution.xml:396(link) C/evolution.xml:651(title) ++msgid "USENET News Receiving Options" ++msgstr "USENET News 接收选项" ++ ++#: C/evolution.xml:399(link) C/evolution.xml:675(title) ++msgid "Local Delivery Receiving Options" ++msgstr "Local Delivery 接受选项" ++ ++#: C/evolution.xml:402(link) C/evolution.xml:690(title) ++msgid "MH-Format Mail Directories Receiving Options" ++msgstr "MH-格式邮件目录接收选项" ++ ++#: C/evolution.xml:405(link) C/evolution.xml:710(title) ++msgid "Maildir-Format Mail Directories Receiving Options" ++msgstr "Maildir-格式邮件目录接收选项" ++ ++#: C/evolution.xml:408(link) ++msgid "Standard Unix mbox spool file Receiving Options" ++msgstr "标准 Unix mbox spool 文件接收选项" ++ ++#: C/evolution.xml:414(para) C/evolution.xml:454(para) ++#: C/evolution.xml:586(para) C/evolution.xml:631(para) ++#: C/evolution.xml:653(para) C/evolution.xml:676(para) ++#: C/evolution.xml:691(para) C/evolution.xml:711(para) ++#: C/evolution.xml:754(para) ++msgid "You need to specify the following options for this server type:" ++msgstr "您需要为该服务器类型指定如下选项：" ++ ++#: C/evolution.xml:417(para) C/evolution.xml:458(para) ++#: C/evolution.xml:590(para) C/evolution.xml:634(para) ++#: C/evolution.xml:656(para) C/evolution.xml:679(para) ++#: C/evolution.xml:694(para) C/evolution.xml:714(para) ++#: C/evolution.xml:734(para) C/evolution.xml:757(para) ++#: C/evolution.xml:5982(para) ++msgid "Select if you want Evolution to automatically check for new mail." ++msgstr "选择是否要 Evolution 自动检查新邮件。" ++ ++#: C/evolution.xml:418(para) C/evolution.xml:459(para) ++#: C/evolution.xml:591(para) C/evolution.xml:635(para) ++#: C/evolution.xml:657(para) C/evolution.xml:680(para) ++#: C/evolution.xml:695(para) C/evolution.xml:715(para) ++#: C/evolution.xml:735(para) C/evolution.xml:758(para) ++#: C/evolution.xml:5983(para) ++msgid "" ++"If you select this option, you need to specify how often Evolution should " ++"check for new messages." ++msgstr "如果选择该选项，需要指定检查新消息的频率。" ++ ++#: C/evolution.xml:421(para) C/evolution.xml:462(para) ++#: C/evolution.xml:527(para) C/evolution.xml:5987(para) ++msgid "Select if you want to check for new messages in all folders." ++msgstr "选择是否要在所有文件夹中检查新消息。" ++ ++#: C/evolution.xml:424(para) C/evolution.xml:480(para) ++#: C/evolution.xml:561(para) C/evolution.xml:606(para) ++#: C/evolution.xml:718(para) C/evolution.xml:738(para) ++#: C/evolution.xml:761(para) C/evolution.xml:5990(para) ++msgid "" ++"Select Apply filters to new messages in inbox on this server if you want to " ++"apply filters." ++msgstr "要应用过滤，请选择“应用过滤规则到此服务器上收件箱中的新信件”。" ++ ++#: C/evolution.xml:425(para) C/evolution.xml:607(para) ++#: C/evolution.xml:719(para) C/evolution.xml:5991(para) ++msgid "" ++"For additional information on filtering, see Creating New Filter Rules." ++msgstr "" ++"关于邮件过滤的其他信息，请参阅创" ++"建新的过滤规则." ++ ++#: C/evolution.xml:428(para) C/evolution.xml:483(para) ++#: C/evolution.xml:569(para) C/evolution.xml:610(para) ++#: C/evolution.xml:5994(para) ++msgid "Select if you want to check new messages for junk content." ++msgstr "选择您是否希望检查新信件中的垃圾内容。" ++ ++#: C/evolution.xml:429(para) C/evolution.xml:484(para) ++#: C/evolution.xml:570(para) C/evolution.xml:611(para) ++msgid "" ++"For additional information on junk content, see Stopping Junk Mail (Spam) and Junk." ++msgstr "" ++"关于垃圾内容的其他信息，请参阅阻止" ++"垃圾邮件 (Spam) 和 垃圾邮件." ++ ++#: C/evolution.xml:432(para) C/evolution.xml:5998(para) ++msgid "Select if you want to only check for junk messages in the Inbox folder." ++msgstr "选择您是否希望仅在收件箱中检查垃圾邮件。" ++ ++#: C/evolution.xml:435(para) C/evolution.xml:477(para) ++#: C/evolution.xml:553(para) C/evolution.xml:617(para) ++msgid "" ++"Select Automatically synchronize remote mail locally to download the " ++"messages to your local system." ++msgstr "选择是否自动将远程邮件同步到本地，并把邮件下载到您的计算机上。" ++ ++#: C/evolution.xml:436(para) C/evolution.xml:618(para) ++msgid "" ++"Evolution, by default, downloads only the header information such as From, " ++"Subject, and Date. The body of the message and the attachments are " ++"downloaded only when you click the message. Thus you can save time and " ++"network usage. This is useful when you don't read all the messages you " ++"receive." ++msgstr "" ++"Evolution程序默认只下载邮件的头信息，例如寄件人，主题和日期。 邮件的正文和附" ++"件只有当您点击邮件时才会下载。 这样您可以节省时节和网络流量。 当您不想阅读全" ++"部收到的邮件时这很有用。" ++ ++#: C/evolution.xml:437(para) C/evolution.xml:619(para) ++msgid "" ++"If you check this option, Evolution fetches the headers as well as the body " ++"of the message simultaneously. In this case, the time taken to open a " ++"message is comparatively less. In addition, you can download the mail for " ++"reading them offline, when you have checked this option." ++msgstr "" ++"如果您勾选了此项，Evolution程序将会在接收头信息的同时接收邮件正文内容。 在这" ++"种情况下，打开邮件花费的时间会相对少一些。 此外，如果勾选了此项，您可以下载邮" ++"件并离线阅读它们。" ++ ++#: C/evolution.xml:440(para) ++msgid "" ++"Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port " ++"field." ++msgstr "在“邮政代理 SOAP 端口”一栏填入您的邮政代理 SOAP 端口号。" ++ ++#: C/evolution.xml:441(para) C/evolution.xml:6009(para) ++msgid "" ++"If you are unsure what your Post Office Agent SOAP port is, contact your " ++"system administrator." ++msgstr "如果您不确定您的邮政代理端口号，请联系系统管理员。" ++ ++#: C/evolution.xml:449(para) C/evolution.xml:490(para) ++#: C/evolution.xml:579(para) C/evolution.xml:625(para) ++#: C/evolution.xml:647(para) C/evolution.xml:671(para) ++#: C/evolution.xml:686(para) C/evolution.xml:706(para) ++#: C/evolution.xml:727(para) C/evolution.xml:749(para) ++#: C/evolution.xml:772(para) ++msgid "" ++"When you have finished, continue with Sending " ++"Mail." ++msgstr "完成配置后，即可前进至发送邮件." ++ ++#: C/evolution.xml:465(para) C/evolution.xml:535(para) ++msgid "" ++"Specify the Global Catalog server name in the Global Catalog Server Name " ++"field." ++msgstr "在“全局目录服务器名”栏中填入全局目录服务器名。" ++ ++#: C/evolution.xml:466(para) C/evolution.xml:536(para) ++msgid "" ++"The Global Catalog Server contains the user information for users. If you " ++"are unsure what your Global Catalog server name is, contact your system " ++"administrator." ++msgstr "" ++"全局目录服务器包含了用户的信息。如果您不确定您的全局目录服务器名，请咨询系统" ++"管理员。" ++ ++#: C/evolution.xml:469(para) C/evolution.xml:544(para) ++msgid "" ++"Select if you want to limit the number of Global Address List (GAL) " ++"responses." ++msgstr "确定您是否要限制全局地址列表（GAL）响应数。" ++ ++#: C/evolution.xml:470(para) C/evolution.xml:545(para) ++msgid "" ++"The GAL contains a list of all email addresses. If you select this option, " ++"you need to specify the maximum number of responses." ++msgstr "" ++"GAL包含了所有电子邮件地址的列表。如果您选择了该项，您需要确定GAL最大响应数。" ++ ++#: C/evolution.xml:473(para) ++msgid "Select if you want to use a password expiry warning time period." ++msgstr "选择您是否希望有一个密码到期警告期限" ++ ++#: C/evolution.xml:474(para) ++msgid "" ++"If you select this option, you need to specify how often Evolution should " ++"send the password expire message." ++msgstr "如果您选择了此项，您需要确定Evolution发送密码到期信息的频率。" ++ ++#: C/evolution.xml:494(title) ++msgid "Exchange MAPI Receiving Options" ++msgstr "Exchange MAPI 接收选项" ++ ++#: C/evolution.xml:495(para) ++msgid "" ++"If you select Microsoft Exchange MAPI as your receiving server type, you " ++"need to specify the following options:" ++msgstr "" ++"如果您选择了 Microsoft Exchange MAPI 作为您的接收服务器类型，您需要配置以下选" ++"项：" ++ ++#: C/evolution.xml:498(para) ++msgid "" ++"Select the desired options as given in the following table, then click " ++"Forward." ++msgstr "在下列表格中选择您需要的选项，然后单击“前进”。" ++ ++#: C/evolution.xml:506(para) ++msgid "Options" ++msgstr "选项" ++ ++#: C/evolution.xml:509(para) C/evolution.xml:1146(para) ++#: C/evolution.xml:1857(para) C/evolution.xml:7109(para) ++msgid "Description" ++msgstr "描述" ++ ++#: C/evolution.xml:516(para) ++msgid "Check for new messages every x minutes" ++msgstr "每X分钟检查一次新消息" ++ ++#: C/evolution.xml:519(para) ++msgid "" ++"Select this option if you want Evolution to automatically check for new " ++"mail. If you select this option, you need to specify how often Evolution " ++"should check for new messages." ++msgstr "" ++"如果您需要 Evolution 自动检查新邮件，勾选此项。 选择此项的同时您还需要确定 " ++"Evolution 检查新邮件的频率。" ++ ++#: C/evolution.xml:524(para) ++msgid "Check for new messages in all folders" ++msgstr "在所有文件夹中检查新信息" ++ ++#: C/evolution.xml:532(para) ++msgid "Global Catalog server name" ++msgstr "全局目录服务器名" ++ ++#: C/evolution.xml:541(para) ++msgid "Limit number of GAL responses" ++msgstr "限制GAL响应数" ++ ++#: C/evolution.xml:550(para) ++msgid "Automatically synchronize account locally" ++msgstr "自动同步本地账户" ++ ++#: C/evolution.xml:558(para) ++msgid "Apply filters to new messages in Inbox on this server" ++msgstr "应用过滤规则到此服务器上收件箱中的新信件" ++ ++#: C/evolution.xml:566(para) ++msgid "Check new messages for Junk contents" ++msgstr "检查新邮件中的垃圾内容" ++ ++#: C/evolution.xml:594(para) ++msgid "" ++"Select if you want Evolution to use custom commands to connect to the IMAP " ++"server." ++msgstr "如果您想要让 Evolution 使用自定义命令连接到IMAP服务器，请选择该项。" ++ ++#: C/evolution.xml:595(para) ++msgid "" ++"If you select this option, specify the custom command you want Evolution to " ++"use." ++msgstr "如果您勾选了该项，请确定您想让Evolution 执行的自定义命令。" ++ ++#: C/evolution.xml:598(para) ++msgid "Select if you want Evolution to show only subscribed folders." ++msgstr "如果您想让Evolution只显示订阅了的文件夹，请选择该项。" ++ ++#: C/evolution.xml:599(para) ++msgid "" ++"Subscribed folders are folders that you have chosen to receive mail from by " ++"subscribing to them." ++msgstr "“订阅的文件夹”是指您选择通过订阅它们来作为接收邮件的来源。" ++ ++#: C/evolution.xml:602(para) ++msgid "" ++"Select if you want Evolution to override server-supplied folder namespaces." ++msgstr "如果您想让Evolution覆盖服务器提供的文件夹命名空间，请选择该项。" ++ ++#: C/evolution.xml:603(para) ++msgid "" ++"By choosing this option you can rename the folders that the server provides. " ++"If you select this option, you need to specify the namespace to use." ++msgstr "" ++"选择该项后，您可以对服务器提供的文件夹重命名。如果您选择了此项，您需要确定要" ++"使用的命名空间。" ++ ++#: C/evolution.xml:614(para) ++msgid "Select if you want to check for junk messages in the Inbox folder." ++msgstr "如果您仅想在收件箱中检查垃圾邮件，请选择此项。" ++ ++#: C/evolution.xml:638(para) ++msgid "Select if you want to leave messages on the server." ++msgstr "如果您想在服务器上保留信件，请选择此项。" ++ ++#: C/evolution.xml:641(para) ++msgid "Select if you want to disable support for all POP3 extensions." ++msgstr "选择是否禁用所有 POP3 扩展支持。" ++ ++#: C/evolution.xml:660(para) ++msgid "Select if you want to show folders in short notation." ++msgstr "选择是否以简短形式显示文件夹。" ++ ++#: C/evolution.xml:661(para) ++msgid "For example, comp.os.linux would appear as c.o.linux." ++msgstr "例如，comp.os.linux 将会显示作 c.o.linux。" ++ ++#: C/evolution.xml:664(para) ++msgid "" ++"Select if you want to show relative folder names in the subscription dialog " ++"box." ++msgstr "如果您想在订阅对话框中显示相对文件夹的名称，请选择此项" ++ ++#: C/evolution.xml:665(para) ++msgid "" ++"If you select to show relative folder names in the subscription page, only " ++"the name of the folder is displayed. For example the folder evolution.mail " ++"would appear as evolution." ++msgstr "" ++"如果您选择了在订阅页面显示相对文件夹的名称，则只有文件夹的（主）名称会显示。" ++"例如名为 evolution.mail 会显示为 evolution 。" ++ ++#: C/evolution.xml:698(para) ++msgid "" ++"Select if you want to use the .folders summary file." ++msgstr "如果您想使用.folders文件夹概览文件，请选择此项。" ++ ++#: C/evolution.xml:731(title) ++msgid "Standard Unix mbox Spool File Receiving Options" ++msgstr "标准 Unix mbox Spool 文件 接收选项" ++ ++#: C/evolution.xml:741(para) C/evolution.xml:764(para) ++msgid "" ++"Select if you want to store status headers in Elm, Pine, and Mutt formats." ++msgstr "如果您想以Elm/Pine/Mutt格式存储状态头，请选择此项。" ++ ++#: C/evolution.xml:753(title) ++msgid "Standard Unix mbox Spool Directory Receiving Options" ++msgstr "标准 Unix mbox Spool 目录 接收选项" ++ ++#: C/evolution.xml:778(para) ++msgid "" ++"Now that you have entered information about how you plan to get mail, " ++"Evolution needs to know about how you want to send it." ++msgstr "" ++"待您键入一系列关于接收邮件方式的信息之后，Evolution 还需要知道您要如何发送邮" ++"件。" ++ ++#: C/evolution.xml:781(para) ++msgid "Select a server type from the Server Type list." ++msgstr "从服务器类型列表中选择服务器类型。" ++ ++#: C/evolution.xml:782(para) ++msgid "The following server types are available:" ++msgstr "以下服务器类型可用：" ++ ++#: C/evolution.xml:784(title) ++msgid "Sendmail:" ++msgstr "Sendmail:" ++ ++#: C/evolution.xml:785(para) ++msgid "" ++"Uses the Sendmail program to send mail from your system. Sendmail is more " ++"flexible, but is not as easy to configure, so you should select this option " ++"only if you know how to set up a Sendmail service." ++msgstr "" ++"使用 Sendmail 程序来发送来自您的系统的邮件。 Sendmail 程序比较灵活，但不易配" ++"置，所以只有当您了解如何设置Sendmail服务时才应选择此项。" ++ ++#: C/evolution.xml:788(title) ++msgid "SMTP:" ++msgstr "SMTP:" ++ ++#: C/evolution.xml:789(para) ++msgid "" ++"Sends mail using an outbound mail server. This is the most common choice for " ++"sending mail. If you choose SMTP, there are additional configuration " ++"options. See SMTP Configuration for more " ++"information." ++msgstr "" ++"通过外界的邮件服务器发送邮件。 这是发送邮件最常用的选择。 如果您选择了 SMTP，" ++"还会有额外的配置选项，更多信息请参阅SMTP 配置" ++ ++#: C/evolution.xml:795(title) ++msgid "SMTP Configuration" ++msgstr "SMTP 配置：" ++ ++#: C/evolution.xml:803(para) ++msgid "Select if your server requires authentication." ++msgstr "选择服务器是否需要认证。" ++ ++#: C/evolution.xml:804(para) ++msgid "" ++"If you selected that your server requires authentication, you need to " ++"provide the following information:" ++msgstr "如果选择服务器需认证，您需要提供以下信息：" ++ ++#: C/evolution.xml:826(para) ++msgid "Continue with Account Management." ++msgstr "接下来是帐号管理。" ++ ++#: C/evolution.xml:832(para) ++msgid "" ++"Now that you have finished the email configuration process you need to give " ++"the account a name. The name can be any name you prefer. Type your account " ++"name on the Name field, then click Forward." ++msgstr "" ++"待完成了邮件账户配置后，您需要给账户起个名字。它可以是任何您喜欢的名字。请" ++"在“名称”一栏键入您的账户名字，然后点击“前进”。" ++ ++#: C/evolution.xml:833(para) ++msgid "" ++"Continue with Time Zone." ++msgstr "" ++"接下来是时区。" ++ ++#: C/evolution.xml:840(para) ++msgid "Select your time zone on the map." ++msgstr "在地图上选择您的时区。" ++ ++#: C/evolution.xml:842(para) ++msgid "Select from the time zone drop-down list." ++msgstr "从时区下拉列表中选择。" ++ ++#: C/evolution.xml:846(para) ++msgid "Click OK, then click Apply." ++msgstr "点击“确定”，然后点“应用”。" ++ ++#: C/evolution.xml:847(para) ++msgid "Evolution opens with your new account created." ++msgstr "Evolution 会打开您新建的帐号。" ++ ++#: C/evolution.xml:850(para) ++msgid "" ++"If you want to import email from another email client, continue with Importing Mail (Optional). If not, skip to " ++"Using Evolution: An Overview." ++msgstr "" ++"如果您想从其他的邮件客户端导入邮件，请参阅导入" ++"邮件（可选）。 否则，直接跳至 使用" ++"Evolution: 概览" ++ ++#: C/evolution.xml:854(title) ++msgid "Importing Mail (Optional)" ++msgstr "导入邮件(可选)" ++ ++#: C/evolution.xml:855(para) ++msgid "" ++"After selecting your time zone, if Evolution finds email or address files " ++"from another application, it offers to import them. For a full description " ++"of the import feature, see Importing Single " ++"Files." ++msgstr "" ++"选择时区后，如果 Evolution 能在其它应用程序中找到邮件或地址文件，可以将它们导" ++"入。 要了解关于“导入”功能的详细信息，请参阅" ++"导入单独文件." ++ ++#: C/evolution.xml:856(para) C/evolution.xml:2610(para) ++msgid "" ++"Microsoft Outlook* and versions of Outlook Express after version 4 use " ++"proprietary formats that Evolution cannot read or import." ++msgstr "" ++"Microsoft Outlook* 以及 Outlook Express 版本 4 以后的版本使用 Evolution 无法" ++"读取的专有格式。" ++ ++#: C/evolution.xml:857(para) ++msgid "" ++"To import information, you might want to use the Export tool under Windows*. " ++"See the instructions in Migrating " ++"Local Outlook Mail Folders." ++msgstr "" ++"要导入信息，您可能会想用Windows*下面的导出工具。请参阅迁移本地Outlook邮件文件夹。" ++ ++#: C/evolution.xml:858(para) C/evolution.xml:2615(para) ++msgid "" ++"Before importing email from Netscape*, Mozilla and Netscape users need to " ++"click File > Compact > All Folders from within the Netscape or Mozilla " ++"mail tool. Otherwise, Evolution imports and undeletes the messages in your " ++"Trash folders." ++msgstr "" ++"在导入来自Netscape*的邮件之前，Mozilla 和 Netscape用户需要选择 文件 > 紧" ++"凑 > 来自Netscape 或 Mozilla 内部邮件工具的所有文件夹。 否则， Evolution会" ++"导入并还原您回收站里的邮件。" ++ ++#: C/evolution.xml:860(para) ++msgid "" ++"Evolution uses standard file types for email and calendar information, so " ++"you can copy those files from your ~/.evolution " ++"directory. The file formats used are mbox for email and " ++"iCal for calendar information." ++msgstr "" ++"Evolution 使用标准的邮件和日历信息文档格式，故您可以从~/.evolution目录中复制这些文件。 文件格式是，邮件：mbox; 日" ++"历信息：iCal" ++ ++#: C/evolution.xml:861(para) ++msgid "" ++"Contacts files are stored in a database, but can be saved as a standard " ++"vCard*. To export an address book, click File > Save Address Book As VCard" ++"\". If you want to export only one contact, click File > Save Contact as " ++"VCard." ++msgstr "" ++"联系人文件是存放在数据库中的，但也可以保存为标准的vCard*文件。 要导出一个地址" ++"簿，点击 文件 > 将地址簿另存为 VCard\". 如果您只想要导出一个联系人信息，点" ++"击 文件 > 联系人另存为 VCard. " ++ ++#: C/evolution.xml:869(para) ++msgid "" ++"Now that the first-run configuration has finished, you're ready to begin " ++"using Evolution. Here's a quick explanation of what's happening in your main " ++"Evolution window." ++msgstr "" ++"完成初次运行邮件配置后，您就可以开始使用Evolution了。 下面对您的Evolution主窗" ++"口界面内容做一个简要描述。" ++ ++#: C/evolution.xml:872(title) ++msgid "Menu Bar:" ++msgstr "菜单栏：" ++ ++#: C/evolution.xml:873(para) ++msgid "" ++"The menu bar gives you access to most Evolution features. For additional " ++"information, see The Menu Bar." ++msgstr "" ++"菜单栏给了您使用绝大多数Evolution功能的途径。 有关菜单栏的更多信息，请参阅" ++"菜单栏." ++ ++#: C/evolution.xml:876(title) ++msgid "Folder List:" ++msgstr "文件夹列表：" ++ ++#: C/evolution.xml:877(para) ++msgid "" ++"The folder list gives you a list of the available folders for each account. " ++"To see the contents of a folder, click the folder name and the contents are " ++"displayed in the message list." ++msgstr "" ++"文件夹列表显示每个账户的可用文件夹。 要查看每个文件夹的内容， 点击文件夹的名" ++"称，文件夹的内容就会显示在邮件列表里。" ++ ++#: C/evolution.xml:880(title) ++msgid "Toolbar:" ++msgstr "工具条：" ++ ++#: C/evolution.xml:881(para) ++msgid "" ++"The toolbar gives you fast and easy access to the frequently used features " ++"in each component." ++msgstr "工具栏使您能够简单快速地使用一些常用的功能。" ++ ++#: C/evolution.xml:884(title) ++msgid "Search Tool:" ++msgstr "搜索工具：" ++ ++#: C/evolution.xml:885(para) ++msgid "" ++"The search tool lets you search your email, contacts, calendar, and tasks to " ++"easily find what you're looking for." ++msgstr "搜索工具能让您方便地找到关于邮件，联系人，日历，人物等您想要的信息。" ++ ++#: C/evolution.xml:888(title) C/evolution.xml:1047(title) ++msgid "Message List:" ++msgstr "邮件列表：" ++ ++#: C/evolution.xml:889(para) ++msgid "" ++"The message list displays a list of email that you have received. To view an " ++"email in the preview pane, click the email in the message list." ++msgstr "" ++"邮件列表显示您收到的邮件。要在预览面板中查看一封邮件，在邮件列表中点击该邮件" ++"即可。" ++ ++#: C/evolution.xml:892(title) ++msgid "Side Bar:" ++msgstr "侧边条：" ++ ++#: C/evolution.xml:893(para) ++msgid "" ++"The side bar lets you switch between folders and between Evolution tools. At " ++"the bottom of the side bar is the switcher that lets you switch Evolution " ++"tools, and above that is a list of all the available folders for the current " ++"tool. For additional information, see The Side Bar." ++msgstr "" ++"边栏能让您在文件夹视图和Evolution工具中切换。边栏底部是切换区，能让您切换" ++"Evolution工具；上部是当前功能下所有可用的文件夹列表。要查看更多信息，请参阅" ++"边栏." ++ ++#: C/evolution.xml:896(title) ++msgid "Switcher:" ++msgstr "切换器" ++ ++#: C/evolution.xml:897(para) ++msgid "" ++"The switcher at the bottom of the side bar lets you switch between the " ++"Evolution tools - Mail, Contacts, Calendars, Memos and Tasks." ++msgstr "" ++"在底部边栏的切换器能够在 Evolution 工具－邮件、联系人、日历、备忘录、任务之间" ++"切换。" ++ ++#: C/evolution.xml:900(title) ++msgid "Status Bar:" ++msgstr "状态栏：" ++ ++#: C/evolution.xml:901(para) ++msgid "" ++"The status bar periodically displays a message, or tells you the progress of " ++"a task. This most often happens when you're checking or sending email. These " ++"progress queues are shown in the previous figure. The Online/Offline " ++"indicator is here, too, in the lower left of the window." ++msgstr "" ++"状态栏周期性地显示消息，或告诉您任务的进展。这主要出现在您查看或发送邮件的时" ++"候。这些进度队列会显示在之前那幅图中。状态栏左下角还有在线/离线标记。" ++ ++#: C/evolution.xml:904(title) C/evolution.xml:1051(title) ++msgid "Preview Pane:" ++msgstr "预览面板：" ++ ++#: C/evolution.xml:905(para) ++msgid "" ++"The preview pane displays the contents of the email that is selected in the " ++"message list." ++msgstr "预览面板显示在邮件列表中选中的邮件内容。" ++ ++#: C/evolution.xml:909(title) ++msgid "The Menu Bar" ++msgstr "菜单栏" ++ ++#: C/evolution.xml:910(para) ++msgid "" ++"The menu bar's contents always provide all the possible actions for any " ++"given view of your data. If you're looking at your Inbox, most of the menu " ++"items relate to email. Some content relates to other components of Evolution " ++"and some, especially in the File menu, relates to the application as a whole." ++msgstr "" ++"菜单栏提供了所有能对您查看到的数据进行的操作。如果您在查看收件箱，则大部分菜" ++"单条目是与邮件相关的。菜单栏里一些内容与Evolution的其它组件相关，另一些，特别" ++"是“文件”菜单里的条目，则是和全局功能相关的。" ++ ++#: C/evolution.xml:912(title) ++msgid "File:" ++msgstr "文件：" ++ ++#: C/evolution.xml:913(para) ++msgid "" ++"Anything related to a file or to the operations of the application is listed " ++"in this menu, such as creating things, saving them to disk, printing them, " ++"and quitting the program itself." ++msgstr "" ++"任何与文件相关或与该程序操作相关的条目都列在这个菜单里，例如创建内容，保存到" ++"磁盘，打印和退出程序。" ++ ++#: C/evolution.xml:916(title) ++msgid "Edit:" ++msgstr "编辑：" ++ ++#: C/evolution.xml:917(para) ++msgid "" ++"Holds useful tools that help you edit text and move it around. Also lets you " ++"access the settings and configuration options." ++msgstr "" ++"包括能帮助您编辑和移动文本的工具。还可以让您对Evolution程序进行设置或配置。" ++ ++#: C/evolution.xml:920(title) ++msgid "View:" ++msgstr "查看：" ++ ++#: C/evolution.xml:921(para) ++msgid "" ++"Lets you decide how Evolution should look. Some of the features control the " ++"appearance of Evolution as a whole, and others the way a particular kind of " ++"information appears." ++msgstr "" ++"让您决定Evolution程序的外观。 一部分操作能全局控制Evolution的外观，其它操作则" ++"控制一些特定信息的显示外观。" ++ ++#: C/evolution.xml:924(title) ++msgid "Folder:" ++msgstr "文件夹：" ++ ++#: C/evolution.xml:925(para) ++msgid "" ++"Holds actions that can be performed on folders. You can find things like " ++"copy, rename, delete, and so on." ++msgstr "包括对文件夹可进行的操作。您可以找到复制，重命名，删除等条目。" ++ ++#: C/evolution.xml:928(title) ++msgid "Message:" ++msgstr "消息：" ++ ++#: C/evolution.xml:929(para) ++msgid "" ++"Holds actions that can be applied to a message. If there is only one target " ++"for the action, such as replying to a message, you can normally find it in " ++"the Message menu." ++msgstr "" ++"包括对邮件可进行的操作。如果是只有一个对象的操作，例如回复邮件，您就可以在“信" ++"件”菜单中找到它。" ++ ++#: C/evolution.xml:932(title) ++msgid "Search:" ++msgstr "搜索：" ++ ++#: C/evolution.xml:933(para) ++msgid "" ++"Lets you search for messages, or for phrases within a message. You can also " ++"see previous searches you have made. In addition to the Search menu, there " ++"is a text entry box in the toolbar that you can use to search for messages. " ++"You can also create a search folder from a search." ++msgstr "" ++"使您搜索邮件，或邮件中的关键词。您可以找到之前的搜索记录。除了“搜索”菜单之" ++"外，在工具栏中还有一个文本输入框也可以用来搜索邮件。您还可以创建搜索文件夹。" ++ ++#: C/evolution.xml:936(title) ++msgid "Help:" ++msgstr "帮助：" ++ ++#: C/evolution.xml:937(para) ++msgid "Opens the Evolution help files." ++msgstr "打开 Evolution 帮助文件。" ++ ++#: C/evolution.xml:942(title) ++msgid "The Sidebar" ++msgstr "侧边栏" ++ ++#: C/evolution.xml:943(para) ++msgid "" ++"The Sidebar is the vertical panel on the left side of the Evolution main " ++"window. At the bottom of the Sidebar is the Switcher. This lets you switch " ++"between different Evolution tools like Mail, Memo, Tasks, and Contacts. " ++"Above the Switcher is a list of folders related to the current Evolution " ++"tool." ++msgstr "" ++"边栏是位于Evolution主窗口左侧的垂直面板。在边栏的底部是切换区，能让您在不同的" ++"Evolution工具例如邮件，备忘，任务，联系人之间切换。 在切换区上方是与当前的" ++"Evolution工具相关的文件夹列表。" ++ ++#: C/evolution.xml:944(para) ++msgid "" ++"The folder list organizes your email, calendars, address books, task lists " ++"and memo lists in a tree, similar to a file tree. Most people find one to four folders at the base of the tree, " ++"depending on the tool and their system configuration. Each Evolution tool " ++"has at least one folder, called On This Computer, for local information. For " ++"example, the folder list for the email tool shows any remote email storage " ++"you have set up, plus local folders and search folders, which are discussed " ++"in Using Search Folders." ++msgstr "" ++"文件夹列表将您的邮件，日历，地址簿，任务列表和备忘列表组织成一个树状结构，类" ++"似于文件树。 大部分人会在树的基部找到1~4个" ++"文件夹（取决于当前工具和他们的系统设定）。每种Evolution工具都有至少一个文件" ++"夹，名为“在此计算机中”，用于存放本地信息。例如，“邮件”工具的文件夹列表显示您" ++"设置的任何远程邮件存储区，以及本地文件夹和搜索文件夹（会在使用搜索文件夹中讨论）。" ++ ++#: C/evolution.xml:945(para) ++msgid "" ++"If you get large amounts of email, you might want more folders than just " ++"your Inbox. You can also create multiple calendar, task, or contacts folders." ++msgstr "" ++"如果您有大量的邮件，您也许会需要更多的文件夹而不仅仅是您的收件箱。您也可以创" ++"建多个日历，任务或联系人文件夹。" ++ ++#: C/evolution.xml:946(para) ++msgid "To create a new folder:" ++msgstr "创建新文件夹：" ++ ++#: C/evolution.xml:949(para) ++msgid "Click Folder > New." ++msgstr "点击“文件夹” > “新建”。" ++ ++#: C/evolution.xml:952(para) ++msgid "Type the name of the folder in the Folder Name field." ++msgstr "在文件夹名称字段键入文件夹名称。" ++ ++#: C/evolution.xml:955(para) ++msgid "Select the location of the new folder." ++msgstr "选择新文件夹的位置。" ++ ++#: C/evolution.xml:958(para) C/evolution.xml:1419(para) ++#: C/evolution.xml:1445(para) C/evolution.xml:1457(para) ++#: C/evolution.xml:1596(para) C/evolution.xml:1670(para) ++#: C/evolution.xml:1952(para) C/evolution.xml:2053(para) ++#: C/evolution.xml:2068(para) C/evolution.xml:2386(para) ++#: C/evolution.xml:2428(para) C/evolution.xml:2494(para) ++#: C/evolution.xml:2977(para) C/evolution.xml:3009(para) ++#: C/evolution.xml:3205(para) C/evolution.xml:3247(para) ++#: C/evolution.xml:3376(para) C/evolution.xml:3470(para) ++#: C/evolution.xml:3485(para) C/evolution.xml:3503(para) ++#: C/evolution.xml:3560(para) C/evolution.xml:3606(para) ++#: C/evolution.xml:3813(para) C/evolution.xml:3817(para) ++#: C/evolution.xml:4038(para) C/evolution.xml:4415(para) ++#: C/evolution.xml:4480(para) C/evolution.xml:4602(para) ++#: C/evolution.xml:4674(para) C/evolution.xml:5004(para) ++#: C/evolution.xml:5057(para) C/evolution.xml:5504(para) ++#: C/evolution.xml:5579(para) C/evolution.xml:5600(para) ++#: C/evolution.xml:5623(para) C/evolution.xml:5657(para) ++#: C/evolution.xml:6015(para) C/evolution.xml:6188(para) ++#: C/evolution.xml:6215(para) C/evolution.xml:6243(para) ++#: C/evolution.xml:6258(para) C/evolution.xml:6281(para) ++#: C/evolution.xml:6308(para) C/evolution.xml:6440(para) ++#: C/evolution.xml:6462(para) C/evolution.xml:6539(para) ++#: C/evolution.xml:6569(para) C/evolution.xml:7245(para) ++#: C/evolution.xml:7343(para) C/evolution.xml:7476(para) ++msgid "Click OK." ++msgstr "点击“确定”。" ++ ++#: C/evolution.xml:963(title) ++msgid "Changing Switcher Appearance:" ++msgstr "改变切换器外观：" ++ ++#: C/evolution.xml:964(para) ++msgid "" ++"To change the appearance of your switcher click View > Switcher " ++"Appearance from the Menu Bar. Under Switcher Appearance you can " ++"select:" ++msgstr "" ++"要改变切换器外观，在菜单栏中点击“查看” > “切换器外观”。在“切换器外观”中，可以选择：" ++ ++#: C/evolution.xml:966(title) ++msgid "Icons and Text:" ++msgstr "图标与文本：" ++ ++#: C/evolution.xml:967(para) ++msgid "Displays buttons with the label and the icon corresponding to it." ++msgstr "显示带有标签的按钮和相应的图标。" ++ ++#: C/evolution.xml:970(title) ++msgid "Icons Only:" ++msgstr "仅图标：" ++ ++#: C/evolution.xml:971(para) ++msgid "Shows only the icons." ++msgstr "仅显示图标。" ++ ++#: C/evolution.xml:974(title) ++msgid "Texts Only:" ++msgstr "仅文本：" ++ ++#: C/evolution.xml:975(para) ++msgid "Displays buttons with the label, not the icons." ++msgstr "仅显示带标签的按钮，不显示图标。" ++ ++#: C/evolution.xml:978(title) ++msgid "Toolbar Style:" ++msgstr "工具条类型：" ++ ++#: C/evolution.xml:979(para) ++msgid "Shows buttons using the desktop toolbar settings." ++msgstr "使用桌面工具条设置以显示按钮。" ++ ++#: C/evolution.xml:982(title) ++msgid "Hide Buttons:" ++msgstr "隐藏按钮：" ++ ++#: C/evolution.xml:983(para) ++msgid "This option hides all the shortcut buttons of switcher." ++msgstr "此选项隐藏切换器的全部快捷按钮。" ++ ++#: C/evolution.xml:988(title) ++msgid "Folder Management" ++msgstr "文件夹管理" ++ ++#: C/evolution.xml:989(para) ++msgid "" ++"Right-click a folder or subfolder to display a menu with the following " ++"options:" ++msgstr "右击文件夹或子文件夹以显示带有如下选项的菜单：" ++ ++#: C/evolution.xml:991(title) ++msgid "Copy:" ++msgstr "复制：" ++ ++#: C/evolution.xml:992(para) ++msgid "" ++"Copies the folder to a different location. When you select this item, " ++"Evolution offers a choice of locations to copy the folder to." ++msgstr "" ++"将文件夹复制到不同的位置。当你选择该项，Evolution 会提供一系列要拷贝文件夹的" ++"位置。" ++ ++#: C/evolution.xml:995(title) ++msgid "Move:" ++msgstr "移动：" ++ ++#: C/evolution.xml:996(para) ++msgid "" ++"Moves the folder to another location. When you select this item, Evolution " ++"offers a choice of locations to move the folder to." ++msgstr "" ++"移动文件夹到另一个位置。选择此项时，Evolution 会提供一系列文件夹要移往的位" ++"置。" ++ ++#: C/evolution.xml:999(title) ++msgid "Mark Messages As Read:" ++msgstr "标记消息为已读：" ++ ++#: C/evolution.xml:1000(para) ++msgid "Marks all the messages in the folder as read." ++msgstr "标记文件夹中的全部消息为已读。" ++ ++#: C/evolution.xml:1003(title) ++msgid "New Folder:" ++msgstr "新文件夹：" ++ ++#: C/evolution.xml:1004(para) ++msgid "Creates another folder in the same location." ++msgstr "在相同位置处创建另一个文件夹。" ++ ++#: C/evolution.xml:1007(title) C/evolution.xml:3135(title) ++msgid "Delete:" ++msgstr "删除：" ++ ++#: C/evolution.xml:1008(para) ++msgid "Deletes the folder and all its contents." ++msgstr "删除文件夹以及内容。" ++ ++#: C/evolution.xml:1011(title) ++msgid "Rename:" ++msgstr "重命名：" ++ ++#: C/evolution.xml:1012(para) ++msgid "Lets you change the name of the folder." ++msgstr "改变文件夹的名字。" ++ ++#: C/evolution.xml:1015(title) ++msgid "Disable:" ++msgstr "禁用：" ++ ++#: C/evolution.xml:1016(para) ++msgid "Disables the account." ++msgstr "禁用帐号。" ++ ++#: C/evolution.xml:1019(title) ++msgid "Properties:" ++msgstr "属性：" ++ ++#: C/evolution.xml:1020(para) ++msgid "" ++"Checks the number of total and unread messages in a folder, and, for remote " ++"folders, lets you select whether to copy the folder to your local system for " ++"offline operation." ++msgstr "" ++"检查文件夹中的消息总数与未读消息总数，对于远程文件夹，需选择是否复制文件夹到" ++"本地系统以进行离线操作。" ++ ++#: C/evolution.xml:1022(para) ++msgid "" ++"You can also rearrange folders and messages by dragging and dropping them." ++msgstr "您可以通过拖拽来重新安排文件夹与消息。" ++ ++#: C/evolution.xml:1023(para) ++msgid "" ++"Any time new email arrives in a email folder, that folder label is displayed " ++"in bold text, along with the number of new messages in that folder." ++msgstr "" ++"新邮件在任何时候到达文件夹，文件夹标签以及文件夹中的新消息数会以黑体显示。" ++ ++#: C/evolution.xml:1028(title) ++msgid "Email" ++msgstr "电子邮件" ++ ++#: C/evolution.xml:1029(para) ++msgid "Evolution email is like other email programs in several ways:" ++msgstr "Evolution 在以下方面与其他邮件程序类似：" ++ ++#: C/evolution.xml:1032(para) ++msgid "" ++"It can send and receive email in HTML or as plain text, and makes it easy to " ++"send and receive multiple file attachments." ++msgstr "它可以收发 HTML 或纯文本的邮件，收发多文件附件非常容易。" ++ ++#: C/evolution.xml:1035(para) ++msgid "" ++"It supports multiple email sources, including IMAP, POP3, and local mbox or MH spools and " ++"files created by other email programs." ++msgstr "" ++"它支持多邮件源，包括IMAP, POP3,以及其他邮件程序创建的本地 mbox 或 MH 邮件队列与文件。" ++ ++#: C/evolution.xml:1038(para) ++msgid "" ++"It can sort and organize your email in a wide variety of ways with folders, " ++"searches, and filters." ++msgstr "它可以通过许多方式按照文件夹、搜索、过滤结果来排序和组织邮件。" ++ ++#: C/evolution.xml:1041(para) ++msgid "It lets you guard your privacy with encryption." ++msgstr "通过加密保护您的隐私。" ++ ++#: C/evolution.xml:1044(para) ++msgid "" ++"However, Evolution has some important differences from other email programs. " ++"First, it is built to handle very large amounts of email. The junk email, message filtering and searching functions were built for speed and " ++"efficiency. There's also the search folder, an advanced organizational feature not found in " ++"some email clients. If you get a lot of email, or if you keep every message " ++"you get in case you need to refer to it later, you will find this feature " ++"especially useful. Here's a quick explanation of what's happening in your " ++"main Evolution email window." ++msgstr "" ++"然而，Evolution与其它邮件程序相比也有一些重要区别。例如，它能处理大量的邮件。" ++"垃圾邮件, 邮件 过滤 和 搜索功能既快速又有效率。 此外还有搜索文件夹功能，这是一项部分邮件客户" ++"端程序所没有的高级功能。如果您有许多邮件，或者您需要保存您拿到的每封邮件以便" ++"在以后阅读它们，您会发现这个功能非常有用。下面对Evolution邮件窗口的内容作简要" ++"介绍。" ++ ++#: C/evolution.xml:1048(para) ++msgid "" ++"The message list displays all the messages that you have. This includes all " ++"your read and unread messages, and email that is flagged to be deleted." ++msgstr "" ++"邮件列表显示您所拥有的全部邮件，包括所有您已读和未读的邮件，以及被标记要删除" ++"的邮件。" ++ ++#: C/evolution.xml:1052(para) ++msgid "" ++"The preview pane displays the message that is currently chosen in the " ++"message list." ++msgstr "预览面板显示当前在邮件列表中被选中的邮件的内容。" ++ ++#: C/evolution.xml:1054(para) ++msgid "" ++"If you find the preview pane too small, you can resize the pane, enlarge the " ++"whole window, or double-click the message in the message list to have it " ++"open in a new window. To change the size of a pane, drag the divider between " ++"the two panes." ++msgstr "" ++"如果您觉得预览面板太小，您可以调节面板的大小，扩大整个窗口，或在邮件列表中双" ++"击邮件以在新窗口中打开邮件。要调节面板的大小，直接拖拽两个面板之间的分隔条即" ++"可。" ++ ++#: C/evolution.xml:1055(para) ++msgid "" ++"As with folders, you can right-click messages in the message list and get a " ++"menu of possible actions, including moving or deleting them, creating " ++"filters or search folders based on them, and marking them as junk mail." ++msgstr "" ++"对于文件夹，您可以在邮件列表中右击邮件弹出菜单，可找到一系列操作，包括移动或" ++"删除邮件，创建过滤规则或搜索文件夹，以及将它们标记为垃圾邮件。" ++ ++#: C/evolution.xml:1056(para) ++msgid "" ++"Most of the email-related actions you want to perform are listed in the " ++"Message menu and Folder menu in the menu bar. The most frequently used ones, " ++"like Reply and Forward, also appear as buttons in the toolbar. Most of them " ++"are also located in the right-click menu and as keyboard shortcuts." ++msgstr "" ++"大部分与邮件相关的操作已列在菜单栏中的“信件”和“文件夹”菜单中了。最常用的几" ++"个，例如“回复”，“转发”，也在工具栏上以按钮的形式显示。大部分操作也在右键快捷" ++"菜单中以及键盘快捷键中。" ++ ++#: C/evolution.xml:1057(para) ++msgid "" ++"For an in-depth guide to the email capabilities of Evolution, read Sending and Receiving Email." ++msgstr "" ++"要详细了解Evolution的邮件功能，请阅读发送和接收" ++"邮件." ++ ++#: C/evolution.xml:1061(title) ++msgid "The Calendar" ++msgstr "日历" ++ ++#: C/evolution.xml:1062(para) ++msgid "" ++"To begin using the calendar, click Calendar in the Switcher. By default, the " ++"calendar shows today's schedule on a ruled background. At the left bottom, " ++"there is a monthly calendar you can use to switch days. At the upper right, " ++"there is a task list, where you can keep a list of tasks separate from your " ++"calendar appointments. Below that, there is a memo list." ++msgstr "" ++"要开始使用日历，在“切换区”中点击“日历”。默认情况下日历会用特定的背景显示当日" ++"的计划。在左下角有一个（按月的）日历可用来切换日期。在右上角有一个任务列表，" ++"您可以保存一些从日历中分离出来的任务。在它的下方是备忘列表。" ++ ++#: C/evolution.xml:1065(title) ++msgid "Appointment List:" ++msgstr "约会列表；" ++ ++#: C/evolution.xml:1066(para) ++msgid "The appointment list displays all your scheduled appointments." ++msgstr "约会列表显示所有计划的约会。" ++ ++#: C/evolution.xml:1069(title) ++msgid "Month Pane:" ++msgstr "月份面板：" ++ ++#: C/evolution.xml:1070(para) ++msgid "" ++"The month pane is a small view of a calendar month. To display additional " ++"months, drag the column border to the right. You can also select a range of " ++"days in the month pane to display a custom range of days in the appointment " ++"list." ++msgstr "" ++"月份面板显示一个月的视图。要显示其它月份，把竖向的边框拖到右侧。您也可以在月" ++"份面板中选择一段日期以在约会列表中显示该段日期。" ++ ++#: C/evolution.xml:1073(title) ++msgid "Task List:" ++msgstr "任务列表：" ++ ++#: C/evolution.xml:1074(para) ++msgid "" ++"Tasks are distinct from appointments because they generally don't have times " ++"associated with them. You can use the list in a larger window by clicking " ++"the Tasks button in the side bar." ++msgstr "" ++"任务与约会有所不同，它们没有特定的时间与之关联。您可以通过点击边栏上的“任" ++"务”按钮在一个较大的窗口中显示任务列表。" ++ ++#: C/evolution.xml:1076(para) ++msgid "" ++"For more information about the calendar, see Evolution Calendar." ++msgstr "" ++"更多关于日历的信息，参见Evolution 日历。" ++ ++#: C/evolution.xml:1080(title) ++msgid "The Contacts" ++msgstr "联系" ++ ++#: C/evolution.xml:1081(para) ++msgid "" ++"The Evolution contacts can handle all of the functions of an address book or " ++"phone book. However, it is easier to update Evolution than it is to change " ++"an actual paper book, in part because Evolution can synchronize with Palm " ++"OS* devices and use LDAP directories on a " ++"network." ++msgstr "" ++"Evolution联系人 拥有各种地址簿或电话簿的全部功能。 然而，更新Evolution要比直" ++"接修改纸质的电话簿方便多了， 因为Evolution能够与Palm OS*设备同步，也可以使用" ++"网上的LDAP目录。" ++ ++#: C/evolution.xml:1082(para) ++msgid "" ++"To use the contacts tool, click Contacts in the Switcher. By default, the " ++"display shows all your contacts in alphabetical order, in a minicard view. " ++"You can select other views from the View menu, and adjust the width of the " ++"columns by clicking and dragging the gray column dividers." ++msgstr "" ++"要使用联系人工具，点击切换区里的“联系人”。默认情况下，您所有的联系人会按照字" ++"母排序，以名片的形式显示。您可以从“视图”菜单中选择其它视图，还可以通过点击、" ++"拖拽灰色的边栏分隔线调整视图栏宽度。" ++ ++#: C/evolution.xml:1084(para) ++msgid "" ++"Another advantage of the Evolution contacts is its integration with the rest " ++"of the application. For example, you can right-click an email address in " ++"Evolution mail to instantly create a contact entry." ++msgstr "" ++"Evolution联系人的另一个优点是：它与程序的其它部分整合得很好。例如，您可以在" ++"Evolution邮件里右击一个邮件地址，以此直接创建一个新的联系人条目。" ++ ++#: C/evolution.xml:1085(emphasis) ++msgid "Contact List" ++msgstr "联系列表" ++ ++#: C/evolution.xml:1086(para) ++msgid "" ++"The largest section of the contacts display shows a list of individual " ++"contacts. You can also search the contacts in the same way that you search " ++"email folders, using the search tool on the right side of the toolbar." ++msgstr "" ++"“联系人”视图最大的区域显示联系人列表。您也可以像搜索邮件文件夹一样搜索联系" ++"人，使用工具栏右侧的搜索工具即可。" ++ ++#: C/evolution.xml:1087(para) ++msgid "" ++"For detailed instructions on how to use the address book, read Evolution Contacts: the Address Book." ++msgstr "" ++"要了解关于如何使用地址簿的详细信息，请阅读Evolution 联系人：地址簿." ++ ++#: C/evolution.xml:1092(title) ++msgid "Backing Up and Restoring Evolution" ++msgstr "备份与恢复 Evolution" ++ ++#: C/evolution.xml:1093(para) ++msgid "" ++"With the Backup and Restore plugin enabled, you can successfully back up " ++"Evolution to your machine and restore it whenever it is required. The backup " ++"saves your Evolution settings, mail, contacts, tasks, memos, and calendars " ++"and creates an archive." ++msgstr "" ++"启用备份和还原引擎后，您可以成功地将Evolution备份到您的主机上，并在任何需要的" ++"时候还原备份。“备份”能保存您对Evolution的设置以及邮件，联系人，任务，备忘和日" ++"历并创建一个备份文件。" ++ ++#: C/evolution.xml:1096(para) ++msgid "" ++"Select File > Backup Settings to select the folder where you want to save " ++"the backup." ++msgstr "选择文件 > 备份设置，选择您希望保存备份的文件夹。" ++ ++#: C/evolution.xml:1097(para) ++msgid "Evolution is always backed up as evolution-backup.tar.gz." ++msgstr "Evolution 总是默认备份为evolution-backup.tar.gz 。" ++ ++#: C/evolution.xml:1098(para) ++msgid "" ++"Before the backup process starts, it asks you to close Evolution and " ++"displays a warning as shown below:" ++msgstr "备份过程开始之前，程序会让您关闭Evolution并显示一个警告窗口如下：" ++ ++#: C/evolution.xml:1103(para) ++msgid "" ++"Select Restart Evolution after backup to restart Evolution immediately after " ++"the backup process." ++msgstr "选择“备份后重启Evolution”，在备份过程结束后立刻重启Evolution 。" ++ ++#: C/evolution.xml:1106(para) ++msgid "Click Yes to close Evolution and start the backup." ++msgstr "点击“是”以关闭 Evolution 并开始备份。" ++ ++#: C/evolution.xml:1108(para) C/evolution.xml:1126(para) ++msgid "Evolution will auto-restart after the process." ++msgstr "在进程完成之后，Evolution 会重新启动。" ++ ++#: C/evolution.xml:1113(title) ++msgid "Restoring Evolution" ++msgstr "恢复 Evolution" ++ ++#: C/evolution.xml:1114(para) ++msgid "This feature restores your settings from the archive." ++msgstr "该功能帮助您从备份文件中还原设置。" ++ ++#: C/evolution.xml:1117(para) ++msgid "" ++"Select File > Restore Settings to open the available evolution-backup.tar." ++"gz files." ++msgstr "选择“文件”> “恢复设置”以打开可用的 evolution-backup.tar.gz 文件。" ++ ++#: C/evolution.xml:1120(para) ++msgid "Select the evolution-backup.tar.gz and click Save." ++msgstr "选择 evolution-backup.tar.gz ，点击“保存”。" ++ ++#: C/evolution.xml:1121(para) ++msgid "" ++"Before the process starts, a pop-up window appears and asks you to close " ++"Evolution. Close all the windows and then click Restore in the pop-up window." ++msgstr "" ++"在还原过程开始之前，会弹出一个窗口提醒您关闭Evolution 。请关闭所有窗口，在弹" ++"出窗口中点击“还原”。" ++ ++#: C/evolution.xml:1123(para) ++msgid "" ++"If you are creating your first account via the Startup Wizard, you can use " ++"the option to restore from the archive if it is available locally." ++msgstr "" ++"如果您刚通过启动设置向导创建了第一个账户，您可以使用这个选项从本地的备份文件" ++"中还原设置。" ++ ++#: C/evolution.xml:1133(title) ++msgid "Command Line Options" ++msgstr "命令行选项" ++ ++#: C/evolution.xml:1134(para) ++msgid "" ++"Evolution has a number of command line options that you can use. For more " ++"information about command line options, open a terminal window and type " ++"evolution --help." ++msgstr "" ++"Evolution 程序有许多命令行选项可供您选用。要了解更多关于命令行选项的信息，请" ++"打开终端窗口，输入evolution --help." ++ ++#: C/evolution.xml:1135(para) ++msgid "The most important command line options are:" ++msgstr "最重要的命令行选项列表如下：" ++ ++#: C/evolution.xml:1143(para) ++msgid "Command" ++msgstr "命令" ++ ++#: C/evolution.xml:1153(para) ++msgid "evolution --offline" ++msgstr "evolution --offline" ++ ++#: C/evolution.xml:1156(para) ++msgid "Starts Evolution in offline mode." ++msgstr "以离线模式启动 Evolution。" ++ ++#: C/evolution.xml:1161(para) ++msgid "evolution --disable-preview" ++msgstr "evolution --disable-preview" ++ ++#: C/evolution.xml:1164(para) ++msgid "Disables all the preview panes when you launch Evolution." ++msgstr "启动Evolution 时禁用所有预览面板。" ++ ++#: C/evolution.xml:1165(para) ++msgid "" ++"This prevents Evolution from opening the most recently selected message, " ++"task or contact, thus providing a way to avoid an application crash caused " ++"by previewing the message, task or contact." ++msgstr "" ++"该操作将阻止Evolution打开最近查看的信件，任务或联系人，从而避免由于预览信件，" ++"任务或联系人而可能导致程序崩溃的问题。" ++ ++#: C/evolution.xml:1170(para) ++msgid "evolution mailto:joe@somewhere.net" ++msgstr "evolution mailto:joe@somewhere.net" ++ ++#: C/evolution.xml:1173(para) ++msgid "" ++"Starts Evolution and begins composing a message to the email address listed." ++msgstr "启动Evolution并向提供的地址写一封邮件。" ++ ++#: C/evolution.xml:1178(para) ++msgid "evolution -c mail" ++msgstr "evolution -c mail" ++ ++#: C/evolution.xml:1181(para) ++msgid "Starts Evolution in mail mode." ++msgstr "以邮件模式启动 Evolution。" ++ ++#: C/evolution.xml:1186(para) ++msgid "evolution -c calendar" ++msgstr "evolution -c calendar" ++ ++#: C/evolution.xml:1189(para) ++msgid "Starts Evolution in calendar mode." ++msgstr "以日历模式启动 Evolution。" ++ ++#: C/evolution.xml:1194(para) ++msgid "evolution -c contacts" ++msgstr "evolution -c contacts" ++ ++#: C/evolution.xml:1197(para) ++msgid "Starts Evolution in contacts mode." ++msgstr "以联系人模式启动 Evolution。" ++ ++#: C/evolution.xml:1202(para) ++msgid "evolution --force-shutdown" ++msgstr "evolution --force-shutdown" ++ ++#: C/evolution.xml:1205(para) ++msgid "Forces every part of Evolution to shut down immediately." ++msgstr "强制立刻关闭Evolution的每个组件。" ++ ++#: C/evolution.xml:1210(para) ++msgid "evolution %s" ++msgstr "evolution %s" ++ ++#: C/evolution.xml:1213(para) ++msgid "" ++"Makes Evolution your default email handler for your Web browser and in the " ++"GNOME* Control Center." ++msgstr "将Evolution设置为您的浏览器和GNOME* 控制中心的默认邮件处理程序。" ++ ++#: C/evolution.xml:1224(para) ++msgid "" ++"This section, and Organizing Your " ++"Email, provide you with an in-depth guide to the capabilities of " ++"Evolution as a mail client. For information about how " ++"to customize your mail account, see Mail " ++"Preferences." ++msgstr "" ++"这一节和组织您的邮件将向您详细介" ++"绍Evolution作为邮件客户端的功能。要了解关于配置您的邮" ++"件账户的信息，请参阅邮件首选项。" ++ ++#: C/evolution.xml:1227(link) C/evolution.xml:1247(title) ++msgid "Reading Mail" ++msgstr "阅读邮件" ++ ++#: C/evolution.xml:1230(link) C/evolution.xml:1520(title) ++msgid "Composing New Email Messages" ++msgstr "写新邮件" ++ ++#: C/evolution.xml:1233(link) C/evolution.xml:2127(title) ++msgid "Templates" ++msgstr "模板" ++ ++#: C/evolution.xml:1236(link) C/evolution.xml:2228(title) ++msgid "Sending Invitations by Mail" ++msgstr "通过邮件发送邀请" ++ ++#: C/evolution.xml:1239(link) C/evolution.xml:2251(title) ++msgid "IMAP Subscriptions Manager" ++msgstr "IMAP 订阅管理器" ++ ++#: C/evolution.xml:1242(link) C/evolution.xml:2275(title) ++msgid "Encryption" ++msgstr "校验" ++ ++#: C/evolution.xml:1248(para) ++msgid "" ++"If you are not already viewing mail, switch to the mail tool by clicking the " ++"Mail shortcut button, or press Ctrl+1. To read a message, select it in the " ++"message list; if you'd like to see it in its own window, either double-click " ++"it, press Enter, or press Ctrl+O." ++msgstr "" ++"如果您还没有准备阅读邮件，点击“邮件”快捷按钮或按Ctrl+1切换到邮件工具。 要阅读" ++"一封邮件，请在邮件列表中选择它。 如果您想在新窗口中阅读邮件，可以双击它，或者" ++"按Enter键，或者按Ctrl+O 。" ++ ++#: C/evolution.xml:1250(para) ++msgid "" ++"To read mail with the keyboard, you can click the Spacebar to page down and " ++"press Backspace to page up while reading an email. Ensure that you use the " ++"keys when the message list is enabled." ++msgstr "" ++"要通过操作键盘阅读邮件，在阅读内容时可以按空格键翻到下一页或按Backspace键返回" ++"上一页。您在使用这些键时应确保邮件列表是可用的。" ++ ++#: C/evolution.xml:1251(para) ++msgid "" ++"Navigate the message list by using the arrow keys on the keyboard. To go to " ++"the next and previous unread messages, press the period (.) or comma (,) " ++"keys. On some keyboards, these keys are also marked with the > and < " ++"symbols, which is a convenient way to remember that they move you forward " ++"and backward in your message list. You can also use the right square bracket " ++"(]) for the next unread message, and the left square bracket ([) for the " ++"previous unread message." ++msgstr "" ++"您可用键盘上的方向键在邮件列表上移动选择。要前往下一封或上一封未读的邮件，按" ++"句号(.)或逗号(,)键。 在某些键盘上，这两个键是和> 与 < 号 放在一起的，所" ++"以您可以把它们想像为在邮件列表上“前进”和“后退”。 您也可以使用右方括号键 (]) " ++"跳至下一封未读的邮件，使用左方括号键 ([) 调至上一封未读的邮件。" ++ ++#: C/evolution.xml:1255(title) ++msgid "Magic Spacebar for Reading Mail" ++msgstr "阅读邮件的“魔术空格键”" ++ ++#: C/evolution.xml:1256(para) ++msgid "" ++"With Magic Spacebar, you can easily read the unread messages in all the mail " ++"folders. You can read mail, scroll through mail and switch folders by using " ++"the Spacebar on your keyboard." ++msgstr "" ++"使用魔术空格键，您可以轻松地阅读所有文件夹中的未读邮件。您可以用空格键阅读邮" ++"件，滚动邮件和切换文件夹。" ++ ++#: C/evolution.xml:1257(para) ++msgid "To enable Magic Spacebar:" ++msgstr "开启魔术空格键：" ++ ++# 应该是“邮件首选项”而不是在“邮件账户”中启用魔术空格键 ++#: C/evolution.xml:1260(para) C/evolution.xml:1412(para) ++#: C/evolution.xml:2374(para) C/evolution.xml:2416(para) ++#: C/evolution.xml:2477(para) C/evolution.xml:5378(para) ++#: C/evolution.xml:5642(para) C/evolution.xml:5942(para) ++#: C/evolution.xml:5958(para) C/evolution.xml:6420(para) ++msgid "Select Edit > Preferences, then select Mail Accounts." ++msgstr "选择 编辑 > 首选项，然后选择邮件首选项。" ++ ++#: C/evolution.xml:1263(para) ++msgid "Select the Enable Magic Spacebar check box." ++msgstr "勾选“启用魔术空格键”。" ++ ++#: C/evolution.xml:1266(para) ++msgid "When you are in the Mail view, the Spacebar has the following behavior:" ++msgstr "当您在邮件视图中时，空格键有以下作用：" ++ ++#: C/evolution.xml:1269(para) ++msgid "" ++"When you press the Spacebar for the first time, it takes you to the next " ++"unread message." ++msgstr "当您第一次按下空格键时，会跳至下一封未读邮件。" ++ ++#: C/evolution.xml:1272(para) ++msgid "" ++"If the message is more than one screen long, the Spacebar works as Page Down " ++"key." ++msgstr "如果邮件内容超出屏幕范围，按下空格键相当于Page Down键。" ++ ++#: C/evolution.xml:1275(para) ++msgid "" ++"If you press the Spacebar after you reach the bottom of the page, it takes " ++"you to the next unread message." ++msgstr "如果您在到达页面底部时，按下空格键能跳至下一封未读邮件。" ++ ++#: C/evolution.xml:1278(para) ++msgid "" ++"If there are no more unread messages in the mailbox, pressing the Spacebar " ++"takes you to the next unread message in the next folder." ++msgstr "如果邮箱中没有未读邮件，按下空格键跳至下一个文件夹中的未读邮件。" ++ ++#: C/evolution.xml:1281(para) ++msgid "" ++"If new messages arrive in a number of folders, the Spacebar toggles between " ++"those folders. This feature allows you to switch to the next unread message " ++"in a different folder without clicking the folder." ++msgstr "" ++"如果新邮件到达若干个文件夹，按下空格键能在不同文件夹之间跳转。这样您可以直接" ++"跳至其他文件夹中的未读邮件而无须用鼠标点击文件夹。" ++ ++#: C/evolution.xml:1287(title) ++msgid "Checking for New Mail" ++msgstr "检查新邮件" ++ ++#: C/evolution.xml:1288(para) ++msgid "" ++"To check your mail, click Send/Receive in the toolbar. If you haven't " ++"created any mail accounts yet, the setup assistant asks you for the " ++"information it needs to check your email. For information on creating mail " ++"accounts, see Starting Evolution " ++"for the First Time." ++msgstr "" ++"要检查您的新邮件，点击工具栏上的发送/接收 按钮。如果您尚未建立任何邮件账户，" ++"则“设置助手”会向您询问一些必要的信息以便检查邮件。 关于创建邮件账户的信息，请" ++"参阅第一次启动Evolution." ++ ++#: C/evolution.xml:1289(para) ++msgid "" ++"If this is your first time checking mail, or you haven't asked Evolution to " ++"store your password, you are prompted for the password. Enter your password " ++"to download your email." ++msgstr "" ++"如果您是第一次检查邮件，或您之前未让Evolution保存密码，您会被要求输入密码。请" ++"输入密码以便下载邮件。" ++ ++#: C/evolution.xml:1290(para) ++msgid "" ++"If you get an error message instead of mail, you probably need to check your " ++"network settings. To learn how to do that, see Mail Header Preferences, or ask your system administrator." ++msgstr "" ++"如果您未能下载邮件而是得到了出错的信息，您可能需要检查一下您的网络设置。 具体" ++"操作方法，请参阅邮件头首选项，或" ++"询问您的系统管理员。" ++ ++#: C/evolution.xml:1294(title) ++msgid "New Mail Notification" ++msgstr "新邮件提示" ++ ++#: C/evolution.xml:1295(para) ++msgid "" ++"Evolution can notify you of new messages. When you receive a new message in " ++"your inbox, a blinking icon appears on the Switcher." ++msgstr "" ++"Evolution 有新邮件提醒功能。 当您收到一封新邮件时，在切换区会出现一个闪烁的图" ++"标。" ++ ++#: C/evolution.xml:1296(para) ++msgid "" ++"You can also view a blinking icon () in the notification area that disappears when " ++"you open the new message. Mouse over the icon to view the notification " ++"message." ++msgstr "" ++"您也可以在通知区域看到一个闪烁的图标 ()，当您打开新邮件时，该图标会消失。 您可以把鼠标移" ++"至该图标上查看提醒信息。" ++ ++#: C/evolution.xml:1298(para) ++msgid "" ++"To enable this feature, select Edit > Plugins, then select the Mail " ++"Notification check box. You can configure the plugin by specifing the " ++"following in the Plugin Manager." ++msgstr "" ++"要开启这个功能，选择 编辑 > 插件， 然后勾选“邮件通知”。您可以在插件管理器" ++"中配置该插件，选项如下：" ++ ++#: C/evolution.xml:1301(title) ++msgid "Notify new messages for Inbox only:" ++msgstr "仅提示收件箱的新邮件：" ++ ++#: C/evolution.xml:1302(para) ++msgid "" ++"Select this option to restrict the mail notification to Inbox. With this " ++"option enabled, you are notified of each new message arrival in the Inbox." ++msgstr "" ++"选择该项，则只有收件箱中的新邮件才会有提醒。 该选项激活后，每当收件箱中有新邮" ++"件到达时，您会收到提醒。" ++ ++#: C/evolution.xml:1305(title) ++msgid "New Message Notification For Folders" ++msgstr "提示文件夹中的新邮件：" ++ ++#: C/evolution.xml:1306(para) ++msgid "" ++"This feature notifies you of new message arrival in any folder. A folder " ++"with new mail is identified by the unread icon.The icon is displayed as long " ++"as the folder is accessed." ++msgstr "" ++"选择该项，任何文件夹收到新邮件时都会给您提醒。有新信件的文件夹会带上一个未读" ++"标记。这个图标在您访问该文件夹时就会显示。" ++ ++#: C/evolution.xml:1308(para) ++msgid "" ++"In a collapsed folder tree, if a new message arrives in the parent folder, " ++"the folder name is displayed with a '+' plus sign beside the unread mail " ++"count. When a new message arrives in any child folders, the parent folder " ++"name turns bold." ++msgstr "" ++"在一个折叠的文件树中，如果一封新邮件到达了父文件夹，则文件夹名旁边会显示未读" ++"邮件数目以及一个“+”号。如果一封新邮件到达了子文件夹，则父文件夹的名称会加粗。" ++ ++#: C/evolution.xml:1311(title) ++msgid "Generate D-Bus message:" ++msgstr "生成 D-Bus 信息:" ++ ++#: C/evolution.xml:1312(para) ++msgid "" ++"D-Bus is a fast, lightweight message bus system that allows applications to " ++"communicate with each other. Select this option to generate a D-Bus message " ++"on the session bus whenever a new message arrives." ++msgstr "" ++"D-Bus 是一个快速，轻量级的信息线路系统，能让程序之间相互通信。 勾选该项能在新" ++"邮件到达时产生一条D-Bus信息。" ++ ++#: C/evolution.xml:1315(title) ++msgid "Show icon in the notification area:" ++msgstr "在通知区域显示图标：" ++ ++#: C/evolution.xml:1316(para) ++msgid "" ++"Select this option to display a new mail icon in the notification area when " ++"a new message arrives. You have two options to select from:" ++msgstr "" ++"选择该项，当收到新邮件时会在通知区域显示一个新邮件图标。您有两个子选项可以选" ++"择：" ++ ++#: C/evolution.xml:1321(title) ++msgid "Blinking icon in the notification area:" ++msgstr "在通知区域闪烁图标：" ++ ++#: C/evolution.xml:1322(para) ++msgid "" ++"Select this option to make the new mail icon blink in the notification area " ++"on arrival of a new message." ++msgstr "选择该项，收到新邮件时新邮件图标会在通知区域闪烁。" ++ ++#: C/evolution.xml:1327(title) ++msgid "Popup message together with the icon:" ++msgstr "显示图标同时弹出邮件：" ++ ++#: C/evolution.xml:1328(para) ++msgid "" ++"Select this option to make the new message pop up along with the new mail " ++"icon." ++msgstr "选择该项，能使新信件随着图标弹出。" ++ ++#: C/evolution.xml:1333(title) ++msgid "Play sound when new messages arrive:" ++msgstr "新邮件到达时播放声音：" ++ ++#: C/evolution.xml:1334(para) ++msgid "You have two options to select from:" ++msgstr "您有两个子选项可以选择：" ++ ++#: C/evolution.xml:1339(title) C/evolution.xml:3177(title) ++msgid "Beep:" ++msgstr "蜂鸣:" ++ ++#: C/evolution.xml:1340(para) ++msgid "" ++"Select this option to play a beep sound on the arrival of a new message." ++msgstr "选择该选项以在新消息到来时播放蜂鸣声。" ++ ++#: C/evolution.xml:1345(title) ++msgid "Play sound file:" ++msgstr "播放声音文件：" ++ ++#: C/evolution.xml:1346(para) ++msgid "" ++"Select this option to play a sound file of your choice on the arrival of a " ++"new message." ++msgstr "选择此选项以在新消息到来时播放选定的声音文件。" ++ ++#: C/evolution.xml:1350(para) ++msgid "To specify the sound file you want to play:" ++msgstr "指定想要播放的声音文件：" ++ ++#: C/evolution.xml:1353(para) ++msgid "Click None to open the Select Sound File browser window." ++msgstr "选择“无”以打开“选择声音文件”浏览窗口。" ++ ++#: C/evolution.xml:1356(para) ++msgid "Browse to find the sound file of your choice." ++msgstr "浏览以选择要选的声音文件。" ++ ++#: C/evolution.xml:1359(para) ++msgid "Click Open to select the sound file." ++msgstr "点击“打开”选择声音文件。" ++ ++#: C/evolution.xml:1362(para) ++msgid "Click Play to listen to the file." ++msgstr "点击“播放”收听文件。" ++ ++#: C/evolution.xml:1368(title) ++msgid "Vertical View Versus Classical View" ++msgstr "垂直视图VS经典视图" ++ ++#: C/evolution.xml:1369(para) ++msgid "" ++"Evolution provides a vertical view in addition to the classical view. In the " ++"vertical view, the message preview pane is located at the right side of the " ++"message list when compared to the classical view where the message preview " ++"pane is placed below the message list. Vertical view enables you to use the " ++"extra width of wide screen monitors." ++msgstr "" ++"除了经典视图之外，Evolution 还提供了一个“垂直式”的视图。在垂直视图中，邮件预" ++"览面板位于邮件列表的右侧。（而在经典视图中，邮件预览面板位于邮件列表的下" ++"方）。垂直视图能使您有效利用宽屏显示器的额外宽度。" ++ ++#: C/evolution.xml:1371(title) ++msgid "Vertical View:" ++msgstr "垂直视图：" ++ ++#: C/evolution.xml:1372(para) ++msgid "To switch to vertical view, click View > Preview > Vertical View." ++msgstr "要切换到垂直视图，点击 视图 > 预览 > 垂直视图 。" ++ ++#: C/evolution.xml:1374(para) ++msgid "" ++"In vertical view, the message list contains double lines of compressed " ++"headers, which enables you to consume the extra width in the preview column. " ++"The compressed columns have Sender Name and Email, Attachment Icon, Date and " ++"Subject in the second line." ++msgstr "" ++"在垂直视图中，邮件列表包含两行的简要邮件头，以便您利用余下的宽度放置预览面" ++"板。 邮件头包括发信人，附件标记，日期和第二行的邮件标题。" ++ ++#: C/evolution.xml:1377(title) ++msgid "Classical View:" ++msgstr "经典视图：" ++ ++#: C/evolution.xml:1378(para) ++msgid "" ++"To switch to classical view, click View > Preview > Classical View." ++msgstr "切换到经典视图，点击“查看” > “预览”> “经典视图”。" ++ ++#: C/evolution.xml:1383(title) ++msgid "Collapsible Message Headers" ++msgstr "可折叠的邮件头" ++ ++#: C/evolution.xml:1384(para) ++msgid "" ++"Evolution compresses the TO, CC and BCC headers of received mail and shows " ++"only limited addresses. You can set the limit of the number of addresses to " ++"be displayed in the preview pane." ++msgstr "" ++"Evolution 能把收到邮件的TO,CC和BCC等邮件头信息压缩，只显示一部分地址。您可以" ++"设置在预览面板中显示的地址数目。" ++ ++#: C/evolution.xml:1385(para) ++msgid "" ++"Use the following procedure to set the limit of addresses to be displayed:" ++msgstr "根据下列步骤设置限制要显示的地址：" ++ ++#: C/evolution.xml:1388(para) C/evolution.xml:2023(para) ++#: C/evolution.xml:2453(para) C/evolution.xml:5354(para) ++#: C/evolution.xml:5540(para) C/evolution.xml:6705(para) ++msgid "Select Edit > Preferences." ++msgstr "选择“编辑”> “首选项”。" ++ ++#: C/evolution.xml:1391(para) ++msgid "Select Mail Preferences." ++msgstr "选择邮件首选项。" ++ ++#: C/evolution.xml:1394(para) ++msgid "" ++"Check Shrink To/CC/Bcc headers to column to limit the " ++"address." ++msgstr "勾选压缩 To/CC/Bcc 头到列以限制地址显示。" ++ ++#: C/evolution.xml:1397(para) ++msgid "Enter the limit in the field." ++msgstr "在字段中键入限制。" ++ ++#: C/evolution.xml:1400(para) ++msgid "" ++"You can expand the message headers by clicking the icon or the ellipsis (...) in the message preview pane. To collapse the message headers, " ++"click the icon " ++"in the preview pane." ++msgstr "" ++"您可以通过点击邮件预览面板中的图标或省略号(...)来展开邮件头信" ++"息。要折叠邮件头，点击预览面板中的图标。" ++ ++#: C/evolution.xml:1404(title) ++msgid "Sharing Mailboxes with Other Mail Programs" ++msgstr "与其它邮件程序共享邮箱" ++ ++#: C/evolution.xml:1405(para) ++msgid "" ++"If you want to use Evolution and another email client, such as Mutt, at the " ++"same time, use the following procedure:" ++msgstr "" ++"如果您想同时使用Evolution和其它邮件客户端，如Mutt，请按照一下步骤操作：" ++ ++#: C/evolution.xml:1408(para) ++msgid "Download your mail in the other application as you would normally." ++msgstr "在其它程序中用正常方法下载邮件。" ++ ++#: C/evolution.xml:1411(para) ++msgid "In Evolution:" ++msgstr "在 Evolution 中：" ++ ++#: C/evolution.xml:1413(para) ++msgid "" ++"Select the account you want to use to share mail and click Edit. Instead of " ++"Edit, you might want to create a new account just for this source of mail by " ++"clicking New." ++msgstr "" ++"选择您想共享邮件的账户，点击“编辑”。 如果您想为共享的邮件创建一个新的账户，点" ++"击“新建”。" ++ ++#: C/evolution.xml:1416(para) ++msgid "" ++"Under the Receiving Mail tab, select the type of mail file that your other " ++"mail application uses, then specify the full path to that location. A " ++"typical choice would be mbox files, with the path /home/username/Mail/." ++msgstr "" ++"在“接收电子邮件”的标签下，选择与其它邮件程序对应的邮件文件类型，确认文件的完" ++"整路径。 例如，mbox文件，路径选择就是/home/username/" ++"Mail/ 。" ++ ++#: C/evolution.xml:1422(para) ++msgid "" ++"You can only use one mail client at a time. The mail files are locked by the " ++"mail program that is currently using them, so the mail files can't be " ++"accessed by any other mail program." ++msgstr "" ++"在一个时刻您只能使用一个邮件客户端。 邮件文件会被当前使用的邮件程序锁定，故这" ++"些邮件文件不能被任何其它邮件程序访问。" ++ ++#: C/evolution.xml:1426(title) ++msgid "Working with Attachments and HTML Mail" ++msgstr "操作附件和HTML邮件" ++ ++#: C/evolution.xml:1427(para) ++msgid "" ++"If someone sends you an attachment, " ++"Evolution displays a file icon at the end of the message to which it is " ++"attached. Text, including HTML formatting, and embedded images appears as " ++"part of the message, rather than as a separate attachment. Attachments are " ++"also listed under the address list. To view the attachments, click the arrow " ++"to expand the attachment window. To open an attachment, double-click it. " ++"Click the Save All button to save all the attachments." ++msgstr "" ++"如果对方发送给您附件，Evolution 将在附件" ++"所在的邮件结尾显示一个文件图标。 文本（包括HTML格式）和内嵌的图片都是作为邮件" ++"正文显示，而不是作为单独的附件。附件也会在邮件地址列表中列出来。要显示附件，" ++"点击图标旁边的“箭头”符号以展开附件窗口。要打开附件，双击它。要保存所有附件，" ++"点击“全部保存”按钮。" ++ ++#: C/evolution.xml:1430(title) ++msgid "Saving or Opening Attachments" ++msgstr "保存或打开附件" ++ ++#: C/evolution.xml:1431(para) ++msgid "" ++"If you get an email message with an attachment, Evolution can help you save " ++"the attachment or open it with the appropriate applications." ++msgstr "" ++"如果您收到一封包含附件的邮件，Evolution能帮助您保存附件或者用合适的程序打开附" ++"件。" ++ ++#: C/evolution.xml:1432(para) ++msgid "" ++"Evolution shows a right-arrow icon, the number of attachments, and a Save or " ++"Save All button to save all the attachments. Click the right-arrow icon to " ++"show the attachment bar." ++msgstr "" ++"Evolution 显示一个右向箭头的图标，附件数量，以及一个“保存”或“全部保存”按钮用" ++"于保存所有附件。点击右向箭头的图标能显示附件栏。" ++ ++#: C/evolution.xml:1433(para) ++msgid "To save an attachment to disk:" ++msgstr "保存附件到磁盘：" ++ ++#: C/evolution.xml:1436(para) C/evolution.xml:1451(para) ++msgid "" ++"Click the down-arrow on the attachment icon or right-click the attachment " ++"icon in the attachment bar." ++msgstr "在附件栏上点击附件图标上的“向下箭头”或右击附件图标。 " ++ ++#: C/evolution.xml:1439(para) ++msgid "Click Save As." ++msgstr "点击“另存为”。" ++ ++#: C/evolution.xml:1442(para) ++msgid "Select a location and name for the file." ++msgstr "选择文件的位置与名称。" ++ ++#: C/evolution.xml:1448(para) ++msgid "To open an attachment using another application:" ++msgstr "要使用其它应用程序打开附件：" ++ ++#: C/evolution.xml:1454(para) ++msgid "Select the application to open the attachment." ++msgstr "选择要打开附件的应用程序。" ++ ++#: C/evolution.xml:1460(para) ++msgid "" ++"The options available for an attachment vary depending on the type of " ++"attachment and the applications your system has installed. For example, " ++"attached word processor files can be opened in OpenOffice.org or another " ++"word processor, and compressed archive files can be opened in the File " ++"Roller application." ++msgstr "" ++"每个附件可用的选项依赖于附件的格式以及您的系统已安装的应用程序。例如，像文字" ++"处理文件一类的附件可以用OpenOffice.org或其它文字处理程序打开，压缩文件可以使" ++"用File Roller程序打开。" ++ ++#: C/evolution.xml:1464(title) ++msgid "Inline Images in HTML Mail" ++msgstr "HTML邮件的内嵌图片" ++ ++#: C/evolution.xml:1465(para) ++msgid "" ++"When someone sends you HTML mail that includes an image in the body of the " ++"message (for example, the welcome message in your Inbox), Evolution displays " ++"the image inside the message. You can create messages like this by using the " ++"Insert Image tool in the message composer. Alternately, just drag an image " ++"into the message composition area." ++msgstr "" ++"当其他人发给您一封正文中包含有图片的HTML邮件（例如，您收件箱中的“欢迎”邮" ++"件），Evolution会在邮件正文中直接显示图片。您也可以创建这样的邮件，使用邮件编" ++"辑器中的“插入图片”工具即可。您也可以直接把图片拖进正文中。" ++ ++#: C/evolution.xml:1466(para) ++msgid "" ++"Some images are links in a message, rather than being part of the message. " ++"Evolution can download those images from the Internet, but does not do so " ++"unless you request it. This is because remotely hosted images can be slow to " ++"load and display, and can even be used by spammers to track who reads the " ++"email. Not automatically loading images helps protect your privacy." ++msgstr "" ++"一些图片则是邮件中的链接，而不是邮件本身的一部分。 Evolution可以从Internet上" ++"下载这些图片，但不会自动进行这些操作，除非您要求Evolution这么做。 这是因为远" ++"程图片可能载入、显示得很慢，而且甚至可能被垃圾邮件发送者所利用来追踪收件人。 " ++"所以说，不自动载入图片有助于保护您的隐私。" ++ ++#: C/evolution.xml:1467(para) ++msgid "To load the images for one message, click View > Load Images." ++msgstr "要载入一封邮件中的图片，点击 视图 > 装入图像 。" ++ ++#: C/evolution.xml:1468(para) ++msgid "To set the default action for loading images:" ++msgstr "要设置载入图片的默认行为：" ++ ++#: C/evolution.xml:1471(para) ++msgid "Select Edit > Preferences, then select Mail Preferences." ++msgstr "选择 编辑 > 首选项，然后选择“邮件首选项”。" ++ ++#: C/evolution.xml:1474(para) ++msgid "Click the HTML Mail tab." ++msgstr "点击“HTML 邮件”标签页。 " ++ ++#: C/evolution.xml:1477(para) ++msgid "" ++"Select one of the items: Never Load Images Off the Net, Load Images in Mail " ++"From Contacts, or Always Load Images Off the Net." ++msgstr "" ++"选择下列条目之一：绝不从互联网装入图像，装入来自联系人的邮件中的图像，或 总" ++"是从互联网上装入图像。" ++ ++#: C/evolution.xml:1480(para) C/evolution.xml:1498(para) ++#: C/evolution.xml:1702(para) C/evolution.xml:1937(para) ++#: C/evolution.xml:1971(para) C/evolution.xml:1994(para) ++#: C/evolution.xml:2389(para) C/evolution.xml:2431(para) ++#: C/evolution.xml:2465(para) C/evolution.xml:2497(para) ++#: C/evolution.xml:6016(para) C/evolution.xml:6441(para) ++msgid "Click Close." ++msgstr "点击“关闭”。" ++ ++#: C/evolution.xml:1487(title) ++msgid "Using Evolution for News" ++msgstr "使用 Evolution 看新闻" ++ ++#: C/evolution.xml:1488(para) ++msgid "" ++"USENET newsgroups are similar to mail, so it is often convenient to read " ++"news and mail side by side. You can add a news source, called an NNTP " ++"server, the same way you would add new email " ++"account, selecting USENET News as the server type. The news server " ++"appear as a remote mail server, and each newsgroup works like an IMAP " ++"folder. When you click Send/Receive, Evolution also checks for news messages." ++msgstr "" ++"USENET 新闻组和邮件类似，所以一边读邮件一边读新闻是很方便的。 您可以按新增" ++"新邮件账户的方法增加一个新闻源（称为NNTP服务" ++"器），在“服务器类型”中选择“USENET 新闻”。 该新闻服务器显示为一个远程邮件服务" ++"器，每个新闻组作为一个IMAP文件夹。当您点击 发送/接收 时， Evolution 也会检查" ++"新闻消息。" ++ ++#: C/evolution.xml:1489(para) ++msgid "" ++"When you create a newsgroup account, you are not subscribed to any groups. " ++"To subscribe to a newsgroup:" ++msgstr "当您新建了一个新闻组账户时，您尚未订阅任何新闻组。 要订阅新闻组：" ++ ++#: C/evolution.xml:1492(para) C/evolution.xml:5613(para) ++msgid "Click Folder > Subscriptions." ++msgstr "点击 文件夹 > 订阅 。" ++ ++#: C/evolution.xml:1495(para) ++msgid "" ++"Select your NNTP account, select the groups you want to subscribe to, then " ++"click Subscribe." ++msgstr "选择您的 NNTP 账户以及要订阅的新闻组，然后点击 订阅 。" ++ ++#: C/evolution.xml:1504(title) ++msgid "Deleting Mail" ++msgstr "删除邮件" ++ ++#: C/evolution.xml:1505(para) ++msgid "" ++"Evolution allows you to delete unwanted messages. To delete a message, " ++"select it and press the Delete key, or click the Delete button in the " ++"toolbar, or press Ctrl+D, or right-click the message, then click Delete." ++msgstr "" ++"Evolution 允许您删除不需要的邮件。 要删除一封邮件，选中它，按 Delete 键，或点" ++"击工具栏上的“删除”按钮，或按 Ctrl+D，或右击邮件，选择“删除”。" ++ ++#: C/evolution.xml:1506(para) ++msgid "" ++"When you press Delete or click the Trash folder, your mail is not actually " ++"deleted, but is marked for deletion. Your email is recoverable until you " ++"have expunged your mail. When you expunge a folder, you remove all the mail " ++"that you have marked for deletion. To show deleted messages, uncheck Hide " ++"Deleted Messages option from the View menu. You can view the messages " ++"striken off for later deletion. You can also find deleted messages in your " ++"Trash folder." ++msgstr "" ++"当您按 Delete 或点击回收站文件夹时，您的邮件并未真正删除，只是被标记为要删除" ++"的邮件。您的邮件在销毁之前是可恢复的。 当你清空一个文件夹时，就会销毁所有标记" ++"为删除的邮件。要显示删除的邮件，在 视图 菜单中去掉“隐藏已删除的邮件”选项。您" ++"可以看到被划去以便删除的邮件。您也可以在“回收站”文件夹中找到被删除的邮件。" ++ ++#: C/evolution.xml:1507(para) ++msgid "" ++"To permanently erase all the deleted messages in a folder, click Folder > " ++"Expunge or press Ctrl+E." ++msgstr "" ++"要永久销毁已文件夹中所有被删除的邮件，点击 文件夹 > 销毁 或按 Ctrl+E." ++ ++#: C/evolution.xml:1508(para) ++msgid "" ++"Trash folders in GroupWise, local and IMAP accounts are actually virtual " ++"search folders that display all messages you have marked for later deletion. " ++"Hence, emptying Trash is nothing but expunging deleted mail from all your " ++"folders in the account." ++msgstr "" ++"GroupWise，本地以及IMAP账户的回收站文件夹实际上是一个虚拟搜索文件夹，显示所有" ++"您标记为删除的邮件。 因此，清空回收站就是一次性销毁该账户所有文件夹中欲删除的" ++"邮件。" ++ ++#: C/evolution.xml:1509(para) ++msgid "" ++"However, this is not true for the Trash folder on Exchange servers, which " ++"behaves just the same as it does in Outlook. It is a normal folder with " ++"actual messages in it. For more information about search folders, see Using Search Folders." ++msgstr "" ++"然而，对于Exchange服务器中的回收站却不是这样，它与Outlook中的回收站功能相同，" ++"只是一个普通的文件夹，包含有正常的信件。要了解更多关于搜索文件夹的信息，请参" ++"阅使用搜索文件夹。 " ++ ++#: C/evolution.xml:1513(title) ++msgid "Undeleting Messages" ++msgstr "还原被删除的邮件" ++ ++#: C/evolution.xml:1514(para) ++msgid "" ++"You can undelete a message that has been deleted but not expunged. To " ++"undelete a message, select the message, click Edit > Undelete. Note that " ++"View > Hide Deleted messages in the menubar must be disabled for this." ++msgstr "" ++"您可以还原被删除但未被销毁的邮件。要还原一封邮件，选中它，点击 编辑 > 取消" ++"删除信件。注意菜单栏上的 视图 > 隐藏已删除的邮件 此时肯定不可用。" ++ ++#: C/evolution.xml:1515(para) ++msgid "" ++"If you have marked a message for deletion, undeleting it unmarks it, and the " ++"message is removed from the Trash folder." ++msgstr "" ++"如果您将一封信件标记为删除，则还原它将取消删除标记并从回收站中移去该邮件。" ++ ++#: C/evolution.xml:1521(para) ++msgid "" ++"You can start writing a new email message by clicking File > New > " ++"Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking New " ++"in the toolbar." ++msgstr "" ++"您可以点击 文件 > 新建 > 信件， 或在邮件工具状态下按Ctrl+N，或点击工具" ++"栏上的“新建”按钮。" ++ ++#: C/evolution.xml:1522(para) ++msgid "" ++"Enter an address in the To field. If you want to enter multiple email " ++"addresses, type in the addresses separated by comma. You can also use a " ++"contact list to send messages to multiple recipients. Enter a subject in the " ++"Subject field, and a message in the box at the bottom of the window. After " ++"you have written your message, click Send." ++msgstr "" ++"在“收件人”一栏输入地址。 如果您像输入多个邮件地址，用逗号分隔它们。 您也可以" ++"使用联系人列表将邮件发送给多个接收者。在“主题”一栏键入邮件主题，在窗口下方的" ++"文本框中输入正文。写完邮件后，点击“发送”。" ++ ++#: C/evolution.xml:1523(para) ++msgid "New mail message window look like this:" ++msgstr "撰写新邮件窗口外观显示如下：" ++ ++#: C/evolution.xml:1525(para) C/evolution.xml:6321(para) ++msgid "This section contains the following topics:" ++msgstr "这一节包含下列话题：" ++ ++#: C/evolution.xml:1528(link) C/evolution.xml:1566(title) ++msgid "Unicode, ASCII, and Non-Latin Alphabets" ++msgstr "Unicode, ASCII, 和 非拉丁字母" ++ ++#: C/evolution.xml:1531(link) C/evolution.xml:1601(title) ++msgid "Sending Composed Messages Later" ++msgstr "稍后再发送撰写的邮件" ++ ++#: C/evolution.xml:1534(link) C/evolution.xml:1617(title) ++msgid "Working Offline" ++msgstr "离线工作" ++ ++#: C/evolution.xml:1537(link) C/evolution.xml:1660(title) ++msgid "Attachments" ++msgstr "附件" ++ ++#: C/evolution.xml:1540(link) C/evolution.xml:1707(title) ++msgid "Specifying Additional Recipients for Email" ++msgstr "为邮件指定额外的收件人" ++ ++#: C/evolution.xml:1543(link) C/evolution.xml:1732(title) ++msgid "Choosing Recipients Quickly" ++msgstr "快速选择收件人" ++ ++#: C/evolution.xml:1546(link) C/evolution.xml:1740(title) ++msgid "Replying to Email Messages" ++msgstr "回复邮件消息。" ++ ++#: C/evolution.xml:1549(link) C/evolution.xml:1806(title) ++msgid "Searching and Replacing with the Composer" ++msgstr "在编辑器中查找和替换" ++ ++#: C/evolution.xml:1552(link) C/evolution.xml:1828(title) ++msgid "Enhancing Your Email with HTML" ++msgstr "使用HTML装饰邮件" ++ ++#: C/evolution.xml:1555(link) C/evolution.xml:2002(title) ++msgid "Mail Send Options" ++msgstr "邮件发送选项" ++ ++#: C/evolution.xml:1558(link) C/evolution.xml:2078(title) ++msgid "Forwarding Mail" ++msgstr "转发邮件" ++ ++#: C/evolution.xml:1561(link) C/evolution.xml:2099(title) ++msgid "Tips for Email Courtesy" ++msgstr "友情提醒" ++ ++#: C/evolution.xml:1567(para) ++msgid "" ++"If you want to write in a non-Latin alphabet while using a Latin keyboard, " ++"try selecting a different input method in the message composer. Right-click " ++"in the message composition area and select an input method from the Input " ++"Methods menu, then begin typing. The actual keys vary by language and input " ++"style. For example, the Cyrillic input method uses transliterated Latin " ++"keyboard combinations to get the Cyrillic alphabet, combining letters where " ++"necessary. Zh and ya produce the appropriate " ++"single Cyrillic letters, and the single-quote (') produces a soft sign " ++"character." ++msgstr "" ++"如果您想使用拉丁键盘输入非拉丁字符，尝试在邮件编辑器中选择其它输入法。在邮件" ++"编辑器区域内右击鼠标，从输入法菜单中选择一种输入法即可。 输出的字符依赖于语言" ++"和输入法类型。 例如，Cyrillic输入法使用拉丁拼音组合得到Cyrillic字符，在必要的" ++"时候结合字母。 Zh 和 ya 能产生合适的单个" ++"Cyrillic字母，单引号(')产生一个软标记字母。" ++ ++#: C/evolution.xml:1568(para) ++msgid "" ++"For greater language display capabilities, click Edit > Preferences, then " ++"select the character set choices in the Mail Preferences and Composer " ++"Preferences sections. If you aren't sure which one to use, select UTF-8, " ++"which offers the greatest range of character displays for the greatest range " ++"of languages." ++msgstr "" ++"要得到更强的语言显示能力，点击 编辑 > 首选项，然后在“邮件首选项”和“邮件编" ++"辑器首选项”中选择字符集。如果您不确定要选哪个，可以选择 UTF-8，能提供最多语言" ++"最大范围的字符显示。" ++ ++#: C/evolution.xml:1571(title) ++msgid "Using Character Sets" ++msgstr "使用字符集" ++ ++#: C/evolution.xml:1572(para) ++msgid "" ++"A character set is a computer's version of an alphabet. In the past, the " ++"ASCII character set was used almost universally. However, it contains only " ++"128 characters, meaning it is unable to display characters in Cyrillic, " ++"Kanjii, or other non-Latin alphabets. To work around language display " ++"problems, programmers developed a variety of methods, so many human " ++"languages now have their own specific character sets, and items written in " ++"other character sets display incorrectly. Eventually, standards " ++"organizations developed the UTF-8 Unicode* character set to provide a single " ++"compatible set of codes for everyone." ++msgstr "" ++"字符集是字母表的电子版本。过去，ASCII字符集普遍使用。但是，它仅包含128个字" ++"符，不能显示Cyrillic, Kanjii 或其它非拉丁语系的字符。 要解决语言显示问题，程" ++"序设计员创建了一系列方法，现在众多的语言都有了自己特有的字符集，而使用其它字" ++"符集书写的文字则会显示乱码。 最终，标准化组织开发了UTF-8 Unicode*字符集以为每" ++"个人提供一个单一、兼容的字符体系。" ++ ++#: C/evolution.xml:1573(para) ++msgid "" ++"Most email messages state in advance which character set they use, so " ++"Evolution usually can display those messages correctly. However, if you find " ++"that messages are displayed as rows of incomprehensible characters, try " ++"selecting a different character set in the mail settings screen. If your " ++"recipients can't read your messages, try selecting a different character set " ++"in the composer options dialog box. For some languages, such as Turkish or " ++"Korean, it might work best for you to select the language-specific character " ++"set. However, the best choice for most users is UTF-8, which offers the " ++"widest range of characters for the widest range of languages." ++msgstr "" ++"大多数邮件是用它们自身提供的字符集编写的，所以Evolution通常能够正确地显示那些" ++"邮件。然而，如果您发现邮件显示乱码，请尝试选择另外一种字符集。如果收件人无法" ++"阅读您的邮件，尝试在邮件编辑器对话框中选择另外一种字符集。对于有些语言如土耳" ++"其语或朝鲜语，您可能选择它们特定的语言字符集更有效。然而对于大多数用户来说" ++"UTF-8就是最好的选择，它能提供大多数语言的最广泛的字符支持。" ++ ++#: C/evolution.xml:1578(title) ++msgid "Custom Header" ++msgstr "自定义邮件头" ++ ++#: C/evolution.xml:1579(para) ++msgid "To enable the Custom Header plugin:" ++msgstr "开启自定义邮件头插件：" ++ ++#: C/evolution.xml:1580(para) C/evolution.xml:6862(para) ++msgid "Select Edit > Plugins." ++msgstr "选择 编辑 > 插件 。" ++ ++#: C/evolution.xml:1581(para) ++msgid "" ++"Then select Custom Header. You can configure custom headers to set " ++"sensitivity and caveats to the outgoing messages." ++msgstr "" ++"然后选择 自定义信头。 您可以设置自定义邮件头以给发送的邮件提供一些敏感性或警" ++"告性的信息。" ++ ++#: C/evolution.xml:1583(para) ++msgid "" ++"In the Plugin Manager, select the Configuration tab to customize your header " ++"fields. You can add, edit, or remove the header fields. For every header " ++"field you add, you can specify the keys and values. The key is used as the " ++"title of the Custom Header. You can enter multiple values for the keys. You " ++"must use a semicolon to separate every value you enter." ++msgstr "" ++"在插件管理器中，选择“配置”标签来自定义您的邮件头。您可以添加、编辑或移除邮件" ++"头的条目。对于每个您添加的邮件头条目，您可以设置键和值。 键是作为自定义邮件头" ++"的标题。您可以为每个键输入多个值，但必须要使用分号来分隔您输入的每个值。" ++ ++#: C/evolution.xml:1586(para) ++msgid "" ++"Select New > Mail Message or Shift+Ctrl+M to open a Compose Message " ++"window." ++msgstr "选择 新建 > 信件 或按Shift+Ctrl+M打开一个编辑邮件窗口。" ++ ++#: C/evolution.xml:1589(para) ++msgid "" ++"Select Insert > Custom Header to open the Email Custom Header window." ++msgstr "选择 插入 > 自定义信头，打开邮件自定义信头窗口。" ++ ++#: C/evolution.xml:1590(para) ++msgid "" ++"In the Email Custom Header window, you can view all the header fields and " ++"values you add." ++msgstr "在邮件自定义信头窗口中，您可以看到所有的信头条目及相应的您添加的值。" ++ ++#: C/evolution.xml:1593(para) ++msgid "" ++"Set the values for the header fields by using the respective drop-down list." ++msgstr "从对应的下拉列表中选择每个信头条目的值。" ++ ++#: C/evolution.xml:1602(para) ++msgid "" ++"Evolution normally sends mail as soon as you click Send. However, can save a " ++"message to be sent later:" ++msgstr "" ++"Evolution 通常在您点击“发送”之后会立刻发送邮件。但您也可以将邮件保存起来以后" ++"再发送。" ++ ++#: C/evolution.xml:1605(para) ++msgid "" ++"If you are offline when you click Send, Evolution adds your message to the " ++"Outbox queue. The next time you connect to the Internet and send or receive " ++"mail, that message is sent." ++msgstr "" ++"如果您点击“发送”时处于离线状态，Evolution将把您的邮件添加到发件箱队列。下次您" ++"连上Internet之后点击“发送/接收”时，该邮件就会被发送。" ++ ++#: C/evolution.xml:1608(para) ++msgid "" ++"Click File > Save Draft to store your messages in the Drafts folder for " ++"later revision." ++msgstr "" ++"点击 文件 > 另存为草稿可以把您的邮件保存在草稿文件夹里以便将来修改。" ++ ++#: C/evolution.xml:1611(para) ++msgid "" ++"If you prefer to save your message as a text file, click File > Save As, " ++"then specify a filename." ++msgstr "如果您想把邮件保存为文本文件，点击 文件 > 另存为，输入一个文件名。" ++ ++#: C/evolution.xml:1618(para) ++msgid "" ++"Offline mode helps you communicate with remote mail storage systems like " ++"GroupWise, IMAP or Exchange, in " ++"situations where you are not connected to the network at all times. " ++"Evolution keeps a local copy of one or more folders to allow you to compose " ++"messages, storing them in your Outbox to be sent the next time you connect." ++msgstr "" ++"离线模式能使您在不能一直连上网络的情况下与远程邮件存储系统如GroupWise，IMAP或Exchange通信。 Evolution能给一个" ++"或多个文件夹保存一份本地的拷贝以便于您撰写邮件，保存在发件箱中并在您下次联网" ++"时发送邮件。" ++ ++#: C/evolution.xml:1619(para) ++msgid "" ++"POP mail downloads all messages to your local system, but other connections " ++"usually download just the headers, and get the rest only when you want to " ++"read the message. Before you go offline, Evolution downloads the unread " ++"messages from the folders you have chosen to store." ++msgstr "" ++"POP邮件将下载所有的邮件到您的本地计算机，但其它类型的邮件通常只下载邮件头，只" ++"有当您要阅读邮件时才会下载其余部分。 在您离线之前，Evolution会从您选择保存的" ++"文件夹中下载未读的邮件。" ++ ++#: C/evolution.xml:1620(para) ++msgid "To mark a folder for offline use," ++msgstr "将一个文件夹标记为离线使用，" ++ ++#: C/evolution.xml:1623(para) ++msgid "Right-click the folder, then click Properties." ++msgstr "右击文件夹，然后点击“属性”。" ++ ++#: C/evolution.xml:1626(para) ++msgid "Click Copy Folder Content Locally for Offline Operation." ++msgstr "点击“本地复制文件夹内容以离线操作”。" ++ ++#: C/evolution.xml:1629(para) ++msgid "" ++"Your connection status is shown by the small icon in the lower left corner " ++"of the Evolution main window. When you are online, it displays two connected " ++"cables. When you go offline, the cables separate." ++msgstr "" ++"Evolution主窗口左下角的一个小图标会显示您的连接状态。当您在线时，它显示两根连" ++"在一起的电缆。当您离线时，这两根电缆就断开了。" ++ ++#: C/evolution.xml:1630(para) ++msgid "To cache your selected folders and disconnect from the network," ++msgstr "要缓存您选择的文件夹并断开网络，" ++ ++#: C/evolution.xml:1633(para) ++msgid "" ++"Click File > Work Offline, or click the connection status icon in the " ++"lower left of the screen." ++msgstr "点击 文件 > 脱机工作，或点击屏幕左下角的连接状态图标。" ++ ++#: C/evolution.xml:1634(para) ++msgid "" ++"A message pops up and asks you whether you want to go offline immediately or " ++"synchronize folders locally before you go offline." ++msgstr "" ++"会弹出一个对话框，询问您是否立刻进入离线模式还是在进入离线模式之前同步本地文" ++"件夹。" ++ ++#: C/evolution.xml:1639(para) ++msgid "" ++"Click Synchronize to download all the messages to the folders marked for " ++"offline." ++msgstr "点击“同步”，下载被标记为脱机工作的文件夹中的所有邮件。" ++ ++#: C/evolution.xml:1640(para) C/evolution.xml:3983(para) ++msgid "Or" ++msgstr "或" ++ ++#: C/evolution.xml:1641(para) ++msgid "" ++"Click Do not synchronize to go offline immediately, without downloading the " ++"messages locally for offline operations." ++msgstr "点击“不同步”，立即进入离线模式而不下载要脱机操作的邮件到本地。" ++ ++#: C/evolution.xml:1642(para) ++msgid "" ++"Select Do not show this message again to switch off this popup. The default " ++"is to not synchronize while going offline." ++msgstr "选择“不再显示此信息”关闭该对话框。默认是离线时不同步。" ++ ++#: C/evolution.xml:1645(para) ++msgid "" ++"When you want to reconnect, click File > Work Online, or click the " ++"connection status icon again." ++msgstr "当您想重新连线时，点击文件 > 联机工作，或再点击一下连接状态图标。" ++ ++#: C/evolution.xml:1648(title) ++msgid "Download Messages for Offline Operations" ++msgstr "下载邮件以供离线操作" ++ ++#: C/evolution.xml:1649(para) ++msgid "" ++"This features prepares you for going offline and for offline operations. It " ++"helps you download all the messages locally before you go offline. If " ++"otherwise, by default, it goes offline when you click the offline button " ++"without downloading the message." ++msgstr "" ++"该功能是为您进入离线模式和离线操作准备的。它能帮助您在离线之前下载所有邮件到" ++"本地。而默认情况下当您点击“离线”按钮时Evolution仅会离线不会下载邮件。" ++ ++#: C/evolution.xml:1650(para) ++msgid "" ++"To download messages for offline operations, select File > Download " ++"messages for offline." ++msgstr "要下载邮件以供离线操作，选择文件 > 下载信件以离线使用。" ++ ++#: C/evolution.xml:1654(title) ++msgid "Automatic Network State Handling" ++msgstr "自动感知网络状态" ++ ++#: C/evolution.xml:1655(para) ++msgid "" ++"Evolution automatically understands the network state and acts accordingly. " ++"For instance, Evolution switches to offline mode when the network goes down " ++"and automatically switches on when the network is up again. Ensure that your " ++"system has Network Manager installed on to enable this feature." ++msgstr "" ++"Evolution能自动感知网络状态并以此运作。例如，当网络中断时Evolution会自动切换" ++"到离线模式，当网络复原时会自动回到在线模式。注意要确保您的系统安装了网络管理" ++"器后该功能才会有效。" ++ ++#: C/evolution.xml:1661(para) ++msgid "To attach a file to your email:" ++msgstr "将附件添加到您的邮件：" ++ ++#: C/evolution.xml:1664(para) ++msgid "Click the Attach button in the composer." ++msgstr "在邮件编辑器中点击“添加附件”按钮。" ++ ++#: C/evolution.xml:1667(para) ++msgid "Select the file you want to attach." ++msgstr "选择您希望添加的文件。" ++ ++#: C/evolution.xml:1673(para) ++msgid "" ++"You can also drag a file to the attachment bar of the composer window. If " ++"you want to send it as an inline attachment, right-click the attachment and " ++"click Properties, then select Automatic Display of Attachments." ++msgstr "" ++"您也可以将文件拖拽到编辑器窗口的附件栏。 如果您希望作为一个内嵌附件发送，右击" ++"附件，选择“属性”，然后选择“自动显示附件”。" ++ ++#: C/evolution.xml:1674(para) ++msgid "" ++"When you send the message, a copy of the attached file goes with it. Be " ++"aware that large attachments can take a long time to send and receive." ++msgstr "" ++"当您发送邮件时，便会有一个附件的拷贝随之发送。请注意过大的附件会造成发送或接" ++"收时间过长。" ++ ++#: C/evolution.xml:1677(title) ++msgid "Attachment Reminder" ++msgstr "附件提醒" ++ ++#: C/evolution.xml:1678(para) ++msgid "" ++"Evolution has an Attachment Reminder plugin you can use to remind yourself " ++"to attach a file to an email. If it determines that you have not attached " ++"the file, it displays the following message:" ++msgstr "" ++"Evolution有一个附件提醒插件可用来提醒您在邮件中加入附件。如果它发现您没有添加" ++"任何文件，会显示如下信息：" ++ ++#: C/evolution.xml:1682(para) ++msgid "" ++"Click Continue Editing to attach the missing file, or click Send to send the " ++"message without any attachment." ++msgstr "点击“继续编辑”以添加缺失的附件，或点击“发送”以发送不含附件的邮件。" ++ ++#: C/evolution.xml:1685(para) ++msgid "To enable the Attachment Reminder:" ++msgstr "要启用附件提醒：" ++ ++#: C/evolution.xml:1688(para) ++msgid "Select Edit > Plugins > Attachment Reminder." ++msgstr "选择 编辑 > 插件 > 附件提醒。" ++ ++#: C/evolution.xml:1691(para) ++msgid "" ++"Click Configuration, then make sure that Remind Missing Attachments is " ++"selected." ++msgstr "点击“配置”，确认选择了“提醒缺失附件”。" ++ ++#: C/evolution.xml:1695(para) ++msgid "" ++"Click Add, then enter keywords such as Attach or " ++"Attachment." ++msgstr "" ++"点击“添加”，输入关键字如Attach 或 Attachment。" ++ ++#: C/evolution.xml:1696(para) ++msgid "" ++"Based on the keywords you have added here, it searches every mail you are " ++"sending. If it finds the keywords such as attach in your mail " ++"and there is no actual attached file, you are reminded of missing " ++"attachments." ++msgstr "" ++"根据您所添加的关键字，它会搜索您要发送的每封邮件。如果它在您的邮件中发现诸如" ++"attach这样的关键字而事实上邮件中并没有附件，便会提醒您缺少附" ++"件。" ++ ++#: C/evolution.xml:1699(para) ++msgid "" ++"To edit any of the existing keywords, select the keyword, click Edit, then " ++"modify the word as desired." ++msgstr "要编辑已存在的关键字，选中关键字，点击“编辑”，然后可以修改关键字。" ++ ++#: C/evolution.xml:1708(para) ++msgid "" ++"Evolution, like most email programs, recognizes three " ++"types of addresses: primary recipients, secondary recipients, and hidden " ++"(blind) recipients. The simplest way to direct a message is to put the email " ++"address or addresses in the To: field, which denotes primary recipients. Use " ++"the Cc: field to send a message to secondary recipients." ++msgstr "" ++"Evolution和其它大多数邮件程序一样，能识别三种地址类" ++"型：初级收件人，次级收件人和隐藏收件人。发送邮件最简单的方式是把邮件地址放" ++"在“收件人：”一栏，即指向初级收件人。使用“抄送：”一栏可把邮件发给次级收件人。" ++ ++#: C/evolution.xml:1709(para) ++msgid "" ++"Addresses on the Bcc: list are hidden from the other recipients of the " ++"message. You can use it to send mail to large groups of people, especially " ++"if they don't know each other or if privacy is a concern. If your Bcc: field " ++"is absent, click View > Bcc Field." ++msgstr "" ++"位于暗送域的地址是隐藏的，其它收信人不可见。您可以使用它群发邮件，特别是当对" ++"方相互之间不认识或要考虑收信人隐私时。如果您看不到“暗送：”一栏，点击查看 " ++"> 暗送域。" ++ ++#: C/evolution.xml:1710(para) ++msgid "" ++"If you frequently write email to the same groups of people, you can create " ++"address lists in the contacts tool, and then send them mail as though they " ++"have a single address. To learn how to do that, see Creating a List of Contacts." ++msgstr "" ++"如果您经常需要给同一群人发邮件，您可以在“联系人”工具区创建地址列表，然后给他" ++"们整体发邮件，就像他们仅有一个邮件地址一样。要了解具体做法，请查阅创建联系列表。" ++ ++#: C/evolution.xml:1711(para) ++msgid "" ++"Evolution allows you to specify the Reply-To header in an email. To do this:" ++msgstr "Evolution允许您设置邮件的回复信头。操作方法是：" ++ ++#: C/evolution.xml:1714(para) ++msgid "Open a compose window." ++msgstr "打开邮件编辑器窗口。" ++ ++#: C/evolution.xml:1717(para) ++msgid "Open the Reply-To field by clicking View > Reply To." ++msgstr "点击查看 > 回复域，打开回复域。" ++ ++#: C/evolution.xml:1720(para) ++msgid "" ++"Specify the address you want as the Reply-To address in the new Reply-To " ++"field." ++msgstr "在新的回复域中填入您想要的回复地址。" ++ ++#: C/evolution.xml:1723(para) ++msgid "Complete the rest of your message." ++msgstr "完成您信息中的剩余部分。" ++ ++#: C/evolution.xml:1726(para) C/evolution.xml:2092(para) ++#: C/evolution.xml:2200(para) C/evolution.xml:2407(para) ++#: C/evolution.xml:5524(para) ++msgid "Click Send." ++msgstr "点击发送。" ++ ++#: C/evolution.xml:1733(para) ++msgid "" ++"Address auto-completion is enabled in Evolution by default when you create " ++"contacts. Evolution makes it easy for you to quickly fill in the address " ++"field without having to remember the email address of recipients. You can " ++"type nicknames or other portions of address data in the address field and " ++"Evolution will display a drop-down list of possible address completions from " ++"your contacts. If you type a name or nickname that can go with more than one " ++"card, Evolution opens a dialog box to ask you which person you meant." ++msgstr "" ++"当您创建联系人时Evolution默认启动地址自动补全功能，方便您快速填入邮件地址而无" ++"须记忆收信人邮件地址的全名。 您可以输入昵称或其它地址数据，Evolution便会显示" ++"一个下拉列表包含了您可能的联系人地址全名。 如果您输入一个名字或昵称并且与多个" ++"联系人名片相匹配，Evolution会打开一个对话框让您选择需要的联系人。" ++ ++#: C/evolution.xml:1734(para) ++msgid "" ++"If Evolution does not complete addresses automatically, click Edit > " ++"Preferences, then click Autocompletion. Then, select the address book you " ++"want to use for address autocompletion in the mailer." ++msgstr "" ++"如果Evolution没有实现地址自动补全，点击编辑 > 首选项，然后点击“自动补全”。" ++"然后，选择您需要使用“地址自动补全”功能的地址簿。" ++ ++#: C/evolution.xml:1735(para) ++msgid "" ++"Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of " ++"the email addresses in your contacts. Select addresses and click the arrows " ++"to move them into the appropriate address columns." ++msgstr "" ++"另外，您也可以选择点击“收信人：”，“抄送：”，或“暗送：”按钮，得到您的联系人的" ++"邮件地址列表。选择需要的地址并点击箭头把它们移到合适的地址栏。" ++ ++#: C/evolution.xml:1736(para) ++msgid "" ++"For more information about using email with the contact manager and the " ++"calendar, see Send Me a Card: " ++"Adding New Cards Quickly and Scheduling With the Evolution Calendar." ++msgstr "" ++"要了解更多关于使用邮件和联系人管理器、日历的信息，请参阅发送给我名片：快速添加新名片 和 使用Evolution日历进行规划." ++ ++#: C/evolution.xml:1741(para) ++msgid "" ++"To reply to a message, select the message to reply to in the message list " ++"and click the Reply button in the toolbar, or right-click within the message " ++"and select Reply to Sender. This opens the message composer. The To: and " ++"Subject: fields are already filled, although you can alter them if you " ++"prefer. In addition, the full text of the old message is inserted into the " ++"new message, either in grey with a blue line on one side (for HTML display) " ++"or with the > character before each line (in plain text mode), to " ++"indicate that it is part of the previous message." ++msgstr "" ++"要回复一封邮件，在邮件列表中选择该邮件，并在工具栏上点击“回复”按钮，或右击该" ++"邮件，选择“回复发件人”。该操作会打开邮件编辑器。此时“收信人：”和“主题：”两栏" ++"已被自动填上了，但您也可以根据自己需要修改它们。此外，原邮件的全文会被插入新" ++"邮件中，要么是呈灰色字体并且在一侧有一条蓝线(当邮件以HTML显示时)，要么是在每" ++"行开头有 >符号(当邮件以纯文本显示时)，以标识这是原始邮件的一部分。" ++ ++#: C/evolution.xml:1742(para) ++msgid "" ++"If you're reading a message with several recipients, you can use Reply to " ++"All instead of Reply. If there are large numbers of people in the Cc: or To: " ++"fields, this can save substantial amounts of time." ++msgstr "" ++"如果您收到的邮件是有好几个收件人的，您可以选择“回复所有人”而不是“回复发件" ++"人”， 如果在收件域或抄送域有许多人，这样操作可以节省许多时间。" ++ ++#: C/evolution.xml:1745(title) ++msgid "Using the Reply To All Feature" ++msgstr "使用“回复所有人”的功能" ++ ++#: C/evolution.xml:1746(para) ++msgid "" ++"Susan sends an email to a client and sends copies to Tim and to an internal " ++"company mailing list of co-workers. If Tim wants to make a comment for all " ++"of them to read, he uses Reply to All, but if he just wants to tell Susan " ++"that he agrees with her, he uses Reply. His reply does not reach anyone that " ++"Susan put on her Bcc list, because that list is not shared with anyone." ++msgstr "" ++"例如苏珊给一个客户发送了一封邮件，并给蒂姆和内部公司的同事们发送了邮件副本。" ++"如果蒂姆想要向所有人发表评论，他可以使用“回复所有人”功能。但如果蒂姆只是想告" ++"诉苏珊他同意她的观点，他只需使用“回复”。他的回复不会发送给其它位于苏珊邮件暗" ++"送域里的人，因为这个列表并不是大家共享的。" ++ ++#: C/evolution.xml:1747(para) ++msgid "" ++"If you subscribe to a mailing list, and want your reply to go just to the " ++"list rather than to the sender, select Reply to List instead of Reply or " ++"Reply to All." ++msgstr "" ++"如果您订阅了一个邮件列表，想要让您的回复仅发送给列表成员而不是给发信人，请选" ++"择“回复列表”而不是“回复发信人”或“回复所有人”。" ++ ++#: C/evolution.xml:1751(title) ++msgid "Keyboard shortcuts" ++msgstr "键盘快捷键" ++ ++#: C/evolution.xml:1759(para) ++msgid "Tools" ++msgstr "工具" ++ ++#: C/evolution.xml:1762(para) ++msgid "Shortcuts" ++msgstr "快捷方式" ++ ++#: C/evolution.xml:1769(para) ++msgid "Reply to Sender" ++msgstr "回复发件人" ++ ++#: C/evolution.xml:1772(para) ++msgid "Ctrl+R" ++msgstr "Ctrl+R" ++ ++#: C/evolution.xml:1777(para) ++msgid "Reply to List" ++msgstr "回复列表" ++ ++#: C/evolution.xml:1780(para) ++msgid "Clrl+L" ++msgstr "Clrl+L" ++ ++#: C/evolution.xml:1785(para) ++msgid "Reply to All" ++msgstr "回复全部" ++ ++#: C/evolution.xml:1788(para) ++msgid "Shift+Ctrl+R" ++msgstr "Shift+Ctrl+R" ++ ++#: C/evolution.xml:1793(para) ++msgid "Forward" ++msgstr "前进" ++ ++#: C/evolution.xml:1796(para) ++msgid "Ctrl+F" ++msgstr "Ctrl+F" ++ ++#: C/evolution.xml:1807(para) ++msgid "" ++"The message composer makes several text searching features available to you." ++msgstr "邮件编辑器拥有不少适合您的文本搜索功能。" ++ ++#: C/evolution.xml:1809(title) ++msgid "Find:" ++msgstr "查找：" ++ ++#: C/evolution.xml:1810(para) ++msgid "Enter a word or phrase, and Evolution finds it in your message." ++msgstr "键入单词或短语， Evolution 将会在消息中查找它们。" ++ ++#: C/evolution.xml:1813(title) ++msgid "Find Regex:" ++msgstr "根据正则表达式查找：" ++ ++#: C/evolution.xml:1814(para) ++msgid "" ++"You can search for a complex pattern of characters, called a regular expression or regex in " ++"your composer window. If you're not sure what a regular expression is, you " ++"should ignore this feature." ++msgstr "" ++"在邮件编辑器中您可以查找复杂的字符串模式，称为正则表达式。如果您不确定正则表达式是什么，可以忽略该功" ++"能。" ++ ++#: C/evolution.xml:1817(title) ++msgid "Find Again:" ++msgstr "再次查找：" ++ ++#: C/evolution.xml:1818(para) ++msgid "Select this item to repeat the last search you performed." ++msgstr "选择该项，重复您上一次的搜索。" ++ ++#: C/evolution.xml:1821(title) ++msgid "Replace:" ++msgstr "替换：" ++ ++#: C/evolution.xml:1822(para) ++msgid "Find a word or phrase, and replace it with something else." ++msgstr "查找一个单词或词组，将它替换为其它文本。" ++ ++#: C/evolution.xml:1824(para) ++msgid "" ++"For all of these menu items, you can choose whether to search backwards in " ++"the document from the point where your cursor is. You can also determine " ++"whether the search is to be case sensitive in determining a match." ++msgstr "" ++"对于所有这些菜单条目，您可以选择是否要从光标所在处向前搜索文档。您也可以选择" ++"是否要精确匹配。" ++ ++#: C/evolution.xml:1829(para) ++msgid "" ++"Normally, you can't set text styles or insert pictures in email. However, " ++"most newer email programs can display images and text styles in addition to " ++"basic alignment and paragraph formatting. They do this with HTML, just like Web pages do." ++msgstr "" ++"一般情况下，您不能在邮件中设置文本格式或插入图片。然而，现在大多数邮件程序可" ++"以显示图片和多种文件格式诸如对齐和段落格式化。它们像大多数网页那样通过HTML达到这种效果。" ++ ++#: C/evolution.xml:1830(para) ++msgid "" ++"Some people do not have HTML-capable mail clients, or prefer not to receive " ++"HTML-enhanced mail because it is slower to download and display. Because of " ++"this, Evolution sends plain text unless you explicitly ask for HTML." ++msgstr "" ++"有些人没有兼容HTML的邮件客户端，或者他们不喜欢接收HTML邮件，因为它下载、显示" ++"速度慢。因此，Evolution默认发送的是纯文本邮件，除非您显式地要求是HTML格式。" ++ ++#: C/evolution.xml:1833(title) ++msgid "Basic HTML Formatting" ++msgstr "基本 HTML 格式" ++ ++#: C/evolution.xml:1834(para) ++msgid "" ++"You can change the format of an email message from plain text to HTML by " ++"choosing Format > HTML from the menu bar." ++msgstr "您可以通过选择菜单栏上的格式 > HTML，把邮件从纯文本转化成HTML格式。" ++ ++#: C/evolution.xml:1835(para) ++msgid "" ++"To send all your mail as HTML by default, set your mail format preferences " ++"in the mail configuration dialog box. See Composer Preferences for more information." ++msgstr "" ++"要设置默认发送HTML格式的邮件，请在邮件配置对话框中配置您的邮件格式首选项。参" ++"见邮件编辑器首选项以获得" ++"更多信息。" ++ ++#: C/evolution.xml:1836(para) ++msgid "" ++"HTML formatting tools are located in the toolbar just above the space where " ++"you actually compose the message. They also appear in the Insert and Format " ++"menus." ++msgstr "" ++"HTML格式化工具位于您编辑邮件上方的工具栏上。它们也在“插入”和“格式”菜单中出" ++"现。" ++ ++#: C/evolution.xml:1837(para) ++msgid "" ++"The icons in the toolbar are explained in tool-" ++"tips, which appear when you hold your mouse pointer over the buttons. " ++"The buttons fall into five categories:" ++msgstr "" ++"工具栏上各个图标的功能会在工具提示中说明，当" ++"您把鼠标指针移到这些按钮上时就会显示相关说明。这些按钮按功能可分为五类：" ++ ++#: C/evolution.xml:1839(title) ++msgid "Headers and Lists:" ++msgstr "信头与列表：" ++ ++#: C/evolution.xml:1840(para) ++msgid "" ++"At the left edge of the toolbar, you can choose Normal for a default text " ++"style or Header 1 through Header 6 for varying sizes of header from large " ++"(1) to tiny (6). Other styles include preformat, to use the HTML tag for " ++"preformatted blocks of text, and three types of bullet points for lists." ++msgstr "" ++"在工具栏左端，您可以选择“标准”设置为默认文本格式，或“标题1”至“标题6”设置标题" ++"格式(从最大的1到最小的6)。其它格式包括预格式化(给要格式化的文本区使用HTML标" ++"签)，以及三种列表类型。" ++ ++#: C/evolution.xml:1842(para) ++msgid "" ++"For instance, instead of using asterisks to mark a bulleted list, you can " ++"use the Bulleted List style from the style drop-down list. Evolution uses " ++"different bullet styles, and handles word wrap and multiple levels of " ++"indentation." ++msgstr "" ++"例如，要标记一个项目列表，您可以不用星号，而在格式下拉列表中选择“项目列表”。" ++"Evolution使用不同的列表类型，并且能自行处理文字断行和多级缩排。" ++ ++#: C/evolution.xml:1844(title) ++msgid "Text Styles:" ++msgstr "文本类型：" ++ ++#: C/evolution.xml:1845(para) ++msgid "" ++"Use these buttons to determine the way your email looks. If you have text " ++"selected, the style applies to the selected text. If you do not have text " ++"selected, the style applies to whatever you type next." ++msgstr "" ++"使用这些按钮来设置邮件外观。如果您选中了一些文本，则格式设置将会应用到选中的" ++"文本。如果您没有选择文本，则格式设置会应用到接下去输入的文本。" ++ ++#: C/evolution.xml:1854(para) ++msgid "Button" ++msgstr "按钮" ++ ++#: C/evolution.xml:1864(para) ++msgid "TT" ++msgstr "TT" ++ ++#: C/evolution.xml:1867(para) ++msgid "" ++"Typewriter text, which is approximately the same as the Courier monospace " ++"font." ++msgstr "纯文本，与Courier单宽字体基本相同。" ++ ++#: C/evolution.xml:1872(para) ++msgid "Bold A" ++msgstr "Bold A" ++ ++#: C/evolution.xml:1875(para) ++msgid "Bolds the text." ++msgstr "文本黑体化。" ++ ++#: C/evolution.xml:1880(para) ++msgid "Italic A" ++msgstr "Italic A" ++ ++#: C/evolution.xml:1883(para) ++msgid "Italicizes the text." ++msgstr "文本斜体化。" ++ ++#: C/evolution.xml:1888(para) ++msgid "Underlined A" ++msgstr "Underlined A" ++ ++#: C/evolution.xml:1891(para) ++msgid "Underlines the text." ++msgstr "文本添加下划线。" ++ ++#: C/evolution.xml:1896(para) ++msgid "Strike through A" ++msgstr "Strike through A" ++ ++#: C/evolution.xml:1899(para) ++msgid "Marks a line through the text." ++msgstr "在文本上添加删除线。" ++ ++#: C/evolution.xml:1906(title) ++msgid "Alignment:" ++msgstr "对齐：" ++ ++#: C/evolution.xml:1907(para) ++msgid "" ++"Located next to the text style buttons, the three paragraph icons should be " ++"familiar to users of most word processing software. The left-most button " ++"aligns your text to the left, the center button centers text, and the right " ++"button aligns the text to the right." ++msgstr "" ++"位于“文本类型”按钮的旁边，有三种段落对齐格式，对于大多数使用过文字处理软件的" ++"用户来说是很熟悉的。最左边的按钮将您的文本向左对齐，中间的按钮将您的文本居" ++"中，最右边的按钮将您的文本向右对齐。" ++ ++#: C/evolution.xml:1910(title) ++msgid "Indentation Rules:" ++msgstr "缩进规则：" ++ ++#: C/evolution.xml:1911(para) ++msgid "" ++"The button with the arrow pointing left decreases a paragraph's indentation, " ++"and the right arrow increases its indentation." ++msgstr "标有左箭头的按钮是减少段落缩进，标有右箭头的按钮是增加段落缩进。" ++ ++#: C/evolution.xml:1914(title) ++msgid "Color Selection:" ++msgstr "颜色选择：" ++ ++#: C/evolution.xml:1915(para) ++msgid "" ++"At the far right is the color section tool, where a box displays the current " ++"text color. To choose a new color, click the arrow button to the right. If " ++"you have text selected, the color applies to the selected text. If you do " ++"not have text selected, the color applies to whatever you type next. You can " ++"select a background color or image by right-clicking the message background, " ++"then selecting Style > Page Style." ++msgstr "" ++"右边是颜色选择工具，一个框内显示当前文本颜色。要选择一种新的颜色，点击右边的" ++"箭头按钮。如果您已经选中的一些文本，则该颜色会应用到选中的文本。如果您未选中" ++"任何文本，该颜色会应用到后面的输入文本。您可以在编辑区点击右键，选择 类型 " ++"> 页面类型，然后选择一种背景颜色或图片。" ++ ++#: C/evolution.xml:1920(title) ++msgid "Advanced HTML Formatting" ++msgstr "高级HTML格式" ++ ++#: C/evolution.xml:1921(para) ++msgid "" ++"Under the Insert menu, there are several more items you can use to style " ++"your email. To use these and other HTML formatting tools, make sure you have " ++"enabled HTML mode by using Format > HTML from the menu bar." ++msgstr "" ++"在“插入”菜单内，您可以选择更多的条目来装饰邮件。要使用这些HTML格式化工具，请" ++"确认您已经启用了HTML模式(在菜单栏上选择 格式 > HTML)。" ++ ++#: C/evolution.xml:1924(title) ++msgid "Inserting a Link" ++msgstr "插入链接" ++ ++#: C/evolution.xml:1925(para) ++msgid "" ++"Use the Insert a Link tool to put hyperlinks in your HTML messages. If you " ++"don't want special link text, you can just enter the address directly, and " ++"Evolution recognizes it as a link." ++msgstr "" ++"使用“插入链接”工具在您的HTML邮件中放入超链接。如果您不需要特殊的超链接文本，" ++"您可以直接输入网址，Evolution会将它识别并作为一个链接。" ++ ++#: C/evolution.xml:1928(para) ++msgid "Select the text you want to link from." ++msgstr "选择您需要链接的文本。" ++ ++#: C/evolution.xml:1931(para) ++msgid "Right-click in the text, then click Insert Link." ++msgstr "右击文本，选择“插入链接”。" ++ ++#: C/evolution.xml:1934(para) ++msgid "Type the URL in the URL field." ++msgstr "在URL地址栏里输入URL地址。" ++ ++#: C/evolution.xml:1943(title) ++msgid "Inserting an Image" ++msgstr "插入图像" ++ ++#: C/evolution.xml:1946(para) ++msgid "Click Insert > Image in the menubar." ++msgstr "在菜单栏上点击 插入 > 图像。" ++ ++#: C/evolution.xml:1949(para) ++msgid "Browse to and select the image file." ++msgstr "浏览并选择图像文件。" ++ ++#: C/evolution.xml:1958(title) ++msgid "Inserting a Rule" ++msgstr "插入标尺" ++ ++#: C/evolution.xml:1959(para) ++msgid "" ++"You can insert a horizontal line into the text to help divide two sections:" ++msgstr "您可以在文本中插入一条水平线将文本分隔成两块区域。" ++ ++#: C/evolution.xml:1962(para) ++msgid "Click Insert > Rule in the menubar." ++msgstr "在菜单栏上点击 插入 > 标尺。" ++ ++#: C/evolution.xml:1965(para) ++msgid "Select the width, size, and alignment." ++msgstr "选择宽度、尺寸、对齐。" ++ ++#: C/evolution.xml:1968(para) ++msgid "Select Shade if necessary." ++msgstr "如果必要，选择“渐变”。" ++ ++#: C/evolution.xml:1977(title) ++msgid "Inserting a Table" ++msgstr "插入表格" ++ ++#: C/evolution.xml:1978(para) ++msgid "You can insert a table into the text:" ++msgstr "您可以将表格插入文本中：" ++ ++#: C/evolution.xml:1981(para) ++msgid "Click Insert > Table in the menubar." ++msgstr "在菜单栏中点击“插入”> “表格”。" ++ ++#: C/evolution.xml:1984(para) ++msgid "Select the number of rows and columns." ++msgstr "选择行数与列数。" ++ ++#: C/evolution.xml:1987(para) ++msgid "Select the type of layout for the table." ++msgstr "选择表格布局类型。" ++ ++#: C/evolution.xml:1990(para) ++msgid "Select a background for the table." ++msgstr "选择表格背景。" ++ ++#: C/evolution.xml:1991(para) ++msgid "" ++"To insert a picture for the background, click the filechooser button and " ++"select the desired image." ++msgstr "要插入一幅图像作为背景，点击选择文件的按钮，选择您需要的图像。" ++ ++#: C/evolution.xml:2003(para) ++msgid "You can set the following options when sending mail in Evolution." ++msgstr "使用Evolution发送邮件时您可以设置下列选项。" ++ ++#: C/evolution.xml:2005(title) ++msgid "Read Receipts:" ++msgstr "阅读收条：" ++ ++#: C/evolution.xml:2006(para) ++msgid "" ++"Evolution allows you to request a receipt for your sent messages to indicate " ++"when your message is being viewed by the recipient. Receipts are useful when " ++"sending email that is time-sensitive. To request a receipt, click Insert " ++"> Request Read Receipt in the composer window." ++msgstr "" ++"Evolution允许您要求得到一个收条以提醒您收件人已查看了您的邮件。收条在发送紧急" ++"邮件时很有用。若您要求得到阅读收条，请在编辑器窗口点击 插入 > 请求阅读收" ++"条。" ++ ++#: C/evolution.xml:2009(title) ++msgid "Prioritize Message:" ++msgstr "邮件优先级：" ++ ++#: C/evolution.xml:2010(para) ++msgid "" ++"You can prioritize a message to be sent, so that the recipient sees its " ++"relative importance.To prioritize a message, click Insert > Prioritize " ++"Message in the composer window." ++msgstr "" ++"您可以给要发送的邮件设置优先级，这样收件人会看到它的重要性。要给邮件设置优先" ++"级，请在编辑器窗口点击 插入 > 标为优先。" ++ ++#: C/evolution.xml:2013(para) ++msgid "" ++"Evolution will ignore the message priority, because it assumes that the " ++"recipient should decide whether the message is important or not." ++msgstr "" ++"Evolution会忽略邮件的优先级，因为它认为应该由收件人来觉得邮件的重要性。" ++ ++#: C/evolution.xml:2018(title) ++msgid "Default Settings" ++msgstr "默认设置" ++ ++#: C/evolution.xml:2019(para) ++msgid "" ++"Evolution allows you to change the default settings. You can organize your " ++"Draft folder and Sent folder, set the addresses to which you want to sent " ++"carbon copies and blind carbon copies to. You can also change the settings " ++"for message receipts." ++msgstr "" ++"Evolutio允许您修改默认设置。您可以设置自己的草稿箱和已发箱，设置您想要发送副" ++"本拷贝和隐藏副本拷贝的地址。您也可以修改邮件收条的设置。" ++ ++#: C/evolution.xml:2020(para) ++msgid "To change your default settings," ++msgstr "改变默认设置，" ++ ++#: C/evolution.xml:2026(para) ++msgid "Select the mail account whose settings you want to change." ++msgstr "选择要改变设置的邮件帐号。" ++ ++#: C/evolution.xml:2029(para) C/evolution.xml:6640(para) ++#: C/evolution.xml:6709(para) ++msgid "Click Edit to open the Account Editor." ++msgstr "点击“编辑”打开“帐号编辑器”。" ++ ++#: C/evolution.xml:2032(para) ++msgid "Click the Default tab." ++msgstr "点击“默认”标签页。" ++ ++#: C/evolution.xml:2035(para) ++msgid "" ++"Click the respective check boxes and enter the email addresses you want to " ++"always CC and BCC." ++msgstr "在相应的勾选框里勾选，输入您希望总是抄送和总是暗送的地址。" ++ ++#: C/evolution.xml:2038(para) ++msgid "" ++"Select the desired option for send message receipts from the drop-down list." ++msgstr "从下拉列表中选择发送邮件收条选项。" ++ ++#: C/evolution.xml:2043(title) ++msgid "Changing Default Folder for Sent and Draft Items" ++msgstr "改变已发箱和草稿箱的默认文件夹" ++ ++#: C/evolution.xml:2044(para) ++msgid "" ++"By default, all the sent messages directly go to the Sent folder and those " ++"messages marked as drafts are saved in the Drafts folder. To change the " ++"default setting for draft items," ++msgstr "" ++"默认情况下，所有已经发送的邮件会直接存入“已发箱”，被标记为草稿的邮件则会存" ++"入“草稿箱”。要改变草稿箱的默认设置，" ++ ++#: C/evolution.xml:2047(para) ++msgid "Click the Drafts button to open the folder selection window." ++msgstr "点击“草稿”按钮，打开文件夹选择窗口。" ++ ++#: C/evolution.xml:2050(para) ++msgid "Select the folder you want to save drafts to." ++msgstr "选择您想要保存草稿的文件夹。" ++ ++#: C/evolution.xml:2056(para) C/evolution.xml:2071(para) ++msgid "Click the Revert button to revert back to previous settings." ++msgstr "点击“还原”按钮，还原之前的设置。" ++ ++#: C/evolution.xml:2059(para) ++msgid "To change the default folder for sent items," ++msgstr "要改变默认的已发箱按钮，" ++ ++#: C/evolution.xml:2062(para) ++msgid "Click the Sent button to open the folder selection window." ++msgstr "点击“已发箱”按钮，打开文件夹选择窗口。" ++ ++#: C/evolution.xml:2065(para) ++msgid "Select the desired folder for sent items." ++msgstr "选择您想要保存已发邮件的文件夹。" ++ ++#: C/evolution.xml:2079(para) ++msgid "" ++"When you receive an email, you can forward it to other individuals or groups " ++"that might be interested. You can forward a message as an attachment to a " ++"new message (this is the default) or you can send it in line as a quoted portion of the message you are sending. " ++"Attachment forwarding is best if you want to send the full, unaltered " ++"message to someone else. Inline forwarding is best if you want to send " ++"portions of a message, or if you have a large number of comments on " ++"different sections of the message you are forwarding. Remember to note from " ++"whom the message came, and whether you have removed or altered content." ++msgstr "" ++"当您收到一封邮件时，您可以将它转发给其他感兴趣人或组。您可以将邮件作为新邮件" ++"中的一个附件转发(这是默认值)，或者您也可以以嵌入的方式发送，即作为新邮件的一个引用部分。如果您想要把完整的、未经修改的邮" ++"件转发给别人，附件转发是最好的选择。如果您只是想转发邮件中的一部分，或者您需" ++"要在转发的邮件的各个部位添加大量评注，则嵌入转发是最好的选择。请注意要指明邮" ++"件来自何处，您是否已删减或修改过内容。" ++ ++#: C/evolution.xml:2080(para) ++msgid "To forward a message you are reading:" ++msgstr "要转发您正在阅读的邮件：" ++ ++#: C/evolution.xml:2083(para) ++msgid "Click Forward on the toolbar." ++msgstr "在工具栏上点击“前进”。" ++ ++#: C/evolution.xml:2085(para) ++msgid "" ++"If you prefer to forward the message inline " ++"instead of attached, click Message > Forward As > Inline from the menu." ++msgstr "" ++"如果您更愿意转发嵌入邮件而不是作为附件转发，" ++"在菜单上点击 信件 > 转发为 > 嵌入。" ++ ++#: C/evolution.xml:2088(para) ++msgid "" ++"Select an addressee as you would when sending a new message; the subject is " ++"already entered, although you can alter it if you want." ++msgstr "" ++"选择收信人(向发送正常信件一样操作)；邮件主题已自动填好，但您也可以根据需要修" ++"改。" ++ ++#: C/evolution.xml:2091(para) ++msgid "Add your comments on the message in the composition frame" ++msgstr "在编辑框中填入您需要的注释。" ++ ++#: C/evolution.xml:2095(para) ++msgid "" ++"Attachments to a message you are forwarding are forwarded only when you send " ++"the original message as an attachment. Inline messages do not forward any " ++"attachments." ++msgstr "" ++"如果您要转发的邮件中含有附件，当您选择“作为附件转发”时，原来的附件也会转发出" ++"去。但选择“嵌入转发”时，附件不会被转发。" ++ ++#: C/evolution.xml:2102(para) ++#, fuzzy ++msgid "" ++"Don't forward chain letters. If you must, watch out for hoaxes and urban " ++"legends, and make sure the message doesn't have multiple layers of greater-" ++"than signs (>), indicating multiple layers of careless in-line forwarding." ++msgstr "" ++"不要转发连锁信。如果确实需要，请注意恶作剧和流言。确认邮件里没有像大于号" ++"(>)那样的多级层次符号。" ++ ++#: C/evolution.xml:2105(para) ++msgid "" ++"Always begin and close with a salutation. Say please and " ++"thank you, just like you do in real life. You can keep your " ++"pleasantries short, but be polite." ++msgstr "" ++"使用问候语作开头、结尾。写上请 和 谢谢，等礼貌" ++"用语，就像您在现实生活中一样。你也可以在信中适当开点玩笑，但请注意礼貌。" ++ ++#: C/evolution.xml:2108(para) ++msgid "" ++"WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING! Don't write a whole " ++"message in capital letters. It hurts people's ears." ++msgstr "" ++"用大写字母写信意味着你在大声命令别人！千万不要用大写字母写整封邮件，别人看起" ++"来会很刺眼。" ++ ++#: C/evolution.xml:2111(para) ++msgid "" ++"Check your spelling and use complete sentences. By default, Evolution puts a " ++"red line beneath words it doesn't recognize, as you type them." ++msgstr "" ++"仔细检查您的书写，尽量使用完整句。默认情况下，当您在输入时，Evolution会在可能" ++"错误的单词下面加上红色下划线。" ++ ++#: C/evolution.xml:2114(para) ++msgid "Don't send nasty emails (flames). If you get one, don't write back." ++msgstr "不要发送黄色、下流的邮件。即使您收到这样的邮件，千万不要回复。" ++ ++#: C/evolution.xml:2117(para) ++msgid "" ++"When you reply or forward, include enough of the previous message to provide " ++"context." ++msgstr "当您回复或转发邮件时，请包含足够的原邮件的信息。" ++ ++#: C/evolution.xml:2120(para) ++msgid "Don't send spam." ++msgstr "不要发送垃圾邮件。" ++ ++#: C/evolution.xml:2128(para) ++msgid "" ++"A message template is a standard message that you can use at any time to " ++"send mail with the same pattern. Evolution allows you to create and edit " ++"message templates." ++msgstr "" ++"邮件模板是一种标准的邮件格式，您随时可用它编写、发送相同格式的邮件。Evolution" ++"允许您创建、编辑自己的邮件模板。" ++ ++#: C/evolution.xml:2131(link) C/evolution.xml:2151(title) ++msgid "Creating a Message Template from an Existing Message" ++msgstr "根据已有的邮件创建模板" ++ ++#: C/evolution.xml:2134(link) C/evolution.xml:2178(title) ++msgid "Saving a New Message as a Template" ++msgstr "将新邮件保存为模板" ++ ++#: C/evolution.xml:2137(link) C/evolution.xml:2190(title) ++msgid "Using a Message Template as a Reply" ++msgstr "使用模板回复" ++ ++#: C/evolution.xml:2140(link) C/evolution.xml:2207(title) ++msgid "Configuring Message Templates" ++msgstr "配置消息模板" ++ ++#: C/evolution.xml:2143(para) ++msgid "To enable the Message Template Plugin:" ++msgstr "启用消息模板插件：" ++ ++#: C/evolution.xml:2146(para) ++msgid "Select Edit > Plugins, then select Templates." ++msgstr "选择 编辑 > 插件，然后选择模板。" ++ ++#: C/evolution.xml:2154(para) ++msgid "Select the message." ++msgstr "选择消息。" ++ ++#: C/evolution.xml:2157(para) ++msgid "Right-click > Move to folder / Copy to folder." ++msgstr "右击 > 移植文件夹/复制到文件夹。" ++ ++#: C/evolution.xml:2160(para) ++msgid "Select the Template local folder." ++msgstr "选择“模板”文件夹。" ++ ++#: C/evolution.xml:2163(para) ++msgid "You can also edit an existing message and save it as a template." ++msgstr "您也可以编辑已有的邮件，将它保存为模板。" ++ ++#: C/evolution.xml:2166(para) ++msgid "Open the message and click Reply." ++msgstr "打开邮件，点击“回复”。" ++ ++#: C/evolution.xml:2169(para) ++msgid "Edit the message body or the addresses according to your requirements." ++msgstr "根据您的需要编辑邮件内容或地址。" ++ ++#: C/evolution.xml:2172(para) C/evolution.xml:2184(para) ++msgid "Select File > Save as Template." ++msgstr "选择 文件 > 另存为模板。" ++ ++#: C/evolution.xml:2181(para) ++msgid "" ++"Click New and enter the information in the New Message window, according to " ++"your requirements." ++msgstr "点击“新建”，根据需要输入新邮件的内容。" ++ ++#: C/evolution.xml:2193(para) ++msgid "Right-click the message you are replying to, then click Templates." ++msgstr "右击要回复的邮件，然后点击“模板”。" ++ ++#: C/evolution.xml:2194(para) ++msgid "This option lists all the message templates in the Template folder." ++msgstr "该选项会列出模板文件夹中所有信件模板。" ++ ++#: C/evolution.xml:2197(para) ++msgid "" ++"Select Open the message template of your choice and make changes if required." ++msgstr "根据您的需要选择打开邮件模板，在适当的地方作些修改。" ++ ++#: C/evolution.xml:2201(para) ++msgid "" ++"When you select a message template for replying, the subject of the reply is " ++"preserved." ++msgstr "当您选择了一个模板用于回复时，回复的主题已经写好了。" ++ ++#: C/evolution.xml:2208(para) ++msgid "" ++"In the Plugin Manager, select the Configuration tab to customize your " ++"message templates. You can add, edit or remove the key-value pairs. You can " ++"specify any number of key-value pairs." ++msgstr "" ++"您可以在插件管理器中选择“配置”标签自定义您的邮件模板，您可以添加，编辑或删除" ++"其中的关键字-值对，还可以添加任意数目的关键字-值对。" ++ ++#: C/evolution.xml:2209(para) ++msgid "" ++"In any template, the occurrence of every $key is replaced by the value it " ++"has in the configuration. For example, if you set the key to Manager and the " ++"value to Harry, any occurrence of $Manager is replaced by Harry in the " ++"message." ++msgstr "" ++"在任何模板中，所有出现关键字的地方会被它所对应的值代替。例如，如果您在设置了" ++"关键字为“经理”，值为“哈里”，那么邮件中所有出现“经理”的地方都会被“哈里”代替。" ++ ++#: C/evolution.xml:2210(para) ++msgid "" ++"Assume that you have 1000 message templates with your current manager's name " ++"has a reference in them. When the current manager is replaced by a new one, " ++"it's not easy for you to manually replace the manager's name in all the 1000 " ++"messages. If the messages have a $Manager key value, you can reset the value " ++"in the Configuration tab of this plugin." ++msgstr "" ++"假设您有1000个邮件模板里面有您现在经理的名字。万一经理有了变动，您很难一一把" ++"1000个模板里所有的经理的名字换掉。但如果您事先设置了“经理”关键字，您就可以直" ++"接在插件管理器配置标签中重设该值即可。" ++ ++#: C/evolution.xml:2211(para) ++msgid "" ++"By default, the entire environment variables are used as a key-value pair. " ++"An occurrence of $env_variable is replaced by the value it carries. For " ++"example, an occurrence of $PATH in your template is replaced by its value " ++"when the template is used." ++msgstr "" ++"默认情况下，整个环境变量会被作为一个关键字-值对来对待。每出现一个环境变量就会" ++"被它所对应的值所代替。例如，模板中有$PATH时，当使用模板时就会被它的值代替。" ++ ++#: C/evolution.xml:2212(para) ++msgid "The replacement process uses the following order of precedence:" ++msgstr "关键字-值的替换过程根据下列优先级进行：" ++ ++#: C/evolution.xml:2215(para) ++msgid "" ++"$key is replaced by the value set for it in the Configuration tab of the " ++"Templates plugin." ++msgstr "关键字会被它在模板插件中配置的值所替换。" ++ ++#: C/evolution.xml:2218(para) ++msgid "" ++"If the key is not found, it is then replaced with the value of its " ++"environment variable." ++msgstr "如果该关键字在配置中找不到，则会被环境变量所对应的值替换。" ++ ++#: C/evolution.xml:2221(para) ++msgid "" ++"If key is neither a configuration option nor an environment variable, no " ++"changes are made." ++msgstr "如果该关键字既不是环境变量，也没有进行配置，则不会发生任何替换。" ++ ++#: C/evolution.xml:2229(para) ++msgid "" ++"If you create an event in the calendar component, you can then send " ++"invitations to the attendee list through the Evolution email tool. The " ++"invitation card is sent as an attachment in iCal format." ++msgstr "" ++"如果您在日历组件中创建了一个事件，您可以使用Evolution邮件工具给事件参加者发送" ++"邀请。请帖会以iCal格式作为附件发送。" ++ ++#: C/evolution.xml:2230(para) ++msgid "" ++"To send an invitation, right click on the calendar item and click Forward as " ++"iCalendar." ++msgstr "要发送邀请，在日历条目上点击右键，选择“作为iCalendar转发”。" ++ ++#: C/evolution.xml:2231(para) ++msgid "When you receive an invitation, you have several options:" ++msgstr "当您收到一个邀请时，有以下几个选项：" ++ ++#: C/evolution.xml:2233(title) ++msgid "Accept:" ++msgstr "接受：" ++ ++#: C/evolution.xml:2234(para) ++msgid "" ++"Indicates you will attend the meeting. When you click the OK button, the " ++"meeting is entered into your calendar." ++msgstr "意味着您将参加这个活动。当您点击“确定”按钮，该活动会加入到您的日历中。" ++ ++#: C/evolution.xml:2237(title) ++msgid "Tentatively Accept:" ++msgstr "暂时接受：" ++ ++#: C/evolution.xml:2238(para) ++msgid "" ++"Indicates you will probably attend the meeting. When you click the OK " ++"button, the meeting is entered into your calendar, but is marked as " ++"tentative." ++msgstr "" ++"意味着您可能会参加这个活动。当您点击“确定”按钮时，该活动会加入您的日历，并标" ++"记为“暂时”。" ++ ++#: C/evolution.xml:2241(title) ++msgid "Decline:" ++msgstr "拒绝:" ++ ++#: C/evolution.xml:2242(para) ++msgid "" ++"Indicates you are unable to attend the meeting. The meeting is not entered " ++"into your calendar when you click OK, although your response is sent to the " ++"meeting host if you have selected the Send reply to sender option." ++msgstr "" ++"意味着您不能参加这个活动。点击“确定”时该活动不会进入您的日历，即使您已经选择" ++"了“给发信人发送回复”选项并且给活动组织者回复了。" ++ ++#: C/evolution.xml:2245(title) ++msgid "Send reply to sender:" ++msgstr "给发信人发送回复：" ++ ++#: C/evolution.xml:2246(para) ++msgid "" ++"Select this option if you want your response sent to the meeting organizers." ++msgstr "如果您想要回复活动组织者，选择该项。" ++ ++#: C/evolution.xml:2252(para) ++msgid "" ++"Because IMAP folders exist on the server, and opening them or checking them " ++"takes time, you need fine-grained control over the way that you use IMAP " ++"folders. You use the IMAP subscriptions manager to do this. If you prefer to " ++"have every mail folder displayed, you can select that option as well. " ++"However, if you want to choose specific items in your mailbox, and exclude " ++"others, you can use the subscription management tool to do that." ++msgstr "" ++"IMAP文件夹是位于服务器上的，打开或查看它们会比较花费时间，故您在使用过程中需" ++"要有精细的控制。您可以使用“IMAP订阅管理器”来操作。如果您希望显示每个邮件文件" ++"夹，也可以选择对应的选项。但是，如果您想要选择邮箱中的一些条目，排除其它条" ++"目，可以使用订阅管理器来操作。" ++ ++#: C/evolution.xml:2255(para) ++msgid "Select Folder > Subscriptions." ++msgstr "选择文件夹 > 订阅。" ++ ++#: C/evolution.xml:2258(para) ++msgid "" ++"If you have accounts on multiple IMAP servers, select the server where you " ++"want to manage your subscriptions." ++msgstr "如果您有了若干个IMAP服务器账户，选择对应的您想要管理订阅的服务器。" ++ ++#: C/evolution.xml:2259(para) ++msgid "Evolution displays a list of available files and folders." ++msgstr "Evolution会显示可用的文件和文件夹列表。" ++ ++#: C/evolution.xml:2262(para) ++msgid "Select a file or folder by clicking it." ++msgstr "通过点击选择文件或文件夹。" ++ ++#: C/evolution.xml:2263(para) ++msgid "" ++"You should select at least the Inbox folder. Depending upon the way your " ++"IMAP server is configured, the list of available files might include non-" ++"mail folders. If it does, you can ignore them." ++msgstr "" ++"您应该选择至少一个收信箱。根据您的IMAP服务器配置方式，文件列表中可能会包含没" ++"有邮件的文件夹。如果真是如此，您可以忽略它们。" ++ ++#: C/evolution.xml:2266(para) ++msgid "" ++"Enable the corresponding checkbox to add a folder to the subscribed list." ++msgstr "勾选对应的选框，将文件夹加入订阅列表中。" ++ ++#: C/evolution.xml:2269(para) ++msgid "When you have subscribed to the folders you want, close the window." ++msgstr "当您订阅了需要的文件夹之后，关闭窗口。" ++ ++#: C/evolution.xml:2276(para) ++msgid "" ++"To protect and encode your email transmissions, Evolution offers two " ++"encryption methods:" ++msgstr "要保护、加密您传送的邮件，Evolution提供了两种加密方式：" ++ ++#: C/evolution.xml:2279(para) ++msgid "GPG Encryption" ++msgstr "GPG 加密" ++ ++#: C/evolution.xml:2282(para) C/evolution.xml:2443(title) ++msgid "S/MIME Encryption" ++msgstr "S/MIME 加密" ++ ++#: C/evolution.xml:2285(para) ++msgid "" ++"Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), " ++"an implementation of strong Public " ++"Key Encryption." ++msgstr "" ++"Evolution使用GNU隐私保护(GPG)来保护您的隐私，这是强大的公钥加密的一个补充。" ++ ++#: C/evolution.xml:2286(para) ++msgid "" ++"In order to send and receive encrypted emails using GPG, it is necessary to " ++"use two kinds of encryption keys: public and private. Public keys are used " ++"to encrypt messages and private keys to decrypt them. To send encrypted " ++"email, you must have the recepient's public key, which is used to encrypt " ++"the message. The recipient then uses his/her private key to decrypt (and " ++"read) the encrypted message." ++msgstr "" ++"为了使用GPG来发送和接受邮件，有必要使用两种密钥：公有密钥和私有密钥。公有密钥" ++"用于加密邮件，私有密钥用于解密邮件。要发送加密过的邮件，您必须有收信人的公有" ++"密钥，它会在加密邮件时使用。然后收信人使用他/她自己的私有密钥解密并阅读邮件。" ++ ++#: C/evolution.xml:2287(para) ++msgid "" ++"Those who wish to send you encrypted email must first have a copy of your " ++"public key on your keyring. To this end, public keys can be shared with " ++"those who want to send encrypted messages to you. In order to do this, you " ++"may place your public key on a public key server. Private keys should not be " ++"shared with others." ++msgstr "" ++"要发送加密邮件，您必须首先有一个自己的公有密钥的拷贝。这样，要发送加密信件给" ++"您的人就可以共享公有密钥了。所以，您需要把自己的公有密钥放在公有密钥服务器" ++"上。但私有密钥是不会被他人共享的。" ++ ++#: C/evolution.xml:2288(para) ++msgid "" ++"Evolution does not support older versions of PGP, such as OpenPGP and Inline " ++"PGP." ++msgstr "Evolution不提供旧版本的PGP，如OpenPGP和Inline PGP。" ++ ++#: C/evolution.xml:2289(para) ++msgid "You can use encryption in two different ways:" ++msgstr "您可以通过两种方式使用加密：" ++ ++#: C/evolution.xml:2292(para) ++msgid "" ++"You can encrypt the entire message, so that nobody but the recipient can " ++"read it." ++msgstr "您可以对整封邮件进行加密，这样只有收信人能阅读它。" ++ ++#: C/evolution.xml:2295(para) ++msgid "" ++"You can attach an encrypted signature to a plain text message, so that the " ++"recipient can read the message without decrypting it, and needs decrypting " ++"only to verify the sender's identity." ++msgstr "" ++"您可以将一个加密签名添加到纯文本邮件，这样收信人在阅读邮件时无须解密，只有需" ++"要验证发信人身份时才需要解密。" ++ ++#: C/evolution.xml:2298(para) ++msgid "" ++"For example, suppose that Kevin wants to send an encrypted message to his " ++"friend Rachel. He looks up her public key on a general key server, and then " ++"tells Evolution to encrypt the message. The message now reads @#" ++"$23ui7yr87#@!48970fsd. When the information gets to Rachel, she " ++"decrypts it using her private key, and it appears as plain text for her to " ++"read." ++msgstr "" ++"例如，假设Kevin想要给他的朋友Rachel发送一封加密的邮件，首先他会在公有密钥服务" ++"器上查看Rachel的公有密钥，然后告诉Evolution需要加密该邮件。这样，邮件看起来就" ++"像这样：@#$23ui7yr87#@!48970fsd。当邮件到达Rachel时，她需要使" ++"用自己的私有密钥解密，邮件就会显示纯文本供她阅读。" ++ ++#: C/evolution.xml:2301(title) ++msgid "Making a GPG Encryption Key" ++msgstr "生成 GPG 密钥" ++ ++#: C/evolution.xml:2302(para) ++msgid "" ++"Before you can get or send encrypted mail, you need to generate your public " ++"and private keys with GPG. This procedure covers version 1.2.4 of GPG. If " ++"your version is different, these steps might vary slightly. You can find out " ++"your version number by entering gpg --version." ++msgstr "" ++"在您能够接收或发送加密邮件之前，您需要使用GPG生成自己的公有和私有密钥。本节描" ++"述的操作步骤是根据1.2.4版的GPG，如果您的版本不同，步骤会有略有差别。您可以输" ++"入gpg --version查看您的GPG版本号。" ++ ++#: C/evolution.xml:2305(para) ++msgid "Open a terminal and enter gpg --gen-key." ++msgstr "打开终端，键入gpg --gen-key。" ++ ++#: C/evolution.xml:2308(para) ++msgid "Select an algorithm, then press Enter." ++msgstr "选择一个算法，然后按“回车”。" ++ ++#: C/evolution.xml:2310(para) ++msgid "" ++"To accept the default algorithm of DSA and ElGamal, press Enter " ++"(recommended)." ++msgstr "要接受默认的DSA和ElGamal算法，按回车键(推荐)。" ++ ++#: C/evolution.xml:2313(para) ++msgid "" ++"Select a key length, then press Enter. To accept the default, 1024 bits, " ++"press Enter." ++msgstr "选择密钥长度，按回车键。要接受默认的长度，1024位，直接按回车键。" ++ ++#: C/evolution.xml:2316(para) ++msgid "Enter how long your key should be valid for." ++msgstr "输入您的密钥有效期限。" ++ ++#: C/evolution.xml:2318(para) ++msgid "" ++"To accept the default of no expiration, press Enter, then press Y when you " ++"are prompted to verify the selection." ++msgstr "要接受默认值(无限制的有效期)，直接按回车键。您会被提示确认选择，按Y。" ++ ++#: C/evolution.xml:2321(para) ++msgid "Type your real name, then press Enter." ++msgstr "键入您的真名，然后回车。" ++ ++#: C/evolution.xml:2324(para) ++msgid "Type your email address, then press Enter." ++msgstr "输入您的邮件地址，按回车键。" ++ ++#: C/evolution.xml:2327(para) ++msgid "(Optional) Type a comment, then press Enter." ++msgstr "(可选)输入评论，按回车键。" ++ ++#: C/evolution.xml:2330(para) ++msgid "Review your selected user ID. If it is correct, press O." ++msgstr "查看您选择的用户ID，确认后按O。" ++ ++#: C/evolution.xml:2333(para) ++msgid "Type a passphrase, then press Enter." ++msgstr "输入一个密码短语，按回车键。" ++ ++#: C/evolution.xml:2336(para) ++msgid "Move your mouse randomly to generate the keys." ++msgstr "随意移动您的鼠标，生成密钥。" ++ ++#: C/evolution.xml:2339(para) ++msgid "" ++"After the keys are generated, you can view your key information by entering " ++"gpg --list-keys. You should see something similar to " ++"this: /home/you/.gnupg/pubring.gpg " ++"---------------------------- pub 1024D/32j38dk2 2001-06-20 you <" ++"you@example.com> sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14] " ++msgstr "" ++"密钥生成之后，您可以输入gpg --list-keys查看密钥信息。您应" ++"该看到如下的类似信息： /home/you/.gnupg/pubring.gpg " ++"---------------------------- pub 1024D/32j38dk2 2001-06-20 you <" ++"you@example.com> sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14] " ++ ++#: C/evolution.xml:2340(para) ++msgid "" ++"GPG creates one list, or keyring, for your public keys and one for your " ++"private keys. All the public keys you know are stored in the file ~/.gnupg/" ++"pubring.gpg. If you want to give other people your key, send them that file." ++msgstr "" ++"GPG为您创建一串公有密钥和一个私有密钥。所有的公有密钥放在文件~/.gnupg/" ++"pubring.gpg中。如果您想把公有密钥给别人，发送该文件给他们即可。" ++ ++#: C/evolution.xml:2341(para) ++msgid "If you want, you can upload your keys to a key server." ++msgstr "如果您需要的话，可以上传密钥到密钥服务器上。" ++ ++#: C/evolution.xml:2344(para) ++msgid "" ++"Check your public key ID with gpg--list-keys. It is the string after " ++"1024D on the line beginning with pub. In the " ++"example above, it is 32j38dk2." ++msgstr "" ++"使用gpg--list-keys检查您的公有密钥ID，它位于以pub开头的那一行" ++"中1024D后面的字符串。在上面的例子中ID就是32j38dk2。" ++ ++#: C/evolution.xml:2347(para) ++msgid "" ++"Enter the command gpg --send-keys --keyserver wwwkeys.pgp.net " ++"32j38dk2. Substitute your key ID for " ++"32j38dk2. You need your password to do this." ++msgstr "" ++"输入命令gpg --send-keys --keyserver wwwkeys.pgp.net " ++"32j38dk2。注意把32j38dk2替换成您" ++"自己的密钥ID。在操作过程中需要输入自己的密码。" ++ ++#: C/evolution.xml:2350(para) ++msgid "" ++"Key servers store your public keys for you so that your friends can decrypt " ++"your messages. If you choose not to use a key server, you can manually send " ++"your public key, include it in your signature file, or put it on your own " ++"Web page. However, it is easier to publish a key once, and then let people " ++"download it from a central place when they want." ++msgstr "" ++"密钥服务器存储您的公有密钥，这样您的朋友就可以解密您的邮件。如果您不使用密钥" ++"服务器，也可以手动发送自己的公有密钥，可以把它加在签名文件中，也可以放在自己" ++"的网页上。但是，我们建议还是一次性生成一个密钥放到服务器上，让别人在需要的时" ++"候下载，这样更方便一些。" ++ ++#: C/evolution.xml:2351(para) ++msgid "" ++"If you don't have a key to unlock or encrypt a message, you can set your " ++"encryption tool to look it up automatically. If it can't find the key, an " ++"error message appears." ++msgstr "" ++"如果您没有解密或加密邮件的密钥，可以设置自己的加密工具。如果它找不到密钥，会" ++"显示一个错误信息。" ++ ++#: C/evolution.xml:2355(title) ++msgid "Getting and Using GPG Public Keys" ++msgstr "得到和使用GPG公有密钥" ++ ++#: C/evolution.xml:2356(para) ++msgid "" ++"To send an encrypted message, you need to use the recipient's public key in " ++"combination with your private key. Evolution handles the encryption, but you " ++"need to get the public key and add it to your keyring." ++msgstr "" ++"要发送一个加密邮件，您需要使用收信人的公有密钥和自己的私有密钥。Evolution会自" ++"行处理加密过程，但您需要得到公有密钥并加入到您的钥匙环中。" ++ ++#: C/evolution.xml:2357(para) ++msgid "" ++"To get public keys from a public key server, enter the command gpg " ++"--recv-keys --keyserver wwwkeys.pgp.net keyid, " ++"substituting keyid for your recipient's ID. You need to " ++"enter your password, and the ID is automatically added to your keyring." ++msgstr "" ++"要从公有密钥服务器上得到公有密钥，输入命令 gpg --recv-keys --" ++"keyserver wwwkeys.pgp.net keyid，注意把" ++"keyid替换成您的收信人的密钥ID。您需要输入自己的密码，然后" ++"该ID会自动加入您的钥匙环中。" ++ ++#: C/evolution.xml:2359(para) ++msgid "" ++"The domain wwwkeys.pgp.net is assigned " ++"to multiple hosts in various networks. The gpg utility tries to connect to " ++"one in the current network; and if that particular host is down, it fails " ++"with a time-out." ++msgstr "" ++"域名wwwkeys.pgp.net是与多个网络的多个主机" ++"相连的。gpg程序会尝试与当前网络所在的主机连接。如果连接失败，会显示超时的失败" ++"信息。" ++ ++#: C/evolution.xml:2362(para) ++msgid "" ++"To avoid this, type $ host wwwkeys.pgp.net in a terminal " ++"console and get the IP address of the hosts. You can ping each of them to " ++"find the one which is up and running. Now, you can replace wwwkeys.pgp.net " ++"in the gpg --recv-keys --keyserver wwwkeys.pgp.net keyid command with that " ++"explicit IP number as returned by the host utility." ++msgstr "" ++"要避免这种情况，请在终端控制台输入$ host wwwkeys.pgp.net，" ++"得到主机的IP地址。您可以对它们一一进行ping操作，找出正在运行且连接速度较快的" ++"主机。现在，您可以将命令gpg --recv-keys --keyserver wwwkeys.pgp.net keyid中的" ++"wwwkeys.pgp.net替换成找到的IP地址。" ++ ++#: C/evolution.xml:2367(para) ++msgid "" ++"If someone sends you a public key directly, save it as a plain text file and " ++"enter the command gpg --import to add " ++"it to your keyring." ++msgstr "" ++"如果有人直接把公有密钥文件发送给您，请将它保存为纯文本文件，输入命令" ++"gpg --import将它加入到您的钥匙环中。" ++ ++#: C/evolution.xml:2371(title) ++msgid "Setting up GPG Encryption" ++msgstr "设置 GPG 加密" ++ ++#: C/evolution.xml:2377(para) C/evolution.xml:2419(para) ++msgid "Select the account you want to use securely, then click Edit." ++msgstr "选择要加密的帐号，然后点击“编辑”。" ++ ++#: C/evolution.xml:2380(para) C/evolution.xml:2422(para) ++msgid "Click the Security tab." ++msgstr "点击“安全”标签页" ++ ++#: C/evolution.xml:2383(para) ++msgid "Specify your key ID in the PGP/GPG Key ID field." ++msgstr "在“PGP/GPG键标识”一栏中填入您的密钥ID。" ++ ++#: C/evolution.xml:2392(para) ++msgid "" ++"Evolution requires that you know your key ID. If you don't remember it, you " ++"can find it by typing gpg --list-keys in a terminal " ++"window. Your key ID is an eight-character string with random numbers and " ++"letters." ++msgstr "" ++"Evolution要求您知道自己的密钥ID。如果您不记得了，可以在终端窗口输入" ++"gpg --list-keys来找到它。您的密钥ID是由任意数字和字母组成" ++"的八个字符的字符串。" ++ ++#: C/evolution.xml:2396(title) ++msgid "Encrypting Messages" ++msgstr "加密消息" ++ ++#: C/evolution.xml:2397(para) ++msgid "To encrypt a single message:" ++msgstr "要加密一封邮件：" ++ ++#: C/evolution.xml:2400(para) C/evolution.xml:5460(para) ++msgid "Open a Compose Message window." ++msgstr "打开邮件编辑器窗口。" ++ ++#: C/evolution.xml:2403(para) ++msgid "Click Security > PGP Encrypt." ++msgstr "点击安全 > PGP加密。" ++ ++#: C/evolution.xml:2406(para) ++msgid "Compose your message." ++msgstr "编辑您的邮件。" ++ ++#: C/evolution.xml:2411(para) ++msgid "" ++"The Subject line of the message will not be encrypted and should not be used " ++"for sensitive information." ++msgstr "邮件的主题不会被加密。所以，切勿在主题中填写敏感信息。" ++ ++#: C/evolution.xml:2413(para) ++msgid "You can set Evolution to always sign your email messages:" ++msgstr "您可以设置Evolution总是给您的邮件添加签名：" ++ ++#: C/evolution.xml:2425(para) ++msgid "Select Always Sign Outgoing Messages When Using This Account." ++msgstr "选择“当使用该账户时总是发送签名信件”。" ++ ++#: C/evolution.xml:2437(title) ++msgid "Unencrypting a Received Message" ++msgstr "解密收到的消息" ++ ++#: C/evolution.xml:2438(para) ++msgid "" ++"If you receive an encrypted message, you need to decrypt it before you read " ++"it. Remember, the sender must have your public key before they can send you " ++"an encrypted message." ++msgstr "" ++"如果您收到了一封加密过的邮件，您需要在阅读之前将其解密。记住，发信人必须有您" ++"的公有密钥，他们才能给您发送加密邮件。" ++ ++#: C/evolution.xml:2439(para) ++msgid "" ++"When you view the message, Evolution prompts you for your PGP password. " ++"Enter it, and the unencrypted message is displayed." ++msgstr "" ++"当您要查看邮件时，Evolution会提示输入您的PGP密码。输入后，解密的邮件就会显示" ++"出来。" ++ ++#: C/evolution.xml:2444(para) ++msgid "" ++"S/MIME encryption also uses a key-based approach, but it has some " ++"significant advantages in convenience and security. S/MIME uses " ++"certificates, which are similar to keys. The public portion of each " ++"certificate is held by the sender of a message and by one of several " ++"certificate authorities, who are paid to guarantee the identity of the " ++"sender and the security of the message. Evolution already recognizes a large " ++"number of certificate authorities, so when you get a message with an S/MIME " ++"certificate, your system automatically receives the public portion of the " ++"certificate and decrypts or verifies the message." ++msgstr "" ++"S/MIME加密也使用基于密钥的方式，但它在简便性和安全性方面有几个显著优点。S/" ++"MIME使用安全证书，这与密钥类似。每个证书的公有部分由发信人和一个证书所有者(证" ++"书所有者鉴定发信人的身份和邮件安全性)所持有。Evolution能够识别许多证书所有" ++"者，所以当您收到带有S/MIME证书的邮件时，您的系统会自动接收证书的公有部分并解" ++"密邮件或认证邮件。" ++ ++#: C/evolution.xml:2445(para) ++#, fuzzy ++msgid "" ++"S/MIME is used most often in corporate settings. In these cases, " ++"administrators supply certificates that they have purchased from a " ++"certificate authority. In some cases, an organization can act as its own " ++"certificate authority, with or without a guarantee from a dedicated " ++"authority such as VeriSign* or Thawte*. In either case, the system " ++"administrator provides you with a certificate file." ++msgstr "" ++"S/MIME经常在组织设定中使用。在这种情况下，由系统管理员提供从证书所有者那里购" ++"买的证书。在某些情况下，一个组织也可以作为自己的证书所有者，而像VeriSign* 或 " ++"Thawte*那样的奉献拥有者是可有可无的。无论在哪种情况下，系统管理员都会提供您一" ++"个证书文件。" ++ ++#: C/evolution.xml:2446(para) ++msgid "" ++"If you want to use S/MIME independently, you can extract an identification " ++"certificate from your Mozilla* or Netscape* Web browser. See the Mozilla Help for more information on security certificates." ++msgstr "" ++"如果您想独自使用S/MIME，可以从您的Mozilla*或Netscape*浏览器中提取一个认证证" ++"书。请参阅Mozilla Help关于更多安全证书的信息。" ++ ++#: C/evolution.xml:2447(para) ++msgid "The certificate file is a password-protected file on your computer." ++msgstr "证书文件是您计算机上的一个密码保护文件。" ++ ++#: C/evolution.xml:2450(title) ++msgid "Adding a Signing Certificate" ++msgstr "添加签名认证" ++ ++#: C/evolution.xml:2456(para) ++msgid "Click Certificates." ++msgstr "点击“认证”。" ++ ++#: C/evolution.xml:2459(para) C/evolution.xml:2589(para) ++msgid "Click Import." ++msgstr "点击导入。" ++ ++#: C/evolution.xml:2462(para) ++msgid "Select the file to import, then click Open." ++msgstr "选择要导入的文件，点击“打开”。" ++ ++#: C/evolution.xml:2468(para) ++msgid "" ++"Similarly, you can add certificates that are sent to you independently of " ++"any authority by clicking the Contact Certificates tab and using the same " ++"import tool. You can also add new certificate authorities, which have their " ++"own certificate files, in the same way." ++msgstr "" ++"类似的，您也可以添加其他人发送给您的证书，只需点击“联系人证书”标签，使用相同" ++"的导入工具。您也可以用相同方式添加新的证书所有者，即拥有自己的证书文件的人。" ++ ++#: C/evolution.xml:2472(title) ++msgid "Signing or Encrypting Every Message" ++msgstr "给每封邮件添加签名或加密" ++ ++#: C/evolution.xml:2473(para) ++msgid "" ++"After you have added your certificate, you can sign or encrypt a message by " ++"clicking Security > S/MIME Sign or S/MIME Encrypt in the message composer." ++msgstr "" ++"添加您的证书之后，您可以给一封邮件签名或加密，在邮件编辑器中点击安全 > S/" ++"MIME签名或S/MIME加密。" ++ ++#: C/evolution.xml:2474(para) ++msgid "To have every message signed or encrypted:" ++msgstr "给每封邮件添加签名或加密：" ++ ++#: C/evolution.xml:2480(para) ++msgid "Select the account to encrypt the messages in." ++msgstr "选择要加密的邮件所在的账户。" ++ ++#: C/evolution.xml:2483(para) ++msgid "Click Edit, then click Security." ++msgstr "点击“编辑”，然后点击“安全”。" ++ ++#: C/evolution.xml:2486(para) ++msgid "" ++"Click Select next to Signing Certificate and specify the path to your " ++"signing certificate." ++msgstr "在“签名证书”旁边点击选择，配置您的签名证书路径。" ++ ++#: C/evolution.xml:2488(para) ++msgid "" ++"Click Select next to Encryption Certificate and specify the path to your " ++"encryption certificate." ++msgstr "在“加密证书”旁边点击选择，配置您的加密证书路径。" ++ ++#: C/evolution.xml:2491(para) ++msgid "Select the appropriate options." ++msgstr "选择合适的选项。" ++ ++#: C/evolution.xml:2507(para) ++msgid "" ++"Whether you only get a few email messages a day, or you receive hundreds, " ++"you probably want to sort and organize them. Evolution has the tools to help you do it." ++msgstr "" ++"不论您每天只是接收几封邮件还是数百封邮件，您都可能需要将它们进行排列组织。" ++"Evolution有相应的工具可以帮助您操作。" ++ ++#: C/evolution.xml:2510(link) C/evolution.xml:2533(title) ++msgid "Importing Your Old Email" ++msgstr "导入旧邮件" ++ ++#: C/evolution.xml:2513(link) C/evolution.xml:2629(title) ++msgid "Sorting the Message List" ++msgstr "对邮件列表排序" ++ ++#: C/evolution.xml:2516(link) C/evolution.xml:2799(title) ++msgid "Getting Organized with Folders" ++msgstr "组织文件夹" ++ ++#: C/evolution.xml:2519(link) C/evolution.xml:2812(title) ++msgid "Searching for Messages" ++msgstr "搜索消息" ++ ++#: C/evolution.xml:2522(link) C/evolution.xml:3015(title) ++msgid "Create Rules to Automatically Organize Mail" ++msgstr "创建自动组织邮件的规则" ++ ++#: C/evolution.xml:2525(link) C/evolution.xml:3254(title) ++msgid "Using Search Folders" ++msgstr "使用搜索文件夹" ++ ++#: C/evolution.xml:2528(link) C/evolution.xml:3383(title) ++msgid "Stopping Junk Mail (Spam)" ++msgstr "阻止垃圾邮件" ++ ++#: C/evolution.xml:2534(para) ++msgid "" ++"Evolution allows you to import old email and contacts so that you don't need " ++"to worry about losing your old information." ++msgstr "" ++"Evolution允许您导入旧的邮件和联系人，这样您就不需要担心丢失旧的信息了。" ++ ++#: C/evolution.xml:2537(title) ++msgid "Importing Single Files" ++msgstr "导入单独文件" ++ ++#: C/evolution.xml:2538(para) ++msgid "Evolution can import the following types of files:" ++msgstr "Evolution支持下列格式文件的导入：" ++ ++#: C/evolution.xml:2540(title) ++msgid "vCard (.vcf, .gcrd):" ++msgstr "vCard (.vcf, .gcrd)：" ++ ++#: C/evolution.xml:2541(para) ++msgid "" ++"The address book format used by the GNOME, KDE, and many other contact " ++"management applications. You should be able to export to vCard format from " ++"any address book application." ++msgstr "" ++"这种地址簿格式被用于GNOME，KDE和许多其它联系人管理程序。您应该可以从任何地址" ++"簿软件中导出vCard格式文件。" ++ ++#: C/evolution.xml:2544(title) ++msgid "vCalendar:" ++msgstr "vCalendar：" ++ ++#: C/evolution.xml:2545(para) ++msgid "" ++"A format for storing calendar files, which is generally used by Evolution, " ++"Microsoft Outlook, Sunbird, and Korganizer." ++msgstr "" ++"一种存储日历文件的格式，主要用于Evolution，Microsoft Outlook， Sunbird和" ++"Korganizer。" ++ ++#: C/evolution.xml:2548(title) ++msgid "iCalendar or iCal (.ics):" ++msgstr "iCalendar或 iCal (.ics)：" ++ ++#: C/evolution.xml:2549(para) ++msgid "" ++"A format for storing calendar files. iCalendar is used by Palm OS handhelds, " ++"Evolution, and Microsoft Outlook." ++msgstr "" ++"一种存储日历文件的格式，用于Palm OS handhelds，Evolution和Microsoft Outlook。" ++ ++#: C/evolution.xml:2552(title) ++msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):" ++msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab)：" ++ ++#: C/evolution.xml:2553(para) ++msgid "" ++"CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla." ++msgstr "CSV或Tab格式的文件，用于Evolution，Microsoft Outlook和Mozilla。" ++ ++#: C/evolution.xml:2556(title) ++msgid "Microsoft Outlook Express 4 (.mbx):" ++msgstr "Microsoft Outlook Express 4 (.mbx)：" ++ ++#: C/evolution.xml:2557(para) ++msgid "" ++"The email file format used by Microsoft Outlook Express 4. For other " ++"versions of Microsoft Outlook and Outlook Express, see the workaround " ++"described in Step 1." ++msgstr "" ++"这种邮件文件格式用于Microsoft Outlook Express 4。对于其它版本的Microsoft " ++"Outlook和Outlook Express，请参加下文步骤1的" ++"描述内容。" ++ ++#: C/evolution.xml:2560(title) ++msgid "Personal Storage Table (.pst):" ++msgstr "个人存储表格 (.pst)：" ++ ++#: C/evolution.xml:2561(para) ++msgid "" ++"A file format used to store local copies of messages, calendar events, and " ++"other items within Microsoft software such as Microsoft Exchange Client, " ++"Windows Messaging, and Microsoft Outlook." ++msgstr "" ++"一种文件格式，用于存储微软软件如Microsoft Exchange Client，Windows Messaging" ++"和Microsoft Outlook内的本地的邮件、日历事件和其它条目的拷贝。" ++ ++#: C/evolution.xml:2564(title) ++msgid "LDAP Data Interchange Format (.LDIF):" ++msgstr "LDAP数据交换格式 (.LDIF)：" ++ ++#: C/evolution.xml:2565(para) ++msgid "A standard data format for contact cards." ++msgstr "联系人名片的标准数据格式。" ++ ++#: C/evolution.xml:2568(title) ++msgid "Berkley Mailbox (.mbox or null extension):" ++msgstr "Berkley邮箱(.mbox或没有扩展名)：" ++ ++#: C/evolution.xml:2569(para) ++msgid "" ++"The email format used by Mozilla, Netscape, Evolution, Eudora*, and many " ++"other email clients." ++msgstr "" ++"一种邮件格式，用于Mozilla，Netscape，Evolution，Eudora*以及许多其它邮件客户" ++"端。" ++ ++#: C/evolution.xml:2571(para) ++msgid "To import your old email:" ++msgstr "要导入您的旧邮件：" ++ ++#: C/evolution.xml:2574(para) C/evolution.xml:2599(para) ++#: C/evolution.xml:3749(para) ++msgid "Click File > Import." ++msgstr "点击文件 > 导入。" ++ ++#: C/evolution.xml:2580(para) ++msgid "Select Import a Single File, then click Forward." ++msgstr "选择导入单个文件，然后点击“前进”。" ++ ++#: C/evolution.xml:2583(para) ++msgid "" ++"Browse and find the location to save the imported email, then click Forward." ++msgstr "浏览并找到存放要导入的邮件的位置，然后点击“前进”。" ++ ++#: C/evolution.xml:2586(para) ++msgid "Select the file to import, then click Forward." ++msgstr "选择要导入的文件，然后点击“前进”。" ++ ++#: C/evolution.xml:2595(title) ++msgid "Importing Multiple Files" ++msgstr "导入多个文件" ++ ++#: C/evolution.xml:2596(para) ++msgid "" ++"Evolution automates the import process for several applications it can " ++"recognize." ++msgstr "Evolution能够自动为能够识别的应用程序完成批量导入过程。" ++ ++#: C/evolution.xml:2605(para) ++msgid "" ++"Select Import Data and Settings From Older Programs, then click Forward." ++msgstr "选择“从旧版程序中导入数据和设置“，然后点击”前进“。" ++ ++#: C/evolution.xml:2606(para) ++msgid "" ++"Follow the steps Step 3 through Step 5 to import." ++msgstr "" ++"根据步骤3到步骤5完成导入操作。" ++ ++#: C/evolution.xml:2607(para) ++msgid "" ++"Evolution searches for old mail programs and, if possible, imports the data " ++"from them." ++msgstr "Evolution能搜索旧版的邮件程序并且可能的话从它们导入数据。" ++ ++#: C/evolution.xml:2611(para) ++msgid "" ++"One migration method that works well is to use the Outport application. See " ++"outport.sourceforge.net for additional information. You can also import data into another " ++"Windows mail client such as Mozilla." ++msgstr "" ++"还有一个比较好的数据迁移方法是使用Outport程序。更多信息请参见outport.sourceforge.net。您也可以" ++"导入数据到其它邮件客户端如Mozilla。" ++ ++#: C/evolution.xml:2614(para) ++msgid "" ++"While in Windows, import your .pst files into Mozilla Mail (or another mail " ++"program such as Netscape or Eudora that uses the standard mbox format)." ++msgstr "" ++"在Windows中，把您的.pst文件导入到Mozilla Mail(或其它使用标准mbox格式的邮件程" ++"序如Netscape或Eudora)。" ++ ++#: C/evolution.xml:2618(para) ++msgid "" ++"Copy the files to the system or partition that Evolution is installed on." ++msgstr "把文件复制到Evolution安装的系统或分区。" ++ ++#: C/evolution.xml:2621(para) ++msgid "Use the Evolution import tool to import the files." ++msgstr "使用Evolution的导入工具导入文件。" ++ ++#: C/evolution.xml:2624(para) ++msgid "" ++"For POP mail, filters are applied as messages are downloaded. For IMAP mail, " ++"filters are applied to new messages when you open the Inbox folder. On " ++"Exchange servers, filters are not applied until you select your Inbox folder " ++"and click Message > Apply Filters, or press Ctrl+Y. To force your filters " ++"to act on all messages in the folder, select the entire folder by pressing " ++"Ctrl+A, then apply the filters by pressing Ctrl+Y." ++msgstr "" ++"对于POP邮件，邮件下载时就会应用过滤。对于IMAP邮件，当您打开收信箱时新邮件会应" ++"用过滤。在交换服务器上，过滤不会被应用，除非您选择了收信箱，点击邮件 > 应" ++"用过滤，或者按Ctrl+Y。要强制让您的过rl滤对文件夹中所以邮件生效，按Ctrl选择整" ++"个文件夹，按Ctrl+Y应用过滤。" ++ ++#: C/evolution.xml:2630(para) ++msgid "" ++"Evolution helps you work by letting you sort your email. To sort by sender, " ++"subject, or date, click the bars with those labels at the top of the message " ++"list. The direction of the arrow next to the label indicates the direction " ++"of the sort. Click again, to sort them in reverse order. For example, click " ++"Date to sort messages by date from oldest to newest. Click again, and " ++"Evolution sorts the list from newest to oldest. You can also right-click the " ++"message header bars to get a set of sorting options, and to add to or remove " ++"columns from the message list." ++msgstr "" ++"Evolution有排列、整理邮件的功能。要按照发信人，主题或日期给邮件排序，点击邮件" ++"列表顶部相应的标签即可。标签旁边的箭头方向表示排列的方向。再次点击它时，就按" ++"照反方向排列邮件。例如，点击“日期”，邮件将按照日期从旧到新排列。再点击一次，" ++"Evolution将列表从新到旧排列。您也可以在邮件头标签处右击得到一些排列选项，并给" ++"列表添加或移除一些列条目。" ++ ++#: C/evolution.xml:2631(para) ++msgid "" ++"To look at the complete headers for a message, click View > All Message " ++"Headers. To see all message data, click View > Message Source." ++msgstr "" ++"要查看一封邮件的全部邮件头信息，点击视图 > 全部信头。要查看全部邮件数据，" ++"点击视图 > 邮件源代码。" ++ ++#: C/evolution.xml:2634(title) ++msgid "Sorting Mail In Email Threads" ++msgstr "按邮件线索排列邮件" ++ ++#: C/evolution.xml:2635(para) ++msgid "" ++"You can also choose a threaded message view. Click View > Group By " ++"Threads to turn the threaded view on or off. When you select this option, " ++"Evolution groups the replies to a message with the original, so you can " ++"follow the thread of a conversation from one message to the next." ++msgstr "" ++"您也可以选择根据线索排列邮件。点击查看 > 按线索分组以开启或关闭线索视图。" ++"当您选择此项后，Evolution会把回复的邮件和原邮件排列在一起，故您可以按照对话的" ++"顺序查看一封一封的邮件。" ++ ++#: C/evolution.xml:2636(para) ++#, fuzzy ++msgid "" ++"In a thread of conversation view, each new message is stacked below of the " ++"ones that arrived before it, so that the newest message is always the one " ++"you see first. Whenever a new message arrives to an old thread as a reply, " ++"you will see it below the parent message. You always see the thread based on " ++"the date of the recent message received. The threads are sorted by the date " ++"of most recent message in the threads." ++msgstr "" ++"在对话线索视图中，每封新邮件放在之前收到的邮件下面，所以您首先看到的就是最新" ++"的邮件。无论何时收到一封回复的邮件，您都能够在父邮件下面找到它。根据最近收到" ++"邮件的日期，您总是能看到线索。线索是根据最近收到邮件的日期排序的。" ++ ++#: C/evolution.xml:2638(para) ++msgid "" ++"There is a GConf key to toggle between the collapsed or expanded state of " ++"mail thread. By default, it is collapsed and you can change this at /apps/" ++"evolution/mail/display/thread_expand. If the value is set to false, expanded " ++"state is remembered. When you restart Evolution, all the threads are " ++"arranged to this state. This is a highly advanced option only for the " ++"advanced users." ++msgstr "" ++"系统有一个GConf关键字用于切换邮件线索的折叠或展开状态。默认情况下，它是折叠" ++"的。您可以在/apps/evolution/mail/display/thread_expand中改变它。如果该值设" ++"为“假”，则线索会变成展开状态。当您重新启动Evolution时，所有的线索都会根据这个" ++"状态排列。这是针对高级用户的选项。" ++ ++#: C/evolution.xml:2643(title) ++msgid "Sorting Mail with Column Headers" ++msgstr "根据列头排列邮件" ++ ++#: C/evolution.xml:2644(para) ++msgid "" ++"The message list normally has columns to indicate whether a message has been " ++"read, whether it has attachments, how important it is, and the sender, date, " ++"and subject. You can change the column order, or add and remove columns by " ++"dragging and dropping them." ++msgstr "" ++"邮件列表在正常情况下都有相应的列条目显示它是否已读，它是否有附件，它的优先" ++"级，发信人，接收日期以及主题。您可以改变这些列的次序，或者添加、删除列，通过" ++"鼠标拖拽就可以" ++ ++#: C/evolution.xml:2648(title) ++msgid "Sorting Mail With Column Headers" ++msgstr "根据列头排列邮件" ++ ++#: C/evolution.xml:2649(para) ++msgid "" ++"In addition to it, Evolution enables you to sort your messages by using Sort-" ++"by list. You can use any of the criteria given in the Sort-by list such as " ++"sender, location, to, from, size and so forth to " ++"perform sorting. It returns the sorted email list that matches the criteria " ++"you have selected." ++msgstr "" ++"此外，Evolution允许您使用“排序方式”列表排列您的邮件。您可以使用该列表提供的任" ++"何标准进行排序，例如发信人，位置，到，从，大小等。操作将" ++"得到根据您选定的标准排序得到的列表。" ++ ++#: C/evolution.xml:2650(para) ++msgid "To sort messages, perform the following procedure:" ++msgstr "要排列邮件，请按下列步骤操作：" ++ ++#: C/evolution.xml:2653(para) ++msgid "Right-click message header bar." ++msgstr "右击邮件头栏。" ++ ++#: C/evolution.xml:2656(para) ++msgid "Click Sort by to get a list of options." ++msgstr "选择“排序方式”，得到一系列排序选项。" ++ ++#: C/evolution.xml:2658(title) ++msgid "Sort by:" ++msgstr "排序：" ++ ++#: C/evolution.xml:2659(para) ++msgid "Sorts the message by different criteria as listed below:" ++msgstr "根据如下的一些步骤排列邮件：" ++ ++#: C/evolution.xml:2663(para) ++msgid "Recipients" ++msgstr "收件人" ++ ++#: C/evolution.xml:2666(para) C/evolution.xml:2672(para) ++msgid "Sender" ++msgstr "发送者：" ++ ++#: C/evolution.xml:2669(para) ++msgid "Location" ++msgstr "位置" ++ ++#: C/evolution.xml:2675(para) ++msgid "Due By" ++msgstr "延期" ++ ++#: C/evolution.xml:2678(para) ++msgid "Follow Up Flag" ++msgstr "跟随标志" ++ ++#: C/evolution.xml:2681(para) ++msgid "Flag Status" ++msgstr "标志状态" ++ ++#: C/evolution.xml:2684(para) ++msgid "Size" ++msgstr "大小" ++ ++#: C/evolution.xml:2687(para) ++msgid "To" ++msgstr "到" ++ ++#: C/evolution.xml:2690(para) ++msgid "Received" ++msgstr "接收" ++ ++#: C/evolution.xml:2693(para) ++msgid "Date" ++msgstr "日期" ++ ++#: C/evolution.xml:2696(para) ++msgid "Subject" ++msgstr "目标" ++ ++#: C/evolution.xml:2699(para) ++msgid "From" ++msgstr "从" ++ ++#: C/evolution.xml:2702(para) ++msgid "Attachment" ++msgstr "附件" ++ ++#: C/evolution.xml:2705(para) ++msgid "Score" ++msgstr "标签" ++ ++#: C/evolution.xml:2708(para) ++msgid "Flagged" ++msgstr "有标志" ++ ++#: C/evolution.xml:2711(para) C/evolution.xml:3671(para) ++#: C/evolution.xml:4555(para) C/evolution.xml:4933(para) ++#: C/evolution.xml:5126(para) ++msgid "Status" ++msgstr "状态" ++ ++#: C/evolution.xml:2714(para) ++msgid "Custom" ++msgstr "自定义" ++ ++#: C/evolution.xml:2718(para) ++msgid "" ++"Clicking each sort criteria cycles take you through three possibilities. " ++"Sort by criteria in ascending or descending order or unsort the message. " ++"When you click any of the sort criteria reiteratively, Evolution sorts the " ++"messages in a sequential order - ascending, descending and unsort. For " ++"example, when you click Recepients for the first time, Evolution sorts the " ++"messages by recipients in ascending order and for the second time, sorts in " ++"the reverse order. For the next click, messages will be displayed unsorted." ++msgstr "" ++"反复点击每个排序标准会循环三个结果，即根据该标准升序排列、根据该标准降序排列" ++"或取消排列。当您反复点击任何一个排序选项时，Evolution会按照下列次序来排序-升" ++"序，降序和取消排序。例如，当您第一次点击“收信人”时，Evolution会根据收信人升序" ++"排列邮件。当您第二次点击时，按相反次序排列。第三次点击时，排序会被取消。" ++ ++#: C/evolution.xml:2721(title) ++msgid "Sort Ascending:" ++msgstr "升序排列：" ++ ++#: C/evolution.xml:2722(para) ++msgid "" ++"Sorts the messages top to bottom and returns you the sorted message list in " ++"the order of oldest to the latest." ++msgstr "把邮件从头到尾排序，按照从旧到新的次序返回排序列表。" ++ ++#: C/evolution.xml:2725(title) ++msgid "Sort Descending:" ++msgstr "降序排列：" ++ ++#: C/evolution.xml:2726(para) ++msgid "" ++"Sort descending reverts the order and returns you the sorted message list in " ++"the order of newest to oldest." ++msgstr "降序排列会翻转次序，按照从新到旧的次序返回排序列表。" ++ ++#: C/evolution.xml:2729(title) ++msgid "Unsort:" ++msgstr "取消排序：" ++ ++#: C/evolution.xml:2730(para) ++msgid "" ++"Unsort removes sorting from this column, reverting to the order of messages " ++"as they were added to the folder." ++msgstr "" ++"“取消排序”即移出根据本列的排序结果，根据邮件加入文件夹的顺序重置邮件排序结" ++"果。" ++ ++#: C/evolution.xml:2733(title) ++msgid "Removing a Column:" ++msgstr "删除该列：" ++ ++#: C/evolution.xml:2734(para) ++msgid "" ++"Remove this column from the display. You can also remove columns by dragging " ++"the header off the list and letting it drop." ++msgstr "" ++"从视图中删除该列。您也可以将列头拖拽离开列表再让其掉落，这样也可以移除该列。" ++ ++#: C/evolution.xml:2737(title) ++msgid "Adding a Column:" ++msgstr "添加一列：" ++ ++#: C/evolution.xml:2738(para) ++msgid "" ++"When you select this item, a dialog box appears, listing the possible " ++"columns. Drag the column you want into a space between existing column " ++"headers. A red arrow shows where the column will be placed." ++msgstr "" ++"当您选择该项时，会出现一个对话框，列出了可用的列。将您需要添加的项目拖拽到已" ++"有的列头之间即可。有一个红色箭头会显示列将被插入的位置。" ++ ++#: C/evolution.xml:2741(title) ++msgid "Best Fit:" ++msgstr "最佳匹配：" ++ ++#: C/evolution.xml:2742(para) ++msgid "" ++"Automatically adjusts the widths of the columns for the most efficient use " ++"of space." ++msgstr "自动调整每栏的宽度以便有效利用空间。" ++ ++#: C/evolution.xml:2745(title) ++msgid "Customizing the Current View:" ++msgstr "自定义当前视图：" ++ ++#: C/evolution.xml:2746(para) ++msgid "" ++"Choose this item to pick a more complex sort order for messages, or to " ++"choose which columns of information about your messages you want to display." ++msgstr "选择该项可以设置邮件更加复杂的排列次序，或选择需要显示哪一栏邮件信息。" ++ ++#: C/evolution.xml:2750(para) ++msgid "Select the search criteria from the list." ++msgstr "从列表中选择排序标准。" ++ ++#: C/evolution.xml:2751(para) ++msgid "You can view the messages in the desired order in the message list." ++msgstr "之后您就可以看到列表中邮件已经按照您的需要进行排序了。" ++ ++#: C/evolution.xml:2757(title) ++msgid "Using the Follow-Up Feature" ++msgstr "使用“跟随”功能" ++ ++#: C/evolution.xml:2758(para) ++msgid "" ++"To make sure you don't forget about a message, you can use the follow-up " ++"feature." ++msgstr "为了确保您不会忘记重要的邮件，您可以使用“跟随”功能。" ++ ++#: C/evolution.xml:2761(para) ++msgid "Select one or more messages." ++msgstr "选择一封或几封邮件。" ++ ++#: C/evolution.xml:2764(para) ++msgid "Right-click one of the messages." ++msgstr "右击其中一封邮件。" ++ ++#: C/evolution.xml:2767(para) ++msgid "Click Mark for Follow Up." ++msgstr "点击“标记为跟随”。" ++ ++#: C/evolution.xml:2770(para) ++msgid "You can also open the Flag to Follow Up window by" ++msgstr "您也可以通过如下方式打开“标记为跟随”窗口：" ++ ++#: C/evolution.xml:2773(para) ++msgid "Selecting the messages." ++msgstr "选中需要的邮件。" ++ ++#: C/evolution.xml:2776(para) ++msgid "Selecting the Message menu." ++msgstr "选择邮件菜单。" ++ ++#: C/evolution.xml:2779(para) ++msgid "Clicking Mark as." ++msgstr "点击“标记为”。" ++ ++#: C/evolution.xml:2782(para) ++msgid "Selecting Follow Up or pressing Shift+Ctrl+G." ++msgstr "选择“跟随”或按Shift+Ctrl+G。" ++ ++#: C/evolution.xml:2783(para) ++msgid "A window opens to allow you to set the type of flag and the due date." ++msgstr "将会打开一个窗口，让您设置标记类型和截止日期。" ++ ++#: C/evolution.xml:2787(para) ++msgid "" ++"The flag itself is the action you want to remind yourself about. Several are " ++"provided for you, such as Call, Forward and Reply, but you can enter your " ++"own note or action if you want." ++msgstr "" ++"标志本身是您想要提醒自己记住的操作。系统已经提供了您一些标志，如呼叫，转发和" ++"回复，但您也可以填入自己需要的标注或操作。" ++ ++#: C/evolution.xml:2788(para) ++msgid "" ++"After you have added a flag, you can mark it as complete or remove it " ++"entirely by right-clicking the message, then click either Flag Completed or " ++"Clear Flag." ++msgstr "" ++"当您添加了一个标记之后，您可以将它标记为”已完成“或彻底移出它，操作方法是右击" ++"邮件，选择”已完成标志“或”清楚标志“。" ++ ++#: C/evolution.xml:2789(para) ++msgid "" ++"When you read a flagged message, its flag status is displayed at the top, " ++"before the message headers. An overdue message might tell you " ++"Overdue: Call by April 07, 2003, 5:00 PM." ++msgstr "" ++"当您阅读标记过的邮件时，标记状态会在邮件顶部邮件头之前显示。过期的邮件会提示" ++"您如过期：2003年4月7日下午5点呼叫之类的信息。" ++ ++#: C/evolution.xml:2790(para) ++msgid "" ++"Flags can help you organize your work in a number of ways. For example, you " ++"might add a Flag Status column to your message list and sort that way. " ++"Alternately, you could create a search folder that displays all your flagged " ++"messages, then clear the flags when you're done, so the search folder " ++"contains only messages with upcoming deadlines." ++msgstr "" ++"标记可以帮助您用各种方法组织工作。例如，您可以向您的邮件列表添加一个”标记状态" ++"栏“，按照该栏排序。或者，您可以创建一个搜索文件夹用于显示所有标记过的邮件，在" ++"完成相应操作之后可清楚标记，这样该文件夹里剩下的邮件就只是那些即将到达截止日" ++"期还未操作的邮件。" ++ ++#: C/evolution.xml:2792(title) ++msgid "Mark as Important Feature:" ++msgstr "”标记为重要“功能：" ++ ++#: C/evolution.xml:2793(para) ++msgid "" ++"If you prefer a simpler way to remind yourself about messages, you can mark " ++"them as important by right-clicking the message, then click Mark as " ++"Important or select Message > Mark as > Important from the menubar." ++msgstr "" ++"如果您想要一种更方便的方式提醒自己注意一些邮件，可以把它们标记为重要邮件，操" ++"作方法是：右键点击邮件，选择”标记为重要“；或者是从菜单栏中选择信件 > 标记" ++"为 > 重要。" ++ ++#: C/evolution.xml:2800(para) ++msgid "" ++"Evolution, like most other mail systems, stores mail in folders. You start " ++"out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can " ++"create as many as you like. Create new folders by clicking Folder > New, " ++"or by right-clicking in the folder list and selecting New Folder." ++msgstr "" ++"Evolution像其它大多数邮件系统一样，将邮件存储在文件夹里。程序初始有一些文件夹" ++"如收信箱，发信箱和草稿箱，但您也可以自己创建任意数目的文件夹。创建文件夹的方" ++"法是：从菜单栏上点击文件夹 > 新建，或者在文件夹列表右击，选择”新建文件" ++"夹“。" ++ ++#: C/evolution.xml:2801(para) ++msgid "" ++"When you click OK, your new folder appears in the folder view. You can then " ++"move the messages to it by dragging and dropping them, or right click on the " ++"message and choose Move to folder, or press Shift+Ctrl+V." ++msgstr "" ++"当您点击”确定“之后，您的新建文件夹就会出现在文件夹视图里。然后您可以将邮件移" ++"入该文件夹。可以直接用鼠标拖拽，也可以在邮件上右键单击，选择”移动到文件夹“，" ++"或者按Shift+Ctrl+V。" ++ ++#: C/evolution.xml:2802(para) ++msgid "" ++"You can also drop the messages to a particular folder by selecting Message " ++"> Move to folder. This will open the Select folder window, where you can " ++"drop your message to any of the folders listed." ++msgstr "" ++"您也可以提供选择信件Shift+Ctrl+V移动到文件夹来移动邮件。之后会打开一个选择文" ++"件夹窗口，您可以将邮件移至列表中任何一个文件夹。" ++ ++#: C/evolution.xml:2803(para) ++msgid "" ++"If you want to create a new folder click New at the bottom left of the " ++"window. Specify the location and enter the label of the folder in the entry " ++"box appeared at the top. You can also move the messages from one folder to " ++"another by selecting the message and then press the Move button at the " ++"bottom right." ++msgstr "" ++"如果您想在此时新建文件夹，点击窗口左下方的”新建“，选择文件夹的位置，在顶部文" ++"本框输入文件夹名称。您还可以把邮件从一个文件夹移到另一个，选中该邮件，点击右" ++"下方的”移动“按钮即可。" ++ ++#: C/evolution.xml:2804(para) ++msgid "" ++"If you create a filter with the filter assistant, you can have mail filed " ++"automatically. Select Edit > Message Filters to bring up the Message " ++"Filters window." ++msgstr "" ++"如果您使用过滤助手创建了一个过滤规则，您可以自动过滤邮件。选择编辑 > 邮件" ++"过滤，打开邮件过滤窗口。" ++ ++#: C/evolution.xml:2805(para) ++msgid "" ++"Click on the Add button to bring up the Add Rule window from where you can " ++"set different criteria for filtering messages. For additional information on " ++"filtering, see Creating New " ++"Filter Rules." ++msgstr "" ++"点击”添加“按钮，打开添加过滤规则窗口，在此您可以设置各种邮件过滤规则。要查看" ++"更多关于过滤的信息，请参阅创建新" ++"的过滤规则。" ++ ++#: C/evolution.xml:2807(para) ++msgid "" ++"The Inbox folder on most IMAP servers cannot contain both subfolders and " ++"messages. When you create additional folders on your IMAP mail server, " ++"branch them from the root of the IMAP account's folder tree, not from the " ++"Inbox. If you create subfolders in your Inbox folder, you lose the ability " ++"to read messages that exist in your Inbox until you move the folders out of " ++"the way." ++msgstr "" ++"大多数IMAP服务器的收信箱不能既保护子文件夹又包含邮件。当您在IMAP邮件服务器上" ++"创建其它文件夹时，注意要从IMAP账户文件夹树的根目录建立，不要从收件箱建立。如" ++"果您在收件箱中建立子文件夹，您将不能阅读收信箱中原有的邮件，除非您把这些子文" ++"件夹移除。" ++ ++#: C/evolution.xml:2813(para) ++msgid "" ++"Most email clients can search for messages for you, but Evolution does it " ++"differently and efficiently giving you faster search results with quick " ++"search, customized search and advanced search." ++msgstr "" ++"大多数邮件客户端有搜索邮件的功能，但Evolution操作的方式稍有不同，而且很有效" ++"率；它有快速搜索，自定义搜索和高级搜索功能，能更快地返回搜索结果。" ++ ++#: C/evolution.xml:2815(title) C/evolution.xml:3611(title) ++#: C/evolution.xml:4487(title) C/evolution.xml:4822(title) ++#: C/evolution.xml:5064(title) ++msgid "Quick Search:" ++msgstr "快速搜索：" ++ ++#: C/evolution.xml:2816(para) ++msgid "" ++"Quick Search displays all the messages that match the built-in criteria you " ++"selected from the drop-down list at the top left side, just above the " ++"message list." ++msgstr "" ++"快速搜索显示能匹配您在邮件列表上方左侧的下拉列表中选择的内建标准的所有邮件。" ++ ++#: C/evolution.xml:2818(para) ++msgid "To perform a quick search:" ++msgstr "要进行快速搜索操作：" ++ ++#: C/evolution.xml:2821(para) C/evolution.xml:2900(para) ++#: C/evolution.xml:3574(para) C/evolution.xml:3617(para) ++#: C/evolution.xml:4440(para) C/evolution.xml:4784(para) ++#: C/evolution.xml:5018(para) ++msgid "" ++"Click the search icon to expand the drop-down list." ++msgstr "" ++"点击搜索图标展开下拉列表。" ++ ++#: C/evolution.xml:2824(para) C/evolution.xml:3620(para) ++#: C/evolution.xml:4495(para) C/evolution.xml:4864(para) ++#: C/evolution.xml:5072(para) ++msgid "Select the search criteria from the list:" ++msgstr "从列表中选择搜索标准：" ++ ++#: C/evolution.xml:2827(para) ++msgid "All Messages" ++msgstr "全部邮件" ++ ++#: C/evolution.xml:2830(para) ++msgid "Unread Messages" ++msgstr "未读邮件" ++ ++#: C/evolution.xml:2833(para) ++msgid "No Label" ++msgstr "无标签" ++ ++#: C/evolution.xml:2836(para) C/evolution.xml:2878(para) ++msgid "Important" ++msgstr "重要" ++ ++#: C/evolution.xml:2839(para) C/evolution.xml:2881(para) ++msgid "Work" ++msgstr "工作" ++ ++#: C/evolution.xml:2842(para) C/evolution.xml:2884(para) ++#: C/evolution.xml:3665(para) C/evolution.xml:4549(para) ++#: C/evolution.xml:4927(para) C/evolution.xml:5120(para) ++#: C/evolution.xml:5682(para) ++msgid "Personal" ++msgstr "个人" ++ ++#: C/evolution.xml:2845(para) C/evolution.xml:2887(para) ++msgid "To do" ++msgstr "代办" ++ ++#: C/evolution.xml:2848(para) C/evolution.xml:2890(para) ++msgid "Later" ++msgstr "稍后" ++ ++#: C/evolution.xml:2851(para) ++msgid "Read Messages" ++msgstr "已读邮件" ++ ++#: C/evolution.xml:2854(para) ++msgid "Recent Messages" ++msgstr "最近邮件" ++ ++#: C/evolution.xml:2857(para) ++msgid "Last 5 Days' Messages" ++msgstr "前5天的邮件" ++ ++#: C/evolution.xml:2860(para) ++msgid "Messages with Attachments" ++msgstr "有附件的邮件" ++ ++#: C/evolution.xml:2863(para) ++msgid "Important Messages" ++msgstr "重要邮件" ++ ++#: C/evolution.xml:2866(para) ++msgid "Messages Not Junk" ++msgstr "不是垃圾邮件" ++ ++#: C/evolution.xml:2871(para) ++msgid "" ++"Evolution displays the messages matching the criteria present in the shown " ++"message list" ++msgstr "Evolution会在邮件列表中显示匹配相应标准的邮件。" ++ ++#: C/evolution.xml:2875(para) ++msgid "" ++"The following labels need not necessarily be the same as the default names " ++"listed here. You can change the name of these labels by selecting Edit > " ++"Preferences > Mail Preferences > Colors." ++msgstr "" ++"下列标签不一定和列在此处的默认名称一样。您可以通过选择编辑 > 首选项 > " ++"邮件首选项 > 颜色改变这些标签的名称。" ++ ++#: C/evolution.xml:2895(title) C/evolution.xml:3569(title) ++#: C/evolution.xml:4435(title) C/evolution.xml:4779(title) ++#: C/evolution.xml:5013(title) ++msgid "Customized Search:" ++msgstr "自定义搜索：" ++ ++#: C/evolution.xml:2896(para) ++msgid "" ++"Evolution allows you to perform customized search. To search for a message:" ++msgstr "Evolution允许您进行自定义搜索。要搜索一封邮件：" ++ ++#: C/evolution.xml:2902(title) ++msgid "Subject or Sender Contain:" ++msgstr "主题或发信人包含：" ++ ++#: C/evolution.xml:2903(para) ++msgid "" ++"Finds messages that contain the search text in the subject or sender. It " ++"does not search in the message body." ++msgstr "查看在主题或发信人中包含搜索文本的邮件，不搜索邮件正文。" ++ ++#: C/evolution.xml:2906(title) ++msgid "Recipients Contain:" ++msgstr "收信人包含：" ++ ++#: C/evolution.xml:2907(para) ++msgid "Finds messages with the search text in the To: and Cc: headers." ++msgstr "查找在”收信人“和”抄送“中包含搜索文本的邮件。" ++ ++#: C/evolution.xml:2910(title) ++msgid "Message Contains:" ++msgstr "邮件包含：" ++ ++#: C/evolution.xml:2911(para) ++msgid "Searches the message body and all headers for the specified text." ++msgstr "根据输入的文本搜索邮件正文和所有的邮件头。" ++ ++#: C/evolution.xml:2914(title) ++msgid "Subject Contain:" ++msgstr "主题包含：" ++ ++#: C/evolution.xml:2915(para) ++msgid "Shows messages where the search text is in the subject line." ++msgstr "显示主题中含有搜索文本的邮件。" ++ ++#: C/evolution.xml:2918(title) ++msgid "Sender Contain:" ++msgstr "发信人包含：" ++ ++#: C/evolution.xml:2919(para) ++msgid "" ++"Finds messages whose From: header contains a match for your search text." ++msgstr "查找邮件头“发件人：”中包含有搜索文本的邮件。" ++ ++#: C/evolution.xml:2922(title) ++msgid "Body Contains:" ++msgstr "邮件正文包含：" ++ ++#: C/evolution.xml:2923(para) ++msgid "Searches only in message text, not any other header." ++msgstr "仅在邮件正文中搜索，不查找其它任何邮件头。" ++ ++#: C/evolution.xml:2927(para) ++msgid "Click the drop-down list to select the scope" ++msgstr "点击下拉列表选择搜索范围" ++ ++#: C/evolution.xml:2930(para) ++msgid "Current Folder" ++msgstr "当前文件夹" ++ ++#: C/evolution.xml:2933(para) ++msgid "Current Account" ++msgstr "当前帐号" ++ ++#: C/evolution.xml:2936(para) ++msgid "All Accounts" ++msgstr "全部帐号" ++ ++#: C/evolution.xml:2939(para) ++msgid "Current Message" ++msgstr "当前消息" ++ ++#: C/evolution.xml:2944(para) ++msgid "Type the search string in the search entry and press Enter." ++msgstr "在搜索文本框中输入要搜索的文字，按回车键。" ++ ++#: C/evolution.xml:2946(para) ++msgid "" ++"The folder list will be disabled while you perform search on All Accounts or " ++"Current Account." ++msgstr "如果您是在所有账户或当前账户范围内搜索邮件，则文件夹列表会不可用。" ++ ++#: C/evolution.xml:2950(para) ++msgid "" ++"Evolution shows your search results in the message list. You might want to " ++"create a search folder instead; see Using Search Folders for more detail." ++msgstr "" ++"Evolution会在邮件列表中显示您的搜索结果。或许您更希望创建一个搜索文件夹；请参" ++"阅使用搜索文件夹以获得" ++"更多信息。" ++ ++#: C/evolution.xml:2952(para) C/evolution.xml:3609(para) ++msgid "" ++"To clear your search you can click the Clear icon in the search string " ++"field, or choose Search > Clear from the menubar, or enter a blank " ++"search. You can also press Shift+Ctrl+Q to clear the search." ++msgstr "" ++"要清空您的搜索，可以点击搜索文本框上的“清空”图标，或从菜单栏上选择搜索 > " ++"清除，或输入空字符搜索。您还可以按Shift+Ctrl+Q来清空搜索。" ++ ++#: C/evolution.xml:2955(para) ++msgid "" ++"You can even perform a quick search on a customized search results as it " ++"just filters and displays the messages in the message list." ++msgstr "" ++"您还可以对一个自定义搜索的结果进行快速搜索（类似于过滤搜索结果），将搜索结果" ++"显示在邮件列表上。" ++ ++#: C/evolution.xml:2958(title) C/evolution.xml:4461(title) ++#: C/evolution.xml:4805(title) C/evolution.xml:5039(title) ++msgid "Advanced Search:" ++msgstr "高级搜索：" ++ ++#: C/evolution.xml:2959(para) C/evolution.xml:4462(para) ++#: C/evolution.xml:4806(para) C/evolution.xml:5040(para) ++msgid "You can perform an advanced search based on any of the search types." ++msgstr "您可以基于任何搜索类型进行高级搜索操作。" ++ ++#: C/evolution.xml:2963(para) C/evolution.xml:4466(para) ++#: C/evolution.xml:4810(para) ++msgid "Select the Search menu." ++msgstr "选择“搜索”菜单。" ++ ++#: C/evolution.xml:2966(para) ++msgid "Click Advanced Search to open the Advanced Search window." ++msgstr "点击“高级搜索”，打开高级搜索窗口。" ++ ++#: C/evolution.xml:2971(para) ++msgid "Enter the Search name." ++msgstr "键入搜索名称。" ++ ++#: C/evolution.xml:2974(para) ++msgid "" ++"Click Add to add rules. For more information on rules, refer Step 4 under Creating A " ++"Search Folder." ++msgstr "" ++"点击“添加”以添加搜索规则。要查看更多关于搜索规则的信息，请参阅创建搜索文件夹中的步骤 " ++"4。" ++ ++#: C/evolution.xml:2980(para) C/evolution.xml:4483(para) ++#: C/evolution.xml:5060(para) ++msgid "Click Save to save your search results." ++msgstr "点击“保存”，存储您的搜索规则。" ++ ++#: C/evolution.xml:2984(title) ++msgid "Save Search:" ++msgstr "保存搜索：" ++ ++#: C/evolution.xml:2985(para) ++msgid "" ++"To save your search results other than from advanced search, select Search " ++"> Save Search. You can view the label of your search results listed under " ++"Search menu." ++msgstr "" ++"要从除“高级搜索”之外的其它地方保存您的搜索结果，选择搜索 > 保存搜索。您可" ++"以查看列在搜索菜单下的您的搜索结果标签。" ++ ++#: C/evolution.xml:2988(title) ++msgid "Edit Saved Searches:" ++msgstr "编辑保存的搜索：" ++ ++#: C/evolution.xml:2989(para) ++msgid "To edit your saved searches," ++msgstr "要编辑您已保存的搜索，" ++ ++#: C/evolution.xml:2993(para) ++msgid "Select Search from the menu bar." ++msgstr "从菜单栏选择“搜索”。" ++ ++#: C/evolution.xml:2996(para) ++msgid "Click Edit Saved Searches to open the Searches window." ++msgstr "点击“编辑保存的搜索”，打开搜索窗口。" ++ ++#: C/evolution.xml:3001(para) ++msgid "Click the Edit button to open the Edit Rule window." ++msgstr "点击“编辑”按钮，打开编辑规则窗口。" ++ ++#: C/evolution.xml:3002(para) ++msgid "" ++"You can also add or remove searches from the list by using the respective " ++"buttons available at the right." ++msgstr "您也可以从列表中添加、删除搜索，使用窗口右侧对应的按钮即可。" ++ ++#: C/evolution.xml:3006(para) ++msgid "Edit the title or search criteria from the dialog box." ++msgstr "从对话框中编辑标题或搜索标准。" ++ ++#: C/evolution.xml:3016(para) ++msgid "" ++"Filters work very much like the mail room in a large company. Their purpose " ++"is to bundle, sort, and distribute mail to the various folders. In addition, " ++"you can have multiple filters performing multiple actions that might effect " ++"the same message in several ways. For example, your filters could put copies " ++"of one message into multiple folders, or keep one copy and send one to " ++"another person." ++msgstr "" ++"“过滤”的功能类似于一个大公司的收发室。它们的目的是将邮件打包，排列并分发到各" ++"个文件夹里。此外，您可以拥有多个过滤器进行多个过滤操作，能在多方面影响相同的" ++"邮件。例如，您的过滤操作可以把一封邮件的多个拷贝放掉多个文件夹里，或保存一份" ++"拷贝并发送一份给别人。" ++ ++#: C/evolution.xml:3019(title) ++msgid "Creating New Filter Rules" ++msgstr "创建新的过滤规则" ++ ++#: C/evolution.xml:3022(para) C/evolution.xml:3226(para) ++#: C/evolution.xml:3241(para) ++msgid "Click Edit > Message Filters." ++msgstr "点击编辑 > 邮件过滤。" ++ ++#: C/evolution.xml:3025(para) C/evolution.xml:3276(para) ++#: C/evolution.xml:5357(para) C/evolution.xml:5945(para) ++msgid "Click Add." ++msgstr "点击“添加”。" ++ ++#: C/evolution.xml:3028(para) ++msgid "Type a name for the filter in the Rule name field." ++msgstr "在“规则名称”一栏中输入过滤操作的名称。" ++ ++#: C/evolution.xml:3033(para) ++msgid "Define the criteria for the filter in the first section." ++msgstr "在窗口第一个区域设置过滤规则。" ++ ++#: C/evolution.xml:3034(para) ++msgid "" ++"For each of the filter criteria, you must first select which parts of the " ++"message you want to filter:" ++msgstr "对于每个过滤标准，您必须先选择您想要过滤哪一部分邮件。" ++ ++#: C/evolution.xml:3036(title) C/evolution.xml:3286(title) ++msgid "Sender:" ++msgstr "发送者：" ++ ++#: C/evolution.xml:3037(para) ++msgid "The sender's email address or the name of the sender." ++msgstr "发信人的邮件地址或姓名。" ++ ++#: C/evolution.xml:3040(title) ++msgid "Recipient:" ++msgstr "收信人：" ++ ++#: C/evolution.xml:3041(para) C/evolution.xml:3291(para) ++msgid "The recipients of the message." ++msgstr "邮件的接收者。" ++ ++#: C/evolution.xml:3044(title) C/evolution.xml:3294(title) ++msgid "Subject:" ++msgstr "目标：" ++ ++#: C/evolution.xml:3045(para) C/evolution.xml:3295(para) ++msgid "The subject line of the message." ++msgstr "邮件的主题行。" ++ ++#: C/evolution.xml:3048(title) ++msgid "Specific Header:" ++msgstr "指定的邮件头：" ++ ++#: C/evolution.xml:3049(para) ++msgid "Any header including custom ones." ++msgstr "包含自定义字段的任何邮件头。" ++ ++#: C/evolution.xml:3051(para) ++msgid "" ++"If a message uses a header more than once, Evolution pays attention only to " ++"the first instance, even if the message defines the header differently the " ++"second time. For example, if a message declares the Resent-From: header as " ++"engineering@example.com and then restates it as " ++"marketing@example.com, Evolution filters as though the second " ++"declaration did not occur. To filter on messages that use headers multiple " ++"times, use a regular expression." ++msgstr "" ++"如果一封邮件不止一次使用邮件头，Evolution只会关注第一次出现的那个，即使下一次" ++"邮件使用了不同的邮件头。例如，如果一封邮件的发信人信头是" ++"engineering@example.com，然后又重新指明是" ++"marketing@example.com，Evolution在进行过滤时会忽略第二个声明。" ++"如果您需要对多次使用邮件头的邮件进行过滤，可以使用正则表达式。" ++ ++#: C/evolution.xml:3053(title) C/evolution.xml:3298(title) ++msgid "Message Body:" ++msgstr "消息体：" ++ ++#: C/evolution.xml:3054(para) C/evolution.xml:3299(para) ++msgid "Searches in the actual text of the message." ++msgstr "在邮件的正文中搜索。" ++ ++#: C/evolution.xml:3057(title) ++msgid "Expression:" ++msgstr "表达式：" ++ ++#: C/evolution.xml:3058(para) ++msgid "" ++"(For programmers only) Match a message according to an expression you write " ++"in the Scheme language used to define filters in Evolution." ++msgstr "" ++"(仅为程序员设计)根据Scheme语言(一种在Evolution中设置过滤规则的语言)写的表达式" ++"匹配对应的邮件。" ++ ++#: C/evolution.xml:3061(title) C/evolution.xml:3306(title) ++msgid "Date Sent:" ++msgstr "发送日期：" ++ ++#: C/evolution.xml:3062(para) C/evolution.xml:3307(para) ++msgid "" ++"Filters messages according to the date on which they were sent. First, " ++"choose the conditions you want a message to meet, such as before a given " ++"time or after a given time. Then choose the time. The filter compares the " ++"message's time stamp to the system clock when the filter is run, or to a " ++"specific time and date you choose from a calendar. You can also have it look " ++"for a message within a range of time relative to the filter, such as two to " ++"four days ago." ++msgstr "" ++"根据邮件发送的日期过滤邮件。首先，选择您想要邮件匹配日期的条件，例如在指定日" ++"期之前或之后。然后，选择日期。过滤器会比较邮件的时间标签、当前运行时的系统时" ++"间或一个特定的时刻、以及您从日历中选取的日期。您还可以选择比较相对于当前时间" ++"的一个时间段，例如2~4天之前。" ++ ++#: C/evolution.xml:3065(title) C/evolution.xml:3310(title) ++msgid "Date Received:" ++msgstr "接收日期；" ++ ++#: C/evolution.xml:3066(para) C/evolution.xml:3311(para) ++msgid "" ++"This works the same way as the Date Sent option, except that it compares the " ++"time you received the message with the dates you specify." ++msgstr "" ++"与“发信日期”选项的工作方式相同，但它比较您收到邮件的时间和您指定的日期。" ++ ++#: C/evolution.xml:3069(title) C/evolution.xml:3314(title) ++msgid "Label:" ++msgstr "标签：" ++ ++#: C/evolution.xml:3070(para) C/evolution.xml:3315(para) ++msgid "" ++"Messages can have labels of Important, Work, Personal, To Do, or Later. You " ++"can set labels with other filters or manually." ++msgstr "" ++"邮件可以有重要、工作、个人、待办或稍候等标签。您可以手动设置标签或使用其它过" ++"滤规则设置。" ++ ++#: C/evolution.xml:3073(title) C/evolution.xml:3318(title) ++msgid "Score:" ++msgstr "分数：" ++ ++#: C/evolution.xml:3074(para) C/evolution.xml:3319(para) ++msgid "" ++"Sets the message score to any whole number greater than 0. You can have one " ++"filter set or change a message score, and then set up another filter to move " ++"the messages you have scored. A message score is not based on anything in " ++"particular: it is simply a number you can assign to messages so other " ++"filters can process them." ++msgstr "" ++"给邮件设置一个大于0的分数。您可以设置一个过滤或改变一个邮件分数，然后设置另一" ++"个过滤移动您已评分的邮件。邮件评分没有任何特殊的标准：它只是您给邮件标记的一" ++"个数字以便其它过滤器对它们进行操作。" ++ ++#: C/evolution.xml:3077(title) C/evolution.xml:3322(title) ++msgid "Size:" ++msgstr "大小：" ++ ++#: C/evolution.xml:3078(para) C/evolution.xml:3323(para) ++msgid "Sorts based on the size of the message in kilobytes." ++msgstr "根据邮件大小排序，以千兆字节(KB)为单位。" ++ ++#: C/evolution.xml:3081(title) C/evolution.xml:3326(title) ++msgid "Status:" ++msgstr "状态：" ++ ++#: C/evolution.xml:3082(para) C/evolution.xml:3327(para) ++msgid "" ++"Filters according to the status of a message. The status can be Replied To, " ++"Draft, Important, Read, or Junk." ++msgstr "根据邮件状态过滤。邮件状态可以是回复，草稿，重要，已读或者垃圾邮件。" ++ ++#: C/evolution.xml:3085(title) ++msgid "Flagged:" ++msgstr "标志：" ++ ++#: C/evolution.xml:3086(para) C/evolution.xml:3331(para) ++msgid "Checks whether the message is flagged for follow-up." ++msgstr "检查邮件是否被标记为跟随。" ++ ++#: C/evolution.xml:3089(title) C/evolution.xml:3334(title) ++msgid "Attachments:" ++msgstr "附件：" ++ ++#: C/evolution.xml:3090(para) C/evolution.xml:3335(para) ++msgid "Creates a filter based on whether there is an attachment for the email." ++msgstr "根据邮件是否有附件创建过滤。" ++ ++#: C/evolution.xml:3093(title) ++msgid "Mailing List" ++msgstr "邮件列表" ++ ++#: C/evolution.xml:3094(para) C/evolution.xml:3339(para) ++msgid "" ++"Filters based on the mailing list the message came from. This filter might " ++"miss messages from some list servers, because it checks for the X-BeenThere " ++"header, which is used to identify mailing lists or other redistributors of " ++"mail. Mail from list servers that do not set X-BeenThere properly are not be " ++"caught by these filters." ++msgstr "" ++"根据邮件来自的邮件列表过滤。这个过滤操作可能会遗漏一些来自某些列表服务器的邮" ++"件，因为它检查X-BeenThere信头，这是用于确定邮件列表或其它邮件分发者的。而来自" ++"列表服务器的没有正确设置X-BeenThere的邮件就不能被过滤器捕获了。" ++ ++#: C/evolution.xml:3097(title) ++msgid "Regex Match:" ++msgstr "正则表达式匹配：" ++ ++#: C/evolution.xml:3098(para) ++msgid "" ++"If you know your way around a regex, or regular expression, this option allows you to search for complex " ++"patterns of letters, so that you can find, for example, all words that start " ++"with a and end with m, and are between six and fifteen letters long, or all " ++"messages that declare a particular header twice. For information about how " ++"to use regular expressions, check the man page for the grep command." ++msgstr "" ++"如果您了解正则表达式的话，该选项" ++"能让您建立复杂的搜索邮件操作，因此您可以查找所有以a开头，以m结尾，长度为6~15" ++"个字母的单词，或者所有声明了两次邮件头的长邮件。要了解更多关于正则表达式的信" ++"息，请查看grep命令的帮助文档。" ++ ++#: C/evolution.xml:3101(title) ++msgid "Source Account:" ++msgstr "来源账户：" ++ ++#: C/evolution.xml:3102(para) ++msgid "" ++"Filters messages according the server you got them from. This is most useful " ++"if you use multiple POP mail accounts." ++msgstr "根据邮件来源的服务器过滤邮件。如果您使用多个POP邮件账户，这很有用。" ++ ++#: C/evolution.xml:3105(title) C/evolution.xml:3189(title) ++msgid "Pipe to Program:" ++msgstr "管道到程序：" ++ ++#: C/evolution.xml:3106(para) ++msgid "" ++"Evolution can use an external command to process a message, then process it " ++"based on the return value. Commands used in this way must return an integer. " ++"This is most commonly used to add an external junk mail filter." ++msgstr "" ++"Evolution能使用外部命令操作邮件，然后根据返回状态处理它。使用的命令必须能返回" ++"一个整数值。这在添加外部的垃圾邮件过滤器中很有用。" ++ ++#: C/evolution.xml:3109(title) ++msgid "Junk Test:" ++msgstr "垃圾测试：" ++ ++#: C/evolution.xml:3110(para) ++msgid "Filters based on the results of the junk mail test." ++msgstr "根据垃圾邮件测试结果过滤。" ++ ++#: C/evolution.xml:3113(title) ++msgid "Select the Criteria for the Condition:" ++msgstr "选择该种情况下的匹配标准：" ++ ++#: C/evolution.xml:3114(para) ++msgid "" ++"If you want multiple criteria for this filter, click Add and repeat step 4." ++msgstr "如果您想给过滤器添加多个标准，点击”添加“，重复步骤4." ++ ++#: C/evolution.xml:3117(title) ++msgid "Select the Actions for the Filter in the Then Section:" ++msgstr "在”然后“区域内选择过滤的操作：" ++ ++#: C/evolution.xml:3118(para) ++msgid "Select any of the following options." ++msgstr "选择下列选项中的任意一项。" ++ ++#: C/evolution.xml:3123(title) ++msgid "Move to Folder:" ++msgstr "移至文件夹：" ++ ++#: C/evolution.xml:3124(para) ++msgid "Moves the message into a folder you specify." ++msgstr "将邮件移到您指定的文件夹中。" ++ ++#: C/evolution.xml:3129(title) ++msgid "Copy to Folder:" ++msgstr "复制到文件夹：" ++ ++#: C/evolution.xml:3130(para) ++msgid "Puts a copy of the message into a folder you specify." ++msgstr "复制一份邮件的拷贝到您指定的文件夹中。" ++ ++#: C/evolution.xml:3136(para) ++msgid "" ++"Marks the message for deletion. The message can be undeleted until you " ++"expunge or empty the trash." ++msgstr "将邮件标记为删除。在您销毁邮件或清空回收站之前邮件都是可以还原的。" ++ ++#: C/evolution.xml:3141(title) ++msgid "Stop Processing:" ++msgstr "停止处理：" ++ ++#: C/evolution.xml:3142(para) ++msgid "" ++"Select this if you want to all other filters ignore this message. Note that " ++"only filters listed after this particular rule will be ignored." ++msgstr "" ++"如果您想要让所有其它过滤器忽略该邮件，可以选择该项。注意只有列在这个特殊的过" ++"滤规则之后的过滤才会被忽略。" ++ ++#: C/evolution.xml:3147(title) ++msgid "Assign Color:" ++msgstr "分配颜色：" ++ ++#: C/evolution.xml:3148(para) ++msgid "Marks the message with a color of your choice." ++msgstr "给邮件标记一种您选择的颜色。" ++ ++#: C/evolution.xml:3153(title) ++msgid "Assign Score:" ++msgstr "分配计分：" ++ ++#: C/evolution.xml:3154(para) ++msgid "Assigns the message a numeric score." ++msgstr "给邮件分配一个数值分数。" ++ ++#: C/evolution.xml:3159(title) ++msgid "Adjust Score:" ++msgstr "调整计分：" ++ ++#: C/evolution.xml:3160(para) ++msgid "Changes the numeric score by the amount you set." ++msgstr "更改您设置的分值。" ++ ++#: C/evolution.xml:3165(title) ++msgid "Set Status:" ++msgstr "设置状态：" ++ ++#: C/evolution.xml:3166(para) ++msgid "" ++"Sets the status of the message. The status can be Replied To, Draft, " ++"Important, Read, or Junk." ++msgstr "设置邮件的状态。状态可以是回复，草稿，重要，已读或者垃圾邮件。" ++ ++#: C/evolution.xml:3171(title) ++msgid "Unset Status:" ++msgstr "取消状态：" ++ ++#: C/evolution.xml:3172(para) ++msgid "" ++"If the message has a status value, unsets it. If a status value is not set, " ++"it does nothing." ++msgstr "" ++"如果邮件有状态设置，取消状态。如果邮件未设置任何状态，则不进行任何操作。" ++ ++#: C/evolution.xml:3178(para) ++msgid "Makes the system beep." ++msgstr "使系统蜂鸣。" ++ ++#: C/evolution.xml:3183(title) ++msgid "Play Sound:" ++msgstr "播放声音：" ++ ++#: C/evolution.xml:3184(para) ++msgid "Select a sound file for Evolution to play." ++msgstr "选择让Evolution播放一个声音文件。" ++ ++#: C/evolution.xml:3190(para) ++msgid "" ++"Sends the message to a program of your choice. No return value is expected. " ++"This feature can be used to create automatic Web postings from email " ++"messages or to perform additional message post processing not supported by " ++"Evolution." ++msgstr "" ++"将邮件发送给您选择的程序。不需要有返回值。这个功能可用于从邮件创建自动网页发" ++"送或进行额外的Evolution不支持的邮件操作。" ++ ++#: C/evolution.xml:3195(title) ++msgid "Run Program:" ++msgstr "运行程序：" ++ ++#: C/evolution.xml:3196(para) ++msgid "Evolution runs an application." ++msgstr "让Evolution运行一个程序。" ++ ++#: C/evolution.xml:3202(para) ++msgid "Click Add if you need multiple actions and click OK." ++msgstr "如果您需要多个动作，点击”添加“，然后点击”确定“。" ++ ++#: C/evolution.xml:3208(para) ++msgid "There is an easy shortcut for fast filter or search folder creation:" ++msgstr "有快捷的方式用于快速过滤或创建搜索文件夹：" ++ ++#: C/evolution.xml:3211(para) ++msgid "Right-click the message in the message list." ++msgstr "在邮件列表中右击邮件。" ++ ++#: C/evolution.xml:3214(para) ++msgid "Select one of the items under the Create Rule From Message submenu." ++msgstr "在”从邮件创建规则“子菜单中选择一个条目。" ++ ++#: C/evolution.xml:3215(para) ++msgid "" ++"Creating a rule based on a message opens the filter creation tool with some " ++"of the information about the message already filled in for your convenience." ++msgstr "" ++"”根据邮件创建规则“会打开过滤规则创建工具，并且为了您的方便已自动填入了一些该" ++"邮件的信息。" ++ ++#: C/evolution.xml:3218(para) ++msgid "" ++"If you have several filters that match a single message, they are all " ++"applied to the message in order, unless one of the filters has the Stop " ++"Processing action. If you use that action in a filter, the messages that it " ++"affects are not touched by other filters." ++msgstr "" ++"如果您有多个过滤规则匹配到一个邮件，它们会依次全部应用到该邮件，除非其中一种" ++"过滤有”停止处理“操作。如果您使用了一个过滤里面的操作，则该邮件不再受其它过滤" ++"操作的影响。" ++ ++#: C/evolution.xml:3219(para) ++msgid "" ++"When you first open the Filters window, you are shown the list of filters " ++"sorted in the order in which they will be applied. You can move them up and " ++"down in the priority list by clicking the Up and Down buttons." ++msgstr "" ++"当您第一次打开过滤窗口时，您会看到过滤列表按照应用的次序排列。您可以点击”向" ++"上“和”向下“按钮移动改变过滤的优先级。" ++ ++#: C/evolution.xml:3223(title) ++msgid "Editing Filters" ++msgstr "编辑过滤器" ++ ++#: C/evolution.xml:3229(para) ++msgid "Select the filter to edit, then click Edit." ++msgstr "选择要编辑的过滤，点击”编辑“。" ++ ++#: C/evolution.xml:3232(para) ++msgid "Make the desired corrections, then click OK twice." ++msgstr "作需要的更改，然后点击”确定“两次。" ++ ++#: C/evolution.xml:3238(title) ++msgid "Deleting Filters" ++msgstr "删除过滤器" ++ ++#: C/evolution.xml:3244(para) ++msgid "Select the filter to remove, then click Remove." ++msgstr "选择要移除的过滤，然后点击”删除“。" ++ ++#: C/evolution.xml:3255(para) ++msgid "" ++"If filters aren't flexible enough, or you find yourself performing the same " ++"search again and again, consider a search folder. Search folders are an " ++"advanced way of viewing your email messages within Evolution. If you get a " ++"lot of mail or often forget where you put messages, search folders can help " ++"you keep things organized." ++msgstr "" ++"如果您认为过滤工具还不够灵活，或者您需要反复进行相同的搜索操作，可以考虑创建" ++"一个搜索文件夹。搜索文件夹是查看Evolution邮件的一种高级方式。如果您有许多邮" ++"件，或者经常遗忘存放邮件的地方，搜索文件夹能帮助您组织邮件。" ++ ++#: C/evolution.xml:3256(para) ++msgid "" ++"A search folder is really a hybrid of all the other organizational tools: it " ++"looks like a folder, it acts like a search, and you set it up like a filter. " ++"In other words, a conventional folder actually contains messages, but a " ++"search folder is a view of messages that might be in several different " ++"folders. The messages it contains are determined on the fly using a set of " ++"criteria you choose in advance." ++msgstr "" ++"搜索文件夹事实上是各种邮件组织工具的组合：它看起来像一个文件夹，操作起来像搜" ++"索，创建的方式类似于过滤。换句话说，一个普通的文件夹是真正存放文件的地方，而" ++"一个搜索文件夹是邮件的一种视图，这些邮件可能事实上位于不同的文件夹内。搜索文" ++"件夹内包含的邮件是由您自定义的一些标准所决定的。" ++ ++#: C/evolution.xml:3257(para) ++msgid "" ++"As messages that meet the search folder criteria arrive or are deleted, " ++"Evolution automatically adjusts the search folder contents. When you delete " ++"a message, it is erased from the folder in which it actually exists, as well " ++"as any search folders that display it." ++msgstr "" ++"当您收到或删除匹配搜索文件夹规则的邮件时，Evolution会自动调整搜索文件夹的内" ++"容。当您删除一封邮件时，它不仅会从本身存放的文件夹中抹去，还会从显示它的搜索" ++"文件夹中消失。" ++ ++#: C/evolution.xml:3258(para) ++msgid "" ++"The Unmatched Search Folder is the opposite of other search folders: it " ++"displays all messages that do not appear in other search folders." ++msgstr "" ++"“无匹配搜索文件夹”是其它搜索文件夹的反面：它显示所有不在其它搜索文件夹中出现" ++"的邮件。" ++ ++#: C/evolution.xml:3259(para) ++msgid "" ++"If you use remote email storage like IMAP or Microsoft Exchange, and have " ++"created search folders to search through them, the Unmatched Search Folder " ++"also searches the remote folders. If you do not create any search folders " ++"that search remote mail stores, the Unmatched Search Folder does not search " ++"in them either." ++msgstr "" ++"如果您使用远程邮件存储如IMAP或Microsoft Exchange，并且已经创建了搜索文件夹来" ++"检索它们，则无匹配搜索文件夹也会搜索远程文件夹。如果您未创建任何搜索文件夹来" ++"搜索远程存储的邮件，则无匹配搜索文件夹也不会搜索它们。" ++ ++#: C/evolution.xml:3260(para) ++msgid "" ++"As an example of using folders, searches, and search folders, consider the " ++"following: To organize his mailbox, Jim sets up a search folder for email " ++"from his friend and co-worker Anna. He has another search folder for " ++"messages that have novell.com in the address and Evolution in the subject " ++"line, so he can keep a record of what people from work send him about " ++"Evolution. If Anna sends him a message about anything other than Evolution, " ++"it only shows up in the Anna search folder. When Anna sends " ++"him mail about the user interface for Evolution, he can see the message both " ++"in the Anna search folder and in the Internal " ++"Evolution Discussion search folder." ++msgstr "" ++"下面一个例子用于说明文件夹、搜索和搜索文件夹的使用：吉姆为了组织他的邮件，设" ++"置了一个搜索文件夹用于搜索来自他的朋友、同事安娜的邮件。他还有另外一个搜索文" ++"件夹用于搜索地址中含有novell.com和主题中含有Evolution的邮件，这样他可以记录工" ++"作上哪些人发送过他与Evolution相关的邮件。如果安娜发给他一封与Evolution无关的" ++"邮件，它只会在安娜搜索文件夹中显示，当安娜发送给他邮件关于" ++"Evolution的用户界面时，他可以同时在安娜搜索文件夹和" ++"Evolution国际讨论搜索文件夹中看到该邮件。" ++ ++#: C/evolution.xml:3263(title) ++msgid "Creating A Search Folder" ++msgstr "创建搜索文件夹" ++ ++#: C/evolution.xml:3266(para) ++msgid "" ++"Click Message > Create Rule, then select a search folder based on " ++"Subject, Sender, Recipient, or Mailing List." ++msgstr "" ++"点击邮件 > 创建规则，选择一类搜索文件夹，基于主题，发信人，收信人或邮件列" ++"表。" ++ ++#: C/evolution.xml:3268(para) ++msgid "Select Search > Create Search Folder From Search." ++msgstr "选择搜索 > 从头创建搜索文件夹。" ++ ++#: C/evolution.xml:3270(para) ++msgid "" ++"Perform this operation from the search results. Create a search folder from " ++"search is enabled only when you already have performed a search." ++msgstr "" ++"从搜索结果进行该操作。“从头创建搜索文件夹”只有当您已经进行了搜索操作时才可" ++"用。" ++ ++#: C/evolution.xml:3273(para) ++msgid "Select Edit > Search Folder" ++msgstr "选择编辑 > 搜索文件夹" ++ ++#: C/evolution.xml:3281(para) ++msgid "Type the name of the search folder in the Search name field." ++msgstr "在“规则名称”一栏填入搜索文件夹的名称。" ++ ++#: C/evolution.xml:3284(para) ++msgid "" ++"Select your search criteria. For each criterion, you must first select which " ++"of the following parts of the message you want the search to examine. The " ++"criteria are almost similar to those for filters." ++msgstr "" ++"选择搜索标准。对于每个标准，您必须先选择要搜索下列哪部分邮件。搜索标准和过滤" ++"类似。" ++ ++#: C/evolution.xml:3287(para) ++msgid "Sender's address." ++msgstr "发送者地址" ++ ++#: C/evolution.xml:3290(title) ++msgid "Recipients:" ++msgstr "收信人：" ++ ++#: C/evolution.xml:3302(title) ++msgid "Expression (for programmers only):" ++msgstr "表达式(仅为程序员设立)：" ++ ++#: C/evolution.xml:3303(para) ++msgid "" ++"Match a message according to an expression you write in the Scheme language " ++"used to define filters in Evolution." ++msgstr "" ++"根据Scheme语言(一种在Evolution中设置过滤规则的语言)写的表达式匹配对应的邮件。" ++ ++#: C/evolution.xml:3330(title) ++msgid "Follow Up:" ++msgstr "跟随：" ++ ++#: C/evolution.xml:3338(title) ++msgid "Mailing List:" ++msgstr "邮件列表：" ++ ++#: C/evolution.xml:3342(title) ++msgid "Match all:" ++msgstr "匹配全部：" ++ ++#: C/evolution.xml:3343(para) ++msgid "Checks whether the message matchs all the criteria listed." ++msgstr "检查邮件是否匹配所有的搜索规则。" ++ ++#: C/evolution.xml:3347(para) ++msgid "" ++"Select which folders will be used for the search folder. Your options are:" ++msgstr "选择哪些文件夹将被用做搜索文件夹。您的选择是：" ++ ++#: C/evolution.xml:3349(title) ++msgid "All local folders:" ++msgstr "全部本地文件夹：" ++ ++#: C/evolution.xml:3350(para) ++msgid "" ++"Uses all local folders for the search folder source in addition to " ++"individual folders that are selected." ++msgstr "使用所有本地文件夹作为搜索文件夹来源，包括选中的单独文件夹。" ++ ++#: C/evolution.xml:3353(title) ++msgid "All active remote folders:" ++msgstr "全部活动远程文件夹：" ++ ++#: C/evolution.xml:3354(para) ++msgid "" ++"Remote folders are considered active if you are connected to the server; you " ++"must be connected to your mail server for the search folder to include any " ++"messages from that source in addition to individual folders that are " ++"selected." ++msgstr "" ++"远程文件夹在您连接到对应的服务器时被认为是活动的；您必须连接到您的邮件服务器" ++"才能让搜索文件夹包含远程的邮件以及选中的单独文件夹。" ++ ++#: C/evolution.xml:3357(title) ++msgid "All local and active remote folders:" ++msgstr "所有本地和活动的远程文件夹：" ++ ++#: C/evolution.xml:3358(para) ++msgid "" ++"Uses all local and active remote folders for the search folder source in " ++"addition to individual folders that are selected." ++msgstr "" ++"使用使用本地和远程活动的文件夹作为搜索文件夹的来源，包括选中的独立文件夹。" ++ ++#: C/evolution.xml:3361(title) ++msgid "Specific folders only:" ++msgstr "仅指定的文件夹：" ++ ++#: C/evolution.xml:3362(para) ++msgid "Uses individual folders for the search folder source." ++msgstr "使用独立的文件夹作为搜索文件夹来源。" ++ ++#: C/evolution.xml:3364(para) ++msgid "If you select Specific folders only," ++msgstr "如果您选择了“仅指定的文件夹”，" ++ ++#: C/evolution.xml:3367(para) ++msgid "click Add button to open the Select folder window." ++msgstr "点击“添加”按钮，打开选择文件夹窗口。" ++ ++#: C/evolution.xml:3370(para) ++msgid "Select the folder and press Add button." ++msgstr "选择文件夹，点击“添加”按钮。" ++ ++#: C/evolution.xml:3373(para) ++msgid "" ++"You can view the folder added to the list in the entry box at the bottom of " ++"the New Search Folder window." ++msgstr "您可以在新搜索文件夹窗口的底部的输入区内看到添加到列表中的文件夹。" ++ ++#: C/evolution.xml:3384(para) ++msgid "" ++"Evolution can check for junk mail for you. Evolution uses SpamAssassin and/" ++"or Bogofilter with trainable Bayesian filters to perform the spam check. " ++"When the software detects mail that appears to be junk mail, it will flag it " ++"and hide it from your view. Messages that are flagged as junk mail are " ++"displayed only in the Junk folder." ++msgstr "" ++"Evolution能为您检查垃圾邮件，它使用SpamAssassin和/或Bogofilter包含有成熟的" ++"Bayesian过滤来进行垃圾邮件检查。当软件检测到疑似垃圾邮件时，会将它标记并从您" ++"的视图中隐藏。标记为垃圾的邮件只会在垃圾文件夹里显示。" ++ ++#: C/evolution.xml:3385(para) ++msgid "" ++"The junk mail filter can learn which kinds of mail are legitimate and which " ++"are not if you train it. When you first start using junk mail blocking, " ++"check the Junk folder to be sure that legitimate mail doesn't get flagged as " ++"junk mail. If legitimate mail is incorrectly flagged, remove it from the " ++"Junk folder by right-clicking it and selecting Mark as Not Junk or pressing " ++"Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then " ++"click Mark as Junk or press Ctrl+J. When you correct it, the filter can " ++"recognize similar messages in the future, and becomes more accurate as time " ++"goes on." ++msgstr "" ++"您可以训练垃圾邮件过滤器识别合法或非法的邮件。当您第一次开始使用垃圾邮件过滤" ++"时，检查一下垃圾文件夹以确保合法的邮件没有误标记为垃圾邮件。如果合法邮件被误" ++"标记为垃圾邮件，可以从垃圾文件夹中移去，方法是右键点击邮件，选择“标记为不是垃" ++"圾邮件”或按Shift+Ctrl+J。如果Evolution遗漏了垃圾邮件，右键点击邮件，选择“标记" ++"为垃圾邮件”或按Ctrl+J。当您做了类似修正之后，以后过滤器会识别类似的邮件，随着" ++"使用时间增长会越来越准确。" ++ ++#: C/evolution.xml:3386(para) ++msgid "" ++"Every filter needs to learn at the least 100 spam and 100 ham to start " ++"working. For that, you must mark each message manually by clicking the " ++"Not junk button in the toolbar to learn that it is ham. " ++"The Junk button learns a message as spam." ++msgstr "" ++"每个过滤器需要学习至少100种垃圾邮件和100种合法邮件才会开始有效运作。所以，您" ++"必须手动标记每封邮件，方法是在工具栏上点击不是垃圾以告知" ++"过滤器这是合法的邮件。垃圾按钮让过滤器了解邮件为垃圾。" ++ ++#: C/evolution.xml:3387(para) ++msgid "" ++"To change your junk mail filtering preferences, click Edit > Preferences, " ++"then click Mail Preferences." ++msgstr "" ++"要更改您的垃圾邮件过滤首选项，点击编辑 > 首选项，然后点击邮件首选项。" ++ ++#: C/evolution.xml:3388(para) C/evolution.xml:5995(para) ++msgid "" ++"For additional information on junk content, see Junk Mail Preferences." ++msgstr "" ++"要查看更多关于垃圾邮件内容的信息，请参阅垃" ++"圾邮件首选项。" ++ ++#: C/evolution.xml:3389(para) ++msgid "" ++"For additional junk mail settings, see Receiving Mail Options." ++msgstr "" ++"要了解其它关于垃圾邮件的设置，请参阅接收" ++"邮件选项。" ++ ++#: C/evolution.xml:3391(para) ++msgid "" ++"SpamAssassin is an application that scans through the mail box to find junk " ++"mail. Evolution uses SpamAssassin as the default spam-filtering application. " ++"For more information, see The " ++"Apache SpamAssassin Project." ++msgstr "" ++"SpamAssassin是一个扫描邮箱检查垃圾邮件的应用程序。Evolution使用SpamAssassin作" ++"为默认的垃圾邮件过滤程序。要了解更多信息，请参阅Apache SpamAssassin 项目。" ++ ++#: C/evolution.xml:3392(para) ++msgid "" ++"Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) " ++"by a statistical analysis of the message's header and content (body). It is " ++"able to learn from the user's classifications and corrections. For more " ++"information on Bogofilter, see The Bogofilter site." ++msgstr "" ++"Bogofilter是一个邮件过滤器用于分类垃圾或合法邮件，依据是对一系列邮件头和正文" ++"的统计分析。它能够从用户的手动分类和修正中学习。要了解更多关于Bogofilter的信" ++"息，请参阅The Bogofilter " ++"site。" ++ ++#: C/evolution.xml:3399(para) ++msgid "" ++"This section shows you how to use the Evolution " ++"contacts tool to organize any amount of contact information, share addresses " ++"over a network, and save time with everyday tasks." ++msgstr "" ++"本节将向您展示如何使用Evolution联系人工具来组织大量的" ++"联系人信息，在网络上分享地址，以及统筹安排每天的任务以节省时间。" ++ ++#: C/evolution.xml:3402(link) C/evolution.xml:3419(title) ++msgid "Contacts and Cards" ++msgstr "联系人与名片" ++ ++#: C/evolution.xml:3405(link) C/evolution.xml:3567(title) ++msgid "Searching for Contacts" ++msgstr "查找联系人" ++ ++#: C/evolution.xml:3408(link) C/evolution.xml:3718(title) ++msgid "Organizing your Contacts" ++msgstr "组织联系人" ++ ++#: C/evolution.xml:3411(link) C/evolution.xml:3827(title) ++msgid "LDAP: Shared Address Books on a Network" ++msgstr "LDAP：在网上分享地址簿。" ++ ++#: C/evolution.xml:3414(link) C/evolution.xml:3850(title) ++msgid "Send Me a Card: Adding New Cards Quickly" ++msgstr "给我发送名片：快速添加新名片" ++ ++#: C/evolution.xml:3420(para) ++msgid "" ++"Contacts are the individuals you have chosen to add to your address book so " ++"you can keep track of information about them and send email to them. In " ++"Evolution, an individual contact is called a card. For more information on " ++"organizing your contacts see Organizing your Contacts. To learn about configuring the contacts " ++"tool, see Contact Management." ++msgstr "" ++"联系人是您选择添加到地址簿的个人信息以便向他们发送邮件、保持联系。在Evolution" ++"中，一个单独的联系人称为“名片”。要了解更多关于组织您的联系人的信息，请参阅" ++"组织您的联系人。要了解关于配" ++"置联系人工具的方法，请参阅联系人管理。" ++ ++#: C/evolution.xml:3423(title) ++msgid "The Contact Editor" ++msgstr "联系人编辑器" ++ ++#: C/evolution.xml:3424(para) ++msgid "" ++"If you want to add or change cards, use the contact editor. You can edit " ++"email addresses, telephone numbers, mailing addresses and all other contact " ++"information you have entered for a particular contact." ++msgstr "" ++"如果您想添加或编辑名片，可以使用联系人编辑器。您可以编辑电子邮件地址，电话号" ++"码，邮政地址和所有其它您已经输入的联系人信息。" ++ ++#: C/evolution.xml:3425(para) ++msgid "The contact editor window has three tabs:" ++msgstr "联系人编辑器窗口有3个标签：" ++ ++#: C/evolution.xml:3427(title) ++msgid "Contact:" ++msgstr "联系人：" ++ ++#: C/evolution.xml:3428(para) ++msgid "Contains basic contact information." ++msgstr "包含基本联系人信息。" ++ ++#: C/evolution.xml:3431(title) ++msgid "Personal Information:" ++msgstr "个人信息：" ++ ++#: C/evolution.xml:3432(para) ++msgid "" ++"Contains a more specific description of the person, including URLs for " ++"calendar and free/busy information." ++msgstr "包含一些关于该人的详细描述，包括日历的URL地址和忙/闲信息。" ++ ++#: C/evolution.xml:3435(title) ++msgid "Mailing Address:" ++msgstr "邮件地址：" ++ ++#: C/evolution.xml:3436(para) ++msgid "Contains the individual's mailing address." ++msgstr "包含该人的邮政地址。" ++ ++#: C/evolution.xml:3438(para) ++msgid "" ++"You can also use the Forward Contact menu item in the Action menu, which " ++"opens a new message with the card already attached, or Send Message to " ++"Contact, which opens a new message to the contact's email address." ++msgstr "" ++"您还可以使用“操作”菜单中的“转发联系人”条目，它会打开一个新的邮件，里面有该名" ++"片的附件，或使用“给联系人发邮件”条目，它会打开一封新邮件发送给联系人的电子邮" ++"件地址。" ++ ++#: C/evolution.xml:3439(para) ++msgid "" ++"You can add a card from within an email message or calendar appointment. In " ++"an open email, right-click any email address or message, and click Add to " ++"Address Book or select Add Sender to Address Book from the Message menu." ++msgstr "" ++"您可以从电子邮件内部或日历约会中添加名片。在一封打开的邮件中，在任何电子邮件" ++"地址或信息处右键点击，选择“添加到地址簿”或从“邮件”菜单中选择“添加发信人到地址" ++"簿”。" ++ ++#: C/evolution.xml:3440(para) ++msgid "" ++"Most of the items in the contact editor simply display the information you " ++"enter, but some of them have additional features:" ++msgstr "" ++"联系人编辑器中的大部分条目仅是简单地显示您输入的信息，但有一些也有额外的功" ++"能：" ++ ++#: C/evolution.xml:3442(title) ++msgid "Full Name:" ++msgstr "全名：" ++ ++#: C/evolution.xml:3443(para) ++msgid "" ++"Specify the name of your contact here. You can type a name into the Full " ++"Name field, but you can also click the Full Name button to bring up a small " ++"dialog box with text boxes for first and last names, titles like Mr. or Her Excellency, and suffixes like Jr. The Full Name field also interacts with the File Under box to help " ++"you organize your contacts and to handle multi-word surnames. To see how it " ++"works, type a name in the Full Name field. As an example, we will use Miguel " ++"de Icaza. You will notice that the File Under field also fills in, but in " ++"reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts " ++"editor would have correctly guessed that the entry should be filed under " ++"Doe, John Q. However, Miguel's surname, de Icaza, has two words, and to sort it correctly you must enter de Icaza, " ++"Miguel in the File Under entry." ++msgstr "" ++"这里是指定您的联系人的姓名的地方。您可以在“全名”这一栏直接输入一个名字，也可" ++"以单击“全名”按钮弹出一个小对话框用于输入一些额外信息：姓，名，头衔(如" ++"先生或阁下)，后缀(如Jr)。“全名”这一栏也" ++"会与下面的“存档为”一栏相联系，帮助您组织联系人并处理有复姓的情况。要看看它是" ++"如何运作的，可以试着输入一个名字，例如输入Miguel de Icaza。您将会发现“存档" ++"为”这一栏会自动填充，但顺序相反：Icaza, Miguel de。如果您在“全名”中输入John " ++"Q. Doe，则联系人编辑器会正确地猜测该条目会存档为Doe, John Q。" ++"但是，Miguel的姓氏，de Icaza，有两个词，所以为了排列正确您必须" ++"自己在“存档为”一栏中输入de Icaza, Miguel。" ++ ++#: C/evolution.xml:3446(title) ++msgid "Where:" ++msgstr "位置：" ++ ++#: C/evolution.xml:3447(para) ++msgid "" ++"Select one of your address books as the location for this contact. You might " ++"not be able to write to all available address books, especially those on a " ++"network." ++msgstr "" ++"从地址簿中选择一个条目作为该联系人的地址。您不一定能够写入所有的地址簿，例如" ++"一些位于网上的地址簿。" ++ ++#: C/evolution.xml:3450(title) ++msgid "Categories:" ++msgstr "目录" ++ ++#: C/evolution.xml:3451(para) ++msgid "" ++"Click the Categories button to select categories for this card. If you " ++"assign contact categories, you can then search for contacts using those " ++"categories. For more information on contact categories, see Organizing your Contacts" ++msgstr "" ++"点击“类别”按钮选择该名片的类别。如果您分配了联系人的类别，以后就可以使用这些" ++"类别来搜索联系人。要了解更多关于联系人类别的信息，请参阅组织您的联系人。" ++ ++#: C/evolution.xml:3454(title) ++msgid "Free/Busy and Calendar URLs:" ++msgstr "忙/闲和日历URL：" ++ ++#: C/evolution.xml:3455(para) ++msgid "" ++"Click the Personal Information tab to enter Web addresses for the contact. " ++"If the contact publishes free/busy or calendar data online, using a server " ++"other than Exchange or GroupWise, you can specify the addresses for those " ++"servers here. After you do so, you can check their schedules when creating " ++"appointments in the calendar." ++msgstr "" ++"点击”个人信息“标签后，可以输入联系人的网页地址。这样当他使用一个Exchange或" ++"GroupWise之外的服务器在线发布忙/闲消息或日历消息后，您就可以在此处自动哪些服" ++"务器的地址。完成这些配置之后，您可以在日历创建约会事件时检查他们的计划。" ++ ++#: C/evolution.xml:3460(title) ++msgid "Creating and Editing Contacts" ++msgstr "创建与编辑联系人" ++ ++#: C/evolution.xml:3461(para) ++msgid "Follow the steps given below to create a new card." ++msgstr "按照下列步骤操作创建一个新名片。" ++ ++#: C/evolution.xml:3464(para) ++msgid "Click File > New > Contact." ++msgstr "点击“文件”>“新建”>“联系人”。" ++ ++#: C/evolution.xml:3467(para) ++msgid "Enter the contact information to the entry boxes provided." ++msgstr "在提供的输入框中输入联系人信息。" ++ ++#: C/evolution.xml:3473(para) ++msgid "If you want to change a card that already exists," ++msgstr "如果您想修改一张已存在的名片，" ++ ++#: C/evolution.xml:3476(para) ++msgid "" ++"Go to the Contacts window by selecting View > Window > Contacts from " ++"the menubar." ++msgstr "从菜单栏中选择查看 > 窗口 > 联系人，转到联系人窗口。" ++ ++#: C/evolution.xml:3479(para) ++msgid "Double click on the card you want to edit." ++msgstr "双击要编辑的名片。" ++ ++#: C/evolution.xml:3482(para) C/evolution.xml:3502(para) ++msgid "Edit the information in the Contact Editor window." ++msgstr "在联系人编辑器窗口中编辑信息。" ++ ++#: C/evolution.xml:3488(para) ++msgid "You can also edit the contact information from the preview pane." ++msgstr "您也可以从预览面板中编辑联系人信息。" ++ ++#: C/evolution.xml:3491(para) ++msgid "Right click on the address from Message Header." ++msgstr "在邮件头的地址处右键单击。" ++ ++#: C/evolution.xml:3494(para) ++msgid "Select Add to Address Book to bring up the Contact Quick-Add window." ++msgstr "选择”添加到地址簿“，弹出快速添加联系人窗口。" ++ ++#: C/evolution.xml:3499(para) ++msgid "" ++"Press the Edit Full button at the bottom left to bring up the Contact Editor " ++"window." ++msgstr "点击左下角的”编辑全名“按钮，弹出联系人编辑器窗口。" ++ ++#: C/evolution.xml:3510(title) ++msgid "Google Contacts" ++msgstr "谷歌联系人" ++ ++#: C/evolution.xml:3511(para) ++msgid "" ++"Evolution allows you to access your Google Address Book. You can view the " ++"Google contacts offline and create, modify and delete the contacts online." ++msgstr "" ++"Evolution允许您操作您的谷歌地址簿。您可以离线查看谷歌联系人，在线添加、编辑和" ++"删除联系人。" ++ ++#: C/evolution.xml:3512(para) ++msgid "To configure your Google Address Book in Evolution contacts:" ++msgstr "在 Evolution 联系人中配置您的谷歌地址簿：" ++ ++#: C/evolution.xml:3515(para) C/evolution.xml:7254(para) ++msgid "Click File > New > Address Book." ++msgstr "点击文件 > 新建 > 地址簿。" ++ ++#: C/evolution.xml:3519(para) C/evolution.xml:4007(para) ++msgid "Select Google from the Type drop-down list." ++msgstr "在类型下拉列表中选择Google。" ++ ++#: C/evolution.xml:3522(para) ++msgid "Specify a name for the address book." ++msgstr "给地址簿指定一个名称。" ++ ++#: C/evolution.xml:3525(para) ++msgid "" ++"Select or deselect the following options and provide the username for the " ++"Google account:" ++msgstr "选择或取消选择下列选项，并给谷歌账户提供用户名。" ++ ++#: C/evolution.xml:3529(title) ++msgid "Mark as default address book:" ++msgstr "标记为默认地址簿：" ++ ++#: C/evolution.xml:3530(para) ++msgid "" ++"Select this option to make the Google address book as your default address " ++"book." ++msgstr "选择该项会把谷歌地址簿作为您的默认地址簿。" ++ ++#: C/evolution.xml:3535(title) ++msgid "Copy book content locally for offline operations:" ++msgstr "将地址簿内容复制到本地以供脱机操作：" ++ ++#: C/evolution.xml:3536(para) ++msgid "" ++"Select this option to copy the address book to your machine so you can " ++"access the contacts even when you are not connected to the network." ++msgstr "" ++"选择该项会把地址簿内容复制到您的计算机上，这样您在没有连接到网络时也可以对联" ++"系人进行操作。" ++ ++#: C/evolution.xml:3541(title) C/evolution.xml:4021(title) ++msgid "Username:" ++msgstr "用户名：" ++ ++#: C/evolution.xml:3542(para) C/evolution.xml:4022(para) ++msgid "Specify your username for your Google account." ++msgstr "为您的谷歌账户指定用户名。" ++ ++#: C/evolution.xml:3547(title) ++msgid "Use SSL:" ++msgstr "使用 SSL：" ++ ++#: C/evolution.xml:3548(para) C/evolution.xml:5977(para) ++msgid "" ++"Select Use SSL to enable a secure connection between Evolution and the " ++"server." ++msgstr "选择”使用SSL“可以确保Evolution和服务器的连接是安全的。" ++ ++#: C/evolution.xml:3553(title) ++msgid "Refresh:" ++msgstr "刷新：" ++ ++#: C/evolution.xml:3554(para) ++msgid "Set the time to automatically refresh the Google address book." ++msgstr "设置自动刷新谷歌地址簿的时间间隔。" ++ ++#: C/evolution.xml:3570(para) ++msgid "" ++"Evolution enables you to find the contact address quickly by using " ++"customized search. To find the contact address you are looking for, use the " ++"following procedure:" ++msgstr "" ++"Evolution能让您使用自定义搜索快速查找联系人地址。要查找联系人地址，请按如下步" ++"骤操作：" ++ ++#: C/evolution.xml:3577(para) C/evolution.xml:4443(para) ++#: C/evolution.xml:4787(para) C/evolution.xml:5021(para) ++msgid "Specify the search criteria from any of the following:" ++msgstr "从下列列表中指定一种搜索方式：" ++ ++#: C/evolution.xml:3580(para) ++msgid "Name contains" ++msgstr "姓名含有" ++ ++#: C/evolution.xml:3583(para) ++msgid "Email begins with" ++msgstr "邮件以此开头" ++ ++#: C/evolution.xml:3586(para) ++msgid "Any field contains" ++msgstr "任何域含有" ++ ++#: C/evolution.xml:3591(para) ++msgid "Press Enter to begin the search." ++msgstr "按回车开始搜索。" ++ ++#: C/evolution.xml:3594(para) ++msgid "" ++"For a more complex search, select Search Advanced and select criteria that " ++"describe your desired contact:" ++msgstr "更复杂的搜索，请选择“高级搜索”，并选择能够描述您需求联系的标准：" ++ ++#: C/evolution.xml:3597(para) ++msgid "Name the rule in the Rule Name field." ++msgstr "在”规则名“一栏中给规则命名。" ++ ++#: C/evolution.xml:3600(para) ++msgid "Set up your criteria in the Find items field." ++msgstr "在”查找项目“区中设置您的搜索方式。" ++ ++#: C/evolution.xml:3603(para) ++msgid "Select Add to add additional criteria." ++msgstr "选择”添加“以添加额外的搜索方式。" ++ ++#: C/evolution.xml:3612(para) ++msgid "" ++"Displays all the contacts that match the built-in criteria you have selected " ++"from the drop-down list at the top left side, just above the display pane." ++msgstr "" ++"显示所有与您从下拉列表中选择的内建搜索方式相匹配的联系人。下拉列表位于显示面" ++"板上方左侧。" ++ ++#: C/evolution.xml:3614(para) ++msgid "To perform quick search, use the following procedure:" ++msgstr "要进行快速搜索，请按如下步骤操作：" ++ ++#: C/evolution.xml:3623(para) C/evolution.xml:4510(para) ++#: C/evolution.xml:4888(para) C/evolution.xml:5081(para) ++msgid "Anniversary" ++msgstr "周年纪念" ++ ++#: C/evolution.xml:3626(para) C/evolution.xml:4513(para) ++#: C/evolution.xml:4891(para) C/evolution.xml:5084(para) ++msgid "Birthday" ++msgstr "生日" ++ ++#: C/evolution.xml:3629(para) C/evolution.xml:4516(para) ++#: C/evolution.xml:4894(para) C/evolution.xml:5087(para) ++msgid "Business" ++msgstr "商务" ++ ++#: C/evolution.xml:3632(para) C/evolution.xml:4519(para) ++#: C/evolution.xml:4897(para) C/evolution.xml:5090(para) ++msgid "Competition" ++msgstr "竞赛" ++ ++#: C/evolution.xml:3635(para) C/evolution.xml:5093(para) ++msgid "Favorites" ++msgstr "偏好" ++ ++#: C/evolution.xml:3638(para) C/evolution.xml:4525(para) ++#: C/evolution.xml:4903(para) C/evolution.xml:5096(para) ++msgid "Gifts" ++msgstr "礼物" ++ ++#: C/evolution.xml:3641(para) C/evolution.xml:4528(para) ++#: C/evolution.xml:4906(para) C/evolution.xml:5099(para) ++#, fuzzy ++msgid "Goals/Objectives" ++msgstr "目标" ++ ++#: C/evolution.xml:3644(para) C/evolution.xml:4531(para) ++msgid "Holiday" ++msgstr "节日" ++ ++#: C/evolution.xml:3647(para) C/evolution.xml:4534(para) ++#: C/evolution.xml:4912(para) C/evolution.xml:5105(para) ++msgid "Holiday Cards" ++msgstr "节日卡片" ++ ++#: C/evolution.xml:3650(para) ++msgid "Hot Contacts" ++msgstr "常用联系人" ++ ++#: C/evolution.xml:3653(para) C/evolution.xml:4537(para) ++#: C/evolution.xml:4915(para) C/evolution.xml:5108(para) ++msgid "Ideas" ++msgstr "观点" ++ ++#: C/evolution.xml:3656(para) C/evolution.xml:4540(para) ++#: C/evolution.xml:4918(para) C/evolution.xml:5111(para) ++msgid "International" ++msgstr "国际" ++ ++#: C/evolution.xml:3659(para) C/evolution.xml:4543(para) ++msgid "Key Customer" ++msgstr "重要客户" ++ ++#: C/evolution.xml:3662(para) C/evolution.xml:4546(para) ++#: C/evolution.xml:4924(para) C/evolution.xml:5117(para) ++msgid "Miscellaneous" ++msgstr "杂项" ++ ++#: C/evolution.xml:3668(para) C/evolution.xml:4552(para) ++#: C/evolution.xml:4930(para) C/evolution.xml:5123(para) ++msgid "Phone Calls" ++msgstr "电话呼叫" ++ ++#: C/evolution.xml:3674(para) C/evolution.xml:4558(para) ++#: C/evolution.xml:4936(para) C/evolution.xml:5129(para) ++msgid "Strategies" ++msgstr "策略" ++ ++#: C/evolution.xml:3677(para) C/evolution.xml:4561(para) ++#: C/evolution.xml:4939(para) C/evolution.xml:5132(para) ++msgid "Suppliers" ++msgstr "供应商" ++ ++#: C/evolution.xml:3680(para) C/evolution.xml:4564(para) ++#: C/evolution.xml:4942(para) C/evolution.xml:5135(para) ++msgid "Time & Expenses" ++msgstr "时间 & 花费" ++ ++#: C/evolution.xml:3683(para) C/evolution.xml:4567(para) ++#: C/evolution.xml:4945(para) C/evolution.xml:5138(para) ++msgid "VIP" ++msgstr "VIP" ++ ++#: C/evolution.xml:3686(para) C/evolution.xml:4570(para) ++#: C/evolution.xml:4948(para) C/evolution.xml:5141(para) ++msgid "Waiting" ++msgstr "等待" ++ ++#: C/evolution.xml:3689(para) ++msgid "Weather: Cloudy" ++msgstr "天气：多云" ++ ++#: C/evolution.xml:3692(para) ++msgid "Weather: Fog" ++msgstr "天气：雾" ++ ++#: C/evolution.xml:3695(para) ++msgid "Weather: Partly Cloudy" ++msgstr "天气：少云" ++ ++#: C/evolution.xml:3698(para) ++msgid "Weather: Rain" ++msgstr "天气：有雨" ++ ++#: C/evolution.xml:3701(para) ++msgid "Weather: Snow" ++msgstr "天气：有雪" ++ ++#: C/evolution.xml:3704(para) ++msgid "Weather: Sunny" ++msgstr "天气：晴" ++ ++#: C/evolution.xml:3707(para) ++msgid "Weather: Thunderstorms" ++msgstr "天气：雷暴" ++ ++#: C/evolution.xml:3712(para) ++msgid "Evolution displays the desired contacts." ++msgstr "Evolution将显示您需要的联系人。" ++ ++#: C/evolution.xml:3719(para) ++msgid "" ++"Evolution allows you to organize your contacts. You can create several " ++"individual address books, or contact lists. Within a given address book, you " ++"can have several categories of contacts." ++msgstr "" ++"Evolution允许您组织自己的联系人。您可以创建一些独立的地址簿或联系人列表。在一" ++"个给定的地址簿内，您可以设置不同类别的联系人。" ++ ++#: C/evolution.xml:3722(link) C/evolution.xml:3736(title) ++msgid "Contact Groups" ++msgstr "联系人组" ++ ++#: C/evolution.xml:3725(link) C/evolution.xml:3758(title) ++msgid "Creating a List of Contacts" ++msgstr "创建联系列表" ++ ++#: C/evolution.xml:3728(link) C/evolution.xml:3790(title) ++msgid "Grouping with Categories" ++msgstr "联系人分组" ++ ++#: C/evolution.xml:3731(link) C/evolution.xml:3844(title) ++msgid "Configuring Evolution to use LDAP" ++msgstr "配置Evolution使用LDAP" ++ ++#: C/evolution.xml:3737(para) ++msgid "" ++"Contact groups are nothing but address books. The simplest way to organize " ++"contacts is to create additional address books. You can create a new one by " ++"clicking File > New > Address Book. For contacts groups on your " ++"computer, you only need to provide a name. For contacts on the network, you " ++"need to provide more information about the contacts server you are trying to " ++"access." ++msgstr "" ++"联系人组事实上就是地址簿。组织联系人的最简单的方式就是创建额外的地址簿。您可" ++"以点击文件 > 新建 > 地址簿来创建新的地址簿。对于保存在本地的联系人组，" ++"您只需提供一个名称。对于保存在网上的联系人，您需要向连接的服务器提供关于联系" ++"人的更详细的信息。" ++ ++#: C/evolution.xml:3738(para) ++msgid "" ++"To move a card from one group to another, just drag it from the main display " ++"of contacts and drop it to a different group. You cannot change the contents " ++"of most network contact groups." ++msgstr "" ++"要将名片从一个组移到另一组，只需从联系人列表中把它拖拽出来放到另一个组即可。" ++"对于大多数网上的联系人组，您不能修改它的内容。" ++ ++#: C/evolution.xml:3740(para) ++msgid "" ++"Contacts groups are not the same as contact lists. A contact group is like a " ++"folder or address book full of contacts. A contact list is a single contact " ++"that contains other contacts, and is most often used to email several people " ++"at once." ++msgstr "" ++"联系人组和联系人列表有区别。联系人组类似于放置联系人的文件夹或地址簿。联系人" ++"列表只是一个包含其它若干个联系人的总联系人条目，主要在给一群人群发邮件时使" ++"用。" ++ ++#: C/evolution.xml:3745(title) ++msgid "Importing Contacts" ++msgstr "导入联系人" ++ ++#: C/evolution.xml:3746(para) ++msgid "" ++"You can import contacts from other contact management tools with the Import " ++"tool." ++msgstr "您可以使用导入工具从其它联系人管理程序导入联系人。" ++ ++#: C/evolution.xml:3751(para) ++msgid "Mail yourself a contact as a vCard attachment." ++msgstr "以vCard格式附件的形式给自己发送一个邮件。" ++ ++#: C/evolution.xml:3752(para) ++msgid "" ++"Currently VCF and LDIF are supported. CSV and TAB format files are supported " ++"from Microsoft Outlook, Thunderbird, Mozilla, and Evolution." ++msgstr "" ++"当前支持VCF和LDIF格式。来自Microsoft Outlook，Thunderbird，Mozilla和Evolution" ++"的CSV和TAB格式文件也支持。" ++ ++#: C/evolution.xml:3759(para) ++msgid "" ++"A contact list is a set of contacts with a single nickname that you create. " ++"When you send email to the nickname, it is sent to every member of the list. " ++"This differs from a network mailing list in that it exists only on your " ++"computer as a convenience to you, rather than as an actual email address " ++"managed by a mailing list application on a server." ++msgstr "" ++"联系人列表是一组带有一个单独的昵称(由您创建)的联系人。当您给这个昵称发送邮件" ++"时相当于给该列表中的每个成员发了邮件。这与网上邮件列表不同，它只存在您的计算" ++"机上以方便您群发邮件，而不是像服务器上由邮件列表程序管理的实际电子邮件地址那" ++"样。" ++ ++#: C/evolution.xml:3760(para) ++msgid "" ++"For example, you could create one card for each family member, then add " ++"those cards to a contact list called Family. Then, instead of " ++"entering each person's email address individually, you can send email to " ++"Family and the message would go to all of them." ++msgstr "" ++"例如，您可以为每个家庭成员分别创建一个名片，然后把这些名片加到一个名为" ++"家庭的列表。接着，您可以直接发送邮件给家庭，这样邮件会" ++"自动到达里面的每个成员，而不需要您手动地逐个输入每个人的邮件地址。" ++ ++#: C/evolution.xml:3761(para) ++msgid "To create a list of contacts:" ++msgstr "要创建一个联系人列表：" ++ ++#: C/evolution.xml:3764(para) ++msgid "Open the list creation window by clicking the New List button." ++msgstr "点击新列表按钮打开创建列表窗口。" ++ ++#: C/evolution.xml:3766(para) ++msgid "Click File > New > Contact List." ++msgstr "点击文件 > 新建 > 联系人列表。" ++ ++#: C/evolution.xml:3769(para) ++msgid "Specify a name for the list." ++msgstr "给列表指定一个名字。" ++ ++#: C/evolution.xml:3772(para) ++msgid "Specify the names or email addresses of contacts." ++msgstr "指定每个联系人的名字或邮件地址。" ++ ++#: C/evolution.xml:3774(para) ++msgid "Drag contacts from the main window into the list." ++msgstr "将联系人从主窗口拖拽到列表中。" ++ ++#: C/evolution.xml:3777(para) ++msgid "" ++"Choose whether you want to hide the email addresses when you send a message " ++"to the list." ++msgstr "选择您是否希望在往该列表发送邮件时隐藏地址。" ++ ++#: C/evolution.xml:3778(para) ++msgid "" ++"Unless it is a very small list, it is recommended that you leave the " ++"addresses hidden. This is the same thing as using the Bcc: " ++"feature discussed in Specifying Additional Recipients for Email." ++msgstr "" ++"建议您选择隐藏地址，除非列表很短。这和使用暗送：的功能(在" ++"为邮件指定额外的收件人中有讨论)是一样的。" ++ ++#: C/evolution.xml:3781(para) ++msgid "When you are finished, click OK." ++msgstr "完成后，点击“确定”。" ++ ++#: C/evolution.xml:3784(para) ++msgid "" ++"The list appears as a contact card, which you can use as you would any other " ++"card, including mailing the list to another person and sending email to the " ++"list." ++msgstr "" ++"该列表显示为一个单独的联系人名片，您可以像使用其它名片那样使用它，例如将该列" ++"表发送给其它人以及给列表成员发送邮件。" ++ ++#: C/evolution.xml:3785(para) ++msgid "" ++"To mail the list, open a new email and type the name you chose for the list. " ++"Evolution addresses the message to the entire list when you send the " ++"message. You can also right-click the list's address card in the contacts " ++"tool and select Send Message to List." ++msgstr "" ++"要给列表发送邮件，打开新邮件，输入您为该列表取的名字。当您发送这份邮件时" ++"Evolution会把邮件发送给全部列表成员。您也可以在联系人工具中右击列表名片，选" ++"择“给列表发送邮件”。" ++ ++#: C/evolution.xml:3786(para) ++msgid "Evolution cannot store contact lists on Microsoft Exchange servers." ++msgstr "Evolution不能存储位于Microsoft Exchange服务器上的联系人列表。" ++ ++#: C/evolution.xml:3791(para) ++msgid "" ++"Another way to group cards is to mark them as belonging to different " ++"categories. You can mark a card as being in several categories or no " ++"category at all. For example, you put a friend's card in the " ++"Business category because he works with you and the " ++"Friends category because he's a friend." ++msgstr "" ++"另外一种组织名片的方式是将它们标记、归属到不同的类别。您可以将一个名片标记为" ++"几种不同类别或无类别。例如，您将一个朋友的名片同时标记为商务和朋友，因为他既和您一起工作又是您的朋友。" ++ ++#: C/evolution.xml:3792(para) ++msgid "To mark a card as belonging to a category," ++msgstr "要将一个名片标记为属于一种类别，" ++ ++#: C/evolution.xml:3795(para) ++msgid "Double click the card to bring up the Contact Editor window" ++msgstr "双击名片，弹出联系人编辑器窗口" ++ ++#: C/evolution.xml:3798(para) ++msgid "Click the Categories button at the left." ++msgstr "点击左侧的“类别”按钮。" ++ ++#: C/evolution.xml:3799(para) ++msgid "The Categories window is shown below." ++msgstr "类别窗口显示如下。" ++ ++#: C/evolution.xml:3804(para) ++msgid "" ++"Select the category from the list. You can select as many or as few " ++"categories as you like." ++msgstr "从列表中选择列表。您可以选择您想要的任意多或任意少的类别。" ++ ++#: C/evolution.xml:3807(para) ++msgid "" ++"If the master list of categories doesn't suit you, you can add your own " ++"categories. To add a new category," ++msgstr "如果默认的类别不能满足您的需求，您可以添加自己的类别。要添加新的类别，" ++ ++#: C/evolution.xml:3810(para) ++msgid "Enter the new category in the entry box at the top." ++msgstr "在顶部输入框中输入新类别的名称。" ++ ++#: C/evolution.xml:3814(para) ++msgid "" ++"You can view the category name in the field next to Categories button in the " ++"Contact Editor window." ++msgstr "您可以在联系人编辑器窗口的”类别“按钮的旁边看到该联系人设定的类别名称。" ++ ++#: C/evolution.xml:3821(para) ++msgid "" ++"You can edit or set the color and icon for each categories available under " ++"categories list. To achieve that click the Edit button at the bottom of the " ++"Categories window. Press the Delete button to delete the items from the list." ++msgstr "" ++"您可以为类别列表里可用的类别设置或编辑颜色、图标，操作方法是点击类别窗口底部" ++"的”编辑“按钮。点击”删除“按钮可用从列表中删除类别。" ++ ++#: C/evolution.xml:3828(para) ++msgid "" ++"The LDAP protocol was created to let users " ++"share contact information over a network by sharing access to a central " ++"directory. LDAP allows a company to maintain a shared set of contact " ++"information. Many companies keep a common LDAP address book for all their " ++"employees or for client contacts." ++msgstr "" ++"LDAP协议用于让用户在网上通过共享一个中心文件夹" ++"来分享联系人信息。LDAP允许公司保存一个共享的联系人信息库。许多公司有它们雇员" ++"或客户的联系人LDAP地址簿。" ++ ++#: C/evolution.xml:3829(para) ++msgid "" ++"To learn how to add a remote LDAP directory to your available address books, " ++"see Contact Management. Remote " ++"groups of contacts appear under the On LDAP Servers item in the side bar. " ++"They work like a local folder of contact cards, with the following " ++"exceptions:" ++msgstr "" ++"要了解如何将远程LDAP目录添加到您的地址簿里，请参阅联系人管理器。远程的联系人组显示在边栏的”LDAP服务器“条" ++"目下面。它们可以像本地的联系人名片目录一样工作，但有以下几点不同：" ++ ++#: C/evolution.xml:3832(para) ++msgid "" ++"Network folders are only available when you are connected to the network. If " ++"you use a laptop or have a modem connection, you might want to copy or cache " ++"some of the network directory. You do this by dragging and dropping your " ++"desired contacts into the local address books." ++msgstr "" ++"网络文件夹仅当您连上网络之后才能操作。如果您使用的是笔记本电脑或使用调制解调" ++"器连接，可能想要复制或缓冲网络文件夹的一部分内容。您可以将里面需要的联系人条" ++"目拖拽到本地地址簿里。" ++ ++#: C/evolution.xml:3833(para) ++msgid "" ++"You can also mark the network folder for offline usage. To mark the folder, " ++"right-click the folder, click Properties and select Copy Folder Content " ++"Locally for Offline Operation." ++msgstr "" ++"您也可以标记网络文件夹供离线使用。要标记该文件夹，右键点击文件夹，选择”属" ++"性“，选择”复制文件夹内容到本地供离线操作“。" ++ ++#: C/evolution.xml:3836(para) ++msgid "" ++"To prevent excess network traffic, Evolution does not normally load data " ++"from the LDAP server upon opening." ++msgstr "" ++"为了避免造成额外的网络拥堵，Evolution正常情况下不会在打开时自动载入LDAP服务器" ++"上的数据。" ++ ++#: C/evolution.xml:3839(para) ++msgid "" ++"Depending on your server settings, you might not be able to edit all the " ++"fields in a contact stored on an LDAP server. Some servers prohibit some or " ++"all changes, and others use a smaller set of fields than Evolution allows. " ++"Check with your system administrator if you need different settings." ++msgstr "" ++"根据您系统设置，您可能不能编辑位于LDAP服务器上的联系人的一些信息。一些服务器" ++"禁止部分或全部的更改，一些则使用少于Evolution允许的条目。如果您需要不同的设" ++"置，请咨询您的系统管理员。" ++ ++#: C/evolution.xml:3845(para) ++msgid "" ++"For information about setting up Evolution to use LDAP, refer to Contact Management." ++msgstr "" ++"要了解更多关于设置Evolution使用LDAP的信息，请参阅联系人管理器。" ++ ++#: C/evolution.xml:3851(para) ++msgid "" ++"When you get information about a person in the mail or in a calendar entry, " ++"you can add it to an address card. To do so, right-click any email address " ++"or email message, and click Add to Address Book on the menu that appears. If " ++"the sender already exists, the Editor button opens and you can edit the " ++"address card details. Evolution can also add cards from a hand-held device " ++"during a HotSync* operation. For more information, see Synchronizing Your Handheld Device." ++msgstr "" ++"当您在邮件中或日历事件中得到一个人的信息，您可以将它添加到一个地址名片。操作" ++"方法是，在任何电子邮件地址或电子邮件信息处右击，然后在弹出的菜单中选择“添加到" ++"地址簿”。如果发信人已经存在地址簿中，会打开编辑器按钮然后您可以编辑名片详细信" ++"息。Evolution也可以通过HotSync*操作从手持设备添加名片。要了解更多相关信息，请" ++"参阅同步您的手持设备。" ++ ++#: C/evolution.xml:3857(para) ++msgid "" ++"This section shows you how to use the Evolution " ++"Calendar to manage your schedule alone or in conjunction with peers. To " ++"learn about importing calendar data, see Importing Single Files, which covers the Import tool." ++msgstr "" ++"本节将向您展示如何使用Evolution日历来安排您个人或与其" ++"它朋友的事件计划。要了解关于导入日历数据的信息，请参阅导入单个文件，里面有对导入工具的介绍。" ++ ++#: C/evolution.xml:3860(link) C/evolution.xml:3892(title) ++msgid "Ways of Looking at your Calendar" ++msgstr "查看日历的方式" ++ ++#: C/evolution.xml:3863(link) C/evolution.xml:4046(title) ++msgid "Scheduling With the Evolution Calendar" ++msgstr "使用Evolution日历安排计划" ++ ++#: C/evolution.xml:3866(link) C/evolution.xml:4432(title) ++msgid "Searching for Calendar Items" ++msgstr "搜索日历条目" ++ ++#: C/evolution.xml:3869(link) C/evolution.xml:4579(title) ++msgid "Printing Displayed Items" ++msgstr "打印显示的条目" ++ ++#: C/evolution.xml:3872(link) C/evolution.xml:4584(title) ++msgid "Deleting Old Appointments and Meetings" ++msgstr "删除过时的约会和会议" ++ ++#: C/evolution.xml:3875(link) C/evolution.xml:4589(title) ++msgid "Delegating Meetings" ++msgstr "委托会议" ++ ++#: C/evolution.xml:3878(link) ++msgid "Multiple Calendars, Web Calendars, and CalDAV" ++msgstr "多个日历，网络日历和CalDAV" ++ ++#: C/evolution.xml:3881(link) C/evolution.xml:4645(title) ++msgid "The Task List" ++msgstr "任务列表" ++ ++#: C/evolution.xml:3884(link) C/evolution.xml:4958(title) ++msgid "Memos" ++msgstr "备忘录" ++ ++#: C/evolution.xml:3887(link) C/evolution.xml:5151(title) ++msgid "Configuring Time Zones" ++msgstr "配置时区" ++ ++#: C/evolution.xml:3893(para) ++msgid "" ++"In Evolution, you can keep multiple calendars and overlay them one over the " ++"next. For example, you might have a schedule of events for work, one for " ++"home, and one for your favorite sports team. The side bar lists those " ++"calendars, and you can select or deselect the boxes next to them to show and " ++"hide the appointments in your calendar view. By hiding and showing different " ++"sets of appointments, you can be sure to avoid conflicts, while keeping a " ++"minimum of clutter in your view." ++msgstr "" ++"在Evolution中，您可以设置多个日历并。例如，您可能会有一份工作日程计划，一份家" ++"务计划和一份最喜爱的运动队日程安排。这些日历会列在边栏上，您可以通过选择/取消" ++"选择它们旁边的复选框来显示/隐藏日历视图中的相应事件。通过隐藏/显示不同的事件" ++"组，您可以确保避免事件冲突，将其安排得有条不紊。" ++ ++#: C/evolution.xml:3894(para) ++msgid "Appointments for each calendar appear as a different color." ++msgstr "不同日历的事件显示为不同颜色。" ++ ++#: C/evolution.xml:3895(para) ++msgid "" ++"The toolbar offers you five different buttons that can show you different " ++"views of your calendar." ++msgstr "工具栏提供您五种不同的按钮可以根据不同的视图显示日历。" ++ ++#: C/evolution.xml:3903(para) ++msgid "Calendar View" ++msgstr "日历视图" ++ ++#: C/evolution.xml:3906(para) ++msgid "Shortcut Keys" ++msgstr "快捷键" ++ ++#: C/evolution.xml:3913(para) ++msgid "Day" ++msgstr "日" ++ ++#: C/evolution.xml:3916(para) ++msgid "control+y" ++msgstr "control+y" ++ ++#: C/evolution.xml:3921(para) ++msgid "Work Week" ++msgstr "工作周" ++ ++#: C/evolution.xml:3924(para) ++msgid "control+j" ++msgstr "control+j" ++ ++#: C/evolution.xml:3929(para) ++msgid "Week" ++msgstr "周" ++ ++#: C/evolution.xml:3932(para) ++msgid "control+k" ++msgstr "control+k" ++ ++#: C/evolution.xml:3937(para) ++msgid "Month" ++msgstr "月" ++ ++#: C/evolution.xml:3940(para) ++msgid "control+m" ++msgstr "control+m" ++ ++#: C/evolution.xml:3945(para) ++msgid "List" ++msgstr "列表" ++ ++#: C/evolution.xml:3948(para) ++msgid "control+l" ++msgstr "control+l" ++ ++#: C/evolution.xml:3954(para) ++msgid "" ++"You can also select an arbitrary range of days in the small calendar in the " ++"side bar. To do this, select the days that you want to view in your calendar." ++msgstr "" ++"您也可以在侧边栏的小日历上选择显示任意范围的日期。操作方法是，选中您想要在日" ++"历中显示的日期即可。" ++ ++#: C/evolution.xml:3955(para) ++msgid "" ++"The Previous and Next buttons move you forward and back in your calendar " ++"pages. If you are using a week or month view, you can move by week or month. " ++"To return to today's listing, click the Today button in the toolbar." ++msgstr "" ++"”前进“和”后退“按钮帮助您在日历页面上前进和后退。如果您使用的是周或月的视图，" ++"您可以以周或月为单位移动。要返回今日的列表，点击工具栏上的”今天“按钮。" ++ ++#: C/evolution.xml:3956(para) ++msgid "" ++"To visit calendar entries for a specific date, click Go To and select the " ++"date in the dialog box that appears." ++msgstr "要查看特定日期的事件，点击”转到“，在弹出的对话框中选择日期。" ++ ++#: C/evolution.xml:3959(title) ++msgid "Calendar Properties" ++msgstr "日历属性" ++ ++#: C/evolution.xml:3960(para) ++msgid "" ++"Evolution allows you to edit the label of your calendar, assign color, and " ++"copy content for offline use. To set your calendar properties" ++msgstr "" ++"Evolution允许您编辑日历的标签，分配颜色以及复制内容供离线操作。要设置您日历的" ++"属性" ++ ++#: C/evolution.xml:3963(para) ++msgid "Select the calendar from the side bar at the left." ++msgstr "从左边侧边栏里选择日历。" ++ ++#: C/evolution.xml:3966(para) ++msgid "Right-click on the calendar." ++msgstr "在日历上右击。" ++ ++#: C/evolution.xml:3969(para) ++msgid "Select Properties to open Calendar Properties dialog box." ++msgstr "选择”属性“，打开日历属性对话框。" ++ ++#: C/evolution.xml:3973(para) ++msgid "Edit the label from Name field." ++msgstr "在”名称“一栏中编辑标签。" ++ ++#: C/evolution.xml:3976(para) ++msgid "To assign a color for the calendar, click the Color button." ++msgstr "要给日历分配颜色，点击”颜色“按钮。" ++ ++#: C/evolution.xml:3979(para) ++msgid "Select the color and click OK." ++msgstr "选择一种颜色，点击”确定“。" ++ ++#: C/evolution.xml:3982(para) ++msgid "" ++"To mark your calendar content for offline use, click Copy calendar contents " ++"locally for offline operations." ++msgstr "要标记您的日历内容以供离线操作，选择”复制日历内容到本地供离线操作“。" ++ ++#: C/evolution.xml:3984(para) ++msgid "" ++"Right-click on the calendar at the left and select Mark Calendar for offline " ++"use. For more information on working offline refer Working Offline." ++msgstr "" ++"在左侧的日历上右击，选择”标记日历供离线操作“。要查看更多关于离线操作的信息，" ++"请参阅离线工作。" ++ ++#: C/evolution.xml:3986(para) ++msgid "" ++"To export or share or to store a calendar locally in iCal format, right " ++"click on the calendar in the calendar view at the left and select Save to " ++"Disk." ++msgstr "" ++"要将日历以iCal格式导出、分享或保存到本地，在左侧视图的日历上右击，选择”保存到" ++"磁盘“。" ++ ++#: C/evolution.xml:3988(para) ++msgid "" ++"Click Mark as default folder if you want to mark this folder as your default " ++"calendar folder." ++msgstr "如果您想将该文件夹作为您的默认日历文件夹，选择”标记为默认文件夹“。" ++ ++#: C/evolution.xml:3990(title) ++msgid "Weather Calendar" ++msgstr "天气日历" ++ ++#: C/evolution.xml:3991(para) ++msgid "" ++"In the Properties of a Weather calendar you can specify a location for the " ++"weather calendar. Click Location to select any world-wide location for the " ++"calendar." ++msgstr "" ++"在天气日历的属性中您可以指定天气日历的地点。点击”位置“为日历选择世界上任意一" ++"个地点。" ++ ++#: C/evolution.xml:3993(para) ++msgid "" ++"The temperature for the selected location appears in units as specified at " ++"the top of the Calendar view." ++msgstr "在日历视图上部可以指定选择的地点的气温显示单位。" ++ ++#: C/evolution.xml:3998(title) ++msgid "Google Calendar" ++msgstr "谷歌日历" ++ ++#: C/evolution.xml:3999(para) ++msgid "" ++"Evolution allows you to access your Google calendar. You can view the Google " ++"calendar offline or create, modify, and delete the calendar items online. " ++"Google calendar uses the CalDAV interface." ++msgstr "" ++"Evolution允许您操作谷歌日历。您可以离线查看谷歌日历或在线创建，编辑和删除日历" ++"条目。谷歌日历使用的是CalDAV界面。" ++ ++#: C/evolution.xml:4000(para) ++msgid "To integrate the Google calendar to Evolution:" ++msgstr "要将谷歌日历整合到Evolution中：" ++ ++#: C/evolution.xml:4004(para) C/evolution.xml:4617(para) ++msgid "Click New, then select Calendar to open the New Calendar dialog." ++msgstr "点击”新建“，选择”日历“打开新建日历对话框。" ++ ++#: C/evolution.xml:4011(para) ++msgid "Specify the following:" ++msgstr "指定以下项目：" ++ ++#: C/evolution.xml:4015(title) ++msgid "Name:" ++msgstr "名称：" ++ ++#: C/evolution.xml:4016(para) ++msgid "Specify a name for the Google calendar." ++msgstr "指定谷歌日历的名称。" ++ ++#: C/evolution.xml:4028(para) ++msgid "Set the time to automatically refresh the calendar." ++msgstr "选择自动刷新日历的时间。" ++ ++#: C/evolution.xml:4031(para) ++msgid "" ++"If you want to set a color label for the calendar, click the Color tab, " ++"select the desired color, then click OK." ++msgstr "如果您想为日历设置颜色标签，点击”颜色“，选择需要的颜色，点击”确定“。" ++ ++#: C/evolution.xml:4034(para) ++msgid "" ++"If you want to view the calendar items offline, select Copy calendar content " ++"locally for offline operation check box." ++msgstr "如果您想离线查看日历条目，选择”复制日历内容到本地供离线操作“的选择框。" ++ ++#: C/evolution.xml:4035(para) ++msgid "" ++"If you select this option, you cannot modify or create the calendar items." ++msgstr "如果您选择了该项，您将不能修改或创建日历条目。" ++ ++#: C/evolution.xml:4047(para) ++msgid "" ++"There are two types of events you can schedule with Evolution: appointments " ++"and meetings. An appointment is an event you schedule for yourself only, and " ++"a meeting is an event that you schedule multiple people for. You can also " ++"use the busy/free search for meetings to determine the availability of " ++"invitees." ++msgstr "" ++"您可以使用Evolution来安排两类事件：约会和会议。”约会“是一类为您自己安排的事" ++"件，”会议“则是您为多个人安排的事件。在会议中您也可以使用忙/闲搜索来决定能够参" ++"与的成员。" ++ ++#: C/evolution.xml:4050(link) C/evolution.xml:4076(title) ++msgid "Appointments" ++msgstr "约会" ++ ++#: C/evolution.xml:4053(link) C/evolution.xml:4247(title) ++msgid "Sending a Meeting Invitation" ++msgstr "发送会议邀请" ++ ++#: C/evolution.xml:4056(link) C/evolution.xml:4336(title) ++msgid "Accepting and Replying to a Meeting Request" ++msgstr "接受并回复会议邀请" ++ ++#: C/evolution.xml:4059(link) C/evolution.xml:4354(title) ++msgid "Reading Responses to Meeting Requests" ++msgstr "阅读给会议邀请者的回执" ++ ++#: C/evolution.xml:4062(link) C/evolution.xml:4359(title) ++msgid "Tool Tip View" ++msgstr "工具提示查看" ++ ++#: C/evolution.xml:4065(link) C/evolution.xml:4364(title) ++msgid "Using the Free/Busy View" ++msgstr "使用忙/闲视图" ++ ++#: C/evolution.xml:4068(link) C/evolution.xml:4392(title) ++msgid "" ++"Publishing Calendar and Free/Busy Information Without a Groupware Server" ++msgstr "在没有Groupware服务器的情况下发布日历和忙/闲信息。" ++ ++#: C/evolution.xml:4071(link) C/evolution.xml:4425(title) ++msgid "Accessing Free/Busy Data Without a Groupware Server" ++msgstr "在没有Groupware服务器的情况下获得忙/闲数据" ++ ++#: C/evolution.xml:4077(para) ++msgid "In Evolution, an appointment is an event you schedule for yourself." ++msgstr "在Evolution中，”约会“是一类为您自己安排的事件。" ++ ++#: C/evolution.xml:4080(link) C/evolution.xml:4094(title) ++msgid "Creating Appointments" ++msgstr "创建约会" ++ ++#: C/evolution.xml:4083(link) C/evolution.xml:4181(title) ++#: C/evolution.xml:5633(title) ++msgid "Reminders" ++msgstr "提醒" ++ ++#: C/evolution.xml:4086(link) C/evolution.xml:4217(title) ++msgid "Classifications" ++msgstr "分类" ++ ++#: C/evolution.xml:4089(link) C/evolution.xml:4240(title) ++msgid "Recurrence" ++msgstr "重复" ++ ++#: C/evolution.xml:4097(para) ++msgid "Click File > New > Appointment." ++msgstr "点击文件 > 新建 > 约会。" ++ ++#: C/evolution.xml:4099(para) ++msgid "" ++"Click Calendars on the Switcher, then click File, then New > Appointment." ++msgstr "在切换器上点击日历，点击文件 > 新建 > 约会。" ++ ++#: C/evolution.xml:4101(para) ++msgid "" ++"Double-click in a blank space on the calendar view to open an Appointment " ++"dialog box. The particular time on the calendar view against which you have " ++"double clicked on will be suggested for the new appointment." ++msgstr "" ++"在日历视图的空白处双击，打开一个约会对话框。您双击所对应的时刻会被设置为新约" ++"会的时间。" ++ ++#: C/evolution.xml:4103(para) ++msgid "" ++"Select the required duration on the calendar view and enter the summary." ++msgstr "在日历视图上选择需要的时间段，按回车键输入约会概要信息。" ++ ++#: C/evolution.xml:4106(para) C/evolution.xml:4260(para) ++msgid "Select a calendar in the Calendar drop-down list." ++msgstr "在日历下拉列表中选择一个日历。" ++ ++#: C/evolution.xml:4107(para) C/evolution.xml:4118(para) ++#: C/evolution.xml:4275(para) C/evolution.xml:4690(para) ++#: C/evolution.xml:4744(para) C/evolution.xml:4974(para) ++#: C/evolution.xml:6045(para) ++msgid "Enter a brief summary in the Summary field." ++msgstr "在”概要“一栏输入简短的概要。" ++ ++#: C/evolution.xml:4112(para) C/evolution.xml:4278(para) ++msgid "(Optional) Type a location in the Location field." ++msgstr "(可选)在”位置“一栏输入一个地点位置。" ++ ++#: C/evolution.xml:4115(para) ++msgid "Select the date and time." ++msgstr "选择时间和日期。" ++ ++#: C/evolution.xml:4121(para) C/evolution.xml:4281(para) ++msgid "" ++"To select this appointment as an all day event, click Options > All Day " ++"Event." ++msgstr "要选择该约会为一个全天时间，点击选项 > 全天事件。" ++ ++#: C/evolution.xml:4123(para) C/evolution.xml:4283(para) ++msgid "Click the All Day Event button on the toolbar." ++msgstr "在工具栏上点击全天事件按钮。" ++ ++#: C/evolution.xml:4126(para) C/evolution.xml:4286(para) ++msgid "" ++"If the event is an all day event, specify a starting date and an ending date." ++msgstr "如果该事件是全天事件，指定一个开始日期和结束日期。" ++ ++#: C/evolution.xml:4129(para) C/evolution.xml:4289(para) ++msgid "" ++"If the event is not an all day event, specify a starting time and an ending " ++"time." ++msgstr "如果该事件不是全天事件，指定一个开始时刻和结束时刻。" ++ ++#: C/evolution.xml:4132(para) C/evolution.xml:4292(para) ++msgid "Select For to specify the duration." ++msgstr "选择”时长“，指定事件持续时间。" ++ ++#: C/evolution.xml:4134(para) C/evolution.xml:4294(para) ++msgid "Select Until to specify the ending time of the event." ++msgstr "选择”直到“，指定事件结束时间。" ++ ++#: C/evolution.xml:4137(para) C/evolution.xml:4297(para) ++#: C/evolution.xml:4699(para) C/evolution.xml:4750(para) ++msgid "Type the time zone information in the Time Zone field." ++msgstr "在”时区“一栏输入时区信息。" ++ ++#: C/evolution.xml:4139(para) C/evolution.xml:4299(para) ++#: C/evolution.xml:4701(para) C/evolution.xml:4752(para) ++msgid "Click the globe to customize the time zone." ++msgstr "点击”全球“，自定义时区。" ++ ++#: C/evolution.xml:4140(para) C/evolution.xml:4300(para) ++#: C/evolution.xml:4702(para) C/evolution.xml:4753(para) ++msgid "To hide or show the Time Zone field, click View > Time Zone." ++msgstr "要隐藏或显示时区栏，点击视图 > 时区。" ++ ++#: C/evolution.xml:4143(para) ++msgid "To show the time as busy, click Options > Show Time as Busy." ++msgstr "要将时间显示为忙碌，点击选项 > 将时间显示为忙碌。" ++ ++#: C/evolution.xml:4146(para) C/evolution.xml:4223(para) ++#: C/evolution.xml:4705(para) C/evolution.xml:4756(para) ++#: C/evolution.xml:4970(para) ++msgid "(Optional) Type a category in the Categories field." ++msgstr "(可选)在类别一栏输入事件类别。" ++ ++#: C/evolution.xml:4147(para) C/evolution.xml:4229(para) ++#: C/evolution.xml:4706(para) C/evolution.xml:4757(para) ++msgid "To show or hide the Categories field, click View > Categories." ++msgstr "要显示或隐藏类别栏，点击视图 > 类别。" ++ ++#: C/evolution.xml:4150(para) C/evolution.xml:4709(para) ++#: C/evolution.xml:4760(para) C/evolution.xml:4980(para) ++#: C/evolution.xml:6054(para) ++msgid "(Optional) Enter a description in the Description field." ++msgstr "(可选)在描述区中输入描述信息。" ++ ++#: C/evolution.xml:4153(para) C/evolution.xml:4303(para) ++msgid "" ++"To create an alarm for this appointment, click Alarms on the toolbar, or " ++"click Options > Alarms." ++msgstr "要为约会创建闹钟提醒，点击工具栏上的提醒，或点击选项 > 提醒。" ++ ++#: C/evolution.xml:4154(para) C/evolution.xml:4210(para) ++#: C/evolution.xml:4304(para) ++msgid "Select Customize to add or remove customized alarms for the event." ++msgstr "选择”自定义“添加或删除事件的自定义提醒。" ++ ++#: C/evolution.xml:4155(para) C/evolution.xml:4305(para) ++msgid "" ++"For more information on reminders, see Reminders." ++msgstr "" ++"要查看更多关于提醒的信息，请参阅提醒。" ++ ++#: C/evolution.xml:4158(para) C/evolution.xml:4308(para) ++#: C/evolution.xml:4718(para) C/evolution.xml:4763(para) ++#: C/evolution.xml:4983(para) ++msgid "" ++"(Optional) To add an attachment, drag and drop the attachment into the " ++"attachment bar." ++msgstr "(可选)要添加一个附件，将附件拖放到附件栏。" ++ ++#: C/evolution.xml:4160(para) C/evolution.xml:4310(para) ++#: C/evolution.xml:4720(para) C/evolution.xml:4765(para) ++#: C/evolution.xml:4985(para) ++msgid "" ++"Click the Attach button on the toolbar, or click Insert > Attachment and " ++"then browse to the attachment." ++msgstr "点击工具栏上的附件按钮，或点击插入 > 附件，然后浏览并选择附件。" ++ ++#: C/evolution.xml:4163(para) C/evolution.xml:4313(para) ++#: C/evolution.xml:4712(para) C/evolution.xml:4768(para) ++#: C/evolution.xml:4988(para) ++msgid "" ++"(Optional) Click Options > Classifications, then select a classification " ++"(as Public, Private or Confidential)." ++msgstr "(可选)点击选项 > 分类，选择一种类别(公开，私人，机密)。" ++ ++#: C/evolution.xml:4166(para) C/evolution.xml:4316(para) ++msgid "(Optional) Click the Recurrence button on the toolbar." ++msgstr "(可选)点击工具栏上的重复按钮。" ++ ++#: C/evolution.xml:4168(para) C/evolution.xml:4318(para) ++msgid "" ++"Click Options > Recurrence, and specify whether you want the appointment " ++"to recur and how often." ++msgstr "点击选项 > 再现，指定是否希望此约会重现以及重现的频率。" ++ ++#: C/evolution.xml:4173(title) ++msgid "All Day Event" ++msgstr "全天事件" ++ ++#: C/evolution.xml:4174(para) ++msgid "" ++"An All Day event appears at the top of a day's appointment list, in the " ++"header under the date, rather than inside. That makes it easy to have " ++"appointments that overlap and fit inside each other. For example, a " ++"conference might be an All Day appointment, and the meetings at the " ++"conference could be timed appointments. Appointments with specific starting " ++"and ending times can also overlap. When they do they display as multiple " ++"columns in the day view of the calendar." ++msgstr "" ++"全天事件显示在一日事件列表的顶部，在日期下面的头部区域而不是主体内部区域。这" ++"样普通的相互重叠的约会更容易排列。例如，一个大会可以是一个全天事件，大会中的" ++"子会议可以是普通的约会。特定时间起始和终止的约会可以重叠。当它们重叠时，会在" ++"日历视图中分多列显示。" ++ ++#: C/evolution.xml:4175(para) ++msgid "" ++"If you create calendar appointments that overlap, Evolution displays them " ++"side by side in your calendar." ++msgstr "如果您创建了重叠的日历约会，Evolution会在您的日历中并肩显示。" ++ ++#: C/evolution.xml:4182(para) ++msgid "" ++"You can have several Reminders for individual appointments, any time prior " ++"to the appointment you schedule. You can have one reminder of each of the " ++"following types:" ++msgstr "" ++"您可以为独立的约会创建多个提醒，在安排的约会之前任意时刻都行。您可以拥有下列" ++"的提醒类型，每种一个：" ++ ++#: C/evolution.xml:4186(title) ++msgid "Display:" ++msgstr "显示：" ++ ++#: C/evolution.xml:4187(para) ++msgid "" ++"A notification pops up on your screen to remind you of your appointment." ++msgstr "在您的屏幕上弹出一个提示，提醒您约会事件。" ++ ++#: C/evolution.xml:4192(title) ++msgid "Audio:" ++msgstr "声音：" ++ ++#: C/evolution.xml:4193(para) ++msgid "Your computer delivers a sound alarm." ++msgstr "您的计算机会发出提示声。" ++ ++#: C/evolution.xml:4198(title) ++msgid "Program:" ++msgstr "程序" ++ ++#: C/evolution.xml:4199(para) ++msgid "" ++"You can run a program as a reminder. You can enter its name in the text " ++"field, or find it with the Browse button." ++msgstr "" ++"您可以运行一个特定的程序作为提醒。您可以在文本框中键入它的名称，或点击”浏" ++"览“按钮找到它。" ++ ++#: C/evolution.xml:4203(para) ++msgid "" ++"Apart from the above notifications, the Evolution alarm icon blinks in the " ++"notification area. To pause the alarm or view the event, click the " ++"notification icon." ++msgstr "" ++"除了上述的提醒之外，Evolution还会在系统通知区域闪烁一个提醒图标。要终止提醒或" ++"查看事件，点击该通知图标即可。" ++ ++#: C/evolution.xml:4204(para) ++msgid "To create a reminder:" ++msgstr "要创建一个提醒：" ++ ++#: C/evolution.xml:4207(para) ++msgid "" ++"To create an alarm for this appointment, click Alarms on the toolbar, or " ++"click Options, then Alarms." ++msgstr "" ++"要为该约会创建一个提醒，点击工具栏上的”提醒“图标，或点击选项，然后选择提醒。" ++ ++#: C/evolution.xml:4213(para) ++msgid "" ++"If you have stored reminders in a local calendar, they work from the moment " ++"you log in. However, for reminders stored on any remote server like " ++"GroupWise or Exchange which requires authentication, you must run Evolution " ++"at least once after logging in. No matter where the reminders are stored, " ++"you can quit Evolution and still be reminded of an upcoming appointment." ++msgstr "" ++"如果您把提醒存储在本地日历中，它们从您登录系统时刻开始即有效。但是，存储在远" ++"程服务器如GroupWise或Exchange(它们需要身份认证)的提醒，您必须在登录系统后至少" ++"一次启动Evolution。不论您将提醒存储在何处，您都可以在退出Evolution的情况下收" ++"到即将到来的约会提醒。" ++ ++#: C/evolution.xml:4218(para) ++msgid "" ++"If you are using a calendar on a Novell GroupWise or Microsoft Exchange server, select a " ++"classification for the appointment to determine who can view it. Public is " ++"the default category, and a public appointment can be viewed by anyone on " ++"the calendar-sharing network. Private denotes one level of security, and " ++"Confidential an even higher level. The different levels vary depending on " ++"your server settings; check with your system administrator or adjust your " ++"delegation settings." ++msgstr "" ++"如果您使用位于Novell GroupWise或" ++"Microsoft Exchange服务器上的日历，可以为约会选择一个列表以决定谁可以查看它" ++"们。默认类别是”公开“，可以被任何位于日历共享网络上的人查看。类别”私人“提高了" ++"一级安全性，类别”机密“的安全性更高。不同级别安全性根据您的服务器设置有所不" ++"同。请咨询您的系统管理员或调整您的委托设置。" ++ ++#: C/evolution.xml:4219(para) ++msgid "" ++"If you are using a Novell GroupWise or Microsoft Exchange server, other " ++"people on the server can check your schedule to see if you are available at " ++"any given time. If you have an appointment that is flexible or that you want " ++"to designate as Free rather than Busy time, select the Free box in the Show " ++"Time As section. Normally, appointments display as Busy." ++msgstr "" ++"如果您在使用Novell GroupWise或Microsoft Exchange，其他在该服务器上的人可以查" ++"看您的计划以便了解您在某个时刻是否有空。如果您的约会是可调节的，或者您想要指" ++"明该时段是闲而非忙，可以在“将时间显示为”区域中选择“闲”。正常情况下，约会显示" ++"为“忙”。" ++ ++#: C/evolution.xml:4220(para) ++msgid "" ++"You can categorize appointments in the same way you can categorize contacts." ++msgstr "类似于分类联系人，您可以以同样的方式分类约会。" ++ ++#: C/evolution.xml:4226(para) ++msgid "" ++"Select the check box next to each category that matches the appointment you " ++"are creating." ++msgstr "在与您创建的约会相匹配的类别旁边勾上选框。" ++ ++#: C/evolution.xml:4233(para) ++msgid "" ++"You can add a new category to your category list by clicking Edit Master " ++"Category List, then click Click Here To Add A Category." ++msgstr "" ++"您也可以通过点击“编辑分类列表”，然后点击“点击此处添加新类别”来添加新的类别到" ++"您的分类列表。" ++ ++#: C/evolution.xml:4235(para) ++msgid "" ++"After you have selected your categories, click OK to assign these categories " ++"to the appointment. The categories you selected are now listed in the text " ++"box to the right of the Categories button." ++msgstr "" ++"选择您的类别后，点击“确定”将类别分配到约会。这时您选择的类别就已经列在“类" ++"别”按钮右侧的文本框中了。" ++ ++#: C/evolution.xml:4236(para) ++msgid "" ++"Appointments with categories appear with icons in the calendar display, and " ++"you can also search for appointments by category. To display only the " ++"appointments in a particular category, select the corresponding category in " ++"the search bar at the top of the calendar." ++msgstr "" ++"带有类别的约会在日历视图中会显示为带有一个图标，您还可以通过类别来搜索约会。" ++"要显示某个特定类别的约会，在日历顶部的搜索栏选择对应的类别。" ++ ++#: C/evolution.xml:4241(para) ++msgid "" ++"The Recurrence tool button lets you describe repetition in appointments " ++"ranging from once every day up to once every 100 years. You can then choose " ++"a time and date when the appointment stops recurring, and, under Exceptions, " ++"pick individual days when the appointment does not recur. Make your " ++"selections from left to right, and you form a sentence: Every two " ++"weeks on Monday and Friday until January 3, 2008 or Every " ++"month on the first Friday for 12 occurrences." ++msgstr "" ++"“重复工具”按钮让您描述事件的重复周期(从每天一次到100年一次)。然后您可以选择一" ++"个时刻或日期作为该约会停止重复的时间。此外还可以设置若干例外(即指定某几天您不" ++"想让它重复)。从左到右依次进行您的选择，结果会像这样：每2周在周一和周五" ++"直到2008年1月3日或每1月在第一个星期五时长12个循环。" ++ ++#: C/evolution.xml:4242(para) ++msgid "" ++"After you have finished settings, click the Save button in the toolbar to " ++"save and close the appointment editor window. If you want, you can alter an " ++"appointment summary in the calendar view by clicking it and typing. You can " ++"change other settings by right-clicking the appointment then choosing Open, " ++"or double-clicking the appointment." ++msgstr "" ++"设定完毕之后，点击工具栏上“保存”按钮保存并关闭约会编辑器窗口。如果需要的话，" ++"您可以选择再输入一些摘要，方法是在日历视图上点击它即可输入。您还可以通过在约" ++"会标记上右击选择“打开”或双击，修改其它一些设置。" ++ ++#: C/evolution.xml:4248(para) ++msgid "" ++"A meeting is an event you schedule for multiple people. Evolution can be " ++"used to schedule group meetings and help you manage responses to meeting " ++"requests." ++msgstr "" ++"会议是一类您为多个人安排的事件。Evolution可用于计划群体会议，帮助您处理会议请" ++"求的回执。" ++ ++#: C/evolution.xml:4249(para) ++msgid "" ++"When you create a meeting or group appointment, you can specify the " ++"attendees in several categories, such as chair or " ++"required. When you save the meeting listing, each attendee is " ++"sent an email with the meeting information, which also gives them the option " ++"to respond." ++msgstr "" ++"当您创建一个会议或群体约会时，您可以指定不同类别的与会者，如主席或必需的出席者。当您保存会议列表时，每个与会者会收到一封" ++"与该会议相关的邮件，给他们回复的选择。" ++ ++#: C/evolution.xml:4250(para) ++msgid "" ++"If you don't need to collect attendance information when you're scheduling " ++"an event, and would rather just announce the event, right-click the meeting " ++"and select Forward as iCalendar. This opens a new email message with the " ++"event notification attached as an announcement. Recipients can add the event " ++"to their calendars with one click, but it won't automatically send you email " ++"about whether they plan to attend." ++msgstr "" ++"如果您在安排会议时不需要收集与会者信息，仅仅是公告会议，可以右键点击该会议，" ++"选择“作为iCalendar转发”。这将会打开一封新邮件，里面有一个与会议相关的通知附" ++"件。收信人可以点击它把该会议加入日历，但它不会自动回复您他们是否计划参加会" ++"议。" ++ ++#: C/evolution.xml:4251(para) ++msgid "To schedule a meeting:" ++msgstr "要计划一个会议：" ++ ++#: C/evolution.xml:4254(para) C/evolution.xml:4369(para) ++msgid "Click File > New > Meeting." ++msgstr "点击文件 > 新建 > 会议。" ++ ++#: C/evolution.xml:4257(para) C/evolution.xml:4735(para) ++msgid "" ++"If you have multiple email accounts, select the one to use by selecting an " ++"item in the Organizer field." ++msgstr "如果您有多个邮件账户，在“组织者”一栏中选择一个。" ++ ++#: C/evolution.xml:4263(para) C/evolution.xml:4372(para) ++msgid "Click Add to add the email addresses of people you want to invite." ++msgstr "点击“添加”，添加您想要邀请的人的邮件地址。" ++ ++#: C/evolution.xml:4266(para) ++msgid "" ++"To remove an attendee from the list, select an attendee and press Remove." ++msgstr "要从列表中移除与会者，选中他，点击“删除”。" ++ ++#: C/evolution.xml:4269(para) ++msgid "To edit a field, select the field and click Edit." ++msgstr "要编辑与会者条目，选中它，点击“编辑”。" ++ ++#: C/evolution.xml:4272(para) ++msgid "" ++"Click View on the menu bar to show or hide the Type, Role, Status, and RSVP " ++"fields." ++msgstr "点击菜单栏上的“视图”选择显示或隐藏类型域，角色域，状态域，请回复域。" ++ ++#: C/evolution.xml:4321(para) ++msgid "" ++"To query free/busy information for the attendees, click the Free/Busy button " ++"on the toolbar." ++msgstr "要求查询出席者的忙/闲信息，点击工具栏上的忙/闲按钮。" ++ ++#: C/evolution.xml:4323(para) ++msgid "Click Options > Free/Busy." ++msgstr "点击选项 > 忙/闲。" ++ ++#: C/evolution.xml:4326(para) C/evolution.xml:6109(para) ++msgid "Click Save to save the meeting." ++msgstr "点击“保存”，保存该会议。" ++ ++#: C/evolution.xml:4329(para) ++msgid "" ++"An email is sent out to all the recipients, inviting them to your event." ++msgstr "Evolution会发送一封邮件给所有出席者，邀请他们参加您的会议。" ++ ++#: C/evolution.xml:4331(para) ++msgid "" ++"In Evolution, a meeting can have only one organizer, and only the organizer " ++"can add participants to that meeting. Though it is possible to change the " ++"organizer of a meeting, this is not recommended as a means to invite " ++"additional participants to meetings. If you want to invite additional people " ++"to a meeting and are not that meeting's organizer, it is recommended that " ++"you forward the invitation message you received from the original meeting " ++"organiser to additional participants." ++msgstr "" ++"在Evolution中，一个会议只能有一个组织者，只有组织者可以添加出席者列表。虽然会" ++"议的组织者也可能变化，但不建议以这种方式来邀请额外的会议出席者。如果您不是会" ++"议组织者却想邀请额外的人，建议您转发收到的请帖给其他您想要邀请的人。" ++ ++#: C/evolution.xml:4337(para) ++msgid "" ++"Meeting requests are sent as iCal attachments. To view or respond to one, " ++"click the attachment icon and view it inline in the mail window. All the " ++"details are shown about the event, including time and dates. Then you can " ++"choose how to reply to the invitation. Your choices are:" ++msgstr "" ++"会议请帖以iCal附件发送。要查看或回复，点击附件图标，在邮件窗口中嵌入查看。里" ++"面会显示会议的各个细节，包括时间、日期等。然后您可以选择如何回复。您的选择" ++"有：" ++ ++#: C/evolution.xml:4340(para) ++msgid "Accept" ++msgstr "接受" ++ ++#: C/evolution.xml:4343(para) ++msgid "Tentatively Accept" ++msgstr "暂时接受" ++ ++#: C/evolution.xml:4346(para) ++msgid "Decline" ++msgstr "拒绝" ++ ++#: C/evolution.xml:4349(para) ++msgid "" ++"Click OK to send an email to the organizer with your answer. The event is " ++"also added to your calendar if you accept." ++msgstr "" ++"点击“确定”，将您的选择回复给会议组织者。如果您选择接受的话，该会议会加入您的" ++"日历。" ++ ++#: C/evolution.xml:4350(para) ++msgid "" ++"After you add the meeting to your calendar, you can make changes to the " ++"information, but if the original organizer sends out another update, your " ++"changes might be overwritten." ++msgstr "" ++"在您将会议加入到日历之后，您可以对该信息作些修改，但如果最初的组织者发送了一" ++"个更新消息，则您的修改可能会被覆盖掉。" ++ ++#: C/evolution.xml:4355(para) ++msgid "" ++"When you get a reply to a meeting invitation you sent, you can view it " ++"inline by clicking the attachment and selecting View Inline." ++msgstr "" ++"当您收到您发送的会议请帖的回执时，可以点击附件，选择“嵌入阅读”来查看它。" ++ ++#: C/evolution.xml:4360(para) ++msgid "" ++"If you are in a hurry and you want to see the details of a meeting, mouse " ++"over the meeting in the calendar view. A tool tip appears with the details " ++"of the meeting. It will provide the agenda of the meeting, venue and time. " ++"If you are the organizer of the meeting, you can also view the status of the " ++"attendees, e.g. how many of them have accepted or declined the meeting " ++"request." ++msgstr "" ++"如果您急需查看会议的详情，可以将鼠标移到日历视图上的会议标记。这时一个工具提" ++"示会显现，显示会议的细节，包括会议议程，地点，时间等。如果您是会议组织者，您" ++"也可以查看出席者的状态，例如，接受或拒绝会议请求的人数。" ++ ++#: C/evolution.xml:4365(para) ++msgid "" ++"In addition to the standard meeting scheduling tools, you can use the Free/" ++"Busy view to check whether people are available in advance. The Free/Busy " ++"feature is normally a function of dedicated groupware servers such as " ++"Microsoft Exchange and Novell GroupWise. However, you can also publish Free/" ++"Busy information online, and access Free/Busy information published " ++"elsewhere. If not everyone you collaborate with publishes Free/Busy data, " ++"you can still use iCal event invitations to coordinate schedules with other " ++"people." ++msgstr "" ++"除了标准的会议安排工具之外，您还可以使用忙/闲视图来提前查看人员情况。忙/闲查" ++"看功能是群体软件服务器如Microsoft Exchange和Novell GroupWise的一种标准功能。" ++"但是，您也可以在线发布忙/闲信息，以及获得别处发布的忙/闲信息。如果您身边不是" ++"所有人都发布了忙/闲信息，您仍然可以使用iCal会议邀请来和别人协调会议计划安排。" ++ ++#: C/evolution.xml:4366(para) ++msgid "To access the free/busy view:" ++msgstr "要查看忙/闲信息：" ++ ++#: C/evolution.xml:4375(para) ++msgid "" ++"Click the Free/Busy button on the toolbar, or click Options > Free/Busy." ++msgstr "在工具栏上点击忙/闲按钮，或点击选项 > 忙/闲。" ++ ++#: C/evolution.xml:4379(para) ++msgid "" ++"Adjust the meeting time, either by dragging the meeting borders or by using " ++"the Autopick buttons to choose a time automatically, then click Save and " ++"Close. Attendees on an Exchange server have the appointment updated " ++"automatically; others receive email notification of any change in plans." ++msgstr "" ++"调整会议时间，可以拖拽会议时间边界线，也可以点击“自动获取”按钮来自动选择一个" ++"时间段，然后点击“保存”并关闭。这样，位于Exchange服务器上的出席者会自动更新会" ++"议信息；其它人则会收到电子邮件提醒。" ++ ++#: C/evolution.xml:4383(title) ++msgid "Attendee List:" ++msgstr "出席者列表：" ++ ++#: C/evolution.xml:4384(para) ++msgid "" ++"The Attendee List shows the people who have been invited to the appointment." ++msgstr "出席者列表显示了被邀请参与会议的出席者。" ++ ++#: C/evolution.xml:4387(title) ++msgid "Schedule Grid:" ++msgstr "计划表格" ++ ++#: C/evolution.xml:4388(para) ++msgid "" ++"The Schedule Grid shows the published Free/Busy information for the people " ++"you have invited. This is where you compare schedules to find free time to " ++"schedule the appointment. Individuals have visible scheduling information " ++"only if they use the same Novell GroupWise or Microsoft Exchange server you " ++"do (that is, if they are in the same organization as you), or if they " ++"publish free/busy information at a URL you can reach and you have entered " ++"that URL into their contact cards using the contact editor." ++msgstr "" ++"计划表格显示您邀请的人发布的忙/闲信息。这样您就可以比较各种计划来决定安排会员" ++"的时间。但只有在以下几种情况下个人的计划信息才是可见的：或者他们在使用和您一" ++"样的Novell GroupWise或Microsoft Exchange服务器(即他们和您在同一个组织中)，或" ++"者他们在某个您知道的URL发布忙/闲信息，而且您已经把对应的URL网址输入到了联系人" ++"名片中。" ++ ++#: C/evolution.xml:4393(para) ++msgid "" ++"You can publish Calendar and Free/Busy information to a WebDAV, FTP server, " ++"or remote machine through secure shell or other Web server with HTTP PUT " ++"support. Check with your system administrator if you are not sure you have " ++"this functionality." ++msgstr "" ++"您可以通过SSH或其它支持HTTP PUT的网络服务器将日历和忙/闲信息发布到WebDAV，FTP" ++"服务器或远程主机上。如果您不确定是否有该功能，可以咨询系统管理员。" ++ ++#: C/evolution.xml:4394(para) ++msgid "To set up Calendar or Free/Busy publishing:" ++msgstr "要设置发布日历或忙/闲信息：" ++ ++#: C/evolution.xml:4397(para) C/evolution.xml:5156(para) ++msgid "Click Edit > Preferences, then click Calendar and Tasks." ++msgstr "点击编辑 > 首选项，然后点击“日历和任务”。" ++ ++#: C/evolution.xml:4400(para) ++msgid "" ++"Click the Calendar Publishing tab, click Add, then select the information " ++"you want to publish." ++msgstr "点击“日历发布”标签，点击“添加”，选择您想要发布的信息。" ++ ++#: C/evolution.xml:4403(para) ++msgid "Select the frequency with which you want to upload data." ++msgstr "选择您想要上传数据的频率。" ++ ++#: C/evolution.xml:4406(para) ++msgid "Select the calendars you want to display data for." ++msgstr "选择您想要显示数据的日历。" ++ ++#: C/evolution.xml:4409(para) ++msgid "Specify the publishing location for the upload server." ++msgstr "指定上传服务器的发布位置。" ++ ++#: C/evolution.xml:4412(para) ++msgid "Type your username and password." ++msgstr "输入用户名和密码。" ++ ++#: C/evolution.xml:4418(para) ++msgid "" ++"To immediately publish calendar information, go to the Calendar tool and " ++"click Actions > Publish Calendar Information." ++msgstr "要立刻发布日历信息，切换到日历工具，点击操作 > 发布日历信息。" ++ ++#: C/evolution.xml:4420(para) C/evolution.xml:7067(para) ++msgid "You can specify a template to use when posting to the Free/Busy server." ++msgstr "您可以在发送给忙/闲服务器时指定要使用的模板。" ++ ++#: C/evolution.xml:4426(para) ++msgid "" ++"If individuals give you a URL for Free/Busy data or for their Web calendar, " ++"you can enter it as part of the contact information in the Contacts tool. " ++"Then, when you schedule a meeting with them, Evolution looks up the schedule " ++"and displays it in the Free/Busy data." ++msgstr "" ++"如果别人给您一个他们的忙/闲数据或网络日历的URL地址，您可以将它输入到联系人信" ++"息中。这样，当您在安排与他们相关的会议时。Evolution会自动检查他们的计划并显示" ++"相关的忙/闲数据。" ++ ++#: C/evolution.xml:4433(para) ++msgid "" ++"You can use a customized search, an advanced search, or a quick search to " ++"search for Calendar items." ++msgstr "您可以使用自定义搜索，高级搜索或快速搜索来查找日历条目。" ++ ++#: C/evolution.xml:4436(para) ++msgid "" ++"Evolution enables you to find the Calendar items by using a Customized " ++"Search." ++msgstr "Evolution允许您使用自定义搜索查找日历条目。" ++ ++#: C/evolution.xml:4446(para) C/evolution.xml:4790(para) ++#: C/evolution.xml:5024(para) ++msgid "Summary contains" ++msgstr "概要含有" ++ ++#: C/evolution.xml:4449(para) C/evolution.xml:4793(para) ++#: C/evolution.xml:5027(para) ++msgid "Description contains" ++msgstr "描述含有" ++ ++#: C/evolution.xml:4452(para) C/evolution.xml:4796(para) ++#: C/evolution.xml:5030(para) ++msgid "Any field Contains" ++msgstr "任何域含有" ++ ++#: C/evolution.xml:4457(para) C/evolution.xml:5035(para) ++msgid "Evolution displays the desired Calendar items." ++msgstr "Evolution会显示您需要的日历条目。" ++ ++#: C/evolution.xml:4469(para) C/evolution.xml:4811(para) ++#: C/evolution.xml:5047(para) ++msgid "Select Advanced Search to open Advanced Search dialog box." ++msgstr "选择“高级搜索”，打开高级搜索对话框。" ++ ++#: C/evolution.xml:4470(para) C/evolution.xml:4812(para) ++#: C/evolution.xml:5048(para) ++msgid "Search name field displays the search type you have selected." ++msgstr "“规则名称”一栏显示您已经选择的搜索类型。" ++ ++#: C/evolution.xml:4474(para) C/evolution.xml:4815(para) ++#: C/evolution.xml:5051(para) ++msgid "Click Add to add rules." ++msgstr "点击“添加”，添加搜索规则。" ++ ++#: C/evolution.xml:4477(para) C/evolution.xml:4818(para) ++#: C/evolution.xml:5054(para) ++msgid "Select the criteria, and then type a search entry in the given field." ++msgstr "选择搜索方式，在给出的文本框中输入搜索文本。" ++ ++#: C/evolution.xml:4488(para) ++msgid "" ++"Displays all the Calendar items that match the criteria that you have " ++"selected from the drop-down list in the Search bar." ++msgstr "显示与您从搜索栏下拉列表中选择的搜索方式相匹配的全部日历条目。" ++ ++#: C/evolution.xml:4492(para) C/evolution.xml:5069(para) ++msgid "Click the Show drop-down list." ++msgstr "点击下拉列表。" ++ ++#: C/evolution.xml:4498(para) C/evolution.xml:4867(para) ++#: C/evolution.xml:5075(para) ++msgid "Any Category" ++msgstr "任何类别" ++ ++#: C/evolution.xml:4501(para) C/evolution.xml:4870(para) ++#: C/evolution.xml:5078(para) ++msgid "Unmatched" ++msgstr "不匹配" ++ ++#: C/evolution.xml:4504(para) ++msgid "Active Appointments" ++msgstr "活动约会" ++ ++#: C/evolution.xml:4507(para) ++msgid "Next 7 Days' Appointments" ++msgstr "下一周的约会" ++ ++#: C/evolution.xml:4522(para) C/evolution.xml:4900(para) ++msgid "Favourites" ++msgstr "最喜爱的" ++ ++#: C/evolution.xml:4575(para) ++msgid "You can view the desired items listed in the Calendar view." ++msgstr "您可以在日历视图中看到需要的条目。" ++ ++#: C/evolution.xml:4580(para) ++msgid "To print the displayed calendar items, click File > Print." ++msgstr "要打印显示的日历条目，点击文件 > 打印。" ++ ++#: C/evolution.xml:4585(para) ++msgid "" ++"Keeping a list of everything you did in the past eventually slows down your " ++"calendar. To delete old events, click Actions > Purge, then enter the " ++"number of days of past events you want to keep. Click OK to purge the items." ++msgstr "" ++"如果所有过去您已完成的事项都残留在日历里，则其运行速度会变慢。要删除旧的事" ++"件，点击操作 > 销毁，然后输入您想保留过去几天的事件？点击“确定”，在此时间" ++"之前的会被销毁。" ++ ++#: C/evolution.xml:4590(para) ++msgid "Only attendees of a meeting can delegate a meeting." ++msgstr "只有会议的出席者才能委托会议。" ++ ++#: C/evolution.xml:4593(para) ++msgid "In the Calendar, right-click the meeting you want to delegate." ++msgstr "在日历中，右键单击您想委托的会议。" ++ ++#: C/evolution.xml:4596(para) ++msgid "Click Delegate Meeting." ++msgstr "点击“委托会议”。" ++ ++#: C/evolution.xml:4599(para) ++msgid "Select the contacts you want to delegate the meeting to." ++msgstr "选择您想要把会议委托给哪些联系人。" ++ ++#: C/evolution.xml:4605(para) ++msgid "Each contact receives a copy of the meeting invitation." ++msgstr "每个联系人就会收到该会议请帖的副本。" ++ ++#: C/evolution.xml:4609(title) ++msgid "Multiple Calendars, Web Calendars and CalDAV" ++msgstr "多个日历，网络日历和CalDAV" ++ ++#: C/evolution.xml:4610(para) ++msgid "" ++"To create a new calendar, click File > New > Calendar. If the calendar " ++"is one you plan to store locally, you need only provide a name and color. If " ++"it is a remote calendar, specify the name, color, URL, and a refresh " ++"frequency. The refresh frequency determines how often Evolution checks to " ++"see if the calendar has changed. If you are working with someone who " ++"publishes an online calendar, you might want to check for updates every " ++"thirty minutes. On the other hand, if you have displayed a sports team " ++"schedule in your calendar, you might not need to refresh it more than once a " ++"week." ++msgstr "" ++"要创建一个新日历，点击文件 > 新建 > 日历。如果您准备把日历保存在本地，" ++"您只需提供一个日历名称和颜色。如果日历是保存在远程服务器上，您需要指定它的名" ++"称，颜色，URL，以及刷新频率。刷新频率决定了Evolution每隔多长时间查看一下日历" ++"是否有所改变。如果您和某个发布了在线日历的人一起工作，您可能需要每隔三十分钟" ++"检查一次更新。另一方面，如果您在日历中显示的是一个足球队的训练计划，您需要的" ++"刷新频率会低于每周一次。" ++ ++#: C/evolution.xml:4611(para) ++msgid "" ++"The icalshare.com Web site has " ++"an extensive list of shared online calendars, including national and " ++"religious holidays, phases of the moon, sports, and local and regional " ++"events." ++msgstr "" ++"网站icalshare.com Web site列有集" ++"中的在线共享日历列表，包括全国性节日和宗教节日，月相周期，体育移动，以及本地" ++"的和宗教的事件。" ++ ++#: C/evolution.xml:4612(para) ++msgid "" ++"Evolution lets you view and manage calendars on remote CalDAV servers. The " ++"procedure to create a CalDAV calendar source is similar to that of a remote " ++"Web calendar source. You can view and create calendar events on CalDav " ++"accounts just like other calendars on Evolution." ++msgstr "" ++"Evolution能让您查看、处理远程CalDAV服务器上的日历。创建一个CalDAV日历源的步骤" ++"和创建远程网络日历源类似。您可以像其它Evolution上的日历一样在CalDAV日历上查" ++"看、创建日历事件。" ++ ++#: C/evolution.xml:4613(para) ++msgid "" ++"You can view and manage local iCal or ics files in the Calendar view. Select " ++"the local iCal or ics files as calendar source to manage or view them in " ++"Evolution." ++msgstr "" ++"您可以在日历视图中查看、处理本地的iCal或ics文件。选择本地的iCal或ics文件作为" ++"在Evolution中查看、操作的日历源。" ++ ++#: C/evolution.xml:4614(para) ++msgid "To access a local ics or iCal file in the Calendar view:" ++msgstr "要在日历视图中操作本地的iCal或ics文件：" ++ ++#: C/evolution.xml:4620(para) ++msgid "Select On this computer from the Type drop-down list." ++msgstr "从类型下拉列表中选择“在本电脑上”。" ++ ++#: C/evolution.xml:4623(para) ++msgid "In the Name field, specify a name for the local calendar." ++msgstr "在“名称”一栏，为本地日历指定一个名称。" ++ ++#: C/evolution.xml:4626(para) ++msgid "Select customize options." ++msgstr "选择“自定义选项”。" ++ ++#: C/evolution.xml:4629(para) ++msgid "" ++"In the File name field, give ics / ical file location as the calendar source." ++msgstr "在“文件名”一栏中，指定ics/ical文件位置作为日历源。" ++ ++#: C/evolution.xml:4632(para) ++msgid "In the Refresh field, choose refresh type from the drop-down list." ++msgstr "在“刷新”一栏，从下拉列表中选择刷新的方式。" ++ ++#: C/evolution.xml:4635(para) ++msgid "Select the Force read only option if you want the calendar read-only." ++msgstr "如果您想让日历成为只读的话，选择“强制只读”。" ++ ++#: C/evolution.xml:4638(para) ++msgid "" ++"To set a color label for the calendar, click the Color tab, select the " ++"desired color, then click OK." ++msgstr "要为日历设置一个颜色标签，点击“颜色”，选择需要的颜色，然后点击“确定”。" ++ ++#: C/evolution.xml:4646(para) ++msgid "" ++"The Task List, located in the upper-right corner of the calendar, lets you " ++"keep a list of tasks separate from your calendar appointments." ++msgstr "任务列表位于日历右上角，帮助您记录从日历约会事件中分离出来的任务。" ++ ++#: C/evolution.xml:4647(para) ++msgid "" ++"You can use the list in a larger window by clicking the Tasks button in the " ++"side bar." ++msgstr "您可以在侧边栏中点击“任务”按钮，在较大的窗口中查看任务列表。" ++ ++#: C/evolution.xml:4648(para) ++msgid "" ++"Task Lists are more easily organized in the dedicated Tasks tool. Each task " ++"list is assigned a color, and you can use the Tasks tool switcher to hide " ++"and show task lists just like calendars. In the calendar display task pad, " ++"tasks from all visible task lists appear, color coded by list." ++msgstr "" ++"任务列表在专门的任务工具中是有序排列的。每个任务列表分配了一个颜色标签，您可" ++"以使用任务工具切换器来显示或隐藏任务列表，正如同日历一样。在日历视图的任务列" ++"表面板上，所有来自可见列表的任务都会显示，颜色标签由各列表分配。" ++ ++#: C/evolution.xml:4651(link) C/evolution.xml:4662(title) ++msgid "Creating a New Task List" ++msgstr "创建新任务列表" ++ ++#: C/evolution.xml:4654(link) C/evolution.xml:4681(title) ++msgid "Creating a New Task" ++msgstr "创建新任务" ++ ++#: C/evolution.xml:4657(link) C/evolution.xml:4726(title) ++msgid "Assigned Tasks" ++msgstr "已安排任务" ++ ++#: C/evolution.xml:4665(para) ++msgid "Click File > New > Task List." ++msgstr "点击文件 > 新建 > 任务列表。" ++ ++#: C/evolution.xml:4668(para) ++msgid "Specify the name and color for the task list." ++msgstr "为该任务列表指定名称和颜色。" ++ ++#: C/evolution.xml:4671(para) ++msgid "" ++"(Optional) If the task is an online list, specify the URL of the task list." ++msgstr "(可选)如果该任务列表是在线列表，指定它的URL地址。" ++ ++#: C/evolution.xml:4677(para) ++msgid "" ++"After you have added a task to your to-do list, its summary appears in the " ++"Summary section of the task list. To view or edit a detailed description of " ++"an item, double-click it, or right-click it and select Open. You can delete " ++"items by selecting them, then clicking Delete. The list of tasks is sorted " ++"in a similar way to the list of email messages in Evolution Mail. Click once " ++"on a message header to change the direction and type of sorting, or right-" ++"click to add or remove columns from the display." ++msgstr "" ++"在您添加任务到列表后，它的概要部分会显示在任务列表中的“概要”域。要查看或编辑" ++"一个条目的详细信息，双击它或右击它选择“打开”；要删除一个条目，选中它，点击“删" ++"除”。任务列表的排列方式类似于Evolution邮件中邮件的排列方式。在邮件头上点击一" ++"次会改变排列方向和类型。在邮件头上右击，可以选择添加或删除显示的列。" ++ ++#: C/evolution.xml:4684(para) ++msgid "Click File > New > Task." ++msgstr "点击文件 > 新建 > 任务。" ++ ++#: C/evolution.xml:4687(para) C/evolution.xml:4738(para) ++msgid "Select a group for the task." ++msgstr "选择任务所在的组。" ++ ++#: C/evolution.xml:4693(para) ++msgid "(Optional) Specify a starting date and ending date for the task." ++msgstr "(可选)指定任务的开始日期和结束日期。" ++ ++#: C/evolution.xml:4696(para) ++msgid "(Optional) Specify a starting time and ending time for the task." ++msgstr "(可选)指定任务的开始时间和结束时间。" ++ ++#: C/evolution.xml:4715(para) C/evolution.xml:4771(para) ++msgid "" ++"(Optional) To specify a status for the task, click Options > Status " ++"Details." ++msgstr "(可选)要指定任务的状态，点击“选项” > 状态细节。" ++ ++#: C/evolution.xml:4727(para) ++msgid "Evolution can be used to assign a task to multiple people." ++msgstr "使用Evolution可以将一项任务分配给多个人。" ++ ++#: C/evolution.xml:4728(para) ++msgid "" ++"When you assign a task, you can specify the attendees in several categories, " ++"such as chair or required. When you save the " ++"task, each attendee is sent an email with the task information, which also " ++"gives them the option to respond." ++msgstr "" ++"当您分配任务时，您可以指定不同类别的出席者，如主席或必" ++"需的出席者。当您保存任务时，每个出席者会收到一封关于该任务的邮件，并" ++"会给他们相关选项供答复。" ++ ++#: C/evolution.xml:4729(para) ++msgid "To assign a new task:" ++msgstr "要分配一项新任务：" ++ ++#: C/evolution.xml:4732(para) ++msgid "Click File > New > Assigned Task." ++msgstr "点击文件 > 新建 > 分配任务。" ++ ++#: C/evolution.xml:4741(para) ++msgid "" ++"Click Add, or press Insert key, or right click and then press Add to add the " ++"email addresses of people you want to assign the task. To remove an attendee " ++"from the list, select an attendee, then press Remove. To edit a field, " ++"select the field, then click Edit. Click View on the menu bar to show or " ++"hide the Type, Role, Status, and RSVP fields." ++msgstr "" ++"点击添加，或按Insert键，或右击点击然后选择“添加”，添加要分配任务的人的邮件地" ++"址。要从列表中删除一个出席者，选中他，按“删除”。要编辑一个域信息，选中该域，" ++"点击“编辑”。在菜单栏上点击“视图”来显示或隐藏类型域，角色域，状态域和RSVP域。" ++ ++#: C/evolution.xml:4747(para) ++msgid "" ++"(Optional) Specify a starting date and time, and a due date and time for the " ++"task." ++msgstr "(可选)为任务指定开始日期和时间，以及结束日期和时间。" ++ ++#: C/evolution.xml:4777(title) ++msgid "Searching for Task Items" ++msgstr "搜索任务项目" ++ ++#: C/evolution.xml:4780(para) ++msgid "" ++"Evolution enables you to find the task items by using Customized Search." ++msgstr "Evolution允许您使用自定义搜索查找任务条目。" ++ ++#: C/evolution.xml:4801(para) ++msgid "Evolution displays the desired Task items." ++msgstr "Evolution会显示需要的任务列表。" ++ ++#: C/evolution.xml:4823(para) ++msgid "" ++"Displays all the task items that match the criteria that you have selected " ++"from the drop-down list at the top left side, just above the display pane." ++msgstr "" ++"显示所有与您从下拉列表中选择的内建搜索方式相匹配的任务条目。下拉列表位于显示" ++"面板上方左侧。" ++ ++#: C/evolution.xml:4825(para) ++msgid "" ++"This feature provides the following best quick search options. This allows " ++"you to quickly see when tasks are due, as it can become unwieldy for " ++"planning if you have a lot of tasks in hand." ++msgstr "" ++"该功能提供了下列最好的快速搜索选项。这允许您快速查看任务什么时候到期，因为当" ++"您手头上列了很多任务时处理起来难度会加大。" ++ ++#: C/evolution.xml:4827(title) ++msgid "Any Category:" ++msgstr "任何类别：" ++ ++#: C/evolution.xml:4828(para) ++msgid "Displays all the tasks that fall under any category." ++msgstr "显示匹配任意一种类别的任务。" ++ ++#: C/evolution.xml:4831(title) ++msgid "Unmatched:" ++msgstr "未匹配：" ++ ++#: C/evolution.xml:4832(para) ++msgid "" ++"Displays all the tasks that do not fall under any of the categories listed " ++"here." ++msgstr "显示不匹配任何列在此处的类别的任务。" ++ ++#: C/evolution.xml:4835(title) ++msgid "Next 7 Days' Tasks:" ++msgstr "下一个7天任务：" ++ ++#: C/evolution.xml:4836(para) ++msgid "Displays all the active tasks that are due within the next seven days." ++msgstr "显示所有在下一周到期的活动任务。" ++ ++#: C/evolution.xml:4839(title) ++msgid "Active Tasks:" ++msgstr "活跃任务；" ++ ++#: C/evolution.xml:4840(para) ++msgid "" ++"Displays all the tasks whose due date is yet to come. This allows you to see " ++"the date due for tasks due in the future." ++msgstr "显示所有尚未到期的任务，这能让您查看任务的到期时间。" ++ ++#: C/evolution.xml:4843(title) ++msgid "Over Due Tasks:" ++msgstr "过期任务：" ++ ++#: C/evolution.xml:4844(para) ++msgid "Displays all the tasks whose end date has already passed." ++msgstr "显示结束日期已经过去的所有任务。" ++ ++#: C/evolution.xml:4847(title) ++msgid "Completed Tasks:" ++msgstr "完成的任务：" ++ ++#: C/evolution.xml:4848(para) ++msgid "Displays the tasks whose status is 100% completed." ++msgstr "显示状态为 100% 完成的任务。" ++ ++#: C/evolution.xml:4851(title) ++msgid "Tasks With Attachment:" ++msgstr "有附件的任务：" ++ ++#: C/evolution.xml:4852(para) ++msgid "Displays all the tasks with attachments." ++msgstr "显示所有带有附件的任务。" ++ ++#: C/evolution.xml:4855(title) ++msgid "<List of Categories>:" ++msgstr "<分类列表>:" ++ ++#: C/evolution.xml:4856(para) ++msgid "" ++"Lists all the tasks that belong to a particular category such as " ++"Anniversary, Holidays, Gifts, etc." ++msgstr "此处列出了所有特殊类别，例如周年纪念日，节日，礼物等。" ++ ++#: C/evolution.xml:4858(para) ++msgid "To perform quick search," ++msgstr "要进行快速搜索，" ++ ++#: C/evolution.xml:4861(para) ++msgid "Click the Show drop-down list from the Search bar." ++msgstr "点击搜索栏的下拉列表。" ++ ++#: C/evolution.xml:4873(para) ++msgid "Next 7 Days Tasks" ++msgstr "下一个 7 天任务" ++ ++#: C/evolution.xml:4876(para) ++msgid "Active Tasks" ++msgstr "活跃任务" ++ ++#: C/evolution.xml:4879(para) ++msgid "Over Due Tasks" ++msgstr "超期任务" ++ ++#: C/evolution.xml:4882(para) ++msgid "Completed Tasks" ++msgstr "完成人物" ++ ++#: C/evolution.xml:4885(para) ++msgid "Tasks With Attachments" ++msgstr "有附件的任务" ++ ++#: C/evolution.xml:4909(para) C/evolution.xml:5102(para) ++msgid "Holidays" ++msgstr "节日" ++ ++#: C/evolution.xml:4921(para) C/evolution.xml:5114(para) ++msgid "Key Customers" ++msgstr "重要顾客" ++ ++#: C/evolution.xml:4953(para) ++msgid "You can view the desired items listed in the Task view." ++msgstr "您可以在任务视图中查看需要的任务的列表。" ++ ++#: C/evolution.xml:4959(para) ++msgid "" ++"In Evolution, the Memos component lets you create, edit, and store journal " ++"entries without dates, using the filesystem as a backend." ++msgstr "" ++"在Evolution中，备忘组件能让您创建，编辑，存储没有日期的日志条目，它使用文件系" ++"统作为后端。" ++ ++#: C/evolution.xml:4961(para) ++msgid "To create a new memo entry:" ++msgstr "要创建一个新的备忘条目：" ++ ++#: C/evolution.xml:4964(para) ++msgid "Click File > New > Memo." ++msgstr "点击文件 > 新建 > 备忘。" ++ ++#: C/evolution.xml:4967(para) C/evolution.xml:6042(para) ++msgid "Select the Group in which you would like to create the entry." ++msgstr "选择您想要创建备忘的组。" ++ ++#: C/evolution.xml:4971(para) ++msgid "To show or hide Categories field, click View > Categories." ++msgstr "要显示或隐藏类别域，点击视图 > 类别。" ++ ++#: C/evolution.xml:4977(para) C/evolution.xml:6048(para) ++msgid "" ++"In the Start Date field, type the date this reminder note should appear in " ++"the recipients' Calendars." ++msgstr "在“开始日期”一栏，输入该备忘要在收信人日历中显示的日期。" ++ ++#: C/evolution.xml:4993(title) ++msgid "The Memo List" ++msgstr "备忘录列表" ++ ++#: C/evolution.xml:4994(para) ++msgid "" ++"As with calendars and tasks, you can create multiple memo lists. Each memo " ++"list is assigned a color, and you can use the side bar to hide and show memo " ++"lists." ++msgstr "" ++"和日历及任务一样，您可以创建多个备忘列表。每个备忘列表会被分配一种颜色，您可" ++"以使用侧边栏来隐藏或显示列表。" ++ ++#: C/evolution.xml:4995(para) ++msgid "To create a new memo list:" ++msgstr "要创建新的备忘列表：" ++ ++#: C/evolution.xml:4998(para) ++msgid "Click File > New > Memo List." ++msgstr "点击文件 > 新建 > 备忘列表。" ++ ++#: C/evolution.xml:5001(para) ++msgid "Enter the type, name and color for the memo list." ++msgstr "输入备忘列表的类型，名称和颜色。" ++ ++#: C/evolution.xml:5010(title) ++msgid "Searching for Memo Items" ++msgstr "搜索备忘条目" ++ ++#: C/evolution.xml:5011(para) ++msgid "" ++"You can use a customized search, an advanced search, or a quick search to " ++"search for Memo Items." ++msgstr "您可以使用自定义搜索，高级搜索或快速搜索来搜索备忘条目。" ++ ++#: C/evolution.xml:5014(para) ++msgid "" ++"Evolution enables you to find the Memo items by using a Customized Search." ++msgstr "Evolution允许您使用自定义搜索来查找备忘条目。" ++ ++#: C/evolution.xml:5044(para) ++msgid "Select the desired search type from the drop-down list." ++msgstr "从下拉列表中选择需要的搜索方式。" ++ ++#: C/evolution.xml:5065(para) ++msgid "" ++"Displays all the Memo items that match the criteria that you have selected " ++"from the Show drop-down list in the Search bar." ++msgstr "显示所有与您从搜索栏下拉列表中选择的搜索方式相匹配的备忘条目。" ++ ++#: C/evolution.xml:5144(para) ++msgid "You can view the desired items listed in the Memo view." ++msgstr "您可以在备忘视图中查看需要的条目。" ++ ++#: C/evolution.xml:5152(para) ++msgid "Evolution supports the use of multiple time zones." ++msgstr "Evolution支持多时区的使用。" ++ ++#: C/evolution.xml:5153(para) ++msgid "" ++"If you share calendar files with friends or co-workers, you might need to " ++"configure your time zone." ++msgstr "如果您需要和朋友或同事分享日历文件，您可能需要配置您的时区。" ++ ++#: C/evolution.xml:5159(para) ++msgid "Click the icon next to the Time Zone field, then select your location." ++msgstr "点击时区旁边的图标，然后选择您的位置。" ++ ++#: C/evolution.xml:5160(para) ++msgid "Each red dot represents a major city." ++msgstr "每个红点代表一个主要的城市。" ++ ++#: C/evolution.xml:5163(para) ++msgid "Select a city, then click OK." ++msgstr "选择一个城市，点击“确定”。" ++ ++#: C/evolution.xml:5166(para) ++msgid "" ++"You can also configure time zone information specific to each appointment. " ++"To do that, simply create a new appointment and click the globe to customize " ++"the time zone that the time exists in. For example, if you live in New York " ++"but have a telephone meeting set for noon with someone in California, you " ++"need to make sure that your schedules are coordinated. Setting time zones on " ++"a per-appointment basis helps avoid that potential confusion." ++msgstr "" ++"您也可以针对各个约会配置时区。操作方法是，创建一个新的约会，点击“选择”自定义" ++"该约会时间存在的时区。例如，假设您住在纽约但在中午有一个与加利福尼亚客户的电" ++"话会议，这样您就需要确保您的计划是与时差相协调的。在某个特定的约会基础上设置" ++"时区有助于您避免潜在的时差混淆。" ++ ++#: C/evolution.xml:5170(title) ++msgid "Marcus Bains Line" ++msgstr "Marcus Bains线" ++ ++#: C/evolution.xml:5171(para) ++msgid "" ++"The Marcus Bains Line is a marker to show the current date and time. This " ++"feature is available in the Evolution calendar." ++msgstr "" ++"Marcus Bains线是一个显示当前日期和时间的标记。Evolution日历中就有该功能。" ++ ++#: C/evolution.xml:5177(para) ++msgid "" ++"Evolution Exchange for Microsoft Exchange allows " ++"Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 " ++"servers. Like Evolution, it is free software and is licensed under the GPL." ++msgstr "" ++"为Microsoft Exchange设计的Evolution Exchange能让" ++"Evolution客户端访问位于Microsoft Exchange 2000和2003服务器上的账户。它和" ++"Evolution一样是基于GPL许可的自由软件。" ++ ++#: C/evolution.xml:5180(link) C/evolution.xml:5203(title) ++msgid "Evolution Exchange Features" ++msgstr "Evolution Exchange的功能" ++ ++#: C/evolution.xml:5183(link) C/evolution.xml:5305(title) ++msgid "Adding Your Exchange Account to Evolution" ++msgstr "将您的Exchange账户添加到Evolution" ++ ++#: C/evolution.xml:5186(link) C/evolution.xml:5416(title) ++msgid "Accessing the Exchange Server" ++msgstr "访问Exchange服务器" ++ ++#: C/evolution.xml:5189(link) C/evolution.xml:5424(title) ++msgid "Settings Exclusive to Evolution Exchange" ++msgstr "Evolution Exchange专有的设置" ++ ++#: C/evolution.xml:5192(link) C/evolution.xml:5446(link) ++#: C/evolution.xml:5665(title) ++msgid "Scheduling Meetings with Free/Busy" ++msgstr "使用忙/闲计划会议" ++ ++#: C/evolution.xml:5195(link) C/evolution.xml:5721(title) ++msgid "Evolution MAPI Features" ++msgstr "Evolution MAPI 特性" ++ ++#: C/evolution.xml:5199(para) ++msgid "" ++"Evolution Exchange works only with Exchange 2000 and later, and requires " ++"that Outlook Web Access be enabled. Each user needs a valid Microsoft " ++"Exchange server account, including a license." ++msgstr "" ++"Evolution Exchange仅针对Exchange2000以及更高版本有效，并且要求Outlook Web " ++"Access可用。每个用户需要一个有效的Microsoft Exchange服务器账户以及一个证书。" ++ ++#: C/evolution.xml:5204(para) ++msgid "" ++"Evolution Exchange supports the following basic Microsoft Exchange features:" ++msgstr "Evolution Exchange支持下列基本的Microsoft Exchange功能：" ++ ++#: C/evolution.xml:5207(para) C/evolution.xml:6916(link) ++#: C/evolution.xml:6927(title) C/evolution.xml:6975(link) ++#: C/evolution.xml:6990(title) ++msgid "General" ++msgstr "常规" ++ ++#: C/evolution.xml:5211(title) ++msgid "Remote Exchange Information Store:" ++msgstr "远程Exchange信息存储：" ++ ++#: C/evolution.xml:5212(para) ++msgid "" ++"Allows you to access mail, address book (including the Global Address List " ++"folder), calendars, and task folders on an Exchange server from Evolution." ++msgstr "" ++"允许您从Evolution访问位于Exchange服务器上的邮件，地址簿(包括全局地址列表文件" ++"夹)，日历和任务文件夹。" ++ ++#: C/evolution.xml:5217(title) ++msgid "Palm Synchronization:" ++msgstr "手持设备同步：" ++ ++#: C/evolution.xml:5218(para) ++msgid "Supported for Contacts and Calendars on Exchange." ++msgstr "支持Exchange上的联系人和日历。" ++ ++#: C/evolution.xml:5223(title) ++msgid "Password Management:" ++msgstr "密码管理：" ++ ++#: C/evolution.xml:5224(para) ++msgid "" ++"Allows you to reset your password. If your password has expired, Evolution " ++"asks you to change your password at startup." ++msgstr "" ++"允许您重设密码。如果您的密码过期了，Evolution在启动时会要求您修改密码。" ++ ++#: C/evolution.xml:5230(para) C/evolution.xml:5775(para) ++msgid "Mail" ++msgstr "邮件" ++ ++#: C/evolution.xml:5234(title) ++msgid "Viewing Mail in Exchange Folders:" ++msgstr "查看Exchange文件夹中的邮件。" ++ ++#: C/evolution.xml:5235(para) ++msgid "" ++"Mail stored on the Exchange server is visible in the Mail component in " ++"Evolution." ++msgstr "在Evolution邮件组件中能查看存储在Exchange服务器上的邮件。" ++ ++#: C/evolution.xml:5240(title) ++msgid "Sending Email via Exchange Protocols:" ++msgstr "通过Exchange协议发送邮件：" ++ ++#: C/evolution.xml:5241(para) ++msgid "" ++"If you use the Microsoft Exchange mail transport protocol to send email, " ++"make sure that the address you have entered as your email address is exactly " ++"the one that the Exchange server has on file. This might be " ++"yourname@exchange-server.example.com rather than " ++"yourname@example.com." ++msgstr "" ++"如果您使用Microsoft Exchange邮件传输协议来发送邮件，请确保您输入的地址邮件地" ++"址是准确的Exchange服务器的文件上记载的地址。它有可能是" ++"yourname@exchange-server.example.com而不是" ++"yourname@example.com。" ++ ++#: C/evolution.xml:5246(title) ++msgid "Out of Office Message:" ++msgstr "自动回复邮件:" ++ ++#: C/evolution.xml:5247(para) ++msgid "" ++"You can set out of Office message that will automatically be " ++"sent to people who send mail to you while you are away from office." ++msgstr "" ++"您可以设置自动回复邮件，当您不在工作时会自动回复给发您邮件的" ++"人。" ++ ++#: C/evolution.xml:5252(title) ++msgid "Send Options:" ++msgstr "发送选项：" ++ ++#: C/evolution.xml:5253(para) ++msgid "" ++"You can set the priority and sensitivity of the sent message so that the " ++"recipients will know how important the message is. You can also enable " ++"delivery receipt request and read receipt request for the messages sent." ++msgstr "" ++"您可以设置发送邮件的优先级和敏感性这样收信人会了解信件的重要性。您也可以启用" ++"发送收信回执功能，可以阅读发送的邮件的回执。" ++ ++#: C/evolution.xml:5259(para) C/evolution.xml:5798(para) ++#: C/evolution.xml:7496(link) C/evolution.xml:7566(title) ++msgid "Calendar" ++msgstr "日历" ++ ++#: C/evolution.xml:5263(title) ++msgid "Meeting Requests/Proposal:" ++msgstr "会议请求/协议：" ++ ++#: C/evolution.xml:5264(para) ++msgid "" ++"Allows Evolution users to schedule meetings. You can check when other users " ++"are busy according to their calendars and send the meeting requests " ++"accordingly." ++msgstr "" ++"允许Evolution用户计划会议。您可以根据他人的日历查看他们的空闲时间并据此发送给" ++"他们会议请求。" ++ ++#: C/evolution.xml:5269(title) ++msgid "Adding iCalendar Meeting Requests to the Calendar:" ++msgstr "将iCalendar会议请求添加到日历：" ++ ++#: C/evolution.xml:5270(para) ++msgid "" ++"Allows you to add the iCalendar meeting requests you receive to your " ++"Exchange calendar. Note that you need to specify the calendar from the list, " ++"to which you want to add your meeting schedules." ++msgstr "" ++"允许您添加接收到的iCalendar会议请求到您的Exchange日历。注意您需要从列表中指定" ++"您需要添加会议计划的日历。" ++ ++#: C/evolution.xml:5276(para) C/evolution.xml:5688(para) ++#: C/evolution.xml:5812(para) ++msgid "Contacts" ++msgstr "联系人" ++ ++#: C/evolution.xml:5280(title) ++msgid "Address Completion:" ++msgstr "地址补齐：" ++ ++#: C/evolution.xml:5281(para) ++msgid "Supported for your Exchange Contacts folder." ++msgstr "支持您的Exchange联系人文件夹。" ++ ++#: C/evolution.xml:5286(title) ++msgid "Adding vCards to the Address Book:" ++msgstr "将vCard添加到地址簿：" ++ ++#: C/evolution.xml:5287(para) ++msgid "" ++"Allows you to save the vCards you receive in attachment to your Exchange " ++"address book. New Address Book entries can also be created on Exchange from " ++"received email messages with a single click." ++msgstr "" ++"允许您将收到的vCard附件保存到您的Exchange地址簿。您也可以在Exchange上从接收到" ++"的邮件中创建新的地址簿条目，只需一次单击就行了。" ++ ++#: C/evolution.xml:5293(para) ++msgid "Work Offline (disconnected mode)" ++msgstr "离线工作(断开模式)" ++ ++#: C/evolution.xml:5294(para) ++msgid "" ++"To mark a folder for offline usage, right-click the folder, then click " ++"Properties. Click Copy Folder Content Locally for Offline Operation. For " ++"more information see Working " ++"Offline." ++msgstr "" ++"要将一个文件夹标记为离线使用，右击单击该文件夹，然后选择属性。点击“复制文件夹" ++"内容到本地供离线操作”。要了解更多相关信息。请参阅离线工作。" ++ ++#: C/evolution.xml:5299(para) ++msgid "Recall Message function is not available." ++msgstr "恢复邮件功能尚不可用。" ++ ++#: C/evolution.xml:5306(para) ++msgid "" ++"After you have installed Evolution Exchange, you need to set up access for " ++"your Exchange account on both the Exchange server and within Evolution." ++msgstr "" ++"安装了Evolution Exchange之后，您需要同时在Exchange服务器和Evolution内设置您的" ++"Exchange账户。" ++ ++#: C/evolution.xml:5309(link) C/evolution.xml:5326(title) ++msgid "Exchange Server Settings" ++msgstr "Exchange Server 设置" ++ ++#: C/evolution.xml:5312(link) C/evolution.xml:5340(title) ++msgid "Standard Configuration Tool for Evolution Exchange" ++msgstr "Evolution Exchange标准配置工具" ++ ++#: C/evolution.xml:5315(link) C/evolution.xml:5344(title) ++msgid "Simple Configuration Tool for Evolution Exchange" ++msgstr "Evolution Exchange简单配置工具" ++ ++#: C/evolution.xml:5318(link) C/evolution.xml:5351(title) ++msgid "Creating a New Exchange Account" ++msgstr "创建新的Exchange账户" ++ ++#: C/evolution.xml:5321(link) C/evolution.xml:5374(title) ++msgid "Configuring an Existing Account for Evolution Exchange Account" ++msgstr "配置一个已经存在的Evolution Exchange账户" ++ ++#: C/evolution.xml:5327(para) ++msgid "Check with your system administrator to ensure that:" ++msgstr "咨询您的系统管理员以确保：" ++ ++#: C/evolution.xml:5330(para) ++msgid "You have a valid account on the Exchange server." ++msgstr "您在Exchange服务器上有一个有效的账户。" ++ ++#: C/evolution.xml:5333(para) ++msgid "" ++"You are permitted to access the account with WebDAV. This is the default " ++"setting for the Exchange server, so unless your system administrator has " ++"specifically turned it off, no changes should be necessary." ++msgstr "" ++"您有使用WebDAV访问该账户的权限。这是Exchange服务器的默认设置，所以除非您的系" ++"统管理员特意关闭了它，否则不会出现变化。" ++ ++#: C/evolution.xml:5336(para) ++msgid "" ++"The Novell Web site Knowledgebase has additional " ++"information about checking to make sure that your Exchange server accepts " ++"connections from Evolution." ++msgstr "" ++"Novell Web site Knowledgebase有额外的关于检查您的" ++"Exchange服务器是否接受与Evolution连接的信息。" ++ ++#: C/evolution.xml:5341(para) ++msgid "" ++"When you know that your server is ready for you to connect, you are ready to " ++"add your Exchange account to Evolution Exchange." ++msgstr "当您知道您可以连接服务器时，就可以准备添加您的账户到Exchange服务器上。" ++ ++#: C/evolution.xml:5345(para) ++msgid "" ++"Evolution Exchange comes with a simple account creation tool for Exchange " ++"accounts." ++msgstr "Evolution Exchange使用一个简单的账户创建工具来创建Exchange账户。" ++ ++#: C/evolution.xml:5346(para) ++msgid "" ++"If you have no accounts configured, the simple account configuration " ++"assistant starts when you start Evolution. It asks only for the Outlook Web " ++"Access URL, and your username and password. Evolution Exchange determines " ++"the remaining information for you." ++msgstr "" ++"如果您没有配置任何账户，则启动Evolution时会启动账户配置助手，它会询问您" ++"Outlook Web Access网址，用户名和密码。Evolution Exchange会决定其余的信息。" ++ ++#: C/evolution.xml:5347(para) ++msgid "" ++"If the simple account configuration tool does not run automatically, you " ++"need to create an account manually. For more information on how to do this, " ++"see Creating a New Exchange " ++"Account." ++msgstr "" ++"如果账户简易配置助手没有自动启动，您需要手动创建一个账户。要了解相关信息，请" ++"参阅创建新的Exchange账户。" ++ ++#: C/evolution.xml:5361(para) ++msgid "" ++"Create the account following the procedure in Starting Evolution for the First Time. Remember " ++"to select Microsoft Exchange as server type in the Receiving Mail section." ++msgstr "" ++"按照第一次启动Evolution中" ++"介绍的步骤创建账户。记住在“接收邮件”选项中选择Microsoft Exchange作为服务器类" ++"型。" ++ ++#: C/evolution.xml:5367(para) ++msgid "Only one Microsoft Exchange account can be configured in Evolution." ++msgstr "在Evolution中只能配置一个Microsoft Exchange账户。" ++ ++#: C/evolution.xml:5375(para) ++msgid "" ++"Use the following procedure to configure your existing account for Evolution " ++"Exchange:" ++msgstr "根据下列步骤配置您的已经存在的Evolution Exchange账户：" ++ ++#: C/evolution.xml:5381(para) C/evolution.xml:5961(para) ++msgid "Select the account you want to convert, then click Edit." ++msgstr "选择您想要修改的账户，点击“编辑”。" ++ ++#: C/evolution.xml:5382(para) C/evolution.xml:5964(para) ++msgid "Click the Identity tab." ++msgstr "点击“身份”标签页。" ++ ++#: C/evolution.xml:5385(para) C/evolution.xml:5968(para) ++msgid "Change your email address as needed." ++msgstr "根据需要修改您的邮件地址。" ++ ++#: C/evolution.xml:5388(para) ++msgid "" ++"Click the Receiving Mail tab, then select Microsoft Exchange as your server " ++"type." ++msgstr "点击“接收邮件”选项卡，选择Microsoft Exchange作为您的服务器类型。" ++ ++#: C/evolution.xml:5391(para) ++msgid "" ++"Type your user name, and the Outlook Web Access (OWA) URL. Click " ++"Authenticate, then enter the password at the prompt. The Exchange server " ++"authenticates your account." ++msgstr "" ++"输入您的用户名和Outlook Web Access (OWA)网址。点击“身份验证”，在弹出的对话框" ++"中输入密码。Exchange服务器就会认证您的账户。" ++ ++#: C/evolution.xml:5397(para) C/evolution.xml:5981(para) ++msgid "Click the Receiving Options tab." ++msgstr "点击“接收选项”标签页。" ++ ++#: C/evolution.xml:5398(para) ++msgid "" ++"Specify how often to check for new mail, your Global Catalog server name and " ++"whether to apply filters to messages in your Inbox, check for junk, set a " ++"password expiry period, and any other settings you want to include." ++msgstr "" ++"指定检查新邮件的频率，您的全局列表服务器名称以及是否对您收件箱中的邮件应用过" ++"滤，检查垃圾邮件，设置密码有效期限，以及其它您需要的设置。" ++ ++#: C/evolution.xml:5401(para) ++msgid "" ++"Use the Defaults tab to define folders, send CC or BCC messages to certain " ++"email addresses, and set options for message receipts." ++msgstr "" ++"在“默认”选项卡中指定文件夹，将邮件抄送和暗送到的特定邮件地址，以及设置邮件收" ++"条的选项。" ++ ++#: C/evolution.xml:5404(para) ++msgid "Use the Security tab to set PGP and S/MIME options." ++msgstr "在“安全”标签中设置PGP和S/MIME选项。" ++ ++#: C/evolution.xml:5407(para) ++msgid "Quit Evolution and restart it." ++msgstr "退出 Evolution 并重启。" ++ ++#: C/evolution.xml:5408(para) ++msgid "" ++"Changes to Evolution Exchange accounts configuration are not active until " ++"you have restarted the application." ++msgstr "当您重启Evolution时，对Exchange账户做的配置更改就会生效。" ++ ++#: C/evolution.xml:5417(para) ++msgid "" ++"When you have installed Evolution Exchange, you can access public folders " ++"and perform certain Exchange actions like delegation and password " ++"management, and subscribing to other user's calendars, tasks, and contact " ++"folders. You can also carry out any folder-related operations like adding, " ++"deleting, and renaming folders, and selecting folder permissions on " ++"calendars, tasks, and contact folders. Use the regular Mail tool for mail, " ++"the Contacts tool for contacts, and the Calendar tool for setting schedules." ++msgstr "" ++"当您安装了Evolution Exchange之后，您可以访问上面的公共文件夹，进行特定的" ++"Exchange操作如委托和密码管理，订阅其它用户的日历，任务和联系人文件夹。您还可" ++"以进行任何与文件夹相关的操作如添加，删除，重命名；选择日历、任务及联系人文件" ++"夹的权限。您还可以使用标准的邮件工具，联系人工具和日历工具来进行各自对应的操" ++"作。" ++ ++#: C/evolution.xml:5418(para) ++msgid "" ++"If you are using both an Exchange account and a local mail account, you " ++"should be aware that whenever you save an email address or appointment from " ++"an email message, it is saved in your Exchange contacts list or calendar, " ++"rather than in your local account. The same is true for synchronization with " ++"Palm OS devices; tasks, and appointments. Addresses from your Palm OS device " ++"are synchronized in the Exchange folders rather than in local folders." ++msgstr "" ++"如果您同时在使用Exchange账户和本地邮件账户，您需要注意当从一封邮件中保存邮件" ++"地址或约会事件时，它会保存在您的Exchange联系人列表或日历中而不是本地账户中。" ++"在您与手持设备同步任务和约会时也是这样。您手持设备中的地址会与Exchange文件夹" ++"同步而非本地文件夹。" ++ ++#: C/evolution.xml:5419(para) ++msgid "" ++"To avoid unnecessary strain on the server, the Global Address List (GAL) " ++"appears empty until you search for something in it." ++msgstr "" ++"为了避免给服务器造成不必要的压力，全局地址列表(GAL)在直到您需要搜索其中的东西" ++"之前都是显示为空的。" ++ ++#: C/evolution.xml:5425(para) ++msgid "" ++"There are some settings in Evolution that are available only with Evolution " ++"Exchange, like delegation and permission handling, creating Out of " ++"Office messages, changing password and viewing folder size." ++msgstr "" ++"Evolution中有一些设置是必须与Evolution Exchange配合使用才有效，例如委托和权限" ++"处理，创建自动回复邮件，更改密码和查看文件夹大小。" ++ ++#: C/evolution.xml:5428(link) C/evolution.xml:5451(title) ++msgid "Send Options" ++msgstr "发送选项" ++ ++#: C/evolution.xml:5431(link) C/evolution.xml:5532(title) ++msgid "Access Delegation" ++msgstr "访问委托" ++ ++#: C/evolution.xml:5434(link) C/evolution.xml:5536(title) ++msgid "Delegating Access to Others" ++msgstr "别人的委托访问" ++ ++#: C/evolution.xml:5437(link) C/evolution.xml:5586(title) ++msgid "Subscribe to Other Users' Folders" ++msgstr "订阅其它用户的文件夹" ++ ++#: C/evolution.xml:5440(link) C/evolution.xml:5609(title) ++msgid "Subscribe to Public Folders" ++msgstr "订阅公共文件夹" ++ ++#: C/evolution.xml:5443(link) C/evolution.xml:5638(title) ++msgid "Setting an Out of Office Message" ++msgstr "设置自动回复邮件" ++ ++#: C/evolution.xml:5452(para) ++msgid "" ++"You can set the priority and sensitivity of the sent message from an " ++"exchange account so that the recipients will know how important the message " ++"is. The priority can have one of the three options: High, Normal or Low; and " ++"sensitivity can have one of the four options: Normal, Personal, Private and " ++"Confidential. You can also enable delivery receipt request and read receipt " ++"request for the messages sent." ++msgstr "" ++"您可以在exchange账户中设置发送邮件的优先级和敏感性这样收信人就会了解邮件的重" ++"要性。优先级有三个选项：高，正常或低；敏感性有四个选项：正常，个人，秘密和机" ++"密。您也可以启用发送邮件回执请求以及阅读发送邮件的回执。" ++ ++#: C/evolution.xml:5455(title) ++msgid "Tracking Options" ++msgstr "追踪选项" ++ ++#: C/evolution.xml:5456(para) ++msgid "" ++"Evolution lets you track the status of an item you have sent. You can enable " ++"the Delivery Receipt request as well as Read Receipt request so that you " ++"will know when the item reached the recipients or read by them." ++msgstr "" ++"Evolution能让您追踪您已发送的邮件的状态。您可以启用发送邮件回执请求和阅读回执" ++"请求这样您将会知道什么时候邮件已到达收件人并被收件人阅读。" ++ ++#: C/evolution.xml:5457(para) ++msgid "To set the importance and sensitivity of the message:" ++msgstr "设置邮件的重要性和敏感性：" ++ ++#: C/evolution.xml:5463(para) ++msgid "Select the exchange account from the From field." ++msgstr "在“发信人”一栏中选择exchange账户。" ++ ++#: C/evolution.xml:5466(para) ++msgid "Click Insert > Send Options." ++msgstr "点击插入 > 发送选项。" ++ ++#: C/evolution.xml:5471(para) C/evolution.xml:6211(para) ++msgid "" ++"Select the priority for your sent message from the given three options " ++"(Normal, High, Low)." ++msgstr "根据提供的三个选项(正常，高，低)选择发送邮件的优先级。" ++ ++#: C/evolution.xml:5474(para) ++msgid "" ++"Select the sensitivity for your sent message from the given four options " ++"(Normal, Personal, Private, Confidential)." ++msgstr "根据提供的四个选项(正常，个人，秘密，机密)选择发送邮件的敏感性。" ++ ++#: C/evolution.xml:5478(title) ++msgid "Message Access Delegation:" ++msgstr "邮件访问委托：" ++ ++#: C/evolution.xml:5479(para) ++msgid "" ++"Click Send as Delegate to send the message to the recipient on behalf of " ++"someone else." ++msgstr "点击“发送为委托”，代表其它人将邮件发送给收信人。" ++ ++#: C/evolution.xml:5482(para) ++msgid "" ++"To send a calendar item as delegate, you should subscribe to the delegator's " ++"message and also you should have necessary rights assigned to you by the " ++"delegator." ++msgstr "" ++"要作为委托发送一个日历条目，您应该订阅委托人的邮件而且您需要经过委托人的授" ++"权。" ++ ++#: C/evolution.xml:5486(para) ++msgid "Click User to open Show Contacts dialog box." ++msgstr "点击“用户”，打开“显示联系人”对话框。" ++ ++#: C/evolution.xml:5489(para) ++msgid "" ++"Select the contact from the desired Address book and click Add, then close " ++"the dialog box." ++msgstr "从需要的地址簿中选择联系人，点击“添加”，然后关闭对话框。" ++ ++#: C/evolution.xml:5491(para) ++msgid "" ++"You are not permitted to send a message on behalf of more than one person at " ++"a time." ++msgstr "您不允许在同一时刻代表多个人发送一封邮件。" ++ ++#: C/evolution.xml:5493(para) ++msgid "" ++"When the recipient opens the mail, he or she can also read a message that " ++"The message was sent by <Delegator's name> on behalf of <" ++"Delegate's name> on the preview pane header bar." ++msgstr "" ++"当收信人打开邮件时，他或她能在预览面板头区域看见一条信息显示：这封" ++"邮件由 <委托人姓名> 代表 <被委托人姓名> 发送。" ++ ++#: C/evolution.xml:5498(para) ++msgid "" ++"Select the Request a delivery receipt for this message check box to get a " ++"delivery receipt from your recipient." ++msgstr "选择“要求为该邮件发送收条”，可以得到来自收信人的发送收条。" ++ ++#: C/evolution.xml:5501(para) ++msgid "" ++"Select the Request a read receipt for this message to get a read receipt for " ++"the message you have sent." ++msgstr "选择“要求为该邮件阅读收条”，可以得到您发送邮件的阅读收条。" ++ ++#: C/evolution.xml:5510(title) ++msgid "Delegating Calendar Items" ++msgstr "委托日历条目" ++ ++#: C/evolution.xml:5511(para) ++msgid "" ++"You can send Meetings or Appointments on behalf of someone else if you have " ++"subscribed to his or her Calendar." ++msgstr "您可以代表其他人发送会议或约会信息，如果您已经订阅他或她的日历。" ++ ++#: C/evolution.xml:5514(para) ++msgid "Select the delegator's Calendar." ++msgstr "选择委托人的日历。" ++ ++#: C/evolution.xml:5517(para) ++msgid "Open a new Meeting composer window." ++msgstr "打开新的会议编辑器窗口。" ++ ++#: C/evolution.xml:5520(para) ++msgid "Add the recipients." ++msgstr "添加收信人。" ++ ++#: C/evolution.xml:5523(para) ++msgid "Fill in the information." ++msgstr "填充信息。" ++ ++#: C/evolution.xml:5525(para) ++msgid "" ++"When the recipient receives the calendar item, a message indicates that the " ++"item was created by someone on behalf of the Delegator." ++msgstr "" ++"当收信人收到该日历条目时，会有信息提示他该条目是由某人代表委托人创建的。" ++ ++#: C/evolution.xml:5533(para) ++msgid "" ++"You can allow other people in your organization's Global Address List to " ++"access your calendar, address book, and messages, and they can let you " ++"manage theirs. Delegation allows people to do anything from check on each " ++"other's schedules to completely manage their personal information." ++msgstr "" ++"您可以允许其他在您的组织的全局地址列表中的人访问您的日历，地址簿和邮件，并且" ++"他们可以让你管理他们的日历，地址簿和邮件等。委托有助于人们做类似的事情，从相" ++"互查看个人计划安排到全局管理他们的个人信息。" ++ ++#: C/evolution.xml:5537(para) ++msgid "To add someone to your list of delegates:" ++msgstr "要添加某人到您的委托列表中：" ++ ++#: C/evolution.xml:5543(para) ++msgid "Click the Exchange Settings tab." ++msgstr "点击“Exchange设置”标签。" ++ ++#: C/evolution.xml:5546(para) ++msgid "Click Delegation Assistant to open the Delegates dialog box." ++msgstr "点击“委托助手”打开委托对话框。" ++ ++#: C/evolution.xml:5551(para) ++msgid "Click Add, then search for a contact in the Global Address List." ++msgstr "点击“添加”，然后在全局地址列表中搜索联系人。" ++ ++#: C/evolution.xml:5552(para) ++msgid "" ++"Remember that the Global Address List (GAL) appears empty until you have " ++"searched for something in it." ++msgstr "记住全局地址列表(GAL)在直到您需要搜索之前都是显示为空的。" ++ ++#: C/evolution.xml:5555(para) ++msgid "" ++"Select the delegate and click Edit to open the delegate permission dialog " ++"box." ++msgstr "选择“委托”，点击“编辑”，打开委托权限对话框。" ++ ++#: C/evolution.xml:5560(para) ++msgid "" ++"Select from the following access levels for each of the four types of " ++"folders:" ++msgstr "从下列访问级别中(各为四种类型的文件夹设计)选择：" ++ ++#: C/evolution.xml:5563(para) ++msgid "Do not allow this person to access any folders of this type." ++msgstr "不允许该人访问该类型的任何文件夹。" ++ ++#: C/evolution.xml:5566(title) ++msgid "Reviewer (read-only):" ++msgstr "查看(只读)：" ++ ++#: C/evolution.xml:5567(para) ++msgid "" ++"Allows the delegate to see items in this type of folder, but not create new " ++"items or edit existing items." ++msgstr "" ++"允许委托人查看该种类型的文件夹中的条目，但不能创建新条目或编辑已有的条目。" ++ ++#: C/evolution.xml:5570(title) ++msgid "Author (read, create):" ++msgstr "作者(读，创建)：" ++ ++#: C/evolution.xml:5571(para) ++msgid "" ++"The delegate can view items in your folders, and can create new items, but " ++"cannot change any existing items." ++msgstr "" ++"该委托可以查看您文件夹中的条目并创建新条目，但不能修改任何已存在的条目。" ++ ++#: C/evolution.xml:5574(title) ++msgid "Editor (read, create, edit):" ++msgstr "编辑(读，创建，修改)：" ++ ++#: C/evolution.xml:5575(para) ++msgid "The delegate can view, create, and change items in your folders." ++msgstr "该委托可以查看，创建和修改您文件夹中的条目。" ++ ++#: C/evolution.xml:5582(para) ++msgid "" ++"The delegate is notified through a separate mail that he or she is being " ++"added to your list of delegates. The mail summarizes all the rights that " ++"have been assigned to the delegate." ++msgstr "" ++"该委托会通过一封独立的邮件发送，提示他或她被加入了您的委托列表。邮件里总结了" ++"所有赋予委托人的权限。" ++ ++#: C/evolution.xml:5587(para) ++msgid "To access the folders delegated to you:" ++msgstr "要访问委托给您的文件夹：" ++ ++#: C/evolution.xml:5590(para) ++msgid "Click File > Subscribe to Other User's Exchange Folder." ++msgstr "点击文件 > 订阅其它用户的Exchange文件夹。" ++ ++#: C/evolution.xml:5594(para) ++msgid "" ++"Specify the email address of the user who has delegated to you, or click " ++"User to select the user from your address book." ++msgstr "指定委托给您的用户的邮件地址，或点击“用户”从您的地址簿中选择用户。" ++ ++#: C/evolution.xml:5597(para) ++msgid "Select the folder you want to open." ++msgstr "选择您想要打开的文件夹。" ++ ++#: C/evolution.xml:5603(para) ++msgid "" ++"Folders delegated to you appear in your folder list inside a folder labeled " ++"with the name of its owner. For example, if Martha Thompson delegates " ++"folders to you, you see a folder called Martha Thompson's Folders in the " ++"folder tree at the same level as your Personal Folders and Public Folders." ++msgstr "" ++"委托给您的文件夹在在您的文件夹列表中显示，位于一个标着拥有者名字的文件夹里" ++"面。例如，如果Martha Thompson将文件夹委托给您，您会在文件夹树中看到一个名" ++"为“Martha Thompson的文件夹”的文件夹，它和您的个人文件夹和公共文件夹位于同一级" ++"别。" ++ ++#: C/evolution.xml:5604(para) ++msgid "" ++"If the folder fails to open properly, check with the folder owner to make " ++"sure that you have been granted the correct access permissions." ++msgstr "如果文件夹不能成功打开，请联系文件夹拥有者以确定您有合适的访问权限。" ++ ++#: C/evolution.xml:5610(para) ++msgid "You can subscribe to public folders available on the Exchange server." ++msgstr "您可以订阅Exchange服务器上可用的公共文件夹。" ++ ++#: C/evolution.xml:5616(para) ++msgid "Select the Exchange account." ++msgstr "选择Exchange账户。" ++ ++#: C/evolution.xml:5619(para) ++msgid "Check the folders you want to subscribe to." ++msgstr "选择您想订阅的文件夹。" ++ ++#: C/evolution.xml:5624(para) ++msgid "" ++"The folders you have subscribed to appear in the folder list at the left." ++msgstr "您已经订阅的文件夹将会显示在左边的文件夹列表里。" ++ ++#: C/evolution.xml:5627(para) ++msgid "To view contents of a folder, click it." ++msgstr "要查看一个文件夹的内容，点击它。" ++ ++#: C/evolution.xml:5634(para) ++msgid "" ++"Reminders for meetings in your Exchange calendar do not work until you have " ++"run Evolution at least once after logging in. This is different from locally " ++"stored reminders, which work from the moment you log in, regardless of " ++"whether you have run Evolution in the session so that you can fix a " ++"convenient time for a meeting. To enable Reminder setting in your Exchange " ++"account, select Remember the password checkbox. To find " ++"more information about Reminders seeReminders." ++msgstr "" ++"您的Exchang日历上的会议提醒不会马上生效。必须在登录系统之后至少运行一次" ++"Evolution才会生效。这与本地存储的提醒不同。本地存储的提醒从从您登录系统的那一" ++"刻开始就已生效，无须运行Evolution，这样您可以固定一个合适的时间参加会议。要使" ++"得您的Exchane账户中的提醒设置生效，请选择记住密码。要了" ++"解更多关于提醒的信息，请参阅提醒。" ++ ++#: C/evolution.xml:5639(para) ++msgid "" ++"An Out of Office message is an automatic reply that you can send as a reply " ++"to messages, explaining why you are not immediately responding to their " ++"messages. For example, if you go on vacation for a week and will not access " ++"your email, you can set an automatic reply so that people know that you are " ++"not ignoring them." ++msgstr "" ++"自动回复邮件是由系统自动发出的回复，您可以将它作为回复的邮件，解释为什么您不" ++"能马上回复他们的邮件。例如，假设您要出去旅游一周，不能收发电子邮件，您就可以" ++"设置自动回复这样别人会知道您并不是忽略了他们。" ++ ++#: C/evolution.xml:5645(para) ++msgid "Select the Exchange account, then click Edit." ++msgstr "选择Exchange账户，点击“编辑”。" ++ ++#: C/evolution.xml:5648(para) ++msgid "" ++"Select the Exchange Settings tab. The top option allows you to set an Out of " ++"Office message." ++msgstr "选择“Exchange设置”标签。头一个选项就可以设置自动回复邮件。" ++ ++#: C/evolution.xml:5651(para) ++msgid "Click I Am Currently Out of the Office." ++msgstr "点击“我现在不在工作”。" ++ ++#: C/evolution.xml:5654(para) ++msgid "Type a short message in the text field." ++msgstr "在文本框中输入一条简短的信息。" ++ ++#: C/evolution.xml:5660(para) ++msgid "" ++"Your message is automatically sent to anyone who sends you mail until you " ++"return and select I Am in the office." ++msgstr "" ++"该设置的信息会自动回复给发送给您邮件的人，直到您回来并且选择了“我在工作”。" ++ ++#: C/evolution.xml:5666(para) ++msgid "" ++"Evolution helps you fix a convenient time for a meeting according to the " ++"availability of the attendees. Its Free/Busy feature allows you to perform a " ++"check on other user's Exchange calendar to find whether they are busy " ++"according to their Exchange calendars, if so, you can reschedule the meeting " ++"altogether." ++msgstr "" ++"Evolution能帮助您根据出席者的空闲时间确定合适的会议时间。它的忙/闲功能允许您" ++"查看其它用户的Exchange日历以找出他们在各个时段的忙/闲信息。这样，您就可以统筹" ++"安排会议了。" ++ ++#: C/evolution.xml:5669(para) ++msgid "Create a new appointment in the calendar." ++msgstr "在日历中创建新约会。" ++ ++#: C/evolution.xml:5672(para) ++msgid "Right-click the appointment, then select Schedule Meeting." ++msgstr "右击该约会，然后选择“计划会议”。" ++ ++#: C/evolution.xml:5675(para) ++msgid "Click the Add tab to enter the email addresses into the list." ++msgstr "点击“添加”，将邮件地址输入列表。" ++ ++#: C/evolution.xml:5678(para) ++msgid "" ++"Click the Attendees tab to select the participants from Global Address List " ++"(GAL)." ++msgstr "点击“出席者”，从全局地址列表(GAL)中选择参加人员。" ++ ++#: C/evolution.xml:5679(para) ++msgid "" ++"You can directly select the participants from the following address lists." ++msgstr "您可以直接从下列地址列表中选择参加人员。" ++ ++#: C/evolution.xml:5685(para) ++msgid "Global Address List" ++msgstr "全部地址列表" ++ ++#: C/evolution.xml:5691(para) ++msgid "" ++"You can also specify the category as Anniversary, Birthday, Business etc. " ++"from the drop-down list for each address list given." ++msgstr "" ++"对于给出的每个地址列表，您还可以从下拉列表中指定类别，如周年纪念，生日，商务" ++"等。" ++ ++#: C/evolution.xml:5694(para) ++msgid "Add the participants to the following categories of attendees." ++msgstr "将参加人员添加到下列出席者类别中。" ++ ++#: C/evolution.xml:5697(para) ++msgid "Chair Persons" ++msgstr "主持人" ++ ++#: C/evolution.xml:5700(para) ++msgid "Required Participants" ++msgstr "必需的出席者" ++ ++#: C/evolution.xml:5703(para) ++msgid "Optional Participants" ++msgstr "可选的出席者" ++ ++#: C/evolution.xml:5706(para) ++msgid "Resources" ++msgstr "资源" ++ ++#: C/evolution.xml:5711(para) ++msgid "Click Free/Busy tool at the top right corner." ++msgstr "点击右上角的忙/闲工具。" ++ ++#: C/evolution.xml:5714(para) ++msgid "" ++"Click Options > Update Free/Busy to check participant schedules and, if " ++"possible, update the meeting in all participants' calendars" ++msgstr "" ++"点击选项 > 更新忙/闲信息以查看出席者的计划安排，然后，可能的话，更新所以出" ++"席者的日历中的会议信息。" ++ ++#: C/evolution.xml:5717(para) ++msgid "" ++"If meeting attendees are not available during the times you have scheduled a " ++"meeting, you can nudge the meeting forward or backward to the " ++"nearest available time. To do so, just click the arrows to the left or right " ++"of the Autopick button. The Autopick tool lets you move the meeting to the " ++"nearest time during which all attendees are available. If you are not " ++"satisfied with those results, you can also drag the edges of the area marked " ++"as meeting time to the hours that you want to select." ++msgstr "" ++"如果会议出席者在您安排会议时无法连接到，您可以将会议向前或向后“推移”至最近的" ++"最合适的时间。操作方法时，点击“自动获取”按钮左边或右边的箭头。“自动获取”工具" ++"会帮助您把会议时间移动到最接近所以出席者都空闲的时间。如果您对这些结果尚不满" ++"意，您还可以拖拽标示会议时段边界的线到您想要选择的时刻即可。" ++ ++#: C/evolution.xml:5722(para) ++msgid "" ++"With Evolution MAPI providers, you can view the size of a selected folder." ++msgstr "有了Evolution的MAPI功能，您可以查看一个选择的文件夹的大小。" ++ ++#: C/evolution.xml:5723(para) ++msgid "You can view the folder size by using the following methods:" ++msgstr "您可以按照下列步骤查看文件夹大小：" ++ ++#: C/evolution.xml:5726(para) ++msgid "Select Edit > Preferences > MAPI Account > Edit." ++msgstr "选择编辑 > 首选项 > MAPI账户 > 编辑。" ++ ++#: C/evolution.xml:5729(para) ++msgid "Select the Exchange settings tab." ++msgstr "选择“Exchange设置”选项卡。" ++ ++#: C/evolution.xml:5732(para) ++msgid "Select Folder size." ++msgstr "选择文件夹大小。" ++ ++#: C/evolution.xml:5736(para) ++msgid "" ++"Alternatively, right-click the MAPI Account in the folder tree, then select " ++"folder size." ++msgstr "或者，您也可以在文件夹树中右键点击MAPI账户，然后选择“文件夹大小”。" ++ ++#: C/evolution.xml:5738(para) ++msgid "" ++"A Folder dialog is displayed with details, such as folder name and their " ++"respective size. It also provides you the total mailbox size." ++msgstr "" ++"此时会显示一个文件夹对话框，上面有相关的细节，如文件夹名称和它们各自的大小，" ++"以及邮箱的总大小。" ++ ++#: C/evolution.xml:5745(para) ++msgid "" ++"Evolution can access accounts on NovellGroupWise 7 systems." ++msgstr "" ++"Evolution可以访问位于NovellGroupWise 7 " ++"systems 上面的账户。" ++ ++#: C/evolution.xml:5748(link) C/evolution.xml:5771(title) ++msgid "GroupWise Features" ++msgstr "GroupWise功能" ++ ++#: C/evolution.xml:5751(link) C/evolution.xml:5857(title) ++msgid "GroupWise Terminology vs. Evolution Terminology" ++msgstr "GroupWise 术语 vs. Evolution 术语" ++ ++#: C/evolution.xml:5754(link) C/evolution.xml:5928(title) ++msgid "Adding your GroupWise Account to Evolution" ++msgstr "将您的GroupWise账户添加到Evolution" ++ ++#: C/evolution.xml:5757(link) C/evolution.xml:6065(title) ++msgid "Scheduling Appointments with Free/Busy" ++msgstr "根据忙/闲安排约会" ++ ++#: C/evolution.xml:5760(link) C/evolution.xml:6127(title) ++msgid "Managing Sent Items" ++msgstr "管理发送的条目" ++ ++#: C/evolution.xml:5763(link) C/evolution.xml:6316(title) ++msgid "Giving Other People Access to Your Mailbox or Calendar" ++msgstr "让其它人访问您的邮箱或日历" ++ ++#: C/evolution.xml:5766(link) C/evolution.xml:6485(title) ++msgid "Junk Mail Handling" ++msgstr "处理垃圾邮件" ++ ++#: C/evolution.xml:5772(para) ++msgid "" ++"GroupWise connectivity in Evolution supports the following basic Novell " ++"GroupWise features:" ++msgstr "Evolution中的GroupWise支持下列基本的Novell GroupWise功能：" ++ ++#: C/evolution.xml:5778(para) ++msgid "Viewing mail and folders stored on the GroupWise system." ++msgstr "查看存储在GroupWise系统里的邮件和文件夹。" ++ ++#: C/evolution.xml:5781(para) ++msgid "Sending mail from you GroupWise account." ++msgstr "使用您的GroupWise账户发送邮件。" ++ ++#: C/evolution.xml:5784(para) ++msgid "Converting mail to a task or meeting." ++msgstr "将邮件转换为任务或会议。" ++ ++#: C/evolution.xml:5787(para) ++msgid "Tracking the status of a message." ++msgstr "追踪邮件状态。" ++ ++#: C/evolution.xml:5790(para) ++msgid "" ++"Marking a message as junk mail adds the sender to your GroupWise junk mail " ++"list." ++msgstr "将邮件标记为垃圾邮件，并将发信人添加到您的GroupWise黑名单。" ++ ++#: C/evolution.xml:5793(para) ++msgid "Improved Status Tracking." ++msgstr "高级状态追踪。" ++ ++#: C/evolution.xml:5801(para) ++msgid "" ++"You can send and receive appointment and meeting requests. Allows Evolution " ++"users to schedule meetings and view attendee availability for other users on " ++"GroupWise." ++msgstr "" ++"您可以发送和接收约会和会议请求。允许Evolution用户计划会议和查看其它GroupWise" ++"用户的忙/闲信息。" ++ ++#: C/evolution.xml:5804(para) ++msgid "" ++"You can resend meeting requests. Also, you can edit the fields, and add or " ++"delete participants." ++msgstr "您可以重新发送会议请求。并且，您可以编辑域，添加或删除参加者。" ++ ++#: C/evolution.xml:5807(para) ++msgid "" ++"You can receive an iCalendar meeting request and add it to your GroupWise " ++"calendar." ++msgstr "您可以接收iCalendar会议请求并将它添加到您的GroupWise日历中。" ++ ++#: C/evolution.xml:5815(para) ++msgid "" ++"Address Completion is supported for your GroupWise address books, including " ++"the System address book, the Frequent Contacts address book, and your " ++"personal address book." ++msgstr "" ++"您的GroupWise地址簿支持地址补齐，包括系统地址簿，常用联系人地址簿以及您的个人" ++"地址簿。" ++ ++#: C/evolution.xml:5818(para) ++msgid "" ++"If you receive a card attachment and click Save in Address Book, it is saved " ++"to your Personal address book. New Address Book entries can also be added to " ++"your personal address book from received Email messages." ++msgstr "" ++"如果您收到一个名片附件并将点击“保存到地址簿”，它将会保存到您的个人地址簿。您" ++"也可以从收到的邮件中添加新的地址簿条目到您的个人地址簿。" ++ ++#: C/evolution.xml:5821(para) ++msgid "" ++"To create your GroupWise Frequent contacts and Personal address books, you " ++"need to access your GroupWise account once through GroupWise Java client " ++"because Evolution currently does not support creating them. The GroupWise " ++"system address book is marked for offline use by default. This boosts " ++"performance." ++msgstr "" ++"要创建您的GroupWise常用联系人和个人地址簿，您需要使用GroupWise Java客户端访问" ++"您的GroupWise账户，因为目前Evolution尚不支持创建它们。GroupWise系统地址簿默认" ++"是被标记为供离线使用的。这有利于操作。" ++ ++#: C/evolution.xml:5826(para) C/evolution.xml:5892(para) ++msgid "Reminder Note" ++msgstr "提醒便条" ++ ++#: C/evolution.xml:5829(para) ++msgid "" ++"GroupWise Reminder Note is integrated into Memo component. You can view the " ++"Reminder notes listed under Memos at the bottom right of the Calendar view " ++"given that you have selected them under the Memos component." ++msgstr "" ++"GroupWise的提醒便条已经整合到备忘组件里了。您可以在日历视图右下角查看列在备忘" ++"下面的提醒便条，前提是您已经在备忘组件中选择了它们。" ++ ++#: C/evolution.xml:5834(para) ++msgid "Proxy" ++msgstr "代理" ++ ++#: C/evolution.xml:5837(para) ++msgid "You can assign Proxy access to other users." ++msgstr "您可以给其它用户分配代理访问。" ++ ++#: C/evolution.xml:5840(para) ++msgid "You can view other users' accounts through Proxy access." ++msgstr "您可以通过代理访问查看其它用户账户。" ++ ++#: C/evolution.xml:5845(para) ++msgid "There are, however, some features that are not available:" ++msgstr "但是也有一些功能在Evolution中没有：" ++ ++#: C/evolution.xml:5848(para) ++msgid "Accepting appointments or meetings in offline mode" ++msgstr "离线接受约会或会议。" ++ ++#: C/evolution.xml:5851(para) ++msgid "Archive" ++msgstr "档案" ++ ++#: C/evolution.xml:5858(para) ++msgid "" ++"GroupWise and Evolution sometimes uses different terminology for different " ++"types of items. The following table compares GroupWise terminology to " ++"Evolution terminology." ++msgstr "" ++"GroupWise和Evolution有时对于不同类型的条目会使用不同的术语。下列表格对" ++"GroupWise的术语和Evolution的术语作了比较。" ++ ++#: C/evolution.xml:5866(para) ++msgid "GroupWise" ++msgstr "GroupWise" ++ ++#: C/evolution.xml:5876(para) C/evolution.xml:5887(para) ++msgid "Appointment" ++msgstr "约会" ++ ++#: C/evolution.xml:5879(para) ++msgid "Meeting" ++msgstr "会议" ++ ++#: C/evolution.xml:5884(para) ++msgid "Posted Appointment" ++msgstr "过期约会" ++ ++#: C/evolution.xml:5895(para) C/evolution.xml:5919(para) ++msgid "None; use a task" ++msgstr "无；以“任务”代替" ++ ++#: C/evolution.xml:5900(para) ++msgid "Discussion Note" ++msgstr "讨论便条" ++ ++#: C/evolution.xml:5903(para) ++msgid "None; use an assigned task" ++msgstr "无；使用“已分配的任务”代替" ++ ++#: C/evolution.xml:5908(para) ++msgid "Phone Message" ++msgstr "电话邮件" ++ ++#: C/evolution.xml:5911(para) ++msgid "None; use a message" ++msgstr "无；使用“邮件”代替" ++ ++#: C/evolution.xml:5916(para) ++msgid "Checklist" ++msgstr "检查列表" ++ ++#: C/evolution.xml:5931(link) C/evolution.xml:5939(title) ++msgid "Creating a New GroupWise Account" ++msgstr "创建新的GroupWise账户" ++ ++#: C/evolution.xml:5934(link) C/evolution.xml:5954(title) ++msgid "Changing an Existing Account to Work with GroupWise" ++msgstr "修改已存在的账户使之能与GroupWise工作" ++ ++#: C/evolution.xml:5948(para) ++msgid "" ++"Create the account following the procedure in Starting Evolution for the First Time." ++msgstr "" ++"根据第一次启动Evolution中" ++"介绍的步骤创建账户。" ++ ++#: C/evolution.xml:5955(para) ++msgid "" ++"If you have an existing email account, and want to convert it to use with " ++"GroupWise:" ++msgstr "如果您已经有一个电子邮件账户，想要修改它使之能使用GroupWise：" ++ ++#: C/evolution.xml:5971(para) ++msgid "" ++"Click the Receiving Email tab, then select Novell GroupWise as your server " ++"type." ++msgstr "点击“接收邮件”选项卡，然后选择Novell GroupWise作为您的服务器类型。" ++ ++#: C/evolution.xml:5975(para) ++msgid "" ++"Type the name of your mail server, your user name, and select whether to use " ++"SSL." ++msgstr "输入您的邮件服务器的名称，您的用户名，选择是否使用SSL。" ++ ++#: C/evolution.xml:6001(para) ++msgid "" ++"Select if you want to automatically synchronize your remote calendar and " ++"contacts locally." ++msgstr "选择是否需要自动同步您的远程和本地的日历和文件夹。" ++ ++#: C/evolution.xml:6002(para) ++msgid "" ++"It fetches the remote calendar and contact information and stores it on your " ++"local drive." ++msgstr "它会连接远程的日历和联系人信息并且存储到您的本地磁盘上。" ++ ++#: C/evolution.xml:6004(para) ++msgid "" ++"Remote calendar and contacts are typically stored remotely on servers rather " ++"than on local hard disk." ++msgstr "远程日历和联系人一般情况下是存储在服务器上而不是存储在本地磁盘上。" ++ ++#: C/evolution.xml:6008(para) ++msgid "" ++"Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port " ++"field." ++msgstr "在“邮政代理SOAP端口”一栏，指定您的邮政代理SOAP端口。" ++ ++#: C/evolution.xml:6012(para) ++msgid "" ++"(Optional) Click the Proxy tab, then click Add to add any Proxy users to " ++"your account." ++msgstr "(可选)点击“代理”选项卡，然后点击“添加”，添加任意代理用户到您的账户。" ++ ++#: C/evolution.xml:6023(title) ++msgid "Reminder Notes" ++msgstr "提醒便条" ++ ++#: C/evolution.xml:6024(para) ++msgid "" ++"GroupWise Reminder notes are like mail messages except they are scheduled " ++"for a particular day and appear on the Calendar for that date. You can use " ++"reminder notes to show vacations, holidays, pay days, birthdays, and so on. " ++"Posted reminder notes are placed in your Calendar on the date you specify. " ++"They are not placed in your Mailbox or in any other user's Mailbox." ++msgstr "" ++"GroupWise提醒便条类似于邮件信息，只不过它们是为特定的一天规划的，在那天的日历" ++"中出现。您可以使用提醒便条来显示假期，节日，还款日期，生日，等等。发送的提醒" ++"便条会放在您指定的日期的日历中。它们并不放在您的邮箱或其它用户的邮箱中。" ++ ++#: C/evolution.xml:6025(para) ++msgid "" ++"Evolution integrates this feature into its Memo component so that you can " ++"view the Reminder notes listed under Memo at the right bottom side of the " ++"calendar view." ++msgstr "" ++"Evolution把该功能整合到了它的备忘组件中这样您可以在日历视图右下角查看列在备忘" ++"下面的提醒便条。" ++ ++#: C/evolution.xml:6027(para) ++msgid "" ++"Select the memo or the Reminder notes under the Memo component to display it " ++"on the Calendar view." ++msgstr "要将提醒便条显示在日历视图中，要在备忘组件中将备忘或提醒便条选中。" ++ ++#: C/evolution.xml:6029(para) ++msgid "" ++"To create a new Reminder Note follow Step 1 through Step 8 under Memos." ++msgstr "" ++"要创建一个新的提醒便条，可以根据备忘一节中" ++"介绍的步骤1到步" ++"骤8。" ++ ++#: C/evolution.xml:6030(para) ++msgid "To send a Reminder Note," ++msgstr "要发送一个提醒便条，" ++ ++#: C/evolution.xml:6033(para) ++msgid "Click File, then New > Shared Memo." ++msgstr "点击文件 > 新建 > 共享备忘。" ++ ++#: C/evolution.xml:6036(para) ++msgid "" ++"Select the Organizer's account name from the drop-down list given next to " ++"the Organizer field." ++msgstr "在“组织者”一栏旁边的下列列表中选择组织者的账户。" ++ ++#: C/evolution.xml:6039(para) ++msgid "" ++"In the To field, type a username, then press Enter. Repeat for additional " ++"users." ++msgstr "" ++"在“发送到”一栏中，输入用户名，然后按回车键。要添加其它用户，重复该步骤。" ++ ++#: C/evolution.xml:6051(para) ++msgid "Specify the category that the Reminder note falls under." ++msgstr "指定该提醒所属的类别。" ++ ++#: C/evolution.xml:6057(para) ++msgid "Click Save." ++msgstr "点击“保存”。" ++ ++#: C/evolution.xml:6066(para) ++msgid "" ++"When you schedule a meeting with your calendar on GroupWise, you can check " ++"when other local GroupWise users are busy according to their GroupWise " ++"calendars." ++msgstr "" ++"当您使用位于GroupWise上的日历计划一个会议时，您可以根据其它用户的GoupWise日历" ++"查看他们什么时候忙碌。" ++ ++#: C/evolution.xml:6067(para) ++msgid "" ++"Reminders for appointments in your GroupWise calendar do not work until you " ++"have run Evolution at least once after logging in. This is different from " ++"locally stored reminders, which work from the moment you log in, regardless " ++"of whether you have run Evolution in the session." ++msgstr "" ++"您的GroupWise上的约会提醒不会马上生效，您必须在登录系统之后至少一次运行" ++"Evolution才行。这与存储在本地的提醒不同，它们在您登录系统后就会生效，而无须您" ++"要运行Evolution." ++ ++#: C/evolution.xml:6070(para) ++msgid "Open a new appointment in the calendar." ++msgstr "在日历中打开新的约会。" ++ ++#: C/evolution.xml:6073(para) ++msgid "Click Actions > Schedule Meeting." ++msgstr "点击操作 > 计划会议。" ++ ++#: C/evolution.xml:6076(para) ++msgid "" ++"Add attendees, either by entering their email addresses into the list, or by " ++"clicking the Invite Others button." ++msgstr "" ++"添加出席者，可以将他们的邮件地址输入到列表中，也可以点击“邀请别人”按钮。" ++ ++#: C/evolution.xml:6079(para) ++msgid "" ++"Click Options, then click Update Free/Busy to check participant schedules " ++"and, if possible, update the meeting in all participants' calendars." ++msgstr "" ++"点击“选项”，然后点击“更新忙/闲”来查看参与者的计划，并且可能的话，更新所有参与" ++"者日历中的会议信息。" ++ ++#: C/evolution.xml:6082(para) ++msgid "" ++"If meeting attendees are not available during the times you have scheduled a " ++"meeting, you can nudge the meeting forward or backward to the " ++"nearest available time. To do so, just click the arrows to the left or right " ++"of the Autopick button. The Autopick tool moves the meeting to the nearest " ++"time during which all attendees are available. If you aren't satisfied with " ++"those results, you can drag the edges of the meeting time to the hours that " ++"you want to select." ++msgstr "" ++"如果会议出席者在您安排会议时无法连接到，您可以将会议向前或向后“推移”至最近的" ++"最合适的时间。操作方法时，点击“自动获取”按钮左边或右边的箭头。“自动获取”工具" ++"会帮助您把会议时间移动到最接近所以出席者都空闲的时间。如果您对这些结果尚不满" ++"意，您还可以拖拽标示会议时段边界的线到您想要选择的时刻即可。" ++ ++#: C/evolution.xml:6087(title) ++msgid "Resending a GroupWise Meeting Request" ++msgstr "重新发送一个GroupWise会议请求" ++ ++#: C/evolution.xml:6090(para) ++msgid "Right-click an existing meeting that you have organized." ++msgstr "右键点击一个您组织的已存在的会议。" ++ ++#: C/evolution.xml:6093(para) ++msgid "Select Resend meeting. A confirmation dialog is displayed." ++msgstr "选择“重新发送会议”，会显示一个确认对话框。" ++ ++#: C/evolution.xml:6096(para) ++msgid "Click OK to resend the meeting." ++msgstr "点击“确定”，重新发送会议。" ++ ++#: C/evolution.xml:6100(para) ++msgid "(Optional) Edit any of the fields: Duration, Summary, Description" ++msgstr "(可选)编辑任何其中的域：持续时间，概要，描述" ++ ++#: C/evolution.xml:6103(para) ++msgid "" ++"(Optional) Add attendees, either by entering their email addresses into the " ++"list, or by clicking the Invite Others button." ++msgstr "" ++"(可选)添加出席者，可以将他们的邮件地址输入到列表中，也可以点击“邀请其他人”的" ++"按钮。" ++ ++#: C/evolution.xml:6106(para) ++msgid "" ++"To remove an attendee from the list, select the attendee and click Remove." ++msgstr "要将一个出席者移出列表，选择该出席者，点击“删除”。" ++ ++#: C/evolution.xml:6112(para) ++msgid "" ++"A Dialog is displayed to check whether you want to retract the original item " ++"or not. Click OK to confirm. Click Cancel if you want to keep the original " ++"item in the recipients' calendar." ++msgstr "" ++"此时会显示一个对话框让您确认是否要取消原始的条目。点击“确定”确认修改，如果您" ++"想保留收信人日历中的原始条目，点击“取消”。" ++ ++#: C/evolution.xml:6116(para) ++#, fuzzy ++msgid "" ++"An email is send to all the recipients to invite them to your updated event." ++msgstr "一封邮件会发送给所有收信人请他们参加您的会议。" ++ ++#: C/evolution.xml:6121(title) ++msgid "GroupWise support for header based threading enabled" ++msgstr "GroupWise支持按邮件头编排线索" ++ ++#: C/evolution.xml:6122(para) ++msgid "" ++"There is no need to enable 'Fall back to threading by subject' from Edit " ++"> Preferences > Mail preferences > General tab unless other wise " ++"you want messages to be threaded on subject basis." ++msgstr "" ++"没有必要在编辑 > 首选项 > 邮件首选项 > 常规选项卡中选择‘强制按主题编" ++"排线索’，除非您想要让邮件按照主题编排线索。" ++ ++#: C/evolution.xml:6130(link) C/evolution.xml:6150(title) ++msgid "Confirming Delivery of Items You have Sent" ++msgstr "确认您已发送条目" ++ ++#: C/evolution.xml:6133(link) C/evolution.xml:6263(title) ++msgid "Displaying Sent Items" ++msgstr "显示发送项目" ++ ++#: C/evolution.xml:6136(link) C/evolution.xml:6194(title) ++msgid "Checking the Status of an Item You Have Sent" ++msgstr "查看您已发送的条目的状态" ++ ++#: C/evolution.xml:6139(link) C/evolution.xml:6142(link) ++#: C/evolution.xml:6221(title) ++msgid "Requesting a Reply for Items You Send" ++msgstr "为您发送的条目请求回复" ++ ++#: C/evolution.xml:6146(para) ++msgid "" ++"You can manage your sent items for GroupWise email only if the recipient is " ++"located on the same GroupWise system as you." ++msgstr "" ++"当收信人位于和您同样的GroupWise系统中时您才可以管理您的GroupWise邮件发送条" ++"目。" ++ ++#: C/evolution.xml:6151(para) ++msgid "" ++"Evolution provides several ways for you to confirm that your item was " ++"delivered. You can easily track message status of any message you have sent. " ++"For example, you can see when an email was delivered and when the recipient " ++"opened or deleted the email." ++msgstr "" ++"Evolution提供了几种方式来让您确认您的条目已经发送了。您可以很容易地追踪您发送" ++"的任何邮件的状态。例如，您可以查看什么时候邮件发出去，什么时候收信人打开或删" ++"除了邮件。" ++ ++#: C/evolution.xml:6153(title) ++msgid "Track an Item You Sent:" ++msgstr "追踪您发送的条目：" ++ ++#: C/evolution.xml:6154(para) ++msgid "" ++"You can check the status in the Message Status window of an email you have " ++"sent." ++msgstr "您可以在邮件状态窗口中查看已发送的邮件的状态。" ++ ++#: C/evolution.xml:6157(title) ++msgid "Receive Notification When the Item is Opened or Deleted:" ++msgstr "当条目被打开或删除时接收提示：" ++ ++#: C/evolution.xml:6158(para) ++msgid "" ++"You can receive notification when the recipient opens or deletes a message. " ++"For information, see Requesting a Reply for Items " ++"You Send." ++msgstr "" ++"您可以在收信人打开或删除邮件时接收到提示。要了解更多相关信息，请参阅为您发送的条目请求回复。" ++ ++#: C/evolution.xml:6161(title) ++msgid "Request a Reply:" ++msgstr "请求回复：" ++ ++#: C/evolution.xml:6162(para) ++msgid "" ++"You can inform the recipient that you need a reply to an email. Evolution " ++"adds a sentence to the item stating that a reply is requested and changes " ++"the icon in the recipient's Mailbox to a double arrow. For information, see " ++"Requesting a Reply for Items You Send." ++msgstr "" ++"您可以通知收信人需要回复该邮件。Evolution会在该条目后面添上一句话表示要求回复" ++"该邮件，在收信人邮箱中该邮件的图标会是一个双箭头。要了解很多相关信息，请参阅" ++"为您发送的条目请求回复。" ++ ++#: C/evolution.xml:6166(title) C/evolution.xml:6287(title) ++msgid "Enabling Status Tracking" ++msgstr "启用状态追踪" ++ ++#: C/evolution.xml:6169(para) C/evolution.xml:6208(para) ++#: C/evolution.xml:6224(para) ++msgid "In the Compose Message window, click Insert > Send Options." ++msgstr "在邮件编辑器窗口中，点击插入 > 发送选项。" ++ ++#: C/evolution.xml:6170(para) C/evolution.xml:6291(para) ++msgid "Select Status Tracking." ++msgstr "选择“状态追踪”。" ++ ++#: C/evolution.xml:6174(para) C/evolution.xml:6295(para) ++msgid "Select the check box next to Create a sent item to track information." ++msgstr "选择“创建一个发送条目来追踪信息”旁边的选框。" ++ ++#: C/evolution.xml:6177(para) ++msgid "" ++"Select any of the options given (Delivered, Delivered and opened, All " ++"information)." ++msgstr "在给出的选项中选择一项(已发送，已发送并且已打开，所有信息)。" ++ ++#: C/evolution.xml:6178(para) C/evolution.xml:6299(para) ++msgid "" ++"Based on this selection, you can view the status of the send message in the " ++"Sent Items folder." ++msgstr "根据您的选择，您可以在已发箱中查看已发送的邮件的状态。" ++ ++#: C/evolution.xml:6179(para) ++msgid "" ++"For more information, see Checking the Status of " ++"an Item You Have Sent." ++msgstr "" ++"要了解更多相关信息，请参阅查看您已发送的条目的状态" ++"。" ++ ++#: C/evolution.xml:6182(para) C/evolution.xml:6302(para) ++msgid "" ++"(Optional) Select the check box next to Auto-delete sent item to " ++"automatically delete the sent item from the Sent folder." ++msgstr "" ++"(可选)选择“自动删除发送条目”旁边的选框，可以从已发箱中自动删除发送的条目。" ++ ++#: C/evolution.xml:6185(para) C/evolution.xml:6305(para) ++msgid "Under Return Notification, specify the type of return receipt you want." ++msgstr "在“返回提醒”一栏，指定您想要的回执类型。" ++ ++#: C/evolution.xml:6197(para) ++msgid "" ++"Right-click an email in your Sent folder, then click Track Message Status." ++msgstr "在已发箱中右击一封邮件，然后点击“追踪邮件状态”。" ++ ++#: C/evolution.xml:6198(para) ++msgid "" ++"With Message Tracking, you know when the item reaches the recipients or is " ++"read by them. You also know exactly who received your message, who read your " ++"message, and who deleted it and when." ++msgstr "" ++"使用邮件追踪，您会了解什么时候该邮件到达收信人或被收信人阅读。您还能知道谁接" ++"收了该邮件，谁阅读了该邮件，以及谁在什么时候删除了该邮件。" ++ ++#: C/evolution.xml:6205(title) ++msgid "Changing the Priority of an Email" ++msgstr "更改邮件优先级" ++ ++#: C/evolution.xml:6212(para) ++msgid "" ++"The small icon next to an item in the Mailbox is red when the priority is " ++"high." ++msgstr "当优先级设为“高”时，邮箱中邮件旁边的小图标是红色的。" ++ ++#: C/evolution.xml:6228(para) ++msgid "Click Reply Requested, then specify when you want to receive the reply." ++msgstr "点击“要求回复”，然后指定您想要在什么时候收到回复。" ++ ++#: C/evolution.xml:6230(title) ++msgid "When convenient:" ++msgstr "在合适的时候：" ++ ++#: C/evolution.xml:6231(para) ++msgid "" ++"Select this option to allow the recipients to reply at their convenience. If " ++"you select this option, Reply Requested: When Convenient appears at the top of the message." ++msgstr "" ++"选择该项让收信人在他们方便的时候再回复信件。如果您选择了该项，邮件头部会显" ++"示：要求回复：在合适的时候。" ++ ++#: C/evolution.xml:6234(title) ++msgid "Within days:" ++msgstr "在几天内：" ++ ++#: C/evolution.xml:6235(para) ++msgid "Specify the number of days by when you need a reply." ++msgstr "指定您想要在几天之内收到回复。" ++ ++#: C/evolution.xml:6240(para) ++msgid "" ++"Click Set Expiration Date, then specify the number of days for this message " ++"to remain in the recipient's Inbox." ++msgstr "点击“设置截止日期”，然后指定该邮件在收信人收件箱中停留的天数。" ++ ++#: C/evolution.xml:6248(title) ++msgid "Setting Message Delivery Options" ++msgstr "设置邮件发送选项" ++ ++#: C/evolution.xml:6249(para) ++msgid "" ++"You can delay the delivery of an individual message by having it held in the " ++"Outbox for a specified time." ++msgstr "您可以将邮件保留在发件箱中一段时间来拖延邮件发送。" ++ ++#: C/evolution.xml:6252(para) ++msgid "Click Delay message delivery." ++msgstr "点击“拖延邮件发送”。" ++ ++#: C/evolution.xml:6255(para) ++msgid "" ++"Use the Date and Time options to specify how long the message should remain " ++"in the Outbox before it is sent to the recipient." ++msgstr "选择日期和时间，指定邮件该放在发信箱中多长时间后再发给收信人。" ++ ++#: C/evolution.xml:6266(para) ++msgid "Click the Sent Items folder in the Folder List." ++msgstr "在文件夹列表中点击已发箱。" ++ ++#: C/evolution.xml:6269(para) ++msgid "" ++"All sent items reside in this folder unless you select a different folder " ++"for sent email in the account editor default settings. For more information, " ++"refer to Changing Default Folder for Sent and " ++"Draft Items under Default Settings." ++msgstr "" ++"所有已发送的条目会放在该文件夹中，除非您在账户编辑器的默认设置中为已发送的邮" ++"件选择了不同的文件夹。要了解更多相关信息，请参阅默" ++"认设置中的改变已发箱和草稿箱的默认文件夹。" ++ ++#: C/evolution.xml:6272(title) ++msgid "Delegating an Item" ++msgstr "委托事件" ++ ++#: C/evolution.xml:6275(para) ++msgid "" ++"In the Calendar, right-click the meeting or appointment you want to delegate." ++msgstr "在日历再，右键点击您想要委托的会议或约会。" ++ ++#: C/evolution.xml:6278(para) ++msgid "" ++"Select Delegate Meeting, then select the contacts you want to delegate the " ++"meeting/appointment for." ++msgstr "选择“委托会议”，然后选择您想要委托给的联系人。" ++ ++#: C/evolution.xml:6284(para) ++msgid "Each contact gets a copy of the appointment or meeting." ++msgstr "每个联系人会得到该会议或约会的一份拷贝。" ++ ++#: C/evolution.xml:6290(para) ++msgid "In the Compose Meeting window, click Insert > Send Options." ++msgstr "在编辑会议窗口中，点击插入 > 发送选项。" ++ ++#: C/evolution.xml:6298(para) ++msgid "" ++"Select any of the options given (Delivered, Delivered and opened, All " ++"information)" ++msgstr "在给出的选项中选择一项(已发送，已发送并且已打开，所有信息)。" ++ ++#: C/evolution.xml:6317(para) ++msgid "" ++"Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you " ++"perform various actions, such as reading, accepting, and declining items on " ++"behalf of another user, within the restrictions the other user sets." ++msgstr "" ++"使用代理来管理其它用户的邮箱和日历。代理能让您进行多种操作，如代表其它用户阅" ++"读，接受或拒绝事件，当然须在别人授予您的权限范围之内。" ++ ++#: C/evolution.xml:6319(para) ++msgid "" ++"You can proxy for a user in a different post office or domain, as long as " ++"that person is in the same GroupWise system. You cannot proxy for a user in " ++"a different GroupWise system." ++msgstr "" ++"您可以为任何一个在其它邮局或地域的用户作代理，只要那个人在和您一样的GroupWise" ++"系统中。但是您不能为不在同一个GroupWise系统中的用户做代理。" ++ ++#: C/evolution.xml:6324(link) C/evolution.xml:6341(title) ++msgid "Receiving Proxy Rights" ++msgstr "接收代理权利" ++ ++#: C/evolution.xml:6327(link) C/evolution.xml:6346(title) ++msgid "Assigning Proxy Rights to Another User" ++msgstr "向其他用户分配代理权利" ++ ++#: C/evolution.xml:6330(link) C/evolution.xml:6417(title) ++msgid "Adding and Removing Proxy Names and Rights in Your Proxy List" ++msgstr "添加和删除您的代理列表中的代理人姓名和权利" ++ ++#: C/evolution.xml:6333(link) C/evolution.xml:6448(title) ++msgid "Managing Someone Else's Mailbox or Calendar" ++msgstr "管理其它人的邮箱或日历" ++ ++#: C/evolution.xml:6336(link) C/evolution.xml:6470(title) ++msgid "Marking an Item Private" ++msgstr "将项目标记为私有" ++ ++#: C/evolution.xml:6342(para) ++msgid "" ++"Two steps must be completed before you can act as someone's proxy. First, " ++"the person for whom you plan to act as proxy must grant you rights in the " ++"Proxy List in Preferences. Second, you must proxy to the user so you can " ++"access his or her Mailbox or Calendar." ++msgstr "" ++"在您成为其他人的代理人之前必须经过两个步骤。首先，您想要代理的人必须在首选项" ++"的代理列表中给您授权。其次，您必须接收他的代理这样您就可以访问他/她的邮箱或日" ++"历了。" ++ ++#: C/evolution.xml:6347(para) ++msgid "" ++"Use the Proxy List in the Preferences Account Editor to give other users " ++"rights to proxy for you. You can assign each user different rights to your " ++"calendaring and messaging information. If you want to let users view " ++"specific information about your appointments when they do a Busy Search on " ++"your Calendar, give them Read access for appointments. The following table " ++"describes the rights you can grant to users:" ++msgstr "" ++"在首选项的账户编辑器中使用代理列表来授予其他人为您代理的权限。您可以授予不同" ++"用户不同的权限来访问您的日历和邮件。如果您想要让用户在您的日历上搜索忙/闲信息" ++"时查看关于您约会的特定的信息，可以给他们阅读约会的权限。下列表格列出了您可以" ++"赋予用户的权限：" ++ ++#: C/evolution.xml:6355(para) ++msgid "Permission:" ++msgstr "权限：" ++ ++#: C/evolution.xml:6358(para) ++msgid "Allows your proxy to do:" ++msgstr "允许您的代理：" ++ ++#: C/evolution.xml:6365(para) ++msgid "Read" ++msgstr "读" ++ ++#: C/evolution.xml:6368(para) ++msgid "" ++"Read items you receive. Proxies cannot see your Contacts folder with this or " ++"any other proxy right." ++msgstr "" ++"阅读您收到的条目。该权限或其它任何代理权限的代理人均不能查看您的联系人文件" ++"夹。" ++ ++#: C/evolution.xml:6373(para) ++msgid "Write" ++msgstr "写" ++ ++#: C/evolution.xml:6376(para) ++msgid "" ++"Create and send items in your name, including applying your signature if you " ++"have one defined. Assign categories to items, and change the subject of " ++"items." ++msgstr "" ++"在您的名下创建和发送条目，包括使用您的签名(如果您已经指定的话)。将条目分类，" ++"以及修改条目的主题。" ++ ++#: C/evolution.xml:6381(para) ++msgid "Subscribe to my alarms" ++msgstr "订阅我的警告" ++ ++#: C/evolution.xml:6384(para) ++msgid "" ++"Receive the same alarms you receive. Receiving alarms is supported only if " ++"the proxy is on the same post office you are." ++msgstr "" ++"接收和您收到的一样的警告信息。该功能只有在代理人和您在同一个邮政中才能使用。" ++ ++#: C/evolution.xml:6389(para) ++msgid "Subscribe to my notifications" ++msgstr "订阅我的提醒" ++ ++#: C/evolution.xml:6392(para) ++msgid "" ++"Receive notification when you receive items. Receiving notifications is " ++"supported only if the proxy is on the same post office you are." ++msgstr "" ++"当您收到条目时接收提醒信息。该功能只有在代理人和您在同一个邮政中才能使用。" ++ ++#: C/evolution.xml:6397(para) ++msgid "Modify options/rules/folders" ++msgstr "编辑选项/规则/文件夹" ++ ++#: C/evolution.xml:6400(para) ++msgid "" ++"Change the options in your Mailbox. The proxy can edit any of your Options " ++"settings, including the access given to other users. If the proxy also has " ++"Mail rights, he or she can create or modify rules and folders. This right " ++"allows a proxy to add, delete, and modify categories." ++msgstr "" ++"修改您的邮箱中的选项。代理人可以编辑任何您的选项设置，包括给其它用户的访问权" ++"限。如果代理人还有访问邮件的权限的话，他/她还可以创建和修改规则和文件夹。这种" ++"权限允许代理人添加，删除和修改分类类别。" ++ ++#: C/evolution.xml:6405(para) ++msgid "Read items marked Private" ++msgstr "阅读标记为“隐私”的条目" ++ ++#: C/evolution.xml:6408(para) ++msgid "" ++"Read the items you marked Private. If you don't give a proxy Private rights, " ++"all items marked Private in your Mailbox are hidden from that proxy." ++msgstr "" ++"阅读您标记为“隐私”的条目。如果您没有给代理人该权限，则您邮箱中所有标记为“隐" ++"私”的条目都对该代理人是隐藏的。" ++ ++#: C/evolution.xml:6423(para) ++msgid "Select the GroupWise account to edit, then click Edit." ++msgstr "选择要编辑的GroupWise账户，然后点击“编辑”。" ++ ++#: C/evolution.xml:6426(para) ++msgid "Click the Proxy tab, then click Add." ++msgstr "点击“代理”标签，然后点击“添加”。" ++ ++#: C/evolution.xml:6429(para) ++msgid "" ++"To add a user to the list, type the name in the Name box or import the " ++"contact from Contact list." ++msgstr "要添加用户到列表，在“姓名”框中输入姓名，或者从联系人列表中导入联系人。" ++ ++#: C/evolution.xml:6432(para) ++msgid "Select the rights you want to give to the user." ++msgstr "选择您想要赋予该用户的权限。" ++ ++#: C/evolution.xml:6437(para) ++msgid "" ++"Repeat Step 4 and Step 5 to assign rights to each user in the Proxy List." ++msgstr "" ++"重复步骤4和步骤5，赋予代理列表中每个用户的权限。" ++ ++#: C/evolution.xml:6444(para) ++msgid "" ++"To delete a user from the Proxy List, select the user, then click Remove " ++"User." ++msgstr "要从代理列表中删除用户，选择该用户，然后点击“删除用户”。" ++ ++#: C/evolution.xml:6449(para) ++msgid "" ++"Before you can act as a proxy for someone, that person must give you proxy " ++"rights in his or her Proxy List in Preferences. The amount of access you " ++"have depends on the rights you have been given." ++msgstr "" ++"在您可以成为某人的代理之前，那个人必须在他/她的首选项代理列表中赋予您代理权" ++"限。您能够访问的程度取决于您被赋予的权限。" ++ ++#: C/evolution.xml:6452(para) ++msgid "Right-click on the GroupWise account in the folder list." ++msgstr "在文件夹列表中右击GroupWise账户。" ++ ++#: C/evolution.xml:6455(para) ++msgid "Click Proxy Login." ++msgstr "点击“代理登录”。" ++ ++#: C/evolution.xml:6459(para) ++msgid "" ++"Type the user name of the person who has given you Proxy access, or select " ++"from the list." ++msgstr "输入给你代理访问的人的用户名，或从列表中选择。" ++ ++#: C/evolution.xml:6463(para) ++msgid "The user's data appears in the respective components." ++msgstr "该用户的数据会显示在对应的区域。" ++ ++#: C/evolution.xml:6464(para) ++msgid "" ++"You can set different colors to each user to distinguish between each users' " ++"appointments. You can also select whether to display the appointments of a " ++"particular user or not." ++msgstr "" ++"您可以给每个用户设置不同的颜色来区分每个用户之间的约会。您还可以选择是否要显" ++"示某个特定用户的约会。" ++ ++#: C/evolution.xml:6471(para) ++msgid "" ++"You can limit a proxy's access to individual items in your Mailbox or " ++"Calendar by marking items Private." ++msgstr "您可以通过将条目标记为隐私来限制代理人访问您的邮箱或日历中的某些条目。" ++ ++#: C/evolution.xml:6472(para) ++msgid "" ++"When you mark an item Private, you prevent unauthorized proxies from opening " ++"it. Proxies cannot access items marked Private unless you give them those " ++"rights in your Access List." ++msgstr "" ++"当您将条目标记为隐私时，您将阻止未经授权的用户打开它。除非您在访问列表中给了" ++"代理人相应的权限，否则他们不能访问标记为隐私的条目。" ++ ++#: C/evolution.xml:6473(para) ++msgid "" ++"If you mark an item Private when you send it, neither your proxies nor the " ++"recipient's proxies can open the item without rights. If you mark an item " ++"Private when you receive it, it cannot be read by your unauthorized proxies, " ++"but it can be read by the sender's proxies. Appointments marked Private " ++"display in Busy Search according to the status you selected when you " ++"accepted the appointment." ++msgstr "" ++"如果您在发送一个条目是将它标记为隐私，在没有相应权限的情况下无论是收信人还是" ++"您的代理人都不能打开它。如果您在收到一个条目时把它标记为隐私，则它不能被您的" ++"未经授权的代理人访问，但可以被发信人的代理人访问。标记为隐私的约会可以显示在" ++"忙/闲搜索中，这根据您在接受约会时选择的状态而定。" ++ ++#: C/evolution.xml:6476(para) ++msgid "In an open item, click Actions, then click Mark Private." ++msgstr "在一个打开的条目中，点击“操作”，然后点击“标记为隐私”。" ++ ++#: C/evolution.xml:6478(para) ++msgid "" ++"In your Calendar, click an item in the Appointments, Reminder Notes, or " ++"Tasks List, click Actions, then click Mark Private." ++msgstr "" ++"在您的日历中，在约会，提醒便条或任务列表中选择一个条目，点击“操作”，然后点" ++"击“标记为隐私”。" ++ ++#: C/evolution.xml:6486(para) ++msgid "" ++"Junk mail handling for GroupWise accounts is a little different than other " ++"junk mail handling. When you mark an item as junk mail in GroupWise, the " ++"item is added to your junk list in the GroupWise system. Because these " ++"settings are on the GroupWise system, your junk list follows you from " ++"computer to computer." ++msgstr "" ++"GroupWise账户的垃圾邮件处理和其它账户稍有不同。当您在GroupWise中标记一个条目" ++"为垃圾邮件时，该条目会加入到您的GroupWise系统中的垃圾列表。由于这些设置是位于" ++"GroupWise服务器系统上的，所以即使更换了计算机，您的垃圾列表也会一直跟随您。" ++ ++#: C/evolution.xml:6489(link) C/evolution.xml:6506(title) ++msgid "Marking a Message As Junk Mail" ++msgstr "将邮件标记为垃圾邮件。" ++ ++#: C/evolution.xml:6492(link) C/evolution.xml:6516(title) ++msgid "Marking a Message As Not Junk Mail" ++msgstr "将邮件标记为非垃圾邮件。" ++ ++#: C/evolution.xml:6495(link) C/evolution.xml:6530(title) ++msgid "Enabling or Disabling Your Junk Mail List" ++msgstr "启用或禁用您的垃圾邮件列表" ++ ++#: C/evolution.xml:6498(link) C/evolution.xml:6545(title) ++msgid "Adding an Email Address to Your Junk List" ++msgstr "添加邮件地址到您的垃圾列表" ++ ++#: C/evolution.xml:6501(link) C/evolution.xml:6560(title) ++msgid "Removing an Email Address from Your Junk List" ++msgstr "将邮件地址移出您的垃圾列表" ++ ++#: C/evolution.xml:6509(para) ++msgid "" ++"Select the message to mark as junk, then click the Junk icon or press Ctrl+J." ++msgstr "选择要标记垃圾的邮件，然后点击垃圾图标或按Ctrl+J。" ++ ++#: C/evolution.xml:6510(para) ++msgid "" ++"The message is moved to your Junk Mail folder and the user is added to your " ++"junk list." ++msgstr "邮件会移到您的垃圾邮件文件夹，用户会添加到您的垃圾列表。" ++ ++#: C/evolution.xml:6519(para) ++msgid "Select the message to mark as not junk in your Junk Mail folder." ++msgstr "选择您的垃圾邮件文件夹中要标记为非垃圾的邮件。" ++ ++#: C/evolution.xml:6522(para) ++msgid "Right-click the message, then click Mark as Not Junk." ++msgstr "右击该邮件，然后选择“标记为非垃圾”。" ++ ++#: C/evolution.xml:6523(para) ++msgid "Or select the message and press Shift+Ctrl+J" ++msgstr "或选择该邮件，按Shift+Ctrl+J" ++ ++#: C/evolution.xml:6524(para) ++msgid "" ++"The message is moved to your Mailbox folder and the name is removed from " ++"your junk list." ++msgstr "该邮件会移到您的邮箱文件夹，用户名会移出您的垃圾列表。" ++ ++#: C/evolution.xml:6533(para) C/evolution.xml:6548(para) ++#: C/evolution.xml:6563(para) ++msgid "Right-click a message, then click Junk Mail Settings." ++msgstr "右击一封邮件，点击“垃圾邮件设置”。" ++ ++#: C/evolution.xml:6536(para) ++msgid "Select if you want to enable or disable junk mail handling." ++msgstr "选择您是否要启用或禁用垃圾邮件处理。" ++ ++#: C/evolution.xml:6551(para) ++msgid "Type the email address to block in the Email field." ++msgstr "输入要阻止的电子邮件地址。" ++ ++#: C/evolution.xml:6554(para) ++msgid "Click Add, then click OK." ++msgstr "点击“添加”，然后点击“确定”。" ++ ++#: C/evolution.xml:6566(para) ++msgid "Select the email address to remove, then click Remove." ++msgstr "选择要移除的邮件地址，然后点击“移除”。" ++ ++#: C/evolution.xml:6578(para) ++msgid "" ++"Perhaps your mail server has changed names. Or you have grown tired of a " ++"certain layout for your appointments. Whatever the reason, you can change " ++"your Evolution settings." ++msgstr "" ++"您的邮件服务器可能会改变名称，或者您已逐渐厌倦了您日历上的约会的特定布局。不" ++"论原因是什么，您都可以修改您的Evolution设置。" ++ ++#: C/evolution.xml:6581(link) C/evolution.xml:6635(title) ++msgid "Working with Mail Accounts" ++msgstr "使用邮件账户工作" ++ ++#: C/evolution.xml:6584(link) C/evolution.xml:6680(title) ++msgid "Autocompletion" ++msgstr "自动完成" ++ ++#: C/evolution.xml:6587(link) C/evolution.xml:6738(title) ++msgid "Mail Preferences" ++msgstr "邮件首选项" ++ ++#: C/evolution.xml:6590(link) C/evolution.xml:6912(title) ++msgid "Composer Preferences" ++msgstr "编辑器首选项" ++ ++#: C/evolution.xml:6593(link) C/evolution.xml:6971(title) ++msgid "Calendar and Tasks Settings" ++msgstr "日历和任务设置" ++ ++#: C/evolution.xml:6596(link) C/evolution.xml:7217(title) ++msgid "Contact Management" ++msgstr "联系人管理" ++ ++#: C/evolution.xml:6599(link) C/evolution.xml:7200(title) ++msgid "Certificates" ++msgstr "认证" ++ ++#: C/evolution.xml:6602(link) C/evolution.xml:7350(title) ++msgid "Debug Logs" ++msgstr "调试日志" ++ ++#: C/evolution.xml:6605(para) ++msgid "" ++"You reach the Evolution settings window by clicking Edit > Preferences. " ++"In the left part of the settings window is a column, similar to the " ++"Evolution switcher, that lets you choose which portion of Evolution to " ++"customize. The right part of the window is where you make your actual " ++"changes." ++msgstr "" ++"您可以通过点击编辑 > 首选项来进行这些Evolution的设置。在设置窗口左侧是类似" ++"于Evolutin切换器的列，能让您选择自定义哪一部份Evolution设置。窗口右侧是您真正" ++"要做出自己修改的部分。" ++ ++#: C/evolution.xml:6607(para) ++msgid "There are six items you can customize." ++msgstr "您可以自定义六个方面的内容。" ++ ++#: C/evolution.xml:6609(title) ++msgid "Mail Accounts:" ++msgstr "邮件帐号：" ++ ++#: C/evolution.xml:6610(para) ++msgid "" ++"Add or change information about your email accounts, such as the servers you " ++"connect to, the way you download mail, and your password authentication " ++"mode. This is the most complex item in the list, and is covered in Working with Mail Accounts." ++msgstr "" ++"添加或修改您的电子邮件账户信息，例如您想连接到哪个服务器，您要下载邮件的方" ++"式，以及您的密码验证模式。这是最复杂的设置部分，在使用邮件账户工作。" ++ ++#: C/evolution.xml:6613(title) ++msgid "Autocompletion:" ++msgstr "自动完成：" ++ ++#: C/evolution.xml:6614(para) ++msgid "" ++"Set the address books to be used when completing email addresses in the " ++"message composer. For more information, see Autocompletion." ++msgstr "" ++"设置在邮件编辑器中自动补齐邮件地址时要使用地址簿。要了解更多相关信息，请参阅" ++"自动补全。" ++ ++#: C/evolution.xml:6617(title) ++msgid "Mail Preferences:" ++msgstr "邮件首选项：" ++ ++#: C/evolution.xml:6618(para) ++msgid "" ++"These are overall mail reading preferences, such as display settings, " ++"notification options, and security. Settings that vary per account are in " ++"the Mail Accounts tool, described in Working with Mail Accounts, but most of the mail settings " ++"are in Mail Preferences." ++msgstr "" ++"通用的邮件阅读首选项包括显示设置，提醒选项和安全性。而与每个账户相关的设置位" ++"于邮件账户工具中，在使用邮件账户" ++"工作中会有所介绍，但大多数邮件设置还是位于邮件首选项中。" ++ ++#: C/evolution.xml:6621(title) ++msgid "Composer Preferences:" ++msgstr "编辑器首选项：" ++ ++#: C/evolution.xml:6622(para) ++msgid "" ++"These are settings for the way that you use the mail composer, such as " ++"signatures, and spelling. This includes the ability to substitute graphical " ++"emoticons for emoticons such as : ) that many people use in " ++"email. This tool is covered in Composer Preferences." ++msgstr "" ++"编辑器首选项用于设置您使用邮件编辑器的方式，例如签名和拼写等。这还包括使用" ++"表情图标的功能，例如，: )许多人在使用邮件。该工具包含在编辑器首选项中。" ++ ++#: C/evolution.xml:6625(title) ++msgid "Calendar and Tasks:" ++msgstr "日历和任务：" ++ ++#: C/evolution.xml:6626(para) ++msgid "" ++"Use these settings to control how the calendar behaves, including your time " ++"zone and the length of your work week. For more information, see Calendar and Tasks Settings." ++msgstr "" ++"使用这些设置控制日历的行为，包括您所在的时区和您的工作日长度。要了解更多信" ++"息，请参阅日历和任务设置。" ++ ++#: C/evolution.xml:6629(title) ++msgid "Certificates:" ++msgstr "证书：" ++ ++#: C/evolution.xml:6630(para) ++msgid "" ++"Use these settings for certificate handling for S/MIME security systems. For " ++"more information, see Certificates." ++msgstr "" ++"使用这些证书的设置来处理S/MIME安全系统。要了解更多信息，请参阅证书。" ++ ++#: C/evolution.xml:6632(para) ++msgid "" ++"Previous versions of Evolution included directory servers, folder settings, " ++"and Exchange delegation in the settings tool. Directory servers can now be " ++"set up as contacts groups in the Contacts tool, you can change folder " ++"settings in the folder right-click menu, and Exchange delegation is " ++"available in the Message Menu of the Exchange tool." ++msgstr "" ++"旧版的Evolution在设置工具中还包括目录服务器，文件夹设置和Exchange委托等。目录" ++"服务器现在可以在联系人工具中设置为联系人组。您可以通过文件夹右击菜单改变文件" ++"夹设置。而Exchange委托在Exchange工具的邮件菜单中可以设置。" ++ ++#: C/evolution.xml:6636(para) ++msgid "" ++"Evolution allows you to maintain multiple accounts, or identities. When you " ++"are writing an email message, you can choose which account to use by " ++"selecting from the drop-down list next to the From field in the message " ++"composer." ++msgstr "" ++"Evolution可以使用多个账户，即标识。当您在写邮件时，可以从邮件编辑器的”发件" ++"人“旁边的下拉列表中选择一个要使用的账户。" ++ ++#: C/evolution.xml:6637(para) ++msgid "" ++"Click Send/Receive to update all mail sources that are not disabled. If you " ++"don't want to check mail for a given account, select the account in Edit " ++"> Preferences, then Mail Accounts page and click the Disable button." ++msgstr "" ++"点击发送/接收可以更新所有没有被禁用的邮件源。如果您不想查看特定账户的邮件，可" ++"以在编辑 >首选项中选择对应的账户，在邮件账户页面中点击”禁用“按钮。" ++ ++#: C/evolution.xml:6638(para) ++msgid "" ++"To add a new account, click Add to open the Evolution configuration " ++"assistant." ++msgstr "要添加一个新账户，点击”添加“来打开Evolution配置助手。" ++ ++#: C/evolution.xml:6639(para) ++msgid "To alter an existing account, select it in the Preferences window." ++msgstr "要更改一个已存在的账户，在首选项窗口中选中它。" ++ ++#: C/evolution.xml:6641(para) ++msgid "The account editor dialog box has seven sections:" ++msgstr "账户编辑器对话框有7个部分：" ++ ++#: C/evolution.xml:6643(title) ++msgid "Identity:" ++msgstr "标识：" ++ ++#: C/evolution.xml:6644(para) ++msgid "" ++"Specify the name and email address for this account. You can also choose a " ++"default signature to insert into messages sent from this account." ++msgstr "" ++"指定该账户的姓名和电子邮件地址。您还可以选择一个默认的签名插入到使用该账户发" ++"送的邮件中。" ++ ++#: C/evolution.xml:6647(title) ++msgid "Receiving Email:" ++msgstr "接收邮件：" ++ ++#: C/evolution.xml:6648(para) ++msgid "" ++"Select the way you receive email. You can download email from a POP server, read and keep it on the server (Microsoft " ++"Exchange, NovellGroupWise, or IMAP), or read it from files that already exist on your desktop computer. " ++"If your server requires you to use a secure connection, you can select from " ++"the given three options: No encryption, TLS encryption or SSL encryption." ++msgstr "" ++"选择您接收邮件的方式。您可以从POP服务器下载邮" ++"件，阅读，然后保存在服务器上(Microsoft Exchange，NovellGroupWise，或者IMAP)，或者从本地阅读邮件。如果" ++"您的服务器要求您使用安全连接，您可以选择下列三个选项之一：无加密，TLS加密或" ++"SSL加密。" ++ ++#: C/evolution.xml:6650(para) ++msgid "" ++"Your system administrator might ask you to connect to a specific port on a " ++"mail server. To specify which port you use, just type a colon and the port " ++"number after the server name. For example, to connect to port 143 on the " ++"server smtp.example.com, specify smtp.example.com:143 as the server name." ++msgstr "" ++"您的系统管理员可能会要求您连接到邮件服务器的特定端口。要指定使用某个端口，只" ++"需在邮件服务器名称后面输入一个冒号和端口号。例如，要连接到服务器smtp.example." ++"com的143端口，指定服务器名称为smtp.example.com:143即可。" ++ ++#: C/evolution.xml:6651(para) ++msgid "" ++"For additional information, see Receiving " ++"Mail." ++msgstr "更多附加信息，参阅 接收邮件。" ++ ++#: C/evolution.xml:6653(title) ++msgid "Receiving Options:" ++msgstr "接收选项：" ++ ++#: C/evolution.xml:6654(para) ++msgid "" ++"Decide if you want to check for mail automatically and how often, as well as " ++"setting other message retrieval options." ++msgstr "" ++"确定您是否想要自动检查新邮件，以及多长时间一次，还有设置其它的邮件接收选项。" ++ ++#: C/evolution.xml:6656(para) ++msgid "" ++"For additional information, see Receiving Mail Options." ++msgstr "" ++"要了解额外的信息，请参阅接收邮件选项。" ++ ++#: C/evolution.xml:6658(title) ++msgid "Sending Mail:" ++msgstr "发送邮件：" ++ ++#: C/evolution.xml:6659(para) ++msgid "" ++"Use this section to choose and configure a method for sending mail. You can " ++"choose SMTP, Microsoft Exchange (if you have " ++"installed the Evolution Connector for Microsoft Exchange), Sendmail or many other options." ++msgstr "" ++"在该区域中选择和配置发送邮件的方式。您可以选择SMTP，Microsoft Exchange(如果您已经安装了Microsoft Exchange的Evolution连接器" ++"的话)，Sendmail或其它选项。" ++ ++#: C/evolution.xml:6661(para) ++msgid "" ++"For additional information, see Sending Mail." ++msgstr "要了解更多信息，请参阅发送信件。" ++ ++#: C/evolution.xml:6663(title) ++msgid "Defaults:" ++msgstr "默认：" ++ ++#: C/evolution.xml:6664(para) ++msgid "" ++"Use this section to set where this account stores the messages that it has " ++"sent, and the messages that you save as drafts. If you want to revert to the " ++"default settings, click Restore." ++msgstr "" ++"在该区域中选择将已发送的邮件和草稿邮件存放在什么地方。如果您想要恢复到默认设" ++"置，点击”还原“。" ++ ++#: C/evolution.xml:6666(para) ++msgid "" ++"If you want to send someone a copy of every message from this account, " ++"select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) " ++"To:, and specify one or more addresses." ++msgstr "" ++"如果您想要使用该账户每次都给某个人发送一封邮件拷贝，选择”总是抄送到(Cc)：“或" ++"者”总是暗送到(Bcc)：“，然后指定一个或多个地址。" ++ ++#: C/evolution.xml:6667(para) ++msgid "" ++"You can specify the way you want to receive message receipts. You can set " ++"Send message receipts to Never, Always or Ask for each message. For more " ++"information refer Default Settings." ++msgstr "" ++"您可以指定您是否想要接收邮件收条。您可以设置”发送邮件收条“选项为：”从不“，”总" ++"是“，或”每封信都询问“。要了解更多相关信息，请参阅" ++"默认设置。" ++ ++#: C/evolution.xml:6668(para) ++msgid "" ++"You can change the default settings of your sent items. Click Advanced Send " ++"Options to prioritize, classify your send messages. You can also set the " ++"date for reply request so that recipient will know the immediacy and can " ++"accordingly response to your message. Enable status tracking and set Return " ++"Notification for Mail, Calendar and Task." ++msgstr "" ++"您可以修改您发送邮件的默认设置。点击”高级发送选项“来设置优先级，分类您的发送" ++"邮件。您还可以设置请求回复的日期这样收信人就会了解邮件的重要性从而有根据地回" ++"复您的邮件。在这里可以启用状态追踪，设置邮件、日历和任务的回复提醒。" ++ ++#: C/evolution.xml:6670(title) ++msgid "Security:" ++msgstr "安全：" ++ ++#: C/evolution.xml:6671(para) ++msgid "" ++"Use this section to set the security options for this account. If you use " ++"encryption, enter your PGP key ID (see Encryption for more information) and select among the four options " ++"to determine key and signature handling." ++msgstr "" ++"在该区域中设置该账户的安全选项。如果您想使用加密，输入您的PGP密钥ID号(更多信" ++"息参见加密一节)然后在四个选项中选择以决定" ++"密钥和签名处理。" ++ ++#: C/evolution.xml:6674(title) ++msgid "Proxy:" ++msgstr "代理：" ++ ++#: C/evolution.xml:6675(para) ++msgid "" ++"This only displays if you have a GroupWise account. Use this section to set " ++"proxy access for other users to access your mailbox or calendar." ++msgstr "" ++"该项仅在您有GroupWise账户时才会显示。在改小中可设置其它用户代理访问您的邮箱或" ++"日历。" ++ ++#: C/evolution.xml:6681(para) ++msgid "" ++"The Autocompletion tool lets you choose address books to auto-complete names " ++"for you in the mail composer. This functionality requires accessibility to " ++"each of the address books you want to use. To enable autocompletion, select " ++"each of the address books that you want to use auto completion in the " ++"Autocompletion page." ++msgstr "" ++"自动补全工具让您选择在邮件编辑器中为您自动补全姓名的地址簿。该功能需要您能够" ++"访问想要使用的每个地址簿。要启用自动补全，在”自动补全“页面中选择想要使用该功" ++"能的每个地址簿。" ++ ++#: C/evolution.xml:6682(para) ++msgid "" ++"Select the Always show address of the autocompleted contact check box to " ++"show the email address along with the username." ++msgstr "" ++"选择“总是显示自动补全的联系人地址”的选择框，可以将用户名和邮件地址一起显示。" ++ ++#: C/evolution.xml:6687(title) ++msgid "IMAP Mail Headers" ++msgstr "IMAP邮件头" ++ ++#: C/evolution.xml:6688(para) ++msgid "" ++"Evolution allows you to choose the headers that you want to download so that " ++"you can reduce the download time and filter or move your mail around the way " ++"you like it. Evolution helps you to customize your IMAP Mail header " ++"preferences and thus save the download time. The IMAP Mail header options " ++"are as follows:" ++msgstr "" ++"Evolution允许您选择想要下载的邮件头以便缩短下载时间并且可以根据您需要的方式来" ++"过滤或移动您的邮件。Evolution会帮助您自定义您的IMAP邮件头首选项从而节省下载时" ++"间。IMAP邮件头选项如下所示：" ++ ++#: C/evolution.xml:6690(title) ++msgid "All Headers:" ++msgstr "所有邮件头：" ++ ++#: C/evolution.xml:6691(para) ++msgid "" ++"All available IMAP mail headers for all the messages will be downloaded." ++msgstr "所有邮件的所有可用IMAP邮件头都会被下载。" ++ ++#: C/evolution.xml:6694(title) ++msgid "Basic Headers:" ++msgstr "基本的邮件头：" ++ ++#: C/evolution.xml:6695(para) ++msgid "" ++"This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, " ++"Message-ID, Mime-Version, and Content-Type. If you want to just fetch and " ++"see messages without having to categorically filter messages based on your " ++"mailing lists, choose this option. This will make Evolution work faster and " ++"is generally recommended for common users." ++msgstr "" ++"这包括日期，发信人，收信人，抄送，主题，首选项，In-Reply-To，邮件ID，Mime版本" ++"以及内容类型。如果您只想获取、查看邮件而不需要根据您的邮件列表分类邮件，可以" ++"选择该项。这样Evolution会运行的快一些，推荐多数普通用户使用。" ++ ++#: C/evolution.xml:6698(title) ++msgid "Mailing List Headers:" ++msgstr "邮件列表头：" ++ ++#: C/evolution.xml:6699(para) ++msgid "" ++"Enable this option to have filters based on mailing list headers (like list " ++"ID) so that in addition to the basic headers, the headers that correspond to " ++"mailing-lists are also fetched. Mailing list headers will have the " ++"informations such as the mailinglist-ID, owner of the mailing list, and so " ++"on with which you can create mailing list filters." ++msgstr "" ++"选择该项可以创建基于邮件列表头(如列表ID)的过滤规则，这样除了基本的邮件头之" ++"外，还会获取与邮件列表对应的邮件头。邮件列表头会包含如下信息：邮件列表ID，邮" ++"件列表拥有者，以及其它您可以用来创建邮件列表过滤的信息。" ++ ++#: C/evolution.xml:6701(para) ++msgid "" ++"This is the default Header preference that comes with Evolution. When this " ++"option is chosen, Evolution will download a basic set of headers (as " ++"described above) along with a set of headers that are needed for client-side " ++"filters based on mailing lists. If you do not have any filters on Evolution, " ++"it is recommended to switch to the \"Basic Headers Only\" option." ++msgstr "" ++"这是Evolution默认的邮件头首选项。选择该项后，Evolution会下载一系列基本的邮件" ++"头(如上所述)以及需要在客户端创建基于邮件列表的过滤器的邮件头。如果您没有任何" ++"过滤规则，建议您选择 \"基本邮件头\"选项。" ++ ++#: C/evolution.xml:6702(para) ++msgid "To set the IMAP Mail headers:" ++msgstr "要设置IMAP邮件头：" ++ ++#: C/evolution.xml:6708(para) ++msgid "Select the IMAP account." ++msgstr "选择IMAP账户。" ++ ++#: C/evolution.xml:6712(para) ++msgid "" ++"On the Account Editor, click IMAP Headers tab to open IMAP Headers to the " ++"Account Editor." ++msgstr "" ++"在账户编辑器中，点击“IMAP邮件头”标签，打开该账户编辑器的IMAP邮件头编辑器。" ++ ++#: C/evolution.xml:6717(para) ++msgid "" ++"Click Fetch All Headers to download all the available header information." ++msgstr "选择“获取所有邮件头”，下载所有可用的邮件头信息。" ++ ++#: C/evolution.xml:6719(para) ++msgid "" ++"The more headers you have, the more time it will consume to download. This " ++"option is not recommended." ++msgstr "您拥有的邮件头越多，下载花费的时间就越长。不建议选择该项。" ++ ++#: C/evolution.xml:6723(para) ++msgid "Click Basic Headers to download basic headers." ++msgstr "点击“基本邮件头”，下载基本邮件头。" ++ ++#: C/evolution.xml:6726(para) ++msgid "Click Basic and Mailing Headers to download both." ++msgstr "点击“基本和邮件列表头”，下载基本邮件头和列表头。" ++ ++#: C/evolution.xml:6729(para) ++msgid "Click Add to add any predefined custom headers." ++msgstr "点击“添加”，可以添加任意自定义的邮件头。" ++ ++#: C/evolution.xml:6732(para) ++msgid "Click Remove to remove the custom headers." ++msgstr "点击“删除”，可以删除自定义的邮件头。" ++ ++#: C/evolution.xml:6739(para) ++msgid "" ++"The Mail Preferences tool lets you choose how to display citations, how long " ++"to wait before marking a message as read, and other mail display settings." ++msgstr "" ++"邮件首选项工具让您选择任何显示引用，等待多长时间之后可以把邮件标记为已读，以" ++"及其它邮件显示信息。" ++ ++#: C/evolution.xml:6742(link) C/evolution.xml:6766(title) ++msgid "General Mail Settings" ++msgstr "常规邮件设置" ++ ++#: C/evolution.xml:6745(link) C/evolution.xml:6788(title) ++msgid "HTML Mail Preferences" ++msgstr "HTML 邮件设置" ++ ++#: C/evolution.xml:6748(link) C/evolution.xml:6806(title) ++msgid "Label Preferences" ++msgstr "标签首选项" ++ ++#: C/evolution.xml:6751(link) C/evolution.xml:6840(title) ++msgid "Mail Header Preferences" ++msgstr "邮件头首选项" ++ ++#: C/evolution.xml:6754(link) C/evolution.xml:6857(title) ++msgid "Junk Mail Preferences" ++msgstr "垃圾邮件首选项" ++ ++#: C/evolution.xml:6757(link) C/evolution.xml:6900(title) ++msgid "Automatic Contacts Preferences" ++msgstr "自动联系人首选项" ++ ++#: C/evolution.xml:6760(link) C/evolution.xml:6906(title) ++msgid "Calendar and Tasks Preferences" ++msgstr "日历和任务首选项" ++ ++#: C/evolution.xml:6763(para) ++msgid "" ++"For information on individual email account settings, see Working with Mail Accounts." ++msgstr "" ++"要了解关于设置单独的邮件账户信息，请参阅使用邮件账户工作。" ++ ++#: C/evolution.xml:6767(para) C/evolution.xml:6789(para) ++#: C/evolution.xml:6928(para) C/evolution.xml:6991(para) ++#: C/evolution.xml:7083(para) ++msgid "The following options are available:" ++msgstr "以下选项可用：" ++ ++#: C/evolution.xml:6769(title) ++msgid "Message Fonts:" ++msgstr "消息字体：" ++ ++#: C/evolution.xml:6770(para) ++msgid "" ++"Normally, Evolution uses the same fonts as other GNOME applications. To " ++"choose different fonts, deselect Use the same fonts as other applications " ++"and select one font for standard typefaces and a second for monospace." ++msgstr "" ++"正常情况下，Evolution使用与其它GNOME程序一样的字体。要选择其它字体，先去掉“使" ++"用与其它应用程序相同的字体”的选框，然后选择一种标准输入字体，一种等宽字体。" ++ ++#: C/evolution.xml:6773(title) ++msgid "Message Display:" ++msgstr "消息显示：" ++ ++#: C/evolution.xml:6774(para) ++msgid "" ++"Choose how long you want to wait before marking a message read, how to " ++"highlight quotations, and the default encoding. Enable Fall back " ++"to threading message by subject to group the messages as message " ++"threads. You can also set the limit to the number of addresses displayed in " ++"the message header by enabling Shrink To/CC/BCC header to option. You can also set the limit for rendering text content in " ++"the message you receive. By default, when you receive a message with text " ++"content more than 4096 Kilo Bytes, Evolution will not render the message in " ++"the preview pane. You can view unformatted text either inline or using an " ++"external application. You can also enable the Magic spacebar and search folders." ++msgstr "" ++"选择等待多长时间后把邮件标记为已读，如何突出显示引用，以及默认的编码。选择" ++"默认按照主题对线索中的邮件进行排序可以将邮件以线索为单位" ++"排序。选择折叠收信域/抄送域/暗送域可以限制邮件头中显示的" ++"地址数目。您还可以设置限制格式化收到的邮件的文本的数量。默认情况下，当您收到" ++"文本内容大于4096KB的邮件时，Evolution不会在预览面板中显示该邮件。您可以查看未" ++"格式化的文本或者使用外部程序查看它。您还可以启用魔" ++"术空格键和搜索文件夹。" ++ ++#: C/evolution.xml:6776(para) ++msgid "" ++"To group the messages as threads select View > Group By threads or press " ++"Ctrl+T." ++msgstr "要将邮件按照线索分组，选择视图 > 按照线索分组，或者按Ctrl+T。" ++ ++#: C/evolution.xml:6778(title) ++msgid "Deleting Mail:" ++msgstr "删除邮件：" ++ ++#: C/evolution.xml:6779(para) ++msgid "" ++"Choose whether to delete messages automatically when quitting Evolution and " ++"how frequently, and whether you want to explicitly confirm the final " ++"deletion of messages. Select Confirm when expunging a folder to confirm the " ++"final deletion. You can have four different options to set the frequency for " ++"deletion: Everytime, Once per day, Once per week, and Once per month." ++msgstr "" ++"选择是否要在退出Evolution时自动清空已删除的邮件以及多长时间一次，还有是否您需" ++"要在销毁文件夹时确认。选择“在销毁文件夹时确认”可以确认最终的删除。您可以设置" ++"四种自动删除的频率：每次，每天一次，每周一次，以及每月一次。" ++ ++#: C/evolution.xml:6782(title) ++msgid "New Mail Notifications:" ++msgstr "新邮件提醒：" ++ ++#: C/evolution.xml:6783(para) ++msgid "" ++"Evolution can alert you to the arrival of new mail with a beep or by playing " ++"a sound file. Choose your alert noise, or select none, as you prefer. You " ++"can choose not to notify on new mail arrival." ++msgstr "" ++"Evolution在新邮件到来时可以提醒您，或者是峰鸣，或者播放一个声音文件。选择您需" ++"要的提示声，或者选择无提示声。您可以选择在新邮件到达时不提示。" ++ ++#: C/evolution.xml:6791(title) ++msgid "Show Image Animations:" ++msgstr "显示图像动画：" ++ ++#: C/evolution.xml:6792(para) ++msgid "Turns image animation (e.g. GIF files) on or off." ++msgstr "开启或关闭图像动画(如GIF文件)。" ++ ++#: C/evolution.xml:6795(title) ++msgid "Prompt When Sending HTML Messages to Contacts That Don't Want Them:" ++msgstr "发送给不想接收HTML的联系人时提示：" ++ ++#: C/evolution.xml:6796(para) ++msgid "" ++"Some people do not like HTML mail, and you can set Evolution to warn you of " ++"this preference. This warning appears only when you send HTML mail to people " ++"in your contacts who are listed as disliking HTML." ++msgstr "" ++"一些人不喜欢HTML邮件，您可以设置Evolution提示您该类信息。当您给联系人发送了" ++"HTML邮件而他不喜欢HTML邮件时会出现提醒信息。" ++ ++#: C/evolution.xml:6799(title) ++msgid "Loading Images:" ++msgstr "载入图像：" ++ ++#: C/evolution.xml:6800(para) ++msgid "" ++"You can embed a image in an email and have it load only when the message " ++"arrives. However, spammers can use image loading patterns to confirm " ++"valid addresses and invade your privacy. You can elect to " ++"never load images automatically, to load images only if the sender is in " ++"your contacts, or always load images." ++msgstr "" ++"您可以在邮件中嵌入图像，只在邮件到达时载入它。但是垃圾邮件可以使用图像加载来" ++"确认有效地址从而侵犯您的隐私。您可以选择“从不自动载入图" ++"像”，“载入来自联系人的邮件中的图像”或者“总是载入图像”。" ++ ++#: C/evolution.xml:6802(para) ++msgid "" ++"If you have chosen not to load images automatically, you can choose to see " ++"the images in one message at a time by selecting View > Load Images or " ++"press Ctrl+I." ++msgstr "" ++"如果您选择了“从不自动载入图像”，您可以在查看邮件时选择视图 > 载入图像或按" ++"Ctrl+I，就可以看到图像。" ++ ++#: C/evolution.xml:6807(para) ++msgid "" ++"The Label preferences option lets you add color labels for different kinds " ++"of messages. You can add, edit, or remove the labels. You can also assign " ++"colors to each label you create. You cannot remove the default labels." ++msgstr "" ++"标签首选项让您为不同类别的邮件设置不同的颜色标签。您可以添加，编辑或删除这些" ++"标签。您还可以给您自己创建的类别分配颜色。但是您不能删除默认的标签。" ++ ++#: C/evolution.xml:6809(para) ++msgid "To create a label:" ++msgstr "创建标签：" ++ ++#: C/evolution.xml:6812(para) ++msgid "Click Add and specify the name in the Label Name dialog box." ++msgstr "点击“添加”，在标签名称对话框中指定名称。" ++ ++#: C/evolution.xml:6815(para) ++msgid "Click the color tab and select a color, then click OK." ++msgstr "点击“颜色”，选择一种颜色，点击“确定”。" ++ ++#: C/evolution.xml:6818(para) ++msgid "To edit label properties:" ++msgstr "编辑标签属性：" ++ ++#: C/evolution.xml:6821(para) ++msgid "Select the label and click Edit." ++msgstr "选择该标签，点击“编辑”。" ++ ++#: C/evolution.xml:6824(para) ++msgid "Edit name and color, then click OK." ++msgstr "编辑名称和颜色，然后点击“确定”。" ++ ++#: C/evolution.xml:6827(para) ++msgid "To assign a label to a specific email message:" ++msgstr "要给指定的邮件分配标签：" ++ ++#: C/evolution.xml:6830(para) ++msgid "Right-click the message from the message preview." ++msgstr "在邮件预览视图中右键点击。" ++ ++#: C/evolution.xml:6833(para) ++msgid "Click Label and select the desired label for the message." ++msgstr "点击“标签”，为该邮件选择需要的标签。" ++ ++#: C/evolution.xml:6841(para) ++msgid "" ++"The headers on an incoming message are the information about the message " ++"that isn't the content of the message itself, such as the sender and the " ++"time it was sent. Select the options here to show or hide different amounts " ++"of information about the messages you read. You can also add or remove new " ++"mail headers to the list. The default mail headers cannot be removed." ++msgstr "" ++"一封来信中的邮件头是关于该邮件的一些信息，本身不是邮件正文内容的一部分，例如" ++"发信人和发送的时间。选择这些选项可以显示或隐藏一部分邮件头信息。您还可以在该" ++"列表中添加或删除新的邮件头。但是默认的邮件头不能被删除。" ++ ++#: C/evolution.xml:6843(title) ++msgid "Sender Photograph:" ++msgstr "发送者照片：" ++ ++#: C/evolution.xml:6844(para) ++msgid "" ++"This feature adds support for viewing the photograph of the sender at the " ++"right side of the preview pane." ++msgstr "该功能可以支持查看发信人的照片(位于预览面板右侧)。" ++ ++#: C/evolution.xml:6846(para) ++msgid "" ++"To enable this feature, select Edit > Preferences > Mail Preferences " ++"> Headers > Show the photograph of sender in the email preview. " ++"Deselect this option to disable this feature." ++msgstr "" ++"要启用该功能，选择编辑 > 首选项 > 邮件首选项 > 信头 > 在电子邮件" ++"预览中显示发送者照片。要禁用该功能，去掉该处的选择框。" ++ ++#: C/evolution.xml:6847(para) ++msgid "" ++"By default it searches only in the local address books enabled for " ++"autocompletion. If you deselect the option Search for sender " ++"photograph only in the local address book, it searches in all the " ++"address books enabled for autocompletion. If there are multiple matches for " ++"the same contact, it always takes the first one. Consider a contact that has " ++"multiple matches - the first one with a photograph and the second without a " ++"photo. Here, Evolution takes the first contact regardless of it not having a " ++"photograph." ++msgstr "" ++"默认情况下它只会在本地启用了自动补全的地址簿中搜索。如果您没有选择选项" ++"仅在本地地址簿中搜索发送者照片，它会在所有启用了自动补全" ++"的地址簿中搜索。如果同一个联系人有多个匹配搜索的结果，它只取第一个结果。考虑" ++"一下这种情况：一个联系人有多个条目-其中第一条有照片而第二条没有照片。在此，" ++"Evolution只会取第一次搜索结果，无论它是否有照片。" ++ ++#: C/evolution.xml:6848(para) ++msgid "" ++"This feature is disabled by default as it causes delay in fetching the " ++"messages." ++msgstr "该功能默认是禁用的，因为它会引起下载邮件的延迟。" ++ ++#: C/evolution.xml:6850(title) ++msgid "Configurable Date and Time Format" ++msgstr "配置日期和时间格式" ++ ++#: C/evolution.xml:6851(para) ++msgid "" ++"Although Evolution components have a set of predefined date and time " ++"formats, an advanced user can write acceptable strftime, with new tag %ad " ++"for an abbreviated date to show in tables and date headers." ++msgstr "" ++"虽然Evolution已经预先设置了一些日期和时间格式，但高级用户也可以自行设置一些格" ++"式化的时间，使用标记%ad作为表格中或日期头中要显示的缩略日期。" ++ ++#: C/evolution.xml:6858(para) ++msgid "" ++"You can check your incoming messages for junk content by using Bogofilter " ++"and SpamAssassin* tools, which have trainable Bayesian filters. You need to " ++"enable the Junk plugins to start filtering junk mail." ++msgstr "" ++"您可以使用Bogofilter和SpamAssassin*工具来检查您来信中的垃圾内容，它们都有可训" ++"练的Bayesian过滤器。您需要启用垃圾邮件插件来启用垃圾邮件过滤。" ++ ++#: C/evolution.xml:6859(para) ++msgid "To enable Junk plugins:" ++msgstr "要启用垃圾邮件插件：" ++ ++#: C/evolution.xml:6865(para) ++msgid "" ++"Select the junk plugins you want. You can select either Bogofilter or " ++"SpamAssassin, or you can select both." ++msgstr "" ++"选择您需要的垃圾邮件插件，可以选择Bogofilter或SpamAssassin，或者两个都选。" ++ ++#: C/evolution.xml:6869(title) ++msgid "General:" ++msgstr "常规：" ++ ++#: C/evolution.xml:6870(para) ++msgid "" ++"You can check incoming email for junk contents and also decide how often you " ++"want to delete junk mail. You also have the option to choose either " ++"SpamAssassin or Bogofilter, or you can select both." ++msgstr "" ++"您可以检查来信的的垃圾内容，还可以决定删除垃圾邮件的频率。您还可以选择使用" ++"SpamAssassin或Bogofilter，或两个都选。" ++ ++#: C/evolution.xml:6873(title) ++msgid "Checking Incoming Mail for Junk:" ++msgstr "检查收到的信件是否是垃圾邮件：" ++ ++#: C/evolution.xml:6874(para) ++msgid "This option turns automatic junk mail filtering on or off." ++msgstr "该选项启用或禁用自动过滤垃圾邮件。" ++ ++#: C/evolution.xml:6877(title) ++msgid "Delete junk mail on exit:" ++msgstr "退出时删除垃圾邮件：" ++ ++#: C/evolution.xml:6878(para) ++msgid "" ++"This option deletes junk messages when you exit. You can also specify when " ++"to delete the junk messages (every time, once per day, once per week, once " ++"per month)." ++msgstr "" ++"该选择会在您退出Evolution时删除垃圾邮件。您还可以指定什么时候删除垃圾邮件(每" ++"次，每天一次，每周一次或每月一次)。" ++ ++#: C/evolution.xml:6881(title) ++msgid "Default junk plugin:" ++msgstr "默认的垃圾邮件插件：" ++ ++#: C/evolution.xml:6882(para) ++msgid "" ++"Select either SpamAssassin or Bogofilter, or both, as your junk filter. You " ++"can view them only if you have enabled the respective plugins. When you " ++"select any option, it also reports if the underlying binary is available or " ++"not." ++msgstr "" ++"选择SpamAssassin或Bogofilter，或者都选，作为您的垃圾邮件插件。只有您在安装并" ++"启用了对应的插件时才能看到对应的选项。当您选择了任意一项，会显示是否对应的二" ++"进制程序可用。" ++ ++#: C/evolution.xml:6886(title) ++msgid "SpamAssassin Options:" ++msgstr "垃圾克星选项：" ++ ++#: C/evolution.xml:6887(para) ++msgid "" ++"Remote Test performs junk mail filtering on remote servers. It also includes " ++"online tests, like checking for blacklisted message senders and ISPs." ++msgstr "" ++"可在远程服务器上运行的远程垃圾邮件过滤。它包括在线检查，例如可以检查黑名单中" ++"的发信人和ISP。" ++ ++#: C/evolution.xml:6889(para) ++msgid "" ++"This option uses tests that require a network connection, such as checking " ++"to see if a message is in a list of known junk messages, or if the sender or " ++"gateway are blacklisted by anti-spam organizations. Online tests can make " ++"filtering slower, because remote tests add to the amount of time it takes to " ++"check for junk mail, but they increase accuracy. When you select this " ++"option, you do not need to do any additional setup." ++msgstr "" ++"该选项使用了需要网络连接的测试，例如检查邮件是否是位于已知的垃圾邮件列表中，" ++"或发信人/网关是否被反垃圾邮件组织列入了黑名单。在线测试进行得较慢，但能增强准" ++"确性。当您选择了该选项之后，无须进行其它额外设置。" ++ ++#: C/evolution.xml:6891(title) ++msgid "Bogofilter Options:" ++msgstr "Bogofilter 选项：" ++ ++#: C/evolution.xml:6892(para) ++msgid "" ++"Select Convert mail text to Unicode to enable Unicode* filtering. For more " ++"information on Bogofilter, see the Bogofilter site." ++msgstr "" ++"选择“将信件文本转换为Unicode”，可以启用Unicode*过滤。要了解更多关于Bogofilter" ++"的信息，请参阅Bogofilter网" ++"站" ++ ++#: C/evolution.xml:6895(para) ++msgid "" ++"Check new messages for junk contents option under Edit > Preferences > " ++"Mail Accounts > Edit > Receiving options is enabled only for IMAP. " ++"Check incoming mail for junk option under Edit > Preferences > Mail " ++"Preferences > Junk > General refers only to POP and Local Delivery." ++msgstr "" ++"只有IMAP账户，位于编辑 > 首选项 > 邮件账户 > 编辑 > 接收选项中" ++"的“检查新邮件中的垃圾内容”选项才是可用的。而位于编辑 > 首选项 > 邮件首" ++"选项 > 垃圾 > 常规中的“检查接收到的邮件中的垃圾内容”是只针对POP邮件和本" ++"地发送邮件而言。" ++ ++#: C/evolution.xml:6901(para) ++msgid "" ++"There are two items in this section: Automatic Contacts automatically adds " ++"people that you respond to into your address book. You can select the " ++"default address book for automatic contacts from the list." ++msgstr "" ++"在该区域中有两个条目：“自动联系人”会自动地把您联系过的人添加到您的地址簿。您" ++"可以从列表中选择一个默认地址簿作为自动联系人的地址簿。" ++ ++#: C/evolution.xml:6902(para) ++msgid "" ++"Instant Messaging Contacts periodically synchronizes contact information and " ++"images with your instant messaging program. Currently this only works with " ++"Pidgin. Your address book must not be a read-only one for both these " ++"features to function properly." ++msgstr "" ++"“即时通讯联系人”会周期性地同步Evolution和您的即时通讯软件中的联系人信息和头" ++"像。目前仅有Pidgin可用。要使这两个功能运行顺利，您的地址簿不能是只读的。" ++ ++#: C/evolution.xml:6907(para) ++msgid "" ++"Allows you to delete messages after you have acted on an appointment. It " ++"also allows you to select calendars to search for meeting conflicts." ++msgstr "允许您在操作约会后删除信息。您还可以选择日历搜索冲突的会议。" ++ ++#: C/evolution.xml:6913(para) ++msgid "" ++"There are three tabs for message composer settings where you can set the " ++"composer preferences. The General tab covers assorted behavior, the " ++"Signature tab sets your signature, and the Spell Checking tab controls spell " ++"checking." ++msgstr "" ++"邮件编辑器首选项有三项可以设置：“常规”选项卡包括了一些默认行为，“签名”选项卡" ++"用于设置您的签名，“拼写检查”选项卡用于控制拼写检查。" ++ ++#: C/evolution.xml:6919(link) C/evolution.xml:6959(title) ++msgid "Signature" ++msgstr "签名" ++ ++#: C/evolution.xml:6922(link) C/evolution.xml:6964(title) ++msgid "Spell Checking" ++msgstr "拼写检查" ++ ++#: C/evolution.xml:6930(title) ++msgid "Default Behavior:" ++msgstr "默认行为：" ++ ++#: C/evolution.xml:6931(para) ++msgid "" ++"Choose how to normally forward and reply to messages, what character set " ++"they will use, whether they are in HTML, and whether that HTML can contain " ++"graphic emoticons." ++msgstr "" ++"选择如何用正常方式转发和回复邮件，使用什么字符集，是否使用HTML格式，HTML是否" ++"插入表情图像。" ++ ++#: C/evolution.xml:6933(para) ++msgid "" ++"You can forward messages either as an attachment or inline, or else as " ++"quoted. Choose reply style from the drop-down list: Quote original message, " ++"Do not quote original message, Attach original message." ++msgstr "" ++"您可以以附件、内置或引用的形式转发邮件。您还可以从下拉列表中选择回复风格：引" ++"用原始邮件，不要引用原始邮件，将原始邮件作为附件回复。" ++ ++#: C/evolution.xml:6935(title) ++msgid "Top Posting Options:" ++msgstr "上回复选项：" ++ ++#: C/evolution.xml:6936(para) ++msgid "" ++"When replying, you can choose where to place your signature in the message. " ++"You can place the signature either above the original message or at the end " ++"of the composer window. Top Posting is not recommended because placing the " ++"signature other than at the end of the message is against the mailing " ++"standards." ++msgstr "" ++"在回复信件时，您可以选择是否在您的邮件中保留签名。您可以把签名放在原始邮件的" ++"顶端或在编辑器窗口的底端。不建议您选择“上回复选项”，因为把签名放在信件底部之" ++"外的地方是违反邮件标准的。" ++ ++#: C/evolution.xml:6939(title) C/evolution.xml:7018(title) ++msgid "Alerts:" ++msgstr "警告：" ++ ++#: C/evolution.xml:6940(para) ++msgid "There are two optional alerts you can select:" ++msgstr "您可以选择两种可选的警告：" ++ ++#: C/evolution.xml:6945(title) ++msgid "Prompt When Sending Messages With an Empty Subject Line:" ++msgstr "发送空主题行的邮件时提示：" ++ ++#: C/evolution.xml:6946(para) ++msgid "The composer warns you if you try to send a message without a subject." ++msgstr "如果您发送的邮件没有主题，编辑器会给您警告。" ++ ++#: C/evolution.xml:6951(title) ++msgid "Prompt When Sending Messages with Only Bcc Recipients Defined:" ++msgstr "发送只有暗送收件人的邮件时提示：" ++ ++#: C/evolution.xml:6952(para) ++msgid "" ++"The composer warns you if you try to send a message that has only Bcc " ++"recipients. This is important because some mail servers fail to transmit " ++"blind carbon copy if you do not have at least one recipient that is visible " ++"to all readers." ++msgstr "" ++"如果您发送的邮件只有暗送收件人，编辑器会给您警告。这很重要，因为如果您的邮件" ++"没有一个对所有阅读者都可见的收信人的话，有些邮件服务器将不能传送暗送的副本。" ++ ++#: C/evolution.xml:6960(para) ++msgid "" ++"The signature editor allows you to create several different signatures in " ++"plain text or in HTML, and to specify which of them will be added to email " ++"you create in the message composer. If you prefer to use an alternate " ++"signature or none at all, you can select it from the mail composer itself." ++msgstr "" ++"签名编辑器让您创建不同的签名(纯文本格式或HTML格式)，以及指定哪些签名要添加到" ++"编写的邮件中。如果您更喜欢轮流使用签名或不使用签名，您可以在邮件编辑器里面选" ++"择签名。" ++ ++#: C/evolution.xml:6965(para) ++msgid "" ++"To choose a spell-checking language, select it here. You must install gnome-" ++"spell, aspell, and an aspell language package (like for example aspell-en " ++"for english language) for spell-checking to be available in Evolution. " ++"Additional dictionaries are available through your package manager and are " ++"detected automatically if you have installed them. To have the composer " ++"automatically check your spelling while you type, select Check Spelling " ++"While I Type. You can set the color for misspelled words." ++msgstr "" ++"要选择需要进行拼写检查的语言，可以在此处选择。您需要安装gnome-spell，aspell以" ++"及一种aspell语言包(例如，aspell-en就是英语的拼写检查包)才可以在Evolution中使" ++"用拼写检查。其他的字典可以通过您系统上的软件包管理器安装，在安装完毕之后会自" ++"动检测到。要让编辑器在输入时就自动检查您的拼写，请选择“在我输入时进行拼写检" ++"查”。您可以为错误拼写的单词选择一种着色的颜色。" ++ ++#: C/evolution.xml:6972(para) ++msgid "The calendar configuration tool has several pages:" ++msgstr "日历配置工具有以下几项：" ++ ++#: C/evolution.xml:6978(link) C/evolution.xml:7024(title) ++msgid "Display" ++msgstr "显示" ++ ++#: C/evolution.xml:6981(link) C/evolution.xml:7057(title) ++msgid "Alarms" ++msgstr "提醒" ++ ++#: C/evolution.xml:6984(link) C/evolution.xml:7071(title) ++msgid "Calendar Publishing" ++msgstr "日历发布" ++ ++#: C/evolution.xml:6993(title) ++msgid "Time Zone:" ++msgstr "时区：" ++ ++#: C/evolution.xml:6994(para) ++msgid "The city you're located in, to specify your time zone." ++msgstr "您所在的城市，可以指定您所在的时区。" ++ ++#: C/evolution.xml:6997(title) ++msgid "Time Format:" ++msgstr "日期格式：" ++ ++#: C/evolution.xml:6998(para) ++msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats." ++msgstr "在12小时制(AM/PM) 与24小时制间选择。" ++ ++#: C/evolution.xml:7001(title) ++msgid "Second Zone:" ++msgstr "第二时区：" ++ ++#: C/evolution.xml:7002(para) ++msgid "Specify a location for the second time zone." ++msgstr "为第二时区指定一个位置。" ++ ++#: C/evolution.xml:7004(para) ++msgid "You can view both the time zones in the calendar view." ++msgstr "您可以在日历视图中同时查看两个时区。" ++ ++#: C/evolution.xml:7006(title) ++msgid "Week Starts:" ++msgstr "一周开始于：" ++ ++#: C/evolution.xml:7007(para) ++msgid "Select the day to display as the first in each week." ++msgstr "选择在每一周的开始要显示哪一天。" ++ ++#: C/evolution.xml:7010(title) ++msgid "Day Begins:" ++msgstr "开始日期：" ++ ++#: C/evolution.xml:7011(para) ++msgid "" ++"For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can " ++"select your preferred hours." ++msgstr "" ++"在Evolution中，一个正常的工作日开始于上午9点，结束语下午5点。您可以选择自己合" ++"适的时间。" ++ ++#: C/evolution.xml:7014(title) ++msgid "Day Ends:" ++msgstr "结束日期：" ++ ++#: C/evolution.xml:7015(para) ++msgid "Sets the end of a normal workday." ++msgstr "设置正常工作日的结束时间。" ++ ++#: C/evolution.xml:7019(para) ++msgid "" ++"If you want to be warned before you delete any appointment, or to have a " ++"reminder automatically appear for each event, select the options here." ++msgstr "" ++"如果您想要在删除任何约会之前有警告信息，或在每次会议之前自动收到一条提示，可" ++"以选择该项。" ++ ++#: C/evolution.xml:7025(para) ++msgid "" ++"The Display page lets you choose how your appointments and tasks appear in " ++"your calendar." ++msgstr "“显示”页让您选择您的约会和任务在日历中的显示方式。" ++ ++#: C/evolution.xml:7027(title) ++msgid "Time Divisions:" ++msgstr "时间分隔：" ++ ++#: C/evolution.xml:7028(para) ++msgid "" ++"Sets the time increments shown as fine lines on the daily view in the " ++"calendar." ++msgstr "设置在日历视图上(日视图)显示的时间分隔线。" ++ ++#: C/evolution.xml:7031(title) ++msgid "Show appointment end times in week and month views:" ++msgstr "在周视图和月视图中显示约会结束时间：" ++ ++#: C/evolution.xml:7032(para) ++msgid "" ++"If there is space, Evolution shows the end times in the week and month views " ++"for each appointment." ++msgstr "" ++"Evolution会在周视图和月视图中显示每个约会的结束时间(如果时间不重叠的话)。" ++ ++#: C/evolution.xml:7035(title) ++msgid "Compress weekends in month view:" ++msgstr "在月视图中压缩周末：" ++ ++#: C/evolution.xml:7036(para) ++msgid "" ++"Select this option to display weekends in one box instead of two in the " ++"month view." ++msgstr "选择该项的话，在月视图中周末只会显示一栏而不会是两栏。" ++ ++#: C/evolution.xml:7039(title) ++#, fuzzy ++msgid "Show week numbers in date navigator:" ++msgstr "显示周数目：" ++ ++#: C/evolution.xml:7040(para) ++msgid "Shows the week numbers next to the respective weeks in the calendar." ++msgstr "在日历中对应的周旁边显示周数目。" ++ ++#: C/evolution.xml:7043(title) ++msgid "Tasks due today:" ++msgstr "今天到期的任务：" ++ ++#: C/evolution.xml:7044(para) ++msgid "Select the color for tasks due today." ++msgstr "为今天到期的任务选择一种颜色。" ++ ++#: C/evolution.xml:7047(title) ++msgid "Overdue tasks:" ++msgstr "过期任务：" ++ ++#: C/evolution.xml:7048(para) ++msgid "Select the color for overdue tasks." ++msgstr "设置过期任务的颜色。" ++ ++#: C/evolution.xml:7051(title) ++msgid "Hide completed tasks after:" ++msgstr "隐藏在其后面的已完成任务：" ++ ++#: C/evolution.xml:7052(para) ++msgid "" ++"Select this option to have completed tasks hidden after a period of time " ++"measured in days, hours, or minutes. If you don't select this option, " ++"completed tasks remain in your task list, marked as complete." ++msgstr "" ++"选择该项，可以在一个特定的时间之后(几天，几小时或几分钟)隐藏已完成的任务。如" ++"果您没有选择该项，已完成的任务会留在您的任务列表中，标记为“已完成”。" ++ ++#: C/evolution.xml:7059(title) ++msgid "Select the Calendars for Alarm Notification:" ++msgstr "选择用于提醒的日历：" ++ ++#: C/evolution.xml:7060(para) ++msgid "" ++"Select the calendars for which you want an alarm notification. If you don't " ++"select the calendar, you will not have an alarm notification for any event " ++"in this calendar." ++msgstr "" ++"选择您想要使用提醒的日历。如果您没有选择日历，则您不会收到该日历中任何事件的" ++"提醒。" ++ ++#: C/evolution.xml:7062(para) ++msgid "" ++"Click Dismiss to close the alarm. Click Dismiss All to close all the alarm " ++"notifications." ++msgstr "点击“忽略”，关闭提醒；点击“忽略所有”，关闭所有的提醒。" ++ ++#: C/evolution.xml:7066(title) ++msgid "Free/Busy" ++msgstr "空闲/繁忙" ++ ++#: C/evolution.xml:7073(title) ++msgid "Publishing:" ++msgstr "发布：" ++ ++#: C/evolution.xml:7074(para) ++msgid "" ++"Allows you to select a URL to post your calendar information to. When you " ++"add a URL, you can specify the publishing location, the frequency of " ++"publishing, which calendar to publish, and who to authenticate as." ++msgstr "" ++"允许您选择一个URL地址来发布您的日历信息。当您添加了一个URL时，可以指定发布的" ++"位置，发布频率，要发布的日历以及作者来源。" ++ ++#: C/evolution.xml:7080(title) ++msgid "Network Preferences" ++msgstr "网络首选项" ++ ++#: C/evolution.xml:7081(para) ++msgid "This interface lets you configure your network proxy settings." ++msgstr "该界面用于配置您的网络代理设置。" ++ ++#: C/evolution.xml:7085(title) ++msgid "Use system defaults:" ++msgstr "使用系统默认：" ++ ++#: C/evolution.xml:7086(para) ++msgid "" ++"Select this option to use the system wide proxy settings configured through " ++"Control Center > Network Proxies in GNOME. When this option is selected, " ++"Evolution uses the proxy settings in the /system/http_proxy and /system/" ++"proxy/gconf keys." ++msgstr "" ++"选择该选项，使用系统范围的代理设置，即在GNOME的控制中心 > 网络代理中配置的" ++"代理设置。当选择了该项后，Evolution会根据/system/http_proxy和/system/proxy/" ++"gconf中的键值来使用代理。" ++ ++#: C/evolution.xml:7089(para) ++msgid "" ++"If these keys do not reflect the settings configured through Control Center " ++"> Network Proxies, Evolution does not work with the proxy and you must " ++"either update these gconf keys or choose Manual proxy configuration." ++msgstr "" ++"如果这些键并没有对应与通过控制中心 > 网络代理设置的代理，则Evolution不会使" ++"用该系统代理，您必须更新对应的gconf键值或者选择手动代理配置。" ++ ++#: C/evolution.xml:7092(title) ++msgid "Direct connection to the Internet:" ++msgstr "直接连接到Internet：" ++ ++#: C/evolution.xml:7093(para) ++msgid "Select this option to connect directly to the internet." ++msgstr "选择该项可以直接连接到Internet。" ++ ++#: C/evolution.xml:7096(title) ++msgid "Manual proxy configuration:" ++msgstr "手动代理配置：" ++ ++#: C/evolution.xml:7097(para) ++msgid "" ++"This option helps you costomize proxy settings regardless of the desktop you " ++"use. Specify hosts and ports for HTTP and optionally for other protocols. In " ++"the No Proxy Domain field, specify that comma-separated domain names do not " ++"go through the configured proxy server. You can specify patterns like *." ++"example.com or .example.com in the No Proxy Domain list. Specify a username " ++"and password, and if the proxy server requires authentication, select Use " ++"Authentication to enable the username and password fields. The customized " ++"proxy settings are as follows:" ++msgstr "" ++"该选项帮助您自定义代理设置而不管您使用什么桌面环境。您可以指定HTTP或其它协议" ++"的代理服务器和端口。在“不使用代理服务器”一栏，指定一些不需要通过配置的代理服" ++"务器上网的域名(用逗号分隔)，形式就像这样：*.example.com或者.example.com。如果" ++"代理服务器需要身份验证，选择“使用身份验证”，指定用户名和密码。自定义的代理设" ++"置如下：" ++ ++#: C/evolution.xml:7106(para) ++msgid "Proxy Configuration Settings" ++msgstr "代理配置设置" ++ ++#: C/evolution.xml:7116(para) ++msgid "HTTP Proxy" ++msgstr "HTTP 代理" ++ ++#: C/evolution.xml:7119(para) ++msgid "The machine name to proxy HTTP through." ++msgstr "用于HTTP代理的主机名。" ++ ++#: C/evolution.xml:7124(para) C/evolution.xml:7140(para) ++#: C/evolution.xml:7156(para) ++msgid "Port" ++msgstr "端口" ++ ++#: C/evolution.xml:7127(para) ++msgid "" ++"The port for the machine defined by the HTTP Proxy field that you proxy " ++"through." ++msgstr "您指定的HTTP代理主机的端口。" ++ ++#: C/evolution.xml:7132(para) ++msgid "Secure HTTP Proxy" ++msgstr "安全 HTTP 代理" ++ ++#: C/evolution.xml:7135(para) ++msgid "The machine name to proxy secure HTTP through." ++msgstr "用于安全HTTP代理的主机名。" ++ ++#: C/evolution.xml:7143(para) ++msgid "The port for the machine defined by the Secure HTTP Proxy port field." ++msgstr "您指定的安全HTTP代理的主机端口。" ++ ++#: C/evolution.xml:7148(para) ++msgid "SOCKS Host" ++msgstr "SOCKS主机" ++ ++#: C/evolution.xml:7151(para) ++msgid "The machine name to proxy SOCKS through." ++msgstr "用于SOCKS代理的主机名。" ++ ++#: C/evolution.xml:7159(para) ++msgid "The port for the machine defined by the SOCKS host." ++msgstr "您指定的SOCKS代理的主机端口。" ++ ++#: C/evolution.xml:7164(para) ++msgid "No proxy domain" ++msgstr "无代理域" ++ ++#: C/evolution.xml:7167(para) ++msgid "" ++"This key contains a list of hosts which are connected to directly, rather " ++"than via the proxy (if it is active). The values can be hostnames, domains " ++"(using an initial wildcard like *.example.com), IP host addresses (both IPv4 " ++"and IPv6) and network addresses with a netmask similar to 192.168.0.0/24." ++msgstr "" ++"该键包含了一系列直接连接而不是通过代理连接(如果代理可用的话)的主机名。键的值" ++"可以是主机名，域名(使用通配符开头，如*.example.com)，IP主机地址(IPV4和IPV6)以" ++"及类似于192.168.0.0/24的网络地址。" ++ ++#: C/evolution.xml:7172(para) ++msgid "Use authentication" ++msgstr "使用身份验证" ++ ++#: C/evolution.xml:7175(para) ++msgid "" ++"If this option is enabled, it uses authentication to connect via the proxy " ++"server." ++msgstr "选择该项，将通过身份认证连接代理服务器。" ++ ++#: C/evolution.xml:7180(para) ++msgid "Username" ++msgstr "用户名" ++ ++#: C/evolution.xml:7183(para) ++msgid "Username used to authenticate when performing an HTTP proxying." ++msgstr "使用HTTP代理时身份认证的用户名。" ++ ++#: C/evolution.xml:7188(para) ++msgid "Password" ++msgstr "密码" ++ ++#: C/evolution.xml:7191(para) ++msgid "Password used to authenticate when performing an HTTP proxying." ++msgstr "使用HTTP代理时身份认证的密码。" ++ ++#: C/evolution.xml:7201(para) ++msgid "" ++"Evolution allows you to add certificates for yourself as well as for " ++"contacts. This allows you to communicate with others securely over an " ++"encrypted connection, or sign a message confirming your identity to the " ++"contact. These settings only apply to S/MIME encryption." ++msgstr "" ++"Evolution允许您添加自己或其他联系人的证书。这样您就可以通过加密的方式更加安全" ++"地和其他人联系，或者在邮件里添加签名以让联系人确认您的身份。这些设置只对S/" ++"MIME加密有效。" ++ ++#: C/evolution.xml:7203(title) ++msgid "Your Certificates:" ++msgstr "您的证书：" ++ ++#: C/evolution.xml:7204(para) ++msgid "" ++"Click the Your Certificates tab to display a list of certificates that you " ++"own. You can import, view and delete your certificates from this page." ++msgstr "" ++"点击“您的证书”标签，可以显示一系列您拥有的证书。您可以在该页中导入，查看以及" ++"删除您的证书。" ++ ++#: C/evolution.xml:7207(title) ++msgid "Contact Certificates:" ++msgstr "联系人认证：" ++ ++#: C/evolution.xml:7208(para) ++msgid "" ++"Click the Contact Certificates tab to display a list of certificates that " ++"you have for contacts. These certificates allow you to decrypt messages as " ++"well verify signed messages. You can import, view, edit, and delete your " ++"contact certificates from this page." ++msgstr "" ++"点击“联系人证书”标签，可以显示您拥有的联系人的证书。这些证书可以让您解密邮件" ++"以及鉴别签名邮件。您可以在该页中导入，查看，删除您的联系人证书。" ++ ++#: C/evolution.xml:7211(title) ++msgid "Authorities:" ++msgstr "证书颁发机构：" ++ ++#: C/evolution.xml:7212(para) ++msgid "" ++"Click the Authorities tab to display a list of trusted certificate " ++"authorities who verify that the certificate you have is valid. You can " ++"import, view, edit, and delete certificate authorities from this page." ++msgstr "" ++"点击“证书颁发机构”标签，可以显示一系列已认证的证书颁发机构，它们可以确认您拥" ++"有的证书的有效性。您可以在该页中导入，查看，编辑和删除证书颁发机构。" ++ ++#: C/evolution.xml:7218(para) ++msgid "There are two main tasks for configuring contact information:" ++msgstr "配置联系人信息主要有两个任务：" ++ ++#: C/evolution.xml:7221(link) C/evolution.xml:7229(title) ++msgid "Creating a Contact" ++msgstr "创建联系人" ++ ++#: C/evolution.xml:7224(link) C/evolution.xml:7251(title) ++msgid "Creating an Address Book" ++msgstr "创建地址簿" ++ ++#: C/evolution.xml:7230(para) ++msgid "To add a new contact list, either local or remote:" ++msgstr "要添加一个新的联系人列表(本地或远程)：" ++ ++#: C/evolution.xml:7233(para) ++msgid "Click Contacts in the Switcher." ++msgstr "点击切换器中的“联系人”。" ++ ++#: C/evolution.xml:7236(para) ++msgid "Click the down-arrow next to New." ++msgstr "点击“新建”旁边的下拉箭头。" ++ ++#: C/evolution.xml:7239(para) ++msgid "Select Contact List." ++msgstr "选择联系人列表。" ++ ++#: C/evolution.xml:7242(para) ++msgid "Type a name and location for the Address Book." ++msgstr "输入该地址簿的列表名称和位置。" ++ ++#: C/evolution.xml:7257(para) ++msgid "Select the type of Address Book." ++msgstr "选择该地址簿的类型。" ++ ++#: C/evolution.xml:7259(title) ++msgid "On This Computer:" ++msgstr "在本电脑：" ++ ++#: C/evolution.xml:7260(para) ++msgid "Creates a local address book on the computer." ++msgstr "创建一个位于该计算机上的本地的地址簿。" ++ ++#: C/evolution.xml:7263(title) ++msgid "On LDAP Server:" ++msgstr "在 LDAP 服务器上：" ++ ++#: C/evolution.xml:7264(para) ++msgid "Creates an address book on the LDAP server." ++msgstr "创建一个位于LDAP服务器上的地址簿。" ++ ++#: C/evolution.xml:7267(title) ++msgid "Specific Account:" ++msgstr "指定帐号：" ++ ++#: C/evolution.xml:7268(para) ++msgid "" ++"If you have an account that allows you to create an address book on that " ++"server, you can select that account." ++msgstr "如果您有一个账户可以用于在服务器上创建一个地址簿，可以选择那个账户。" ++ ++#: C/evolution.xml:7272(para) ++msgid "" ++"If you selected On This Computer, specify the name of the address book, and " ++"choose whether you want to the new address book as your default folder." ++msgstr "" ++"如果您选择了“在此计算机中”，指定地址簿的名称，并选择是否要把这个新建的地址簿" ++"作为您的默认文件夹。" ++ ++#: C/evolution.xml:7274(para) ++msgid "" ++"If you are creating an address book on an LDAP " ++"server, enter the server information as requested by the assistant:" ++msgstr "" ++"如果您创建了位于LDAP服务器上的地址簿，输入服务" ++"器提供商要求的服务器信息：" ++ ++#: C/evolution.xml:7276(title) ++msgid "Server Name:" ++msgstr "服务器名称：" ++ ++#: C/evolution.xml:7277(para) ++msgid "The Internet address of the contact server you are using." ++msgstr "您使用的联系人服务器的网址。" ++ ++#: C/evolution.xml:7280(title) ++msgid "Login Method:" ++msgstr "登录方式：" ++ ++#: C/evolution.xml:7281(para) ++msgid "" ++"Specify whether your login is anonymous, uses an email address, or uses a " ++"distinguished name. If the login is not anonymous, specify the email address " ++"or distinguished name (DN) required by the server." ++msgstr "" ++"指定您的登录方式：匿名，电子邮件或者可识别名称。如果不是匿名登录，需要指定电" ++"子邮件或服务器要求的可识别名称(DN)。" ++ ++#: C/evolution.xml:7284(title) ++msgid "Port:" ++msgstr "端口：" ++ ++#: C/evolution.xml:7285(para) ++msgid "" ++"The Internet port Evolution connects to in order to access the LDAP " ++"database. This is normally 389." ++msgstr "Evolution连接LDAP数据库使用的网络端口，默认是389。" ++ ++#: C/evolution.xml:7288(title) ++msgid "Use SSL/TLS:" ++msgstr "使用 SSL/TLS：" ++ ++#: C/evolution.xml:7289(para) ++msgid "" ++"SSL and TLS are security mechanisms. If you select No Encryption, Evolution " ++"will send your password unencrypted. By using SSL or TLS, a secure " ++"connection will be used and your password will be sent encrypted." ++msgstr "" ++"SSL和TLS是安全连接的机制。如果您选择“不加密”，Evolution就会以不加密的形式发送" ++"您的密码。而使用SSL或TLS，就会建立安全连接并以加密的形式发送您的密码。" ++ ++#: C/evolution.xml:7292(title) ++msgid "Details: Search Base:" ++msgstr "细节：搜索基础：" ++ ++#: C/evolution.xml:7293(para) ++msgid "" ++"The search base is the starting point " ++"for a directory search. Contact your network administrator for information " ++"about the correct settings." ++msgstr "" ++"搜索基础是目录搜索的起始点。请咨询您的系" ++"统管理员了解正确的设置方式。" ++ ++#: C/evolution.xml:7296(title) ++msgid "Search Scope:" ++msgstr "查找范围：" ++ ++#: C/evolution.xml:7297(para) ++msgid "" ++"The search scope is the breadth of a " ++"given search. The following options are available:" ++msgstr "" ++"搜索范围是一个搜索的深度。可以有下列选" ++"项：" ++ ++#: C/evolution.xml:7302(title) ++msgid "One:" ++msgstr "单一：" ++ ++#: C/evolution.xml:7303(para) ++msgid "Searches the Search Base and one entry below it." ++msgstr "只搜索基础项目和下一级项目。" ++ ++#: C/evolution.xml:7308(title) ++msgid "Sub:" ++msgstr "子级：" ++ ++#: C/evolution.xml:7309(para) ++msgid "Searches the Search Base and all entries below it." ++msgstr "搜索基础项目和下面包含的所有项目。" ++ ++#: C/evolution.xml:7314(title) ++msgid "Timeout (minutes):" ++msgstr "超时(分钟)：" ++ ++#: C/evolution.xml:7315(para) ++msgid "" ++"The maximum time Evolution attempts to download data from the server before " ++"giving up." ++msgstr "" ++"Evolution能够尝试从服务器上下载数据的最长时间，超过该时间仍不成功即放弃。" ++ ++#: C/evolution.xml:7320(title) ++msgid "Download Limit:" ++msgstr "下载限制：" ++ ++#: C/evolution.xml:7321(para) ++msgid "" ++"The maximum number of results for a given search. Most servers refuse to " ++"send more than 500, but you can set the number lower if you want to shorten " ++"downloads for very broad searches." ++msgstr "" ++"一次搜索的结果条目的最大数量。大部分服务器不会发送大于500条目，但您可以设置更" ++"低的阈值，这样可以在进行宽泛搜索时缩短下载时间。" ++ ++#: C/evolution.xml:7326(title) ++msgid "Display Name:" ++msgstr "显示名称：" ++ ++#: C/evolution.xml:7327(para) ++msgid "" ++"The name you want to use as a label for this folder. It can be any name you " ++"choose." ++msgstr "该文件夹的名称。您可以选择任何名称。" ++ ++#: C/evolution.xml:7332(title) ++msgid "Search Filter:" ++msgstr "搜索过滤器：" ++ ++#: C/evolution.xml:7333(para) ++msgid "" ++"The search filter can be set here for all the LDAP queries. For example:" ++msgstr "搜索过滤器可以设置为所有LDAP的请求，例如：" ++ ++#: C/evolution.xml:7335(para) ++msgid "" ++"ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists " ++"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): " ++"Retrieves the User and Contact List objects.(&(mail=*)(ObjectClass=*)): " ++"Lists the objects associated with the email addresses." ++msgstr "" ++"ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists " ++"only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): " ++"Retrieves the User and Contact List objects.(&(mail=*)(ObjectClass=*)): " ++"Lists the objects associated with the email addresses." ++ ++#: C/evolution.xml:7337(para) ++msgid "" ++"If you change any LDAP address book configurations, Evolution and the " ++"Evolution Data Server need to be restarted in order to see the changes." ++msgstr "" ++"如果您改变了任何LDAP地址簿的配置，Evolution和Evolution数据服务器需要重启才能" ++"应用这些设置。" ++ ++#: C/evolution.xml:7340(para) ++msgid "" ++"If you are creating the address book for a specific account, type the name " ++"of the address book if you want the address book stored locally when " ++"offline, and if you want the address book to be your default folder." ++msgstr "" ++"如果您为某个账户创建了地址簿，并且您想要让该地址簿在离线时保存在本地，或者您" ++"需要让该地址簿成为您默认的文件夹，请输入该地址簿的名称。" ++ ++#: C/evolution.xml:7351(para) ++msgid "" ++"Evolution allows you to view the error logs and set the display duration for " ++"the error messages that appear in the statusbar. When an error occurs, " ++"statusbar displays the error message for the specified time, then it is " ++"moved to the debug file." ++msgstr "" ++"Evolution允许您查看错误日志并且设置错误信息显示在状态栏上的持续时间。当发生错" ++"误时，状态栏会显示一段时间的错误信息，然后它会被移动到调试文件中。" ++ ++#: C/evolution.xml:7354(para) ++msgid "From the Help menu, select Debug Logs." ++msgstr "在“帮助”菜单中，选择“调试日志”。" ++ ++#: C/evolution.xml:7357(para) ++msgid "Specify for how long error messages will be displayed in the statusbar." ++msgstr "指定错误在状态栏显示的时间。" ++ ++#: C/evolution.xml:7361(para) ++msgid "" ++"The icon indicates that the error message is a warning. The icon indicates an " ++"informational message." ++msgstr "" ++"图标预示该错误信息是一个警告信息。图标预示一个提示信息。" ++ ++#: C/evolution.xml:7368(para) ++msgid "" ++"Synchronization presents you with three issues you need to address. First, " ++"you need to enable synchronization. Second, your computer needs to recognize " ++"and access your handheld. At this time, Evolution " ++"only supports Palm OS devices like the PalmPilot* and the Handspring Visor. " ++"Third, you should decide what sort of synchronization behavior you want." ++msgstr "" ++"“同步”这一节内容会向您展示三个需要强调的方面。首先，您需要启用同步功能。其" ++"次，您的计算机需要能够识别并访问您的手持设备。目前，Evolution仅支持Palm OS设备如PalmPilot*和Handspring Visor。第三，您需要决定进" ++"行哪种类型的同步操作。" ++ ++#: C/evolution.xml:7371(link) C/evolution.xml:7382(title) ++msgid "Enabling Synchronization" ++msgstr "启用同步" ++ ++#: C/evolution.xml:7374(link) C/evolution.xml:7387(title) ++msgid "Selecting Conduits" ++msgstr "选择Conduits" ++ ++#: C/evolution.xml:7377(link) C/evolution.xml:7410(title) ++msgid "Synchronizing Information" ++msgstr "同步信息" ++ ++#: C/evolution.xml:7383(para) ++msgid "" ++"If you haven't used a handheld device with your computer before, you need to " ++"run the GNOME Control Center by clicking System > Settings, and make sure " ++"that Pilot Link is properly configured. Make sure that you have read and " ++"write permissions on the device, which is normally in /dev/pilot. If that " ++"does not work, check in /dev/ttyS0 if you have a serial connection, or in /" ++"dev/ttyUSB1 for a USB connection. You can do this by becoming root and " ++"adding your username to the group that owns this device node. For a USB " ++"device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The " ++"second node is the one to be used in configuring the device." ++msgstr "" ++"如果您以前没有使用过手持设备连接您的计算机，您需要点击系统 > 设置打开GNOME" ++"控制中心，确认已正确设置了Pilot连接。确认您有手持设备(一般在/dev/pilot)上的读" ++"和写的权限。如果无效，可以查看/dev/ttyS0(如果您使用串行设备连接)或/dev/" ++"ttyUSB1(如果您使用USB连接)。您可以切换到root身份并添加您的用户名到拥有该设备" ++"模式的用户组中。对于同步的一个USB设备，会创建两个设备节点，ttyUSB0和ttyUSB1。" ++"其中第二个节点用于配置该设置。" ++ ++#: C/evolution.xml:7388(para) ++msgid "" ++"After your computer and your Palm OS device are communicating, select the " ++"conduits you want under the Pilot Conduits " ++"section of the Control Center. You can use conduits to synchronize data with " ++"several applications; the Evolution conduits are labeled EAddress, for the " ++"contacts in your address book; ECalendar, for your calendar; and ETodo, for " ++"your task list." ++msgstr "" ++"在连接您的计算机和Palm OS设备之后，在控制中心的Pilot Conduits选项中选择您需要" ++"的conduit。您可以使用conduit来同步一些程序的" ++"数据。Evolution conduits被标记为EAddress，用于同步您的地址簿中的联系人；" ++"ECalendar用于同步您的日历；EToo用于同步您的任务列表。" ++ ++#: C/evolution.xml:7389(para) ++msgid "" ++"Click Enable, then click Settings to change what the conduit does when " ++"activated. Your options can vary depending on the conduit, but typically " ++"they are as follows:" ++msgstr "" ++"点击“启用”，然后点击“设置”，设置当conduit激活时该做什么。您的选项根据conduit" ++"的不同而不同，大致有以下几项：" ++ ++#: C/evolution.xml:7391(title) ++msgid "Disabled:" ++msgstr "禁用：" ++ ++#: C/evolution.xml:7392(para) ++msgid "Do nothing." ++msgstr "什么也不做。" ++ ++#: C/evolution.xml:7395(title) ++msgid "Synchronize:" ++msgstr "同步：" ++ ++#: C/evolution.xml:7396(para) ++msgid "" ++"Copy new data from the computer to the handheld, and from the handheld to " ++"the computer. Remove items that were on both systems but have been deleted " ++"on one." ++msgstr "" ++"将新数据从计算机复制到手持设备，以及从手持设备到计算机。删除曾在两个系统上都" ++"存在过但已经在一个系统上被删除的条目。" ++ ++#: C/evolution.xml:7399(title) ++msgid "Copy From Pilot:" ++msgstr "从Pilot复制：" ++ ++#: C/evolution.xml:7400(para) ++msgid "" ++"If there is any new data on the handheld device, copy it to the computer." ++msgstr "如果手持设备上有新数据，复制到计算机。" ++ ++#: C/evolution.xml:7403(title) ++msgid "Copy To Pilot:" ++msgstr "复制到Pilot：" ++ ++#: C/evolution.xml:7404(para) ++msgid "Copy new data from the computer to the handheld." ++msgstr "从计算机上复制新数据到手持设备。" ++ ++#: C/evolution.xml:7406(para) ++msgid "" ++"Select the behavior you want for each conduit you choose to use. If you're " ++"not sure, use Synchronize." ++msgstr "" ++"为每个要使用的conduit选择您需要的行为。如果您不确定用哪个，可以选择“同步”。" ++ ++#: C/evolution.xml:7411(para) ++msgid "" ++"Use the following procedure to synchronize the data on your Palm OS device " ++"with the data you store in Evolution." ++msgstr "使用下列步骤同步您存储在Palm OS设备和Evolution中的数据。" ++ ++#: C/evolution.xml:7412(para) ++msgid "" ++"If you want to back up your information before synchronizing, make a copy of " ++"the .evolution directory inside your home directory." ++msgstr "" ++"如果您想在同步之前备份您的信息，可以对您的家目录中的.evolution文件夹作个备份。" ++ ++#: C/evolution.xml:7415(para) ++msgid "Put your handheld device in its cradle and press the HotSync button." ++msgstr "将您的手持设备接入，按下“同步”按钮。" ++ ++#: C/evolution.xml:7416(para) ++msgid "" ++"If you use Palm OS v. 4.0 and have password protection turned on for your " ++"handheld device, you might encounter trouble synchronizing. If this happens, " ++"try turning off password protection on your handheld, synchronize it with " ++"your desktop computer, and then re-enable password protection on your " ++"handheld." ++msgstr "" ++"如果您使用的是4.0版的Palm OS，在手持设备中开启了密码保护，则在同步过程中可能" ++"会遇到问题。如果发生问题的话，请尝试先关闭手持设备上的密码保护，再将其与计算" ++"机进行同步，完成之后再开启手持设备的密码保护。" ++ ++#: C/evolution.xml:7419(para) ++msgid "" ++"If you have followed the setup instructions properly, your Palm OS device " ++"will synchronize data with Evolution." ++msgstr "正确地按照上述步骤操作，您的Palm OS设备就会与Evolution数据同步。" ++ ++#: C/evolution.xml:7425(para) ++msgid "" ++"If you are using Microsoft Outlook, but not Microsoft Exchange, this section " ++"helps you switch to Evolution." ++msgstr "" ++"如果您使用Microsoft Outlook而不是Microsoft Exchange，该节会向您展示如何转移数" ++"据到Evolution。" ++ ++#: C/evolution.xml:7428(title) ++msgid "Migrating Local Outlook Mail Folders" ++msgstr "迁移本地Outlook邮件文件夹" ++ ++#: C/evolution.xml:7429(para) ++msgid "" ++"Exchange and IMAP mail is stored on the server, so you do not need to " ++"migrate it to your Linux* partition. However, if you have stored mail on " ++"your computer, you might want to make it accessible to Evolution." ++msgstr "" ++"Exchange和IMAP邮件是存储在服务器上的，所以您不必将它们迁移到您的Linux*分区" ++"中。但是，如果您在本地保存了邮件，就需要让Evolution也能够访问它们。" ++ ++#: C/evolution.xml:7430(para) ++msgid "First, while using Windows, prepare your messages for import:" ++msgstr "首先，在使用Windows时，准备好您要导出的邮件：" ++ ++#: C/evolution.xml:7433(para) ++msgid "" ++"Clean up your mail. Delete messages and folders you do not need, and click " ++"File > Folders > Properties > Advanced > Compact to erase old, " ++"deleted messages from your PST file." ++msgstr "" ++"清理您的邮件。删除您不需要的邮件和文件夹，然后点击文件 > 文件夹 > 属性 " ++"> 高级 > Compact to erase old，删除您的PST文件中的邮件。" ++ ++#: C/evolution.xml:7436(para) ++msgid "" ++"If you nest your folders one inside another, you might want to rename " ++"subfolders so that you can tell which folder they belong to. You must re-" ++"nest them after you load them into Evolution." ++msgstr "" ++"如果您在一个文件夹中又嵌套了另一个文件夹，您也许想要重命名子文件夹这样就可以" ++"显示它们属于哪个文件夹。您必须在将它们导入Evolution之后重新嵌套。" ++ ++#: C/evolution.xml:7439(para) ++msgid "" ++"Import the files into Mozilla Mail (or another mailer, such as Netscape or " ++"Eudora, that uses the standard mbox format)." ++msgstr "" ++"将这些文件导入到Mozilla Mail(或其它邮件程序，如Netscape或Eudora等使用标准mbox" ++"格式的程序)。" ++ ++#: C/evolution.xml:7440(para) ++msgid "" ++"Linux mailers cannot do this task, because it requires a library available " ++"only under Windows. In Mozilla, import by selecting Window Mail & " ++"Newsgroups Tools Import." ++msgstr "" ++"Linux邮件程序不能作这种工作，因为它要求一些Windows函数库。在Mozilla中，选择" ++"Window Mail &新闻组导入工具来导入文件。" ++ ++#: C/evolution.xml:7443(para) ++msgid "" ++"Mozilla creates a set of files in the directory Windows" ++"\\Application_Data\\Mozilla\\Profiles\\(UserName)\\(Random Letters)\\Mail" ++"\\Local Folders\\OutlookMail\\. The data files are those that have " ++"no file extension." ++msgstr "" ++"Mozilla会在目录 Windows\\Application_Data\\Mozilla\\Profiles" ++"\\(UserName)\\(Random Letters)\\Mail\\Local Folders\\OutlookMail\\" ++"中创建一系列文件。这些数据文件没有扩展名。" ++ ++#: C/evolution.xml:7444(para) ++msgid "" ++"If you are using Windows Vista*, Windows XP* or Windows 2000*, your Windows " ++"hard drive is probably in the NTFS format, which some Linux systems cannot " ++"read without additional software. You might find it simpler to copy the mail " ++"folders to a different drive or to burn a CD." ++msgstr "" ++"如果您使用Windows Vista*，Windows XP*或Windows 2000*，则您的Windows分区可能是" ++"NTFS格式，而一些Linux系统在没有安装额外软件的情况下不能读取这种格式的分区。在" ++"这种情况下将这些邮件文件夹复制到其它分区或烧录到CD更加方便。" ++ ++#: C/evolution.xml:7445(para) ++msgid "" ++"When you have your mail in a format Evolution can understand, reboot to " ++"Linux. Then continue with the following procedure. To create new folders for " ++"your files:" ++msgstr "" ++"当您把邮件转换为Evolution能够识别的格式之后，重启进入Linux。然后进行下列步骤" ++"操作。要为这些文件创建新的文件夹：" ++ ++#: C/evolution.xml:7448(para) ++msgid "Mount your Windows drive or the disk where you saved the mail files." ++msgstr "载入您的Windows分区或您保存邮件文件的磁盘。" ++ ++#: C/evolution.xml:7451(para) ++msgid "" ++"Copy all the mail files into your home directory or another convenient place." ++msgstr "将这些所有邮件文件复制到您的家目录或其它方便的地方。" ++ ++#: C/evolution.xml:7454(para) ++msgid "Start Evolution." ++msgstr "启动 Evolution。" ++ ++#: C/evolution.xml:7457(para) ++msgid "Select File > New > Mail Folder to create the folders you want." ++msgstr "选择文件 > 新建 > 邮件文件夹，创建您想要的文件夹。" ++ ++#: C/evolution.xml:7460(para) ++msgid "To import the data files:" ++msgstr "导入数据文件：" ++ ++#: C/evolution.xml:7463(para) ++msgid "" ++"In Evolution, open the File Import assistant by clicking File > Import." ++msgstr "在Evolution中，点击文件 > 导入，打开文件导入助手。" ++ ++#: C/evolution.xml:7466(para) ++msgid "Click Next, then select Import a single file." ++msgstr "点击“前进”，选择“导入单个文件”。" ++ ++#: C/evolution.xml:7469(para) ++msgid "Click on the filechooser to select the data file." ++msgstr "点击文件选择器，选择数据文件。" ++ ++#: C/evolution.xml:7470(para) ++msgid "Remember, the data files are the files that have no file extension." ++msgstr "记住，数据文件是那些没有扩展名的文件。" ++ ++#: C/evolution.xml:7473(para) ++msgid "Select the folder where you want to put the imported data file." ++msgstr "选择您想要存放这些导入的数据文件的文件夹。" ++ ++#: C/evolution.xml:7479(para) ++msgid "Repeat the import steps until you have imported all your mail." ++msgstr "重复这些导入步骤直到您导入了所有的邮件。" ++ ++#: C/evolution.xml:7487(para) ++msgid "" ++"You can print this section to use it as a quick reference for most of the " ++"things you want to do with Evolution. You can also " ++"find this information by selecting Help > Quick Reference in the Menubar." ++msgstr "" ++"您可以把该节打印出来作为使用Evolution的快速参考手册。" ++"您还可以在菜单栏的帮助 > 快速参考中找到这些内容。" ++ ++#: C/evolution.xml:7490(link) C/evolution.xml:7504(title) ++msgid "Opening or Creating Items" ++msgstr "打开或创建项目" ++ ++#: C/evolution.xml:7493(link) C/evolution.xml:7529(title) ++msgid "Mail Tasks" ++msgstr "邮件任务" ++ ++#: C/evolution.xml:7499(link) C/evolution.xml:7579(title) ++msgid "Address Book" ++msgstr "地址簿" ++ ++#: C/evolution.xml:7507(title) ++msgid "New Item:" ++msgstr "新项目：" ++ ++#: C/evolution.xml:7508(para) ++msgid "" ++"Press Ctrl+N to open a new item for whatever part of Evolution you're " ++"working in. In mail, this means you create a new message. If you're looking " ++"at your address book, Ctrl+N creates a new contact card, and in the " ++"calendar, a new appointment." ++msgstr "" ++"在Evolution的任何部分都可以通过按Ctrl+N来创建一个新项目。在邮件组件中，这意味" ++"着创建一封新邮件。在地址簿中，这意味着创建一个新的联系人卡片。在日历中，这意" ++"味着创建一个新的约会。" ++ ++#: C/evolution.xml:7511(title) ++msgid "Creating a New Email Message:" ++msgstr "创建新邮件消息：" ++ ++#: C/evolution.xml:7512(para) ++msgid "Select File > New > Mail Message or Shift+Ctrl+M." ++msgstr "选择文件 > 新建 > 邮件或按Shift+Ctrl+M。" ++ ++#: C/evolution.xml:7515(title) C/evolution.xml:7568(title) ++msgid "Creating a New Appointment:" ++msgstr "创建一个新的约会：" ++ ++#: C/evolution.xml:7516(para) C/evolution.xml:7569(para) ++msgid "Click File > New > Appointment or Shift+Ctrl+A." ++msgstr "点击文件 > 新建 > 约会或按Shift+Ctrl+A。" ++ ++#: C/evolution.xml:7519(title) ++msgid "Entering a New Contact:" ++msgstr "键入新联系人：" ++ ++#: C/evolution.xml:7520(para) ++msgid "" ++"Double-click in any blank space in the contact manager to create a new " ++"address card. You can also click File > New > Contact or Shift+Ctrl+C." ++msgstr "" ++"在联系人管理器的任何空白位置双击，可以创建一个新的地址名片。您还可以点击文件 " ++"> 新建 > 联系人或按Shift+Ctrl+C。" ++ ++#: C/evolution.xml:7523(title) C/evolution.xml:7573(title) ++msgid "Creating a New Task:" ++msgstr "创建新任务：" ++ ++#: C/evolution.xml:7524(para) C/evolution.xml:7574(para) ++msgid "Click File > New > Task or Shift+Ctrl+T." ++msgstr "点击文件 > 新建 > 任务或按Shift+Ctrl+T。" ++ ++#: C/evolution.xml:7531(title) ++msgid "Send and Receive Mail:" ++msgstr "收发邮件：" ++ ++#: C/evolution.xml:7532(para) ++msgid "" ++"Press F9, click the Send/Receive button in the toolbar, or click File > " ++"Send/Receive." ++msgstr "按F9，点击工具栏上的发送/接收按钮，或点击文件 > 发送/接收。" ++ ++#: C/evolution.xml:7535(title) ++msgid "Navigating the Message List with the Keyboard:" ++msgstr "使用键盘浏览邮件列表：" ++ ++#: C/evolution.xml:7536(para) ++msgid "" ++"Press (]) or (.) to jump to the next unread message. ([) or (,) goes to the " ++"previous unread message. Use the arrow keys to move up and down in the list " ++"of all messages." ++msgstr "" ++"按(]) 或 (.) 跳至下一封未读邮件，([) 或 (,) 跳至上一封未读邮件。使用方向键在" ++"列表中上下移动。" ++ ++#: C/evolution.xml:7539(title) ++msgid "Moving the Display Up and Down in the Preview Pane:" ++msgstr "在预览面板中上下移动显示区：" ++ ++#: C/evolution.xml:7540(para) ++msgid "" ++"Press the Spacebar to move down a page. Press Backspace to move up a page." ++msgstr "按空格键下翻一页。按退格键上翻一页。" ++ ++#: C/evolution.xml:7543(title) ++msgid "Replying To a Message:" ++msgstr "回复消息:" ++ ++#: C/evolution.xml:7544(para) ++msgid "" ++"To reply only to the sender of the message, click Reply in the toolbar, or " ++"press Ctrl+R." ++msgstr "仅回复邮件发送者，点击工具栏的“回复”，或按Ctrl+R。" ++ ++#: C/evolution.xml:7546(para) ++msgid "" ++"To reply to the sender and all the other visible recipients of the message, " ++"click Reply to All or select the message and press Shift+Ctrl+R." ++msgstr "" ++"要回复发信人和所有其他可见的邮件收信人，点击“回复所有人”或选中该邮件，按Shift" ++"+Ctrl+R。" ++ ++#: C/evolution.xml:7548(title) ++msgid "Forwarding a Message:" ++msgstr "转发一封邮件：" ++ ++#: C/evolution.xml:7549(para) ++msgid "" ++"Select the message or messages you want to forward, then click Forward in " ++"the toolbar, or press Ctrl+F." ++msgstr "选中您想要转发的邮件，然后点击工具栏上的“转发”，或按Ctrl+F。" ++ ++#: C/evolution.xml:7552(title) ++msgid "Opening a Message In a New Window:" ++msgstr "在新窗口中打开邮件：" ++ ++#: C/evolution.xml:7553(para) ++msgid "" ++"Double-click the message you want to view, or select it and press Enter or " ++"Ctrl+O." ++msgstr "双击您想要查看的邮件，或者选中它，按回车键或者Ctrl+O。" ++ ++#: C/evolution.xml:7556(title) ++msgid "Creating Filters and Search Folders:" ++msgstr "创建过滤器和搜索文件夹：" ++ ++#: C/evolution.xml:7557(para) ++msgid "" ++"Right-click a message and select Create Rule From Message. You can also " ++"create filters and Search folders in the Edit menu." ++msgstr "" ++"右击邮件，选择“从邮件创建过滤规则”。您也可以在“编辑”菜单中创建过滤器和搜索文" ++"件夹。" ++ ++#: C/evolution.xml:7560(title) ++msgid "Adding a Sender to the Address Book:" ++msgstr "将发信人添加到地址簿：" ++ ++#: C/evolution.xml:7561(para) ++msgid "Right-click on any email address to add it to your address book." ++msgstr "右键点击任何邮件地址，加入您的地址簿。" ++ ++#: C/evolution.xml:7571(para) ++msgid "" ++"You can also click in any blank spot in the calendar and start typing to " ++"create a new appointment entry." ++msgstr "您也可以在日历上任何空的位置点击，输入内容，即可创建新的约会条目。" ++ ++#: C/evolution.xml:7581(title) ++msgid "Editing a Contact:" ++msgstr "编辑联系人：" ++ ++#: C/evolution.xml:7582(para) ++msgid "Double-click the contact's address card to change details." ++msgstr "双击联系人名片，修改内容。" ++ ++#: C/evolution.xml:7585(title) ++msgid "Deleting a Contact:" ++msgstr "删除联系人：" ++ ++#: C/evolution.xml:7586(para) ++msgid "" ++"Right-click a contact, then click Delete; or select a contact, then click " ++"Delete on the toolbar." ++msgstr "右击联系人，选择“删除”；或选择一个联系人，点击工具栏上的“删除”。" ++ ++#: C/evolution.xml:7589(title) ++msgid "Sending Emails to a Contact:" ++msgstr "给联系人发送邮件：" ++ ++#: C/evolution.xml:7590(para) ++msgid "Right-click a contact, then click Send Message to Contact." ++msgstr "邮件点击该联系人，然后选择“给联系人发送邮件”。" ++ ++#: C/evolution.xml:7593(title) ++msgid "Creating a New Contact:" ++msgstr "创建新的联系人：" ++ ++#: C/evolution.xml:7594(para) ++msgid "" ++"Double-click in any blank space in the contact manager to create a new " ++"address card, or right-click anywhere in the address book and select New " ++"Contact. You can also click File > New Contact or press Shift+Ctrl+C." ++msgstr "" ++"在联系人管理器的任何空白处双击，创建一个新的联系人名片，或在地址簿任何位置右" ++"击，选择“新建联系人”。您还可以点击文件 > 新建联系人或按Shift+Ctrl+C。" ++ ++#: C/evolution.xml:7601(para) ++msgid "" ++"Evolution bug tracking is done at the GNOME bug tracking System. You can use " ++"that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) " ++"if you find bugs or want to request new features." ++msgstr "" ++"Evolution的缺陷跟踪是由GNOME缺陷跟踪系统来进行。您可以使用这个系统，或者使用" ++"GNOME缺陷回报工具(即命令行的bug-buddy)来报告缺陷或请求新功能。" ++ ++#: C/evolution.xml:7602(para) ++msgid "" ++"A complete list of feature requests and other issues with Evolution is " ++"available online in the GNOME bug tracking system. You can learn more about " ++"the Evolution development process at the Evolution Developer site." ++msgstr "" ++"在GNOME缺陷跟踪系统上可以查到Evolution的完整的功能请求以及其它条目的列表。您" ++"可以通过Evolution开发者网站了解更多关于Evolution开发进展情况。" ++ ++#: C/evolution.xml:7607(para) ++msgid "" ++"Evolution was written by the Evolution team and " ++"numerous other dedicated GNOME programmers. You can see their names by " ++"clicking Help > About from the main Evolution window." ++msgstr "" ++"Evolution是由Evolution小组以及许多其它致力于GNOME开发" ++"的程序员编写。您可以在Evolution主窗口中点击 帮助 > 关于 查看制造者名单。" ++ ++#: C/evolution.xml:7608(para) ++msgid "" ++"The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar " ++"applications, and to KHTMLW. The developers of Evolution acknowledge the " ++"efforts and contributions of all who worked on those projects." ++msgstr "" ++"Evolution的源代码借用了不少的GNOME-pim，GNOME-Calenda和KHTMLW的代码。" ++"Evolution的开发者对所有参与这些工程的成员表示感谢。" ++ ++#: C/evolution.xml:7609(para) ++msgid "" ++"For more information please visit the Evolution Web page. Please send all comments, " ++"suggestions, and bug reports to the bug tracking database. Instructions for submitting bug reports " ++"can be found on-line at the same location. You can also use the GNOME bug " ++"report tool, bug-buddy, to submit your defect reports." ++msgstr "" ++"更多信息，请访问 Evolution网页。请将评论、建议以及缺陷发送到错误跟踪数据库。提交错误报告的说明可以在同一位置" ++"处找到。您也可使用 GNOME 错误报告工具，bug-buddy，提交缺陷报告。" ++ ++#: C/evolution.xml:7610(para) ++msgid "This manual was written by:" ++msgstr "该手册由以下人员编写：" ++ ++#: C/evolution.xml:7613(para) ++msgid "Radhika PC (pradhika@novell.com)" ++msgstr "Radhika PC (pradhika@novell.com)" ++ ++#: C/evolution.xml:7616(para) ++msgid "Srinivasa Ragavan (sragavan@novell.com)" ++msgstr "Srinivasa Ragavan (sragavan@novell.com)" ++ ++#: C/evolution.xml:7619(para) ++msgid "Andre Klapper (ak-47@gmx.net)" ++msgstr "Andre Klapper (ak-47@gmx.net)" ++ ++#: C/evolution.xml:7622(para) ++msgid "Francisco Javier F. Serrador (serrador@tecknolabs.com)" ++msgstr "Francisco Javier F. Serrador (serrador@tecknolabs.com)" ++ ++#: C/evolution.xml:7625(para) ++msgid "Mark Moulder (mmoulder@novell.com)" ++msgstr "Mark Moulder (mmoulder@novell.com)" ++ ++#: C/evolution.xml:7628(para) ++msgid "Jessica Prabhakar (jprabhakar@novell.com)" ++msgstr "Jessica Prabhakar (jprabhakar@novell.com)" ++ ++#: C/evolution.xml:7631(para) ++msgid "Aaron Weber (aaron@ximian.com)" ++msgstr "Aaron Weber (aaron@ximian.com)" ++ ++#: C/evolution.xml:7634(para) ++msgid "Kevin Breit (mrproper@ximian.com)" ++msgstr "Kevin Breit (mrproper@ximian.com)" ++ ++#: C/evolution.xml:7637(para) ++msgid "Duncan Mak (duncan@ximian.com)" ++msgstr "Duncan Mak (duncan@ximian.com)" ++ ++#: C/evolution.xml:7640(para) ++msgid "Ettore Perazzoli (ettore@ximian.com)" ++msgstr "Ettore Perazzoli (ettore@ximian.com)" ++ ++#: C/evolution.xml:7643(para) ++msgid "Akhil Laddha (lakhil@novell.com)" ++msgstr "Akhil Laddha (lakhil@novell.com)" ++ ++#: C/evolution.xml:7646(para) ++msgid "" ++"With the help of the application programmers and the GNOME Documentation " ++"Project." ++msgstr "在诸位程序员及 GNOME 文档项目的帮助下。" ++ ++#: C/evolution.xml:7649(para) ++msgid "" ++"Please file comments and suggestions for this manual as bugs in the GNOME " ++"bug tracking system. If you contributed to this project but do not see your " ++"name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa " ++"Ragavan (sragavan@novell.com) and either of them will list you." ++msgstr "" ++"请将本手册的评论与建议作为 GNOME 错误跟踪系统中的错误提交。如果您对本项目做了" ++"贡献却没有在这里看到您的名字，请联系 Radhika PC (pradhika@novell.com)或" ++"Srinivasa Ragavan (sragavan@novell.com)，他们中的任何一个将会加入您的名字。" ++ ++#: C/evolution.xml:7654(para) ++msgid "" ++"This glossary contains terms that are frequently used in this guide as well " ++"as in Evolution." ++msgstr "" ++"该术语表包含了一些在本使用指南以及在Evolution中频繁使" ++"用的术语。" ++ ++#: C/evolution.xml:7656(glossterm) ++msgid "Assistant" ++msgstr "向导" ++ ++#: C/evolution.xml:7658(para) ++msgid "" ++"A tool that guides a user through a series of steps, usually to configure or " ++"set up a program. Equivalent to Wizard and Druid." ++msgstr "" ++"一种指导用户进行一系列操作(通常是配置或设置一个程序)的工具，相当于向导、老" ++"师。" ++ ++#: C/evolution.xml:7662(glossterm) ++msgid "attachment" ++msgstr "附件" ++ ++#: C/evolution.xml:7664(para) ++msgid "" ++"Any file sent with an email. Attachments can be embedded in a message or " ++"appended to it." ++msgstr "和邮件一同发送的任何文件。附件可以内嵌在邮件中，或添加到邮件。" ++ ++#: C/evolution.xml:7668(glossterm) ++msgid "automatic indexing" ++msgstr "自动索引" ++ ++#: C/evolution.xml:7670(para) ++msgid "A feature which allows Evolution to quickly find and sort data." ++msgstr "一种功能，允许Evolution快速搜索以及排列数据。" ++ ++#: C/evolution.xml:7674(glossterm) ++msgid "Bcc (Blind Carbon Copy)" ++msgstr "Bcc (暗送副本)" ++ ++#: C/evolution.xml:7676(para) ++msgid "" ++"Blind copy recipients (Bcc) receive a copy of an item. Other recipients " ++"receive no information about blind copies. Only the sender and the blind " ++"copy recipient know that a blind copy was sent. If a recipient replies and " ++"chooses Reply to All, the blind copy recipient does not receive the reply." ++msgstr "" ++"暗送副本收信人(Bcc)会收到邮件的副本。其它收信人不会知道有暗送副本，只有发信人" ++"和暗送副本收信人知道有暗送副本发送出去。如果收信人选择“回复所有人”来回复邮" ++"件，暗送副本收信人不会收到该回复。" ++ ++#: C/evolution.xml:7680(glossterm) ++msgid "Cc (Carbon Copy)" ++msgstr "Cc(抄送副本)" ++ ++#: C/evolution.xml:7682(para) ++msgid "" ++"Carbon copy recipients (CC) receive a copy of an item. CC recipients are " ++"users who would benefit from the information in an item, but are not " ++"affected by or directly responsible for it. All recipients can see that a " ++"carbon copy was sent. They can also see the names of the CC recipients." ++msgstr "" ++"抄送副本收信人(Cc)会收到邮件的副本。抄送副本收信人通常是需要了解邮件信息的掩" ++"护，但不对邮件的内容直接负责。所有的收信人都能发送抄送副本的发送，他们也能看" ++"见抄送副本收信人的名字。" ++ ++#: C/evolution.xml:7686(glossterm) ++msgid "conduit" ++msgstr "conduit" ++ ++#: C/evolution.xml:7688(para) ++msgid "" ++"A small application that controls the transfer of data between a handheld " ++"device and a desktop computer." ++msgstr "一个小程序，控制手持设备和计算机的数据传送。" ++ ++#: C/evolution.xml:7694(para) ++msgid "The GNOME groupware application." ++msgstr "GNOME 群件应用程序。" ++ ++#: C/evolution.xml:7698(glossterm) ++msgid "execute" ++msgstr "执行" ++ ++#: C/evolution.xml:7700(para) ++msgid "" ++"To run a program. Any file that can be run is called an executable. " ++"Evolution can download executable attachments, but before they can be run, " ++"the files must be marked as executable with a shell or file manager. This " ++"security precaution prevents the automatic or accidental execution of " ++"malicious programs. For more information on executables and file " ++"permissions, see the documentation for your file manager or shell." ++msgstr "" ++"运行一个程序。任何能够运行的文件就叫作可执行文件。Evolution可以下载可执行的附" ++"件，但在它们能够运行之前，这些文件必须通过Shell或文件管理器标记为可执行。这种" ++"安全措施可以阻止恶意程序的自动或意外执行。要了解更多关于可执行文件和文件权限" ++"的信息，请参阅您的文件管理器或Shell文档。" ++ ++#: C/evolution.xml:7704(glossterm) ++msgid "expunge" ++msgstr "销毁" ++ ++#: C/evolution.xml:7706(para) ++msgid "" ++"When messages are marked for deletion, they remain until they are expunged. " ++"When a message is expunged, it is permanently deleted, as long as it was " ++"marked for deletion." ++msgstr "" ++"当邮件被标记为“删除”时，它们仍然存在，直到被彻底销毁。当邮件被销毁时，即是被" ++"永久删除。" ++ ++#: C/evolution.xml:7710(glossterm) ++msgid "file tree" ++msgstr "文件树" ++ ++#: C/evolution.xml:7712(para) ++msgid "" ++"A way of describing a group of files on a computer. The top of the tree is " ++"called the root directory, and is denoted by /. The rest " ++"of the branches spread downward from the root. Don't confuse the root " ++"directory with the root account or root's home directory, normally /" ++"root." ++msgstr "" ++"描述计算机上文件组织结构的方式。树的顶端称为根目录，用/表" ++"示。其它分支都从根目录向下伸展开来。注意不要和系统管理员账户的目录即root的家" ++"目录混淆，它使用/root来表示。" ++ ++#: C/evolution.xml:7716(glossterm) ++msgid "filter" ++msgstr "过滤" ++ ++#: C/evolution.xml:7718(para) ++msgid "" ++"Within Evolution, a filter is a method of sorting mail automatically when it " ++"is downloaded. You can create filters to perform one or more actions on a " ++"message that meets any (or all) of a wide range of criteria." ++msgstr "" ++"在Evolution中，过滤器是自动组织下载的邮件的方式。您可以创建过滤器来对一封邮件" ++"进行一个或多个操作，只要它符合一些(或全部)一定范围的标准。" ++ ++#: C/evolution.xml:7722(glossterm) ++msgid "forward" ++msgstr "向前" ++ ++#: C/evolution.xml:7724(para) ++msgid "" ++"Forwards a copy of the message and any additional comments to a different " ++"email address." ++msgstr "转发邮件和任何附加组件的副本到其它不同的邮件地址。" ++ ++#: C/evolution.xml:7728(glossterm) ++msgid "groupware" ++msgstr "群件" ++ ++#: C/evolution.xml:7730(para) ++msgid "" ++"A term describing an application that helps groups of people work together. " ++"Typically, a groupware application has several productivity features built " ++"into one program, including email, calendar, and address book tools." ++msgstr "" ++"一种能够帮助一群人一起工作的应用程序。一般来说，一个群件程序会集中若干个生产" ++"性的功能，包括电子邮件，日历和地址簿工具等。" ++ ++#: C/evolution.xml:7734(glossterm) ++msgid "HTML" ++msgstr "HTML" ++ ++#: C/evolution.xml:7736(para) ++msgid "" ++"Hypertext Markup Language (HTML) is a language for describing page layout in " ++"electronic documents such as Web pages, help files, and email messages. HTML " ++"can be used in email and news posts to insert images and apply text " ++"treatments." ++msgstr "" ++"超文本标记语言(HTML)是一种描述电子文档页面(如网页，帮助文件和电子邮件)的语" ++"言。HTML可被用于在电子邮件和新闻简报中插入图片和应用文本格式。" ++ ++#: C/evolution.xml:7740(glossterm) ++msgid "iCal" ++msgstr "iCal" ++ ++#: C/evolution.xml:7742(para) ++msgid "iCal is a protocol that Evolution uses to manage the calendar section." ++msgstr "iCal是Evolution用于管理日历区的一种协议。" ++ ++#: C/evolution.xml:7746(glossterm) ++msgid "IMAP" ++msgstr "IMAP" ++ ++#: C/evolution.xml:7748(para) ++msgid "" ++"Internet Mail Access Protocol. It allows access to email that is typically " ++"stored remotely on a server rather than on a local hard disk. Often " ++"contrasted with POP." ++msgstr "" ++"因特网邮件访问协议。它允许访问存储在远程服务器而不是存储在本地磁盘的邮件，通" ++"常与POP协议相对。" ++ ++#: C/evolution.xml:7752(glossterm) ++msgid "inline" ++msgstr "内嵌" ++ ++#: C/evolution.xml:7754(para) ++msgid "" ++"Displayed as part of a message or other document, rather than attached as a " ++"separate file. Contrast with attachment." ++msgstr "" ++"显示为邮件或其它文档的一部分，而不是作为一个分离的单独的文件，与附" ++"件相对。" ++ ++#: C/evolution.xml:7758(glossterm) ++msgid "LDAP" ++msgstr "LDAP" ++ ++#: C/evolution.xml:7760(para) ++msgid "" ++"Lightweight Directory Access Protocol. Allows a client to search through a " ++"large database of addresses, phone numbers, and people stored on a server." ++msgstr "" ++"简便目录访问协议。允许一个客户端搜索存储在服务器上的地址、电话号码和人名数据" ++"库。" ++ ++#: C/evolution.xml:7764(glossterm) ++msgid "mail client" ++msgstr "邮件客户端" ++ ++#: C/evolution.xml:7766(para) ++msgid "" ++"The application with which a person reads and sends email. Its counterparts " ++"are the various types of mail servers, which handle user authentication and " ++"direct messages from the sender to the recipient." ++msgstr "" ++"用于阅读、发送电子邮件的应用程序。它的同伴是各种类型的邮件服务器，它们用于处" ++"理用户身份认证以及引导来自发信人的邮件到收信人。" ++ ++#: C/evolution.xml:7770(glossterm) ++msgid "POP" ++msgstr "POP" ++ ++#: C/evolution.xml:7772(para) ++msgid "" ++"Post Office Protocol. A mechanism for email transport. In contrast to IMAP, " ++"it is used only to get mail from a server and store it locally on your hard " ++"disk." ++msgstr "" ++"邮局协议。一种邮件传输机制。与IMAP协议相反，它用于从服务器获取邮件并下载保存" ++"到本地磁盘。" ++ ++#: C/evolution.xml:7776(glossterm) ++msgid "protocol" ++msgstr "协议" ++ ++#: C/evolution.xml:7778(para) ++msgid "" ++"An agreed-upon method of communication, especially one for sending " ++"particular types of information between computer systems. Examples include " ++"POP (Post Office Protocol), for email, and HTTP (HyperText Transfer " ++"Protocol) for Web pages." ++msgstr "" ++"一类用于传输(特别是在计算机之间发送特殊类型的信息)的公认的方式。例如电子邮件" ++"传输的POP(邮局协议)，网页传输的HTTP(超文本传输协议)。" ++ ++#: C/evolution.xml:7782(glossterm) ++msgid "public key encryption" ++msgstr "公用密钥加密" ++ ++#: C/evolution.xml:7784(para) ++msgid "" ++"A strong encryption method that uses a set of two keys, one of which is made " ++"public, and one of which is kept private. Data encrypted using the public " ++"key can only be decrypted using the private key. The longer the keys, the " ++"more difficult it is to break the encryption." ++msgstr "" ++"一种稳健的加密方式，使用两个密钥，一个是公有密钥，一个是私有密钥。使用公有密" ++"钥加密的数据只能被对应的私有密钥解密。密钥越长，破译难度越大。" ++ ++#: C/evolution.xml:7788(glossterm) ++msgid "regular expression" ++msgstr "常规表述" ++ ++#: C/evolution.xml:7790(para) ++msgid "" ++"A regular expression (regex) is a way of describing a string of text using " ++"metacharacters or wildcard symbols. For example, the statement fly.*so[au]p " ++"means any phrase beginning with fly and ending in " ++"soup or soap. If you searched for that " ++"expression, you'd find both fly in my soup and fly in " ++"my soap. For more information, enter man grep " ++"from the command line." ++msgstr "" ++"正则表达式是使用大字符集或通配符来描述字符串的一种形式。例如，表达式fly.*so" ++"[au]p表示以fly开头，soup或soap结" ++"尾的任何字符串。如果您根据该表达式搜索，会匹配到fly in my soup" ++"和fly in my soap。要了解更多信息，可以在命令行中输入" ++"man grep查看。" ++ ++#: C/evolution.xml:7794(glossterm) ++msgid "script" ++msgstr "脚本" ++ ++#: C/evolution.xml:7796(para) ++msgid "" ++"A program written in an interpreted (rather than compiled) language. Often " ++"used as a synonym for macro, to denote a series of prerecorded commands or " ++"actions within an application. Scripts are used to accomplish repetitive and " ++"tedious tasks, to save the user time." ++msgstr "" ++"使用解释性语言(而不是编译性语言)写的程序。它经常被用来执行宏的功能，用于运行" ++"程序中一系列预先录制的指令或操作。脚本用于完成重复性的乏味的操作，以节省用户" ++"时间。" ++ ++#: C/evolution.xml:7800(glossterm) ++msgid "search base" ++msgstr "搜索基础" ++ ++#: C/evolution.xml:7802(para) ++msgid "" ++"LDAP can break contact lists into many groups. The search base tells LDAP " ++"the top group to use. How much of the Search Base to search is set by the " ++"Search Scope option." ++msgstr "" ++"LDAP会把联系人列表分裂为好多个组。搜索基础会告诉LDAP要使用的顶层组。在“查找范" ++"围”选项中可以设置要从搜索基础往下查找多深。" ++ ++#: C/evolution.xml:7806(glossterm) ++msgid "search folder" ++msgstr "查找文件夹" ++ ++#: C/evolution.xml:7808(para) ++msgid "" ++"An email organization tool. Search folders allow you to create a folder that " ++"contains the results of a complex search. Search folder contents are updated " ++"dynamically." ++msgstr "" ++"一种邮件组织工具。搜索文件夹允许您创建包含一个复杂搜索结果的文件夹。搜索文件" ++"夹的内容会动态更新。" ++ ++#: C/evolution.xml:7812(glossterm) ++msgid "search scope" ++msgstr "查找范围" ++ ++#: C/evolution.xml:7814(para) ++msgid "Search Scope states how much of the search base to search." ++msgstr "查找访问描述从基础搜索的深度。" ++ ++#: C/evolution.xml:7818(glossterm) ++msgid "Sendmail" ++msgstr "Sendmail" ++ ++#: C/evolution.xml:7820(para) ++msgid "" ++"A program that sends mail. Evolution can use it instead of SMTP; some people " ++"prefer it because it offers more flexibility; however, it is more difficult " ++"to set up." ++msgstr "" ++"发送邮件的一种程序。Evolution可以使用它代替SMTP；有些人更喜欢使用它，因为它使" ++"用起来更灵活；然而也更难设置。" ++ ++#: C/evolution.xml:7824(glossterm) ++msgid "switcher" ++msgstr "切换器" ++ ++#: C/evolution.xml:7826(para) ++msgid "" ++"An area of Evolution that offers users fast access to the most frequently " ++"used features of the application." ++msgstr "Evolution的一个区域，让用户能快速访问一些常用的功能。" ++ ++#: C/evolution.xml:7830(glossterm) ++msgid "signature" ++msgstr "签名" ++ ++#: C/evolution.xml:7832(para) ++msgid "" ++"Text placed at the end of every email sent, similar to a hand-written " ++"signature at the bottom of a written letter. A signature can be anything " ++"from a favorite quotation to a link to a Web page; courtesy dictates that it " ++"be fewer than four lines long." ++msgstr "" ++"放置在发送的邮件的底部的文本，类似于在书信底部的手写签名。签名可以是一个喜爱" ++"的引文或是一个网页的链接等任何东西；签名最好不要超过四行。" ++ ++#: C/evolution.xml:7836(glossterm) ++msgid "SMTP" ++msgstr "SMTP" ++ ++#: C/evolution.xml:7838(para) ++msgid "" ++"Simple Mail Transfer Protocol. The most common way of transporting mail " ++"messages from your computer to the server." ++msgstr "" ++"简单邮件传输协议(Simple Mail Transfer Protocol)。将邮件从您的电脑传送到服务器" ++"最常规的 方式。" ++ ++#: C/evolution.xml:7842(glossterm) ++msgid "tooltip" ++msgstr "工具提示" ++ ++#: C/evolution.xml:7844(para) ++msgid "" ++"A small box of explanatory text that appears when the mouse pointer is held " ++"over a button or other interface element." ++msgstr "" ++"当鼠标指针移到一个按钮或其它界面元件上方是弹出来的一个含有解释文本的小框。" ++ ++#: C/evolution.xml:7848(glossterm) ++msgid "virus" ++msgstr "病毒" ++ ++#: C/evolution.xml:7850(para) ++msgid "" ++"A program that inserts itself into other files or programs. When executed, " ++"it spreads to more programs and other computers. A virus can cause " ++"substantial damage by clogging networks or disk drives, deleting files, or " ++"opening security holes." ++msgstr "" ++"一种嵌在其它文件或程序里面的小程序。当它执行时会传播给其它程序和计算机。病毒" ++"会通过堵塞网络或磁盘，删除文件，或开启安全漏洞而造成危害。" ++ ++#: C/evolution.xml:7854(glossterm) ++msgid "vCard" ++msgstr "vCard" ++ ++#: C/evolution.xml:7856(para) ++msgid "" ++"A file format for the exchange of contact information. When you get an " ++"address card attached to an email, it is probably in vCard format." ++msgstr "" ++"用于交换联系人信息的一种文件格式。当您得到附在邮件中的一个名片时，一般就是" ++"vCard格式的。" ++ ++#: C/evolution.xml:7862(title) ++msgid "Legal Notices" ++msgstr "法律声明" ++ ++#: C/evolution.xml:7864(member) ++#, fuzzy ++msgid "" ++"Novell, Inc. makes no representations or warranties with respect to the " ++"contents or use of this documentation, and specifically disclaims any " ++"express or implied warranties of merchantability or fitness for any " ++"particular purpose. Further, Novell, Inc. reserves the right to revise this " ++"publication and to make changes to its content, at any time, without " ++"obligation to notify any person or entity of such revisions or changes." ++msgstr "" ++"Novell公司不对该文档的内容和使用作任何保证，也不为任何用于特殊目的的可销性或" ++"适应性作任何保证。此外，Novell公司保留在任何时候修订该文档或修改该文档内容的" ++"权力，而无须有义务通知任何个人或集体关于该修订或修改的消息。" ++ ++#: C/evolution.xml:7865(member) ++#, fuzzy ++msgid "" ++"Further, Novell, Inc. makes no representations or warranties with respect to " ++"any software, and specifically disclaims any express or implied warranties " ++"of merchantability or fitness for any particular purpose. Further, Novell, " ++"Inc. reserves the right to make changes to any and all parts of Novell " ++"software, at any time, without any obligation to notify any person or entity " ++"of such changes." ++msgstr "" ++"Novell公司不对任何软件作保证，也不为任何用于特殊目的的可销性或适应性作任何保" ++"证。此外，Novell公司保留在任何时候修改Novell软件(全部或部分内容)的权力，而无" ++"须有义务通知任何个人或集体关于该修订或修改的消息。" ++ ++#: C/evolution.xml:7868(member) ++#, fuzzy ++msgid "" ++"You may not use, export, or re-export this product in violation of any " ++"applicable laws or regulations including, without limitation, U.S. export " ++"regulations or the laws of the country in which you reside." ++msgstr "" ++"您不应该在违反任何法律条文(美国法律条文或您所在的国家的法律条文)的情况下使" ++"用、分发或再次分发该产品。" ++ ++#: C/evolution.xml:7871(member) ++msgid "" ++"Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/" ++"or modify this document under the terms of the GNU Free Documentation " ++"License (GFDL), Version 1.2 or any later version, published by the Free " ++"Software Foundation with no Invariant Sections, no Front-Cover Texts, and no " ++"Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/" ++"licenses/fdl.html." ++msgstr "" ++"版权所有 2007 Novell, Inc。对于本文档的复制、分发和／或修改必须遵循自由软件基" ++"金会 (Free Software Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.2 或" ++"更高版本，该许可证没有固定的部分、没有封面和背页文本。您可以在http://www.fsf." ++"org/licenses/fdl.html 找到 GFDL 的副本。" ++ ++#: C/evolution.xml:7872(member) ++msgid "" ++"THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE " ++"TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING " ++"THAT:" ++msgstr "" ++"本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供，这表示具有" ++"以下含义：" ++ ++#: C/evolution.xml:7873(member) ++msgid "" ++"1. THE DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY " ++"KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES " ++"THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, " ++"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE " ++"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " ++"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " ++"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " ++"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " ++"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " ++"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " ++"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" ++msgstr "" ++"1.本文档按“原样”提供，不提供任何明示或暗示的保证，包括但不限于：文档或文档的" ++"修改版本没有适销性方面的缺陷、适合特定目的的适用性，以及没有侵权行为。您将自" ++"行承担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或" ++"文档修改版本存在缺陷，您(而不是最初的编写者、作者或撰写人)将承担所有必需的服" ++"务\"维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声" ++"明，那么您就没有权利使用任何文档或文档的修改版本；并且" ++ ++#: C/evolution.xml:7874(member) ++msgid "" ++"2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT " ++"(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL " ++"WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED " ++"VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE " ++"TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR " ++"CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, " ++"DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR " ++"MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR " ++"RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN " ++"IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." ++msgstr "" ++"2.无论在任何情况以及在任何法律理论下，本文档或文档修改版本的作者、最初的编写" ++"者、任何撰写人或任何分发者，或者任意这些方的任何提供者都不对任何人由于使用本" ++"文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损失" ++"承担任何民事(包括疏忽)、合同或其它方面的责任，这些损失包括但不限于信誉损失、" ++"工作停止、计算机失败或故障，或任何以及所有其它损失或由此引发的或与之相关的损" ++"失，即使这些方已被告知存在出现此类损失的可能性时也是如此。" ++ ++#: C/evolution.xml:7877(member) ++msgid "Novell, Inc." ++msgstr "Novell, Inc." ++ ++#: C/evolution.xml:7878(member) ++msgid "404 Wyman Street, Suite 500" ++msgstr "404 Wyman Street, Suite 500" ++ ++#: C/evolution.xml:7879(member) ++msgid "Waltham, MA 02451" ++msgstr "Waltham, MA 02451" ++ ++#: C/evolution.xml:7880(member) ++msgid "U.S.A." ++msgstr "U.S.A." ++ ++#: C/evolution.xml:7881(member) ++msgid "www.novell.com" ++msgstr "www.novell.com" ++ ++#: C/evolution.xml:7884(para) ++msgid "July 2007" ++msgstr "2007年7月" ++ ++#: C/evolution.xml:7886(member) ++msgid "" ++"To access the online documentation for this and other Novell products, and " ++"to get updates, see www.novell.com/documentation" ++msgstr "" ++"获取本产品或其他 Novell 产品的在线文档以及取得更新，参见 www.novell.com/ 文档" ++ ++#: C/evolution.xml:7889(member) ++msgid "Evolution is a trademark of Novell, Inc." ++msgstr "Evolution 是 Novell 公司的商标。" ++ ++#: C/evolution.xml:7890(member) ++msgid "" ++"GroupWise is a registered trademark of Novell, Inc. in the United States and " ++"other countries." ++msgstr "GroupWise 是 Novell 公司在美国及其他国家的注册商标。" ++ ++#: C/evolution.xml:7891(member) ++msgid "" ++"Novell is a registered trademark of Novell, Inc. in the United States and " ++"other countries." ++msgstr "Novell 是 Novell, Inc. 在美国及其他国家的注册商标。" ++ ++#: C/evolution.xml:7892(member) ++msgid "SUSE is a registered trademark of SUSE AG, a Novell company." ++msgstr "SUSE是 Novell 子公司 SUSE AG 的注册商标。" ++ ++#: C/evolution.xml:7893(member) ++msgid "" ++"Ximian is a registered trademark of Novell, Inc. in the United States and " ++"other countries." ++msgstr "Ximian 是 Novell, Inc. 在美国及其他国家的注册商标。" ++ ++#: C/evolution.xml:7896(member) ++msgid "All third-party trademarks are the property of their respective owners." ++msgstr "所有的第三方商标所有权归属于相应的所有者。" ++ ++#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 ++#: C/evolution.xml:0(None) ++msgid "translator-credits" ++msgstr "Zhang Miao , 2009" ++ ++#~ msgid "" ++#~ "@@image: 'figures/evo_identity_a.png'; " ++#~ "md5=51fef803bd3083b0b2c2583221d1c151" ++#~ msgstr "" ++#~ "@@image: 'figures/evo_identity_a.png'; " ++#~ "md5=51fef803bd3083b0b2c2583221d1c151" ++ ++#~ msgid "" ++#~ "@@image: 'figures/evo_receive_setup_a.png'; " ++#~ "md5=5add6d290b2df212516dda2463930759" ++#~ msgstr "" ++#~ "@@image: 'figures/evo_receive_setup_a.png'; " ++#~ "md5=5add6d290b2df212516dda2463930759" +-- +cgit v0.8.3.1 --- evolution-2.30.3.orig/debian/patches/12_remove_not_recommended_for_top_posting.patch +++ evolution-2.30.3/debian/patches/12_remove_not_recommended_for_top_posting.patch @@ -0,0 +1,19 @@ +Description: Remove the (Not Recommended) addition from the label of the Top + Posting Option in 'mail/mail-config.ui'. +Origin: Ubuntu +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=620255 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/588298 +Author: Sense Hofstede + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-config.ui evolution-2.30.2.new//mail/mail-config.ui +--- evolution-2.30.2//mail/mail-config.ui 2010-05-29 17:21:13.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-config.ui 2010-08-05 10:04:27.311128001 +0200 +@@ -4492,7 +4492,7 @@ + True + 0 + 0.47999998927116394 +- <b>Top Posting Option</b> (Not Recommended) ++ <b>Top Posting Option</b> + True + + --- evolution-2.30.3.orig/debian/patches/90_disable_deprecation_warning.patch +++ evolution-2.30.3/debian/patches/90_disable_deprecation_warning.patch @@ -0,0 +1,13 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//configure.ac evolution-2.30.3.new//configure.ac +--- evolution-2.30.3//configure.ac 2010-08-31 14:39:06.659586001 +0200 ++++ evolution-2.30.3.new//configure.ac 2010-08-31 14:39:43.635586000 +0200 +@@ -66,9 +66,6 @@ + AS_COMPILER_FLAGS(WARNING_FLAGS, + "-DG_DISABLE_DEPRECATED + -DPANGO_DISABLE_DEPRECATED +- -DGDK_PIXBUF_DISABLE_DEPRECATED +- -DGDK_DISABLE_DEPRECATED +- -DGTK_DISABLE_DEPRECATED + -DEDS_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES --- evolution-2.30.3.orig/debian/patches/03_lpi.patch +++ evolution-2.30.3/debian/patches/03_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//configure.ac evolution-2.30.1.2.new//configure.ac +--- evolution-2.30.1.2//configure.ac 2010-04-27 14:14:22.000000000 +0200 ++++ evolution-2.30.1.2.new//configure.ac 2010-05-17 18:44:05.946876294 +0200 +@@ -224,6 +224,7 @@ + libxml-2.0 >= libxml_minimum_version + shared-mime-info >= shared_mime_info_minimum_version + gnome-desktop-2.0 >= gnome_desktop_minimum_version ++ launchpad-integration + unique-1.0 >= unique_minimum_version]) + AC_SUBST(GNOME_PLATFORM_CFLAGS) + AC_SUBST(GNOME_PLATFORM_LIBS) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//shell/e-shell-window-actions.c evolution-2.30.1.2.new//shell/e-shell-window-actions.c +--- evolution-2.30.1.2//shell/e-shell-window-actions.c 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.1.2.new//shell/e-shell-window-actions.c 2010-05-17 18:41:56.661879314 +0200 +@@ -30,6 +30,8 @@ + + #include + ++#include ++ + #define EVOLUTION_COPYRIGHT \ + "Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others" + +@@ -1891,6 +1893,9 @@ + e_ui_manager_add_ui_from_file ( + E_UI_MANAGER (ui_manager), "evolution-shell.ui"); + ++ /* LPI */ ++ launchpad_integration_add_ui (ui_manager, "/main-menu/help-menu/launchpad-items"); ++ + /* Shell Actions */ + action_group = ACTION_GROUP (SHELL); + gtk_action_group_add_actions ( +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//ui/evolution-shell.ui evolution-2.30.1.2.new//ui/evolution-shell.ui +--- evolution-2.30.1.2//ui/evolution-shell.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.1.2.new//ui/evolution-shell.ui 2010-05-17 18:41:56.661879314 +0200 +@@ -85,6 +85,8 @@ + + + ++ ++ + + + --- evolution-2.30.3.orig/debian/patches/89_remove_quit_button.patch +++ evolution-2.30.3/debian/patches/89_remove_quit_button.patch @@ -0,0 +1,17 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c 2010-07-13 14:05:55.091172002 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c 2010-07-13 14:09:35.111172001 +0200 +@@ -1447,13 +1447,6 @@ + N_("Converts a meeting to an appointment"), + G_CALLBACK (action_event_schedule_appointment_cb) }, + +- { "quit-calendar", +- GTK_STOCK_CLOSE, +- N_("Quit"), +- NULL, +- NULL, /* XXX Add a tooltip! */ +- G_CALLBACK (quit_calendar_cb) }, +- + /*** Menus ***/ + + { "calendar-actions-menu", --- evolution-2.30.3.orig/debian/patches/91_git_fix_e_shell_ref_counting.patch +++ evolution-2.30.3/debian/patches/91_git_fix_e_shell_ref_counting.patch @@ -0,0 +1,30 @@ +From b1ec17309b2aafb9b8aa2e1e39be9748fbe89030 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes +Date: Sun, 20 Jun 2010 20:34:45 +0000 +Subject: Bug 621759 - EShellSearchbar reference counting errors + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell-content.c evolution-2.30.3.new//shell/e-shell-content.c +--- evolution-2.30.3//shell/e-shell-content.c 2010-09-18 19:45:26.277878001 +0200 ++++ evolution-2.30.3.new//shell/e-shell-content.c 2010-09-18 19:49:53.437878000 +0200 +@@ -257,8 +257,7 @@ + + priv = E_SHELL_CONTENT_GET_PRIVATE (container); + +- if (include_internals && priv->searchbar != NULL && +- container == GTK_CONTAINER (priv->searchbar->parent)) ++ if (priv->searchbar != NULL) + callback (priv->searchbar, callback_data); + + /* Chain up to parent's forall() method. */ +@@ -344,10 +343,8 @@ + { + g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); + +- if (searchbar != NULL) { ++ if (searchbar != NULL) + g_return_if_fail (GTK_IS_WIDGET (searchbar)); +- g_object_ref_sink (searchbar); +- } + + if (shell_content->priv->searchbar != NULL) + gtk_container_remove ( --- evolution-2.30.3.orig/debian/patches/10_desktop_shortcuts.patch +++ evolution-2.30.3/debian/patches/10_desktop_shortcuts.patch @@ -0,0 +1,20 @@ +=== modified file 'data/evolution.desktop.in.in' +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//data/evolution.desktop.in.in evolution-2.30.1.2.new//data/evolution.desktop.in.in +--- evolution-2.30.1.2//data/evolution.desktop.in.in 2010-03-18 15:13:59.000000000 +0100 ++++ evolution-2.30.1.2.new//data/evolution.desktop.in.in 2010-05-17 16:10:48.697947411 +0200 +@@ -15,3 +15,15 @@ + X-GNOME-Bugzilla-Version=@BASE_VERSION@.x + X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory + MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822; ++X-Ayatana-Desktop-Shortcuts=Compose;Contacts ++ ++[Compose Shortcut Group] ++_Name=Compose New Message ++Exec=evolution mailto: ++OnlyShowIn=Messaging Menu ++ ++[Contacts Shortcut Group] ++_Name=Contacts ++Exec=evolution -c contacts ++OnlyShowIn=Messaging Menu ++ --- evolution-2.30.3.orig/debian/patches/89_remove_component_id_registration.patch +++ evolution-2.30.3/debian/patches/89_remove_component_id_registration.patch @@ -0,0 +1,22 @@ +Description: ignore component_id key in gconf. With UNE, we use the express + mode, and so, specify -c in desktop file to launch the right one, + but when you start evolution from various places like the indicator-messages, + the evolution (complete version) desktop entry, you can get calendar or + contact where you expect email, and you can't switch it back easily. +Author: Didier Roche +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/642244 + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//shell/e-shell.c evolution-2.30.3.new//shell/e-shell.c +--- evolution-2.30.3//shell/e-shell.c 2010-09-18 21:09:45.358454001 +0200 ++++ evolution-2.30.3.new//shell/e-shell.c 2010-09-18 21:10:19.754454002 +0200 +@@ -1399,6 +1399,10 @@ + + view_name = e_shell_get_canonical_name (shell, view_name); + ++ // set default view_name ++ if (view_name == NULL) ++ view_name = "mail"; ++ + /* EShellWindow initializes its active view from a GConf key, + * so set the key ahead of time to control the intial view. */ + if (view_name != NULL) { --- evolution-2.30.3.orig/debian/patches/09_add_ubuntuone_email.patch +++ evolution-2.30.3/debian/patches/09_add_ubuntuone_email.patch @@ -0,0 +1,170 @@ +=== modified file 'mail/default/C/Inbox' +--- mail/default/C/Inbox 2010-05-21 18:48:41 +0000 ++++ mail/default/C/Inbox 2010-08-23 12:49:22 +0000 +@@ -311,3 +311,165 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Subject: Bring your digital life together with Ubuntu One! ++From: "The Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Content-Type: multipart/related; type="multipart/alternative"; boundary="=-XU1pjbwfivhq1l/X2rI7" ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++Mime-Version: 1.0 ++X-Mailer: Evolution 2.30.2 ++X-Evolution-Source: imap://ubuntuone-support@mail.canonical.com/ ++ ++ ++--=-XU1pjbwfivhq1l/X2rI7 ++Content-Type: multipart/alternative; boundary="=-8ErHXLoZh99uv2mY1ioK" ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK ++Content-Type: text/plain; charset="UTF-8" ++Content-Transfer-Encoding: 8bit ++ ++ ++ ++Evolution is better with Ubuntu One - the personal cloud that brings ++your digital life together. ++ ++ Ubuntu One does more than sync your files - whether you need to ++ access your contacts, notes or bookmarks from any computer or ++ the web, enjoy your favorite music from a cloud integrated store ++ or stream your entire collection to iPhone and Android mobile ++ phones - we've raised the bar on personal clouds. Learn more at ++ http://one.ubuntu.com/. ++ ++ ++Already have an Ubuntu One account? ++ ++ Add your computer to your account by launching the Ubuntu One ++ Preferences. ++ ++ All contacts in the "Ubuntu One" address book are automatically ++ synced with your personal cloud. Conveniently view and modify ++ contact information ++ in Evolution or the Ubuntu One website. Ubuntu One will even ++ keep your Evolution contacts in sync with your mobile phone. ++ ++ For information about copying or moving your contacts into the ++ Ubuntu One address book, review our online tutorials and FAQs. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++ ++Need help or found a bug? Review the Ubuntu One support options. ++ ++ https://one.ubuntu.com/support/ ++ ++ ++Thank you. ++ ++The Ubuntu One Team ++http://one.ubuntu.com/ ++ ++ ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK ++Content-Type: text/html; charset="utf-8" ++Content-Transfer-Encoding: 8bit ++ ++ ++ ++ ++ ++ ++ ++ ++
++
++Evolution is better with Ubuntu One - the personal cloud that brings your digital life together.
++
++
++ Ubuntu One does more than sync your files - whether you need to access your contacts, notes or bookmarks from any computer or the web, enjoy your favorite music from a cloud integrated store or stream your entire collection to iPhone and Android mobile phones - we've raised the bar on personal clouds. Learn more at http://one.ubuntu.com/.
++
++
++Already have an Ubuntu One account?
++
++ Add your computer to your account by launching the Ubuntu One Preferences.
++
++ All contacts in the "Ubuntu One" address book are automatically synced with your personal cloud. Conveniently view and modify contact information
++ in Evolution or the Ubuntu One website. Ubuntu One will even keep your Evolution contacts in sync with your mobile phone.
++
++ For information about copying or moving your contacts into the Ubuntu One address book, review our online tutorials and FAQs.
++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/
++ https://wiki.ubuntu.com/UbuntuOne/FAQ/
++
++
++Need help or found a bug? Review the Ubuntu One support options.
++
++ https://one.ubuntu.com/support/
++
++
++Thank you.
++
++The Ubuntu One Team
++http://one.ubuntu.com/
++
++
++
++ ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK-- ++ ++--=-XU1pjbwfivhq1l/X2rI7 ++Content-ID: <1281549841.4672.17.camel@ubuntu> ++Content-Disposition: attachment; filename="h1-ubuntuone-logo.png" ++Content-Type: image/png; name="h1-ubuntuone-logo.png" ++Content-Transfer-Encoding: base64 ++ ++iVBORw0KGgoAAAANSUhEUgAAAHUAAAA1CAYAAAB/XKTQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ ++bWFnZVJlYWR5ccllPAAAB/VJREFUeNrsXD1sI0UUnjVpciDFQTqgAJ1DS5GNKCjPlo46tpSDUKDY ++EhISTZLq6OIUIKicXHdIkZ0uOk6KU1EQyXuioQDZV1BQXLJIUFykS3wN6TDvOW9hPJ6ZnbG9ti+7 ++T3qyvTsz+/Z9837mzXqdTqfDEpoc7e3tvQ8fPwK/btgltH0qUevEaZ54ZO1TjuOwKPidt15NA5eB ++G/gZ1XWmmeG+88CHwFXgjKwNR98Ao9t8CvyucOycviM9oM9zrs0533cmwhlYBc7T9+zbb96Y+/PZ ++35txMT+43yx8HHKH8nBsAXTQVnS5IJf6EPge8K/Ad+kYgvwL8DHw54L7xXMfAp9Qm7tRut98yO/r ++TlnhdxrY1bT/loA9JqACN/uQrPGYgBPphM4/mERMzcQM1NuW7e8RiHcIqAs6jpb5ER0TY+kd6ofn ++vwwOzrCEJk0XxPMUG48JoAuy2KfU7jtyyfN0rkPtjrl+32N27EQYU/rWShBPnLggBfffkLjgHOjA ++i/rayZLmGtIMN7NcCuY+zCY/ZBb+F/QHmXmUGQbUhjFaA/RtaTLJoeUUZGQmeqF+mBCuKZKiCpxH ++mXGcfZVMw2Lh0IkKfGwESiY30VIMgglPky6K5EHbnIn7BapRFpwWFQa8C+PshNwALpOKA8pZg7al ++kPFROVuaTB3l3IZxapr+TZtCgjgxYQzEocIdKkCbugbQBjeBUBe5FJ3YEFLvLY0gRQGULN2MCRUl ++gAaZMc7iBsmjAqkoyLluca2iTk44VyRA8iEZfBXaNhVyupZOS7YiEHW/HrJsdIXrZ1MKQdKWwtm2 ++163tqhYK0C2TFk3lJJdZtZDTFQoLAdXJWkxoR+Fl0iHr3bD7dyeVKHnEspiYJyUPSzYTrTLIBCTr ++5rN7zA+WKMuXxUsMFw5xZNW1cYOKMxNLZTmKwwsUZ5mFyxn10qOomPEISgGBwDiqmIDrbApp3MWH ++Ap/NUZJQoniZFawgHZbdRlj5EZM/D+SpS5Igd4xyTqWlepr0fFcRX8dBGRN5KP7VR5AcXStQ/ZAY ++OylluRIA64q2TyJMEl9KUP9QnSD3NSkXlh71pJgGUKclHvgsodGAalOi06z/InGDCeiDrTBSmiKA ++jbtqDzMZKPvVjqlIsmxdX+slAMWX6EcVIuZkektpBsoqBs8qMsOw5EcHQNEQAHHypBVyZhRyTjrU ++pAcBlalLl3kdqDIFVngL4orHprNfFC5DxWoRAFeyiG8rdjA8QzkPDfuOO0dwB/QmFbFuTZsbGYne ++WkHx4UiCOg5yCp097rdsph0phNuXWCAKt0jngjViRTKuakkRhZzjzPaXOTkz5D1qEr1tSCwcNxFa ++5K1U99jVm8Mh3xwgRuEFlE/IKXb/hx3zlNk/74RWsyQb0+YJDWhbZv27KLgVV5a0FbfQVNTXfwi9 ++4T36fKJUslzeBPuZuj6FAZZMpRGPiW0LFvG0PeA5ZuhtRLqtuEfbpG4zSCZTQrKTMxzMZ5oNaiEx ++WTKMZ8EkqYeMGcjpj0hOzyL2eqbgkYJNdmJ2FXrLWeitwLtxlZvBuLVMbi7DKQj5sWrnX0eUpS5L ++XHyb4l3dNjulHZbbw8jJPe3g0oTWegq6ZpDY7YZdg+57jeRzSbbQR1oUekvTOK1h9JZQQgkllFBC ++CZmRk6jgijqPrp7EExb1mMx4zordZkJnlQXlVDEp9JwD+8rWJXtDJlt3vFl25iWg9oOJyqqGFDRQ ++cZsAbssAzC1JRUjM9ncB3LIBmFkaLxsy3jaAu5OAegVokZk/GtpdO6qAJUAbzLwqhxOlAOC2FYDa ++yIZUA2BLPcWHGFuoKXVBg34qiz5kdmXWwApVFlq1vKUi9CvH2lIBHFkNGa0GK0RYjMeNB9nWVg2s ++tSRYaXEAEALKiXEWwJHJ5pNsL9jVPmpeETIWUjG2UlEh3WeSETDgMjDWX5dYf723CP3FhGVZ4a5L ++ABgaDv6nVFVbXxMAzStkWwL3uglcxk+STVaiXI+r+5WBgIlQj9IpfsrqtyavPsB4WeuOA3GTvsvG ++cg1kKwCQPbLRb9lEyccVVFGRPgCoWmrIrGGRc70yF+jLli4EbDtEFjHTbQGA0iUVASteJzOTgKoE ++LrDWNrhbT1A2318KqubaLWb3pycXXLLVG8ziaqliTHwx0Ri/Otpnh5PXA0znJBuGdpK3s1zR3BTL ++1mZmDy48RrcPcbYWV1DFGJm1TawilM0X4mobgMol7tdMcT2gqSpFVEpMS6wiKhKtMkMVpgTUEJI9 ++LnooFhUI6IrC0scpWxWAlU46OL4BfIEZMnCVQEVcb7L/X0r5Aet9Bd4XwD/Q9/vEAf0E/Cl9P6G+ ++fCh4DfgGu3o5118G4yPhUu4r7je+Q7HA/X4GfIu+vwL8D/Bz7nzY+F/DMqVTl1krcBOALBMjmE2J ++ldJWXIFk0xGvH6QnJqDWJWtZBLQJoFWw4oSWi3Ve4AbrfW4avUqsX2OH1Z1DifK2DPpFRrNsoX3J ++TksS2YK36IRt68V3SeOsfIYWsWPZrRS2p6qIi32K18X4WfYzyrY94ESN9zoVANpkZg+Ho9JxL7XW ++N8aB9C0zRxYxs+UcPPf7LfasTLKZZNrYpgBWXou7+w2ABav4rd559F7woqlFcnWoKNyCqzsrN8Hy ++fmea19bjjsk6ue993SMrzkGn1lnt7ngu0zW21a74DGT7uH7JGlladt3iljtBBk6PtGAe8Un3wL8C ++DACPohGRcjh+EgAAAABJRU5ErkJggg== ++ ++ ++--=-XU1pjbwfivhq1l/X2rI7-- + --- evolution-2.30.3.orig/debian/patches/02_fix_missing_include_for_composer.patch +++ evolution-2.30.3/debian/patches/02_fix_missing_include_for_composer.patch @@ -0,0 +1,10 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//capplet/Makefile.am evolution-2.30.3.new//capplet/Makefile.am +--- evolution-2.30.3//capplet/Makefile.am 2010-03-31 17:39:57.000000000 +0200 ++++ evolution-2.30.3.new//capplet/Makefile.am 2010-08-31 13:50:58.963586000 +0200 +@@ -54,5 +54,6 @@ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ + $(top_builddir)/shell/libeshell.la \ ++ $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/e-util/libeutil.la + --- evolution-2.30.3.orig/debian/patches/92_dateformat_ad_uses_weekdays.patch +++ evolution-2.30.3/debian/patches/92_dateformat_ad_uses_weekdays.patch @@ -0,0 +1,39 @@ +--- evolution-2.30.3/e-util/e-datetime-format.c.orig 2010-09-30 15:14:38.509051004 +0200 ++++ evolution-2.30.3/e-util/e-datetime-format.c 2010-09-30 15:56:53.419051003 +0200 +@@ -208,8 +208,35 @@ + } else { + if (future) + res = g_strdup_printf (_("%d days from now"), diff); +- else ++ else if (diff > 7) + res = g_strdup_printf (_("%d days ago"), diff); ++ else { ++ switch(g_date_get_weekday(&val)) { ++ case G_DATE_MONDAY: ++ res = g_strdup_printf (_("Mon"), diff); ++ break; ++ case G_DATE_TUESDAY: ++ res = g_strdup_printf (_("Tue"), diff); ++ break; ++ case G_DATE_WEDNESDAY: ++ res = g_strdup_printf (_("Wed"), diff); ++ break; ++ case G_DATE_THURSDAY: ++ res = g_strdup_printf (_("Thu"), diff); ++ break; ++ case G_DATE_FRIDAY: ++ res = g_strdup_printf (_("Fri"), diff); ++ break; ++ case G_DATE_SATURDAY: ++ res = g_strdup_printf (_("Sat"), diff); ++ break; ++ case G_DATE_SUNDAY: ++ res = g_strdup_printf (_("Sun"), diff); ++ break; ++ default: ++ res = g_strdup_printf (_("Unknown"), diff); ++ } ++ } + } + } + --- evolution-2.30.3.orig/debian/patches/61_translate_menu_entry.patch +++ evolution-2.30.3/debian/patches/61_translate_menu_entry.patch @@ -0,0 +1,8 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.21.2/po/POTFILES.in evolution-2.21.2.new/po/POTFILES.in +--- evolution-2.30.2/po/POTFILES.in 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.2/po/POTFILES.in.ubuntu 2010-08-26 16:29:39.000000000 +0200 +@@ -521,3 +521,4 @@ + widgets/table/gal-a11y-e-table-column-header.c + widgets/text/e-text.c + debian/signature.py ++debian/evolution-mail.desktop.in --- evolution-2.30.3.orig/debian/patches/11_remove_upstream_submit_bugreport.patch +++ evolution-2.30.3/debian/patches/11_remove_upstream_submit_bugreport.patch @@ -0,0 +1,17 @@ +Description: Don't show upstream report a bug as we already have the launchpad + one +Origin: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/105093 +Author: Bilal Akhtar + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2/ui/evolution-shell.ui evolution-2.30.2.new/ui/evolution-shell.ui +--- evolution-2.30.2/ui/evolution-shell.ui 2010-08-04 22:59:32.124414573 +0530 ++++ evolution-2.30.2.new/ui/evolution-shell.ui 2010-08-04 22:59:34.055415853 +0530 +@@ -85,7 +85,6 @@ + + + +- + + + --- evolution-2.30.3.orig/debian/patches/91_add_u1_email_translations.patch +++ evolution-2.30.3/debian/patches/91_add_u1_email_translations.patch @@ -0,0 +1,1644 @@ +=== modified file 'configure.ac' +--- configure.ac 2010-09-01 19:56:03 +0000 ++++ configure.ac 2010-09-21 09:18:39 +0000 +@@ -1706,26 +1706,43 @@ + mail/Makefile + mail/default/Makefile + mail/default/C/Makefile ++mail/default/af/Makefile ++mail/default/ast/Makefile ++mail/default/bg/Makefile + mail/default/ca/Makefile + mail/default/cs/Makefile ++mail/default/cy/Makefile + mail/default/de/Makefile + mail/default/es/Makefile + mail/default/fi/Makefile + mail/default/fr/Makefile ++mail/default/gl/Makefile ++mail/default/gu/Makefile ++mail/default/he/Makefile ++mail/default/hr/Makefile + mail/default/hu/Makefile ++mail/default/id/Makefile + mail/default/it/Makefile + mail/default/ja/Makefile + mail/default/ko/Makefile + mail/default/lt/Makefile + mail/default/mk/Makefile ++mail/default/nb/Makefile + mail/default/nl/Makefile + mail/default/pl/Makefile + mail/default/pt/Makefile ++mail/default/pt_BR/Makefile ++mail/default/pt_PT/Makefile + mail/default/ro/Makefile ++mail/default/ru/Makefile ++mail/default/sk/Makefile ++mail/default/sl/Makefile + mail/default/sr/Makefile + mail/default/sr@latin/Makefile + mail/default/sv/Makefile ++mail/default/ug/Makefile + mail/default/zh_CN/Makefile ++mail/default/zh_TW/Makefile + mail/importers/Makefile + modules/Makefile + modules/addressbook/Makefile + +=== modified file 'mail/default/Makefile.am' +--- mail/default/Makefile.am 2010-05-17 13:54:05 +0000 ++++ mail/default/Makefile.am 2010-09-21 09:19:53 +0000 +@@ -1,5 +1,5 @@ + +-SUBDIRS=C ca cs zh_CN de es fi fr hu it ja ko lt mk nl pl pt ro sr sr@latin sv ++SUBDIRS=C af ast bg ca cs cy zh_CN de es fi fr gl gu he hr hu id it ja ko lt mk nb nl pl pt pt_BR pt_PT ro ru sk sl sr sr@latin sv ug zh_TW + + + + +=== added directory 'mail/default/af' +=== added file 'mail/default/af/Inbox' +--- mail/default/af/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/af/Inbox 2010-09-21 09:15:25 +0000 +@@ -0,0 +1,42 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Die 'Ubuntu One' Span ++To: ubuntuone-support@canonical.com ++Subject: Hou jou digitale lewe netjies met 'Ubuntu One'! ++ ++ ++Nie alleenlik sal jou dokumente, fotos, musiek, en notas gesinkroniseered ++oor al jou kompers bly nie, maar met jou persoonlike digitale wolk sal al ++jou 'Evolution' kontakte ook. ++ ++Leer meer omtrent 'Ubuntu One' by http://one.ubuntu.com/. ++ ++ ++Het jy alreeds 'n 'Ubuntu One' rekening? Voeg jou komper by jou rekening ++deur die 'Ubuntu One' beheer paneel. ++ ++Al jou kontakte in jou 'Ubuntu One' adres boek is outomaties gesinkroniseered ++met jou persoonlike wolk. Kyk en modifiseer kontak informasie gerieflik in ++'Evolution' of die 'Ubuntu One' webwerf. 'Ubuntu One' sal selfs jou 'Evoution' ++kontakte gesinkroniseered hou met jou mobiele foon. ++ ++ ++Vir informasie omtrent kopieering of beweeging van jou kontakte binne-in die ++'Ubuntu One' adres boek, hersien ons aanlyn studieklasse en 'faqs'. ++ ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Benodig jy hulp of het jy 'n 'bug' gevind? Hersien die 'Ubuntu One' ondersteuning opsies. ++ ++https://one.ubuntu.com/support/ ++ ++Baie Dankie. ++ ++Die 'Ubuntu One' span. ++http://one.ubuntu.com/ + +=== added file 'mail/default/af/Makefile.am' +--- mail/default/af/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/af/Makefile.am 2010-09-21 09:15:25 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/af/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/ast' +=== added file 'mail/default/ast/Inbox' +--- mail/default/ast/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/ast/Inbox 2010-09-21 09:15:26 +0000 +@@ -0,0 +1,42 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: L'equipu d'Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Subject: Compaxina la to vida dixital con Ubuntu One. ++ ++Evolution ye meyor con Ubuntu One - la ñube personal pa la to vida ++dixital. ++ ++Ubuntu One fai más que sincronizar los tos ficheros - si necesites acceder ++a tos tos contautos, notes o marcadores dende cualesquier equipu o la web, esfrutar ++de la to música favorita dende una tienda integrada na ñube o esparder tola ++coleición d'iPhone y Android - tamos acabante xubir el llistón de les ++ñubes personales. Tienes más información en http://one.ubuntu.com/. ++ ++¿Tienes yá una cuenta de Ubuntu One? ++Amiesta'l to equipu a la to cuenta, llanzando'l panel de control d'Ubuntu One. ++ ++ Tolos contautos de la llibreta de direiciones d'«Ubuntu One» sincronícense ++automáticamente cola to ñube personal. Puedes ver y camudar la información de ++contautos n'Evolution o'l sitiu web d'Ubuntu One. Ubuntu One va caltener siempres los ++tos contautos d'Evolution sincronizaos col to teléfonu móvil. ++ ++ Pa tener información tocante a copiar o mover los tos contautos a la ++llibreta de direiciones d'Ubuntu One, revisa los nuesos tutoriales en llinia y les ++entrugues más frecuentes (n'inglés). ++ ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++¿Necesites aida o atopasti dalgún fallu? Revisa les opciones de sofitu d'Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Gracies. ++ ++L'equipu d'Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/ast/Makefile.am' +--- mail/default/ast/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/ast/Makefile.am 2010-09-21 09:15:25 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/ast/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/bg' +=== added file 'mail/default/bg/Inbox' +--- mail/default/bg/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/bg/Inbox 2010-09-21 09:15:26 +0000 +@@ -0,0 +1,38 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: The Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Subject: Дръжте цифровия си живот организиран с Ubuntu One! ++ ++Не само вашите документи, снимки, музика и бележки ще бъдат синхронизирани ++с всичките ви компютри и вашия личен облак, но също така и всички ваши ++Evolution контакти. ++ ++Научете повече за Ubuntu One на http://one.ubuntu.com/. ++ ++Вече имате Ubuntu One регистрация? Добавете вашия компютър към вашата ++регистрация като стартирате Ubuntu One Control Panel. ++ ++Всички контакти в адресната книга на “Ubuntu One” автоматично се синхронизират ++с вашия личен облак. Удобно преглеждайте и променяйте контактите си ++в Evolution или на уеб сайта на Ubuntu One. Ubuntu One дори автоматично ++ще поддържа вашите Evolution контакти синхронизирани с мобилния ви телефон. ++ ++За информация относно копиране или местене на вашите контакти в ++адресната книга на Ubuntu One, прегледайте нашите онлайн ръководства и FAQs. ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Имате нужда от помощ, или сте открили бъг? Прегледайте опциите за поддръжка на Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Благодарим ви. ++ ++Екипът на Ubuntu One ++http://one.ubuntu.com/ ++ + +=== added file 'mail/default/bg/Makefile.am' +--- mail/default/bg/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/bg/Makefile.am 2010-09-21 09:15:26 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/bg/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/ca/Inbox' +--- mail/default/ca/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/ca/Inbox 2010-09-21 09:15:26 +0000 +@@ -315,3 +315,54 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: L'Equip de l'Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Compagineu la vostra vida digital amb l'Ubuntu One! ++ ++L'Evolution és millor amb l'Ubuntu One - el núvol personal que us ++permet compaginar la vostra vida digital. ++ ++L'Ubuntu One fa més que sincronitzar els vostres fitxers - ja us calgui ++accedir als vostres contactes, notes o adreces d'interès des de ++qualsevol ordinador o des de la xarxa, gaudir de la vostra música ++preferida des d'una botiga integrada al núvol, o difondre tota la vostra ++col·lecció a l'iPhone o a l'Android - hem elevat el llistó dels núvols ++personals. Podeu obtenir-ne més informació a http://one.ubuntu.com/. ++ ++Ja teniu un compte de l'Ubuntu? ++Afegiu el vostre ordinador al vostre compte en iniciar el Tauler de ++control de l'Ubuntu One. ++ ++ Tots els contactes de la llibreta d'adreces «Ubuntu One» se ++sincronitzen automàticament amb el vostre núvol personal. Podeu ++visualitzar i modificar de manera convenient la informació dels ++contactes a l'Evolution o al lloc web de l'Ubuntu One. L'Ubuntu One ++fins i tot mantindrà els vostres contactes de l'Evolution sincronitzats ++amb el vostre telèfon mòbil. ++ ++ Per obtenir més informació sobre com copiar o traslladar els ++vostres contactes a la llibreta d'adreces de l'Ubuntu One, consulteu ++els nostres programes d'aprenentatge en línia i les nostres preguntes ++més freqüents (en anglès): ++ ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Si us cal ajuda o bé heu trobat un problema podeu consultar les ++opcions d'assistència de l'Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Moltes gràcies. ++ ++L'equip de l'Ubuntu One ++http://one.ubuntu.com/ + +=== added directory 'mail/default/cy' +=== added file 'mail/default/cy/Inbox' +--- mail/default/cy/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/cy/Inbox 2010-09-21 09:15:27 +0000 +@@ -0,0 +1,40 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Y Tîm Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Cadwch eich bywyd digidol yn drefnu gydag Ubuntu One! ++ ++Nid yn unig y bydd eich dogfennau, lluniau, cerddoriaeth, a nodiadau ++aros yn sync ar draws pob un o'ch cyfrifiaduron a gyda'ch cloud ++personol, ond bydd eich holl gysylltiadau Evolution yn ogystal. ++ ++Dysgwch fwy am Ubuntu One ar http://one.ubuntu.com/. ++ ++Oes cyfrif Ubuntu One'n barod? Ychwanegwch eich cyfrifiadur i'ch cyfrif ++trwy lansio'r Panel Rheoli Ubuntu One. ++ ++Mae'r holl gysylltiadau yn y llyfr cyfeiriadau Ubuntu One yn cael eu ++cydamseru'n awtomatig gyda'ch cloud personol. Gweld ac addasu ++gwybodaeth gyswllt yn gyfleus yn Evolution neu'r wefan Ubuntu One. ++Bydd Ubuntu One hyd yn oed yn cydamseru'ch cysylltiadau Evolution i'ch ++ffôn symudol. ++ ++Am fwy o wybodaeth am gopïo neu symud eich cysylltiadau i mewn i'r ++llyfr cyfeiriadau, adolygu ein sesiynau tiwtorial ar-lein a ++chwestiynau cyffredin. ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Oes angen help neu wedi dod o hyd i “bug”? Adolygu'r opsiynau cefnogi ++Ubuntu One. https://one.ubuntu.com/support/ ++ ++Diolch yn fawr. ++ ++Y Tîm Ubuntu One ++http://one.ubuntu.com/ ++ + +=== added file 'mail/default/cy/Makefile.am' +--- mail/default/cy/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/cy/Makefile.am 2010-09-21 09:15:26 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/cy/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/de/Inbox' +--- mail/default/de/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/de/Inbox 2010-09-21 09:15:27 +0000 +@@ -335,3 +335,53 @@ + CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII= + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Das »Ubuntu One«-Team ++To: ubuntuone-support@canonical.com ++Subject: Führen Sie Ihr digitales Leben zusammen – mit Ubuntu One! ++ ++Evolution ist besser mit Ubuntu One – der persönlichen Cloud, die Ihr ++digitales Leben zusammenhält. ++ ++Ubuntu One macht mehr als nur ihre Dateien zu synchronisieren – egal, ++ob Sie von irgendeinem Rechner oder vom Web aus auf Ihre Kontakte, ++Notizen oder Lesezeichen zugreifen wollen, ob Sie aus dem in die ++Cloud integrierten Laden Ihre Lieblingsmusik anhören möchten oder ++ob Sie Ihre gesamte Sammlung auf Ihr iPhone oder Android-Mobiltelefon ++streamen wollen – wir setzen neue Standards bei persönlichen Clouds. ++Erfahren Sie mehr unter http://one.ubuntu.com/. ++ ++Haben sie bereits ein »Ubuntu One«-Konto? ++Dann rufen Sie die »Ubuntu One«-Einstellungen auf und fügen Sie Ihren ++Rechner hinzu. ++ ++ Alle Kontakte im Adressbuch »Ubuntu One« werden automatisch mit ++ihrer persönlichen Cloud synchronisiert. Sie können die Informationen ++zu Ihren Kontakte in Evolution oder auf der »Ubuntu One«-Website bequem ++aufrufen und ändern. Ubuntu One hält sogar Ihre Evolution-Kontakte mit ++Ihrem Mobiltelefon synchron. ++ ++ Für weiterführende Informationen dazu, wie Sie Ihre Kontakte ++ins »Ubuntu One«-Adressbuch kopieren oder verschieben können, lesen Sie ++unsere (englischen) Online-Anleitungen und die Antworten auf gängige ++Fragen (FAQ). ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Benötigen Sie Hilfe oder haben Sie einen Fehler gefunden? Unter ++https://one.ubuntu.com/support/ finden Sie Unterstützung bei ++Problemen. ++ ++Vielen Dank! ++ ++Das »Ubuntu One«-Team ++http://one.ubuntu.com/ + +=== modified file 'mail/default/es/Inbox' +--- mail/default/es/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/es/Inbox 2010-09-21 09:15:27 +0000 +@@ -315,3 +315,48 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: El equipo de Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Subject: Lleve su vida digital con Ubuntu One. ++ ++Evolution es mejor con Ubuntu One - la nube personal para su ++vida digital. ++ ++Ubuntu One hace más que sincronizar sus archivos - si necesita acceder ++a sus contactos, notas o marcadores desde cualquier equipo o la web, disfrutar ++de su música favorita desde una tienda integrada en la nube o difundir toda ++su colección de iPhone y Android - hemos elevado el listón de las ++nubes personales. Tiene más información en http://one.ubuntu.com/. ++ ++¿Ya tiene una cuenta de Ubuntu One? ++Añada su equipo a su cuenta, lanzando el panel de control de Ubuntu One. ++ ++ Todos los contactos de la libreta de direcciones de «Ubuntu One» se sincronizan ++automáticamente con su nube personal. Puede ver y modificar la información de ++contactos en Evolution o el sitio web de Ubuntu One. Ubuntu One mantendrá siempre sus ++contactos de Evolution sincronizados con su teléfono móvil. ++ ++ Para obtener información acerca de copiar o mover sus contactos a la ++libreta de direcciones de Ubuntu One, revise nuestros tutoriales en línea y nuestras ++preguntas más frecuentes (en inglés). ++ ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++¿Necesita ayuda o ha encontrado un error? Revise las opciones de soporte de Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Gracias. ++ ++El equipo de Ubuntu One ++http://one.ubuntu.com/ + +=== modified file 'mail/default/fi/Inbox' +--- mail/default/fi/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/fi/Inbox 2010-09-21 09:15:27 +0000 +@@ -329,3 +329,52 @@ + CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII= + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One -tiimi ++To: ubuntuone-support@canonical.com ++Subject: Hallitse digitaalista elämääsi Ubuntu Onella. ++ ++Evolution on parempi kun se varustetaan Ubuntu Onella - ++henkilökohtaisella pilvipalvelullasi joka mahdollistaa digitaalisen ++elämäsi hallinnan. ++ ++Tiedostojesi ajan tasalla pitämisen lisäksi Ubuntu One tekee paljon ++muutankin: saat käyttöösi yhteystietosi, muistiinpanosi ja ++kirjanmerkkisi miltä tahansa verkkoyhteydellä varustetulta koneelta. ++Voit myös kuunnella lempimusiikkia pilvipalveluun kuuluvasta ++musiikkikaupasta. Myös Android- ja iPhone-puhelimilla voit kuunnella ++kaikkia henkilökohtaisessa kokoelmassasi olevia musiikkikappaleita. ++Ubuntu One vie pilvipalvelut uudelle tasolle. Lue lisää osoitteesta ++http://one.ubuntu.com/. ++ ++Onko sinulla jo Ubuntu One -tili? ++Voit lisätä tietokoneesi tiliisi käynnistämällä Ubuntu Onen ++hallintapaneelin. ++ ++Kaikki "Ubuntu One" -osoitekirjassa olevat yhteystiedot synkronoidaan ++automaattisesti henkilökohtaiseen pilveesi. Voit selata ja muokata ++yhteystietoja sekä Evolutionilla että selaimella Ubuntu One ++-verkkosivulla. Ubuntu One pitää yhteystiedot ajan tasalla myös ++matkapuhelimesi kanssa. ++ ++Lisätietoja yhteystietojen kopioimisesta ja siirtämisestä löytyy Ubuntu ++Onen ohjeista ja usein kysytyt kysymykset -osiosta verkkosivuilta ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ja ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Tarvitsetko apua tai löysitkö virheen Ubuntu Onesta? Tukipalveluista ++löyty lisätietoja osoitteesta https://one.ubuntu.com/support/ ++ ++Terveisin ++ ++Ubuntu One -tiimi ++http://one.ubuntu.com/ + +=== modified file 'mail/default/fr/Inbox' +--- mail/default/fr/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/fr/Inbox 2010-09-21 09:15:27 +0000 +@@ -281,3 +281,45 @@ + + + --=-t4dRE6cqcdSBHOrMdTQ1-- ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++ ++From: L'équipe Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Organisez vos données numériques avec Ubuntu One ! ++ ++Non seulement tous vos documents, photos, musiques et notes resteront ++synchronisées avec tous vos ordinateurs et votre « cloud » personnel, ++mais tout vos contacts d'Evolution pourront l'être aussi. ++ ++Pour plus d'informations consultez http://one.ubuntu.com/. ++ ++Avez-vous déjà un compte Ubuntu One ? Ajoutez votre ordinateur à votre ++compte en utilisant le panneau de configuration Ubuntu One. ++ ++Tous les contacts du carnet d'adresses « Ubuntu One » sont automatiquement ++synchronisés avec votre « cloud » personnel. Vous pouvez à votre convenance ++afficher et modifier vos contacts dans Evolution ou sur le site Web Ubuntu ++One. Ubuntu One peut même synchroniser vos contacts avec votre téléphone ++portable. ++ ++Pour savoir comment copier ou déplacer vos contacts vers le carnet ++d'adresses Ubuntu One, consultez nos tutoriels et notre FAQ : ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Vous avez besoin d'aide ou vous avez remarqué une anomalie ? ++Consultez les options d'assistance : ++https://one.ubuntu.com/support/ ++ ++Merci de votre confiance. ++L'équipe Ubuntu One ++http://one.ubuntu.com/ + +=== added directory 'mail/default/gl' +=== added file 'mail/default/gl/Inbox' +--- mail/default/gl/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/gl/Inbox 2010-09-21 09:15:27 +0000 +@@ -0,0 +1,45 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: O Equipo de Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Leve a súa vida dixital con Ubuntu One! ++ ++Evolution é mellor con Ubuntu One - a nube persoal para a ++súa vida dixital. ++ ++Ubuntu One fai moito máis que sincronizar os seus ficheiros - se ++precisa acceder aos seus contactos, notas ou marcadores desde calquera ++computador ou a web, gozar da súa música favorita desde unha tenda ++integrada na nube ou difundir toda a súa coleción de iPhone ou ++Android. Con Ubuntu One elevamos o listón do que significan as ++nubes persoais. Pode obter máis información en http://one.ubuntu.com/. ++ ++ ++Xa ten unha conta de Ubuntu One? ++Engada o computador á súa conta, iniciando o Panel de Control ++de Ubuntu One. ++ ++ Todos os seus contactos na axenda de enderezos «Ubuntu One» ++sincronízanse automaticamente coa súa nube persoal. Pode ver ++e modificar a información dos contactos no Evolution ou na páxina ++web de Ubuntu One. Ubuntu One manterá sincronizados os seus ++contactos do Evolution co seu teléfono móbil. ++ ++ Para obter máis información sobre como copiar e mover os seus ++contactos á axenda de enderezos de Ubuntu One, consulte o titorial en ++liña e as Preguntas Frecuentes (FAQ). ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Precisa axuda ou encontrou un erro? Vexa as opcións de asistencia ++técnica para Ubuntu One en https://one.ubuntu.com/support/ ++ ++Grazas. ++ ++O Equipo de Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/gl/Makefile.am' +--- mail/default/gl/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/gl/Makefile.am 2010-09-21 09:15:27 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/gl/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/gu' +=== added file 'mail/default/gu/Inbox' +--- mail/default/gu/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/gu/Inbox 2010-09-21 09:15:28 +0000 +@@ -0,0 +1,40 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One જૂથ ++To: ubuntuone-support@canonical.com ++Subject: તમારી Digital જિંદગીને Ubuntu One! સંગાથે લઇ આવો. ++ ++ક્રમિક વિકાસ સર્વોત્તમ છે Ubuntu One સાથે - વ્યક્તિગત ક્લાઉડ તમારી Digital જિંદગીને ++સાથે લાવશે. ++ ++Ubuntu One તમારી ફાઇલોને સમકાલિક કરવા કરતા પણ અધિક કરે છે - જ્યારે તમારે જરુરી ++સંપર્કનો ઉપયોગની, નોંધો અથવા બુકમાર્કનો કોઇપણ કોમ્પ્યુટરથી કે વેબથી ઉપયોગ કરવો છે, એક ++ક્લાઉડમાં એકીકૃત દુકાનમાંથી કે સ્ટ્રીમથી તમારા મનગમતા સંગીતોનો આનંદ માણો કે તમારા પૂર્ણ ++સન્ગ્રહને iPhone કે Android મોબાઇલફોન્સ પર લો - અમે વ્યક્તિગત ક્લાઉડસ માટે આગડ ++આવ્યા છે. અહી વધુ જાણો http://one.ubuntu.com/. ++ ++પહેલાથી Ubuntu One નુ ખાતું છે? ++Ubuntu One નિયંત્રણ પૅનલ ચાલુકરીને તમારુ કોમ્ય્પુટર તમારા ખાતામં ઉમેરો. ++ ++ “Ubuntu One” સરનામું પુસ્તકમાના બધા સંપર્કો આપોઆપ તમારા વ્યક્તિગત ક્લાઉડ ++સાથે સમકાલિક થઇજાય છે. Evolution કે Ubuntu One વેબસાઇટમાં સંપર્કોની માહિતી સુલભરીતે ++જોઇ અને ફેરફાર કરીસકાય છે. Ubuntu One તમારા Evolution ના સંપર્કો તમારા મોબાઇલફોન ++સાથે સમકાલિક પણ રાખે છે. ++ ++ તમારા સંપર્કોને નકલ કે ગતિમાન Ubuntu One સરનામું પુસ્તકમાં કરવામ માટેની માહિતી, ++અમારા ઓનલાઇન ટ્યૂટૉરિઅલ અને પૂછ્યા જતા સવાલોની સમીક્ષા કરવી. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++મદદની આવશ્યકતા છે અથવા ખામી મળીછે? Ubuntu One આધારના વિકલ્પોની સમીક્ષા કરવી. ++https://one.ubuntu.com/support/ ++ ++આભાર. ++ ++Ubuntu One જૂથ ++http://one.ubuntu.com/ + +=== added file 'mail/default/gu/Makefile.am' +--- mail/default/gu/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/gu/Makefile.am 2010-09-21 09:15:27 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/gu/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/he' +=== added file 'mail/default/he/Inbox' +--- mail/default/he/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/he/Inbox 2010-09-21 09:15:28 +0000 +@@ -0,0 +1,39 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: צוות Ubuntu One‏ ++To:‏ ubuntuone-support@canonical.com ++Subject: אחדו את החיים הדיגיטליים שלכם באמצעות Ubuntu One‏! ++ ++Evolution פועלת טוב יותר עם Ubuntu One - העננה הפרטית שמאחדת את החיים הדיגיטליים שלכם. ++ ++Ubuntu One עושה מעבר לסנכרון הקבצים שלכם - בין אם אתם צריכים לגשת לאנשי הקשר, ++להערות או לסימניות שלכם מכל מחשב שהוא או דרך האינטרנט, ליהנות מהמוזיקה המועדפת ++עליכם מחנות המשולבת בעננה או להזרים את כל האוסף שלכם לטלפונים ניידים מסוג iPhone ++או Android - הרמנו את הרף לעננות הפרטיות. ++ תוכלו ללמוד עוד בכתובת http://one.ubuntu.com/‎‏. ++ ++כבר יש לכם חשבון ב־Ubuntu One?‏ ++הוסיפו את המחשב שלכם לחשבון שלכם על ידי טעינת לוח הבקרה של Ubuntu One‏. ++ ++ כל אנשי הקשר בספר הכתובות שלכם ב־”Ubuntu One“ מסונכרנים אוטומטית ++עם העננה הפרטית שלכם. תוכלו לצפות ולשנות פרטי אנשי קשר דרך Evolution או דרך ++האתר של Ubuntu One בפשטות. Ubuntu One אפילו תדאג לסנכרן את אנשי הקשר שלכם ++עם הטלפון הסלולרי שלכם. ++ ++ למידע על העתקה או העברה של אנשי הקשר שלך אל ספר הכתובות של ++Ubuntu One תוכלו לעיין במדריכים ובמקבץ השאלות בכתובות הבאות: ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/‎ ++ ++זקוקים לעזרה או שאיתרתם תקלה? עיינו באפשרויות התמיכה של Ubuntu One.‏ ++https://one.ubuntu.com/support/‎ ++ ++תודה לכם. ++ ++צוות Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/he/Makefile.am' +--- mail/default/he/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/he/Makefile.am 2010-09-21 09:15:28 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/he/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/hr' +=== added file 'mail/default/hr/Inbox' +--- mail/default/hr/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/hr/Inbox 2010-09-21 09:15:29 +0000 +@@ -0,0 +1,45 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One tim ++To: ubuntuone-support@canonical.com ++Subject: Objedinite svoj digitalni život s Ubuntu Oneom! ++ ++Evolution je bolji s Ubuntu Oneom - osobnim oblakom koji ++objedinjuje Vaš digitalni život. ++ ++Ubuntu One čini mnogo više od same sinkronizacije vaših datoteka - ++pristupajte svojim kontaktima, bilješkama ili zabilješkama s bilo kojeg ++računala ili putem weba, uživajte u svojoj omiljenoj glazbi na vašem ++oblaku, koji je povezan s glazbenom trgovinom, ili preslušavajte cijelu ++glazbenu kolekciju izravno na vašem iPhone ili Android mobilnom telefonu ++- podigli smo letvicu osobnih oblaka. Saznajte više na ++http://one.ubuntu.com/. ++ ++Već imate Ubuntu One korisnički račun? ++Spojite svoje računalo s korisničkim računom pokretanjem Ubuntu One ++kontrolne ploče. ++ ++ Svi kontakti u “Ubuntu One” adresaru se automatski sinkroniziraju ++s vašim osobnim oblakom. Jednostavno pregledavajte i ažurirajte informacije ++u Evolutionu ili na Ubuntu One web stranici. Ubuntu One će se čak brinuti ++o sinkronizaciji Evolution kontakata s vašim mobilnim telefonom. ++ ++ Za više informacija o kopiranju ili premještanju kontakata u Ubuntu ++One adresar, posjetite naše online vodiče i učestalo postavljena pitanja. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Trebate li pomoć ili ste pronašli grešku? Pogledajte mogućnosti Ubuntu One ++podrške. ++https://one.ubuntu.com/support/ ++ ++Hvala vam. ++ ++Ubuntu One tim ++http://one.ubuntu.com/ ++ + +=== added file 'mail/default/hr/Makefile.am' +--- mail/default/hr/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/hr/Makefile.am 2010-09-21 09:15:28 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/hr/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/hu/Inbox' +--- mail/default/hu/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/hu/Inbox 2010-09-21 09:15:29 +0000 +@@ -312,3 +312,42 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Az Ubuntu One csapat ++To: ubuntuone-support@canonical.com ++Subject: Rendszerezze digitális életét az Ubuntu One segítségével! ++ ++Nem csak dokumentumai, fotói, zenéi és jegyzetei maradnak szinkronban ++számítógépei között és személyes adatfelhőjében, de minden Evolution névjegye is. ++ ++Tudjon meg többet az Ubuntu Oneról a http://one.ubuntu.com/ oldalon. ++ ++Már van Ubuntu One fiókja? Adja hozzá számítógépét a fiókjához ++az Ubuntu One vezérlőpult elindításával. ++ ++Az „Ubuntu One” címjegyzék minden névjegye automatikusan szinkronizálásra ++kerül személyes adatfelhőjével. A névjegy-információkat kényelmesen megjelenítheti ++és módosíthatja az Evolutionben, vagy az Ubuntu One webhelyen. Az Ubuntu One az ++Evolution névjegyeket még mobiltelefonjával is szinkronban fogja tartani. ++ ++A névjegyek Ubuntu One címjegyzékbe másolásával vagy mozgatásával kapcsolatban ++nézze meg online ismertetőnket és a GyIK-et. ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Segítségre van szüksége, vagy hibát talált? Nézze meg az Ubuntu One támogatási lehetőségeket. ++https://one.ubuntu.com/support/ ++ ++Köszönettel. ++ ++Az Ubuntu One csapat ++http://one.ubuntu.com/ + +=== added directory 'mail/default/id' +=== added file 'mail/default/id/Inbox' +--- mail/default/id/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/id/Inbox 2010-09-21 09:15:29 +0000 +@@ -0,0 +1,43 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Tim Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Satukan kehidupan digital Anda bersama Ubuntu One! ++ ++Evolution jadi lebih baik dengan Ubuntu One - cloud pribadi yang ++menyatukan kehidupan digital Anda. ++ ++Ubuntu One melakukan lebih dari sekedar menyelaraskan berkas Anda - ++apakah Anda perlu mengakses kontak, catatan, atau penanda alamat Anda ++dari sebarang komputer atau web, menikmati musik favorit Anda dari ++toko yang terpadu dalam cloud, atau mengalirkan seluruh koleksi Anda ++ke telepon genggam iPhone atau Android - kami telah meningkatkan ++standar layanan pada cloud pribadi. Pelajari lebih lanjut di ++http://one.ubuntu.com/. ++ ++Sudah punya akun Ubuntu One? ++Tambahkan komputer Anda ke akun Anda dengan meluncurkan Panel Kendali ++Ubuntu One. ++ ++ Semua kontak di buku alamat "Ubuntu One" otomatis diselaraskan ++dengan cloud pribadi Anda. Tilik dan ubah informasi kontak dengan nyaman ++di Evolution atau situs web Ubuntu One. Ubuntu One bahkan akan menjaga ++keselarasan kontak Evolution Anda dengan telepon genggam Anda. ++ ++ Untuk informasi tentang menyalin atau memindahkan kontak Anda ++ke dalam buku alamat Ubuntu One, periksa tutorial daring dan FAQ kami. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Perlu bantuan atau menemukan suatu kutu? Periksa opsi dukungan Ubuntu ++One. https://one.ubuntu.com/support/ ++ ++Terima kasih. ++ ++Tim Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/id/Makefile.am' +--- mail/default/id/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/id/Makefile.am 2010-09-21 09:15:29 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/id/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/it/Inbox' +--- mail/default/it/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/it/Inbox 2010-09-21 09:15:29 +0000 +@@ -323,3 +323,51 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Il team di Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Porta la tua vita digitale sempre con te, con Ubuntu One! ++ ++Evolution e Ubuntu One per un'accoppiata vincente: il tuo cloud ++personale per la tua vita digitale. ++ ++Ubuntu One è in grado di fare molto più di sincronizzare i tuoi file. ++Se hai necessità di accedere ai tuoi contatti, alle tue note o ai tuoi ++segnalibri da un qualsiasi computer o dal Web, ascoltare la tua musica ++preferita dal negozio integrato con il tuo cloud o in streaming sul tuo ++smartphone iPhone o Android, Ubuntu One è in grado di farlo. ++Scopri tutte le novità sul nostro sito: http://one.ubuntu.com/. ++ ++Hai già un account Ubuntu One? ++Collegalo al tuo computer avviando il pannello di controllo di Ubuntu One. ++ ++ Tutti i contatti presenti nella rubrica «Ubuntu One» verranno ++sincronizzati automaticamente col tuo cloud e potrai visualizzarli o ++modificarli usando Evolution o direttamente sul sito web di Ubuntu One. ++E non dovrai più copiarli sul tuo smartphone: Ubuntu One li sincronizza ++per te. ++ ++ Per maggiori informazioni su come copiare o spostare i tuoi ++contatti all'interno della rubrica di Ubuntu One, consulta la nostra ++documentazione: ++ ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Hai bisogno di aiuto o hai riscontrato un problema? Consulta la nostra ++offerta di supporto utente: ++https://one.ubuntu.com/support/ ++ ++Grazie. ++ ++Il team di Ubuntu One ++http://one.ubuntu.com/ + +=== modified file 'mail/default/ja/Inbox' +--- mail/default/ja/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/ja/Inbox 2010-09-21 09:15:29 +0000 +@@ -351,3 +351,48 @@ + CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII= + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: The Ubuntu One チーム ++To: ubuntuone-support@canonical.com ++Subject: デジタルライフをUbuntu Oneにまとめませんか？ ++ ++デジタルライフを一つにまとめるパーソナルクラウドであるUbuntu Oneと ++共に使うと、Evolutionはより一層便利になります。 ++ ++Ubuntu Oneはただファイルを同期するだけではありません。すべてのコンピュータ ++からアドレス帳やメモ、ブックマークにアクセスしたり、ウェブにアクセスして ++クラウドストレージに保存したお気に入りの音楽を楽しんだり、iPhoneやAndroidなどの ++携帯電話にすべてのコレクションをストリーム送信することだってできます。 ++つまり、我々はパーソナルクラウドの品質を引き上げたのです。 ++詳しいことは http://one.ubuntu.com/ で知ることができます。 ++ ++すでにUbuntu Oneのアカウントはお持ちですか？ Ubuntu Oneコントロールパネルを ++起動して、あなたのアカウントにコンピュータを追加してください。 ++ ++“Ubuntu One”アドレス帳にあるすべての連絡先（contacts）は、あなたのパーソナ ++ルクラウドに自動的に同期されます。便利なことに、EvolutionとUbuntu Oneウェブ ++サイト上のどちらでも、連絡先情報の表示や修正ができるのです。さらに ++Ubuntu OneはEvolutionの連絡先を携帯電話と同期することもできます。 ++ ++Ubuntu Oneアドレス帳に、連絡先をコピーしたり移動するための情報は、 ++オンラインのチュートリアルとFAQを確認してください。 ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++助けが必要であったり、バグを見つた場合は、Ubuntu Oneのサポートオプションを ++確認してください。 ++https://one.ubuntu.com/support/ ++ ++Thank you. ++ ++The Ubuntu One チーム ++http://one.ubuntu.com/ + +=== added directory 'mail/default/nb' +=== added file 'mail/default/nb/Inbox' +--- mail/default/nb/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/nb/Inbox 2010-09-21 09:15:30 +0000 +@@ -0,0 +1,43 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One-laget ++To: ubuntuone-support@canonical.com ++Subject: Få orden på ditt digitale liv med Ubuntu One! ++ ++Evolution er bedre med Ubuntu One - din personlige sky som får orden ++på ditt digitale liv. ++ ++Ubuntu One gjør mer enn å bare synkronisere filer - om du ønsker å få ++fatt i kontaktene, notatene eller bokmerkene dine fra hvilken som helst ++maskin eller fra veven, nyte favorittmusikken din fra en butikk ++integrert i skyen eller overføre hele musikksamlingen din til iPhone- ++eller Android-telefoner - vi har tatt steget videre innen personlige ++skyer. Lær mer på http://one.ubuntu.com/. ++ ++Har du en Ubuntu One-konto allerede? ++Åpne innstillingene for Ubuntu One og legg til maskinen din på kontoen. ++ ++ Alle kontaktene i Ubuntu One-adresseboka blir automatisk ++synkronisert med din personlige sky. Du kan enkelt se på og endre ++kontaktinformasjon i Evolution eller på Ubuntu One-nettstedet. ++Ubuntu One vil til og med holde kontaktene i Evolution synkronisert med ++mobiltelefonen din. ++ ++ For informasjon om hvordan du kopierer eller flytter kontaktene ++dine til Ubuntu One-adresseboka, se: ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Trenger du hjelp eller har du funnet noen feil? Se støttesidene til ++Ubuntu one. https://one.ubuntu.com/support/ ++ ++Takk for oppmerksomheten. ++ ++Ubuntu One-laget ++http://one.ubuntu.com/ ++ + +=== added file 'mail/default/nb/Makefile.am' +--- mail/default/nb/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/nb/Makefile.am 2010-09-21 09:15:29 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/nb/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/nl/Inbox' +--- mail/default/nl/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/nl/Inbox 2010-09-21 09:15:30 +0000 +@@ -316,3 +316,53 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Het Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Subject: Breng uw digitale leven samen met Ubuntu One! ++ ++Evolution werkt beter met Ubuntu One - de persoonlijke cloud waarmee u ++uw digitale leven samenbrengt. ++ ++Ubuntu One kan meer dan alleen uw bestanden synchroniseren - of u nu op ++elke computer bij uw contactpersonen, notities of bladwijzers wilt ++kunnen, van uw favoriete muziek wilt genieten via een in de cloud ++geïntegreerde winkel of uw volledige collectie naar uw iPhone of ++Android telefoon wilt streamen - wij hebben de lat voor persoonlijke ++clouds hoger gelegd. Leer meer op http://one.ubuntu.com/ (Engelstalig). ++ ++ ++Heeft u al een Ubuntu One-account? ++Voeg een computer aan uw account toe door het Ubuntu One Controlepaneel ++te starten. ++ ++ Alle contactpersonen in het "Ubuntu One" adresboek worden ++automatisch met uw persoonlijke cloud gesynchroniseerd. U kunt de ++gegevens van uw contactpersonen eenvoudig bekijken en wijzigen via ++Evolution of de Ubuntu One-website. Ubuntu One kan zelfs uw Evolution ++contactpersonen met uw mobiele telefoon synchroniseren. ++ ++ Voor informatie over het kopiëren of verplaatsen van uw contact- ++personen naar het Ubuntu One adresboek kunt u online de Engelstalige ++handleiding en FAQ lezen. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Heeft u hulp nodig of een bug gevonden? Zie dan de Engelstalige Ubuntu ++One support-mogelijkheden. ++https://one.ubuntu.com/support/ ++ ++ ++Bedankt. ++ ++Het Ubuntu One Team ++http://one.ubuntu.com/ + +=== added directory 'mail/default/pt_BR' +=== added file 'mail/default/pt_BR/Inbox' +--- mail/default/pt_BR/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/pt_BR/Inbox 2010-09-21 09:15:30 +0000 +@@ -0,0 +1,40 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Time do Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Traga a sua vida digital junto com o Ubuntu One! ++ ++O Evolution é melhor com o Ubuntu One - a nuvem pessoal que traz a ++sua vida digital juntos. ++ ++Ubuntu One faz mais do que sincronizar seus arquivos - se você precisa ++acessar seus contatos ou favoritos em qualquer computador na internet, desfrutar ++de sua música favorita armazenada na nuvem ou stream para celulares iPhone e ++Android - elevamos os padrões de nuvens pessoal. ++Aprenda mais em http://one.ubuntu.com/ ++ ++Já tem uma conta no Ubuntu One? ++Adicione o seu computador em sua conta executando o painel de controle do Ubuntu One. ++ ++ Todos os contatos do livro de endereços no “Ubuntu One” são automaticamente ++sincronizadas com sua nuvem pessoal. Ver e modificar contatos convenientemente e ++informações no Evolution ou na página do Ubuntu One. Ubuntu One irá manter os contatos ++do Evolution em sincronia com o seu celular. ++ ++ Para informações sobre como copiar ou mover seus contatos no livro de endereço ++do Ubuntu One, revise nosso tutorial on-linue e FAQs. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Precisa de ajuda ou encontrou um erro? Veja as opções de suporte do Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Obrigado. ++ ++Time do Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/pt_BR/Makefile.am' +--- mail/default/pt_BR/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/pt_BR/Makefile.am 2010-09-21 09:15:30 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/pt_BR/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/pt_PT' +=== added file 'mail/default/pt_PT/Inbox' +--- mail/default/pt_PT/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/pt_PT/Inbox 2010-09-21 09:15:31 +0000 +@@ -0,0 +1,32 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Equipa do Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Reúna a sua vida digital com Ubuntu One! ++ ++Evolution é melhor com Ubuntu One - a núvem pessoal que reúne a sua vida digital. ++ ++Ubuntu One faz mais do que sincronizar os seus ficheiros - aceda aos seus contactos, notas ou marcadores, onde precisar, em qualquer computador ou na web, desfrute da sua música preferida numa loja integrada na nuvem ou oiça a sua colecção preferida no seu iPhone ou telemóvel Android em tempo real - Nós subimos a fasquia no que toca a nuvens pessoais. Saiba mais em http://one.ubuntu.com/. ++ ++Já tem uma conta pessoal no Ubuntu One? ++Adicione o seu computador à sua conta abrindo o Painel de Controle do Ubuntu One. ++ ++ Todo o seu livro de contactos do “Ubuntu One” é automaticamente sincronizado na sua nuvem pessoal. Ver e modificar os contactos no Evolution ou no sítio web do Ubuntu One. O Ubuntu One manterá sincronizados os seus contactos do Evolution com o seu telemóvel. ++Manter os seus contactos do Evolution sincronizados com o seu telemóvel. ++ ++ Para informações sobre como copiar ou mover os seus contactos para o livro de contactos do Ubuntu One, veja os nossos tutoriais e FAQs em: ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Precisa de ajuda ou encontrou um bug? Veja as opções para suporte do Ubuntu One em: ++https://one.ubuntu.com/support/ ++ ++Muito Obrigado. ++ ++A Equipa do Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/pt_PT/Makefile.am' +--- mail/default/pt_PT/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/pt_PT/Makefile.am 2010-09-21 09:15:30 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/pt_PT/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/ru' +=== added file 'mail/default/ru/Inbox' +--- mail/default/ru/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/ru/Inbox 2010-09-21 09:15:31 +0000 +@@ -0,0 +1,32 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Команда Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Наслаждайтеcь цифровой жизнью вместе с Ubuntu One! ++ ++Дополнительные возможности Evolution вместе с Ubuntu One - персональным «облачным» сервисом. ++ ++Ubuntu One - не просто синхронизация ваших файлов, это доступ к своей адресной книге, заметкам или закладкам с любого компьютера в сети. Захотелось послушать музыку во встроенном музыкальном магазине, либо скинуть свою музыкальную коллекцию на iPhone или телефон на ОС Android? Всё это вы можете сделать с помощью своего персонального «облака». Узнайте больше на http://one.ubuntu.com/. ++ ++У вас уже есть учётная запись Ubuntu One? ++Просто добавьте свой компьютер к учётной записи, запустив панель управления Ubuntu One. ++ ++Все контакты из адресной книги «Ubuntu One» автоматически синхронизируются с вашим персональным «облаком». Удобный просмотр и редактирование информации о контактах в Evolution или на сайте Ubuntu One. Кроме того, Ubuntu One может синхронизировать контакты Evolution с адресной книгой вашего мобильного телефона. ++ ++Для получения подробной информации о том, как скопировать или переместить свои контакты в адресную книгу ++Ubuntu One, обратитесь к интернет-руководствам и ЧаВо. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Нужна помощь? Нашли ошибку? Обратитесь к странице поддержки Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Спасибо. ++ ++Команда Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/ru/Makefile.am' +--- mail/default/ru/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/ru/Makefile.am 2010-09-21 09:15:31 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/ru/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/sk' +=== added file 'mail/default/sk/Inbox' +--- mail/default/sk/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/sk/Inbox 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,37 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Tím Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Udržujte váš digitálny život zorgranizovaný pomocou Ubuntu One! ++ ++Nielen, že vaše dokumenty, fotky, hudba a poznámky budú synchronizované ++medzi všetkými vašimi počítačmi a vaším osobným cloudom, ale tiež aj všetky ++vaše kontakty programu Evolution. ++ ++Viac sa o Ubuntu One dozviete na http://one.ubuntu.com/. ++ ++Máte už Ubuntu One účet? Pridajte váš počítač do vášho účtu spustením ++ovládacieho panelu Ubuntu One. ++ ++Všetky kontakty v adresári kontaktov „Ubuntu One“ sú automaticky synchronizované ++s vaším osobným cloudom. S ľahkosťou si prezerajte a upravujte vaše kontakty ++v programe Evolution alebo na stránke Ubuntu One. Ubuntu One ++dokonca synchronizuje vaše kontakty z programu Evolution s vaším mobilným telefónom. ++ ++Pre informácie o kopírovaní alebo presúvaní kontaktov do adresára kontaktov ++Ubuntu One, pozrite naše internetové návody a často kladené otázky. ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Potrebujute pomoc alebo ste našli chybu? Prejdite si možnosti podpory Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Ďakujeme. ++ ++Tím Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/sk/Makefile.am' +--- mail/default/sk/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/sk/Makefile.am 2010-09-21 09:15:31 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/sk/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== added directory 'mail/default/sl' +=== added file 'mail/default/sl/Inbox' +--- mail/default/sl/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/sl/Inbox 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,31 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ekipa Ubuntu One ++To: ubuntuone-support@canonical.com ++Subject: Poenotite svoje digitalno življenje z Ubuntu One! ++ ++ Program Evolution je boljši z Ubuntu One - osebnim oblakom, ki poenoti vaše digitalno življenje. ++ ++ Ubuntu One naredi več kot samo uskladi vaše datoteke. Kadarkoli lahko dostopate do svojih stikov, zapiskov ali zaznamkom s kateregakoli računalnika na spletu. V svoji najljubši glasbi lahko uživate preko v oblak vključene trgovine ter svojo celotno glasbeno zbirko pretakate na prenosne telefone iPhone ali Android. S svojo ponudbo smo zvišali standarde, ki veljajo za osebne oblake. Preberite si več o tem na http://one.ubuntu.com/. ++ ++ Račun Ubuntu One že imate? ++Zaženite nadzorni pult Ubuntu One in v njem dodajte svoj računalnik vašemu računu. ++ ++ Vsi stiki v imeniku “Ubuntu One” se samodejno usklajujejo z vašim osebnim oblakom. Prikladno si jih lahko ogledate ali uredite v programu Evolution ali na spletišču Ubuntu One. V njem je celo poskrbljeno za usklajevanje stikov iz programa Evolution z imenikom na vašem prenosnem telefonu. ++ ++ Podrobnosti o kopiranju ali premikanju stikov v imenik Ubuntu One si oglejte v naših spletnih vodnikih in pogosto zastavljenih vprašanjih. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++ Potrebujete pomoč ali pa ste našli napako v programu? Oglejte si možnosti podpore za Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Hvala vam. ++ ++Ekipa Ubuntu One ++http://one.ubuntu.com/ + +=== added file 'mail/default/sl/Makefile.am' +--- mail/default/sl/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/sl/Makefile.am 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/sl/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/sv/Inbox' +--- mail/default/sv/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/sv/Inbox 2010-09-21 09:15:32 +0000 +@@ -309,3 +309,50 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Subject: Organisera ditt digitala liv med Ubuntu One! ++ ++Evolution är bättre med Ubuntu One - det personliga molnet som ++organiserar ditt digitala liv. ++ ++Ubuntu One gör mer än att bara synkronisera dina filer - oavsett om du ++behöver åtkomst till dina kontakter, anteckningar eller bokmärken från ++någon dator eller via webben, njuta av din favoritmusik från en moln- ++integrerad affär eller strömma hela din samling till iPhone och Android- ++mobiltelefoner - vi har höjt ribban för personliga moln. ++Läs mer på http://one.ubuntu.com/. ++ ++Har du redan ett Ubuntu One-konto? ++Lägg till din dator till ditt konto genom att starta kontrollpanelen ++för Ubuntu One. ++ ++ Alla kontakter i “Ubuntu One”-adressboken synkroniseras auto- ++matiskt med ditt personliga moln. Visa och ändra kontaktinformation på ++ett smidigt sätt eller på Ubuntu Ones webbplats. Ubuntu One kan till ++och med synkronisera dina Evolution-kontakter med din mobiltelefon. ++ ++ För information om kopiering eller förflyttning av dina ++kontakter till Ubuntu One-adressboken så kan du se vår handledning och ++frågesida. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++Behöver du hjälp eller har du hittat ett programfel? Se support- ++alternativen för Ubuntu One. ++https://one.ubuntu.com/support/ ++ ++Tack. ++ ++The Ubuntu One Team ++http://one.ubuntu.com/ + +=== added directory 'mail/default/ug' +=== added file 'mail/default/ug/Inbox' +--- mail/default/ug/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/ug/Inbox 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,35 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One ئەترىتى ++To: ubuntuone-support@canonical.com ++Subject: رەقەملىك ھاياتىڭىزنى Ubuntu One بىلەن بىرلەشتۈرۈڭ ++ ++Evolution رەقەملىك تۇرمۇشىڭىزنى بىرلەشتۈرگۈچى شەخسى قاپچۇق -- Ubuntu One بىلەن تېخىمۇ قۇلايلىق. ++ ++Ubuntu One ھۆججەتلىرىڭىزنى رەتلەپلا قالماستىن ئۇ ئارقىلىق يەنە ھەرقانداق ۋاقىتتا ئالاقە ئۇچۇرلىرىڭىز، ئەسلەتمىلىرىڭىز ياكى خەتكۈچلىرىڭىزنى ھەرقانداق بىر كومپيۇتېر ياكى توردا كۆرەلەيسىز، قاپچۇققا بىرلەشتۈرگەن مۇزىكا ئامبىرىڭىزدا ئامراق ناخشىلىرىڭىزدىن ھۇزۇرلىنالايسىز ياكى پۈتۈن مۇزىكا توپلىمىڭىزنى iPhone ياكى Android يانفونىدا ئاڭلىيالايسىز. تېخىمۇ كۆپ مەزمۇن بۇ ئادرېستا: ++ ++http://one.ubuntu.com/ ++ ++Ubuntu One ئابونتىغا تىزىملىتىپ بولدىڭىزمۇ؟ ++ئۇنداقتا كومپيۇتېرىڭىزنى Ubuntu One كونترول تاختىسىدا ئابونتىڭىزغا قوشۇڭ. ++ ++«Ubuntu One» ئادرېس دەپتىرىڭىزدىكى بارلىق ئالاقە ئۇچۇرلىرى شەخسى قاپچۇقىڭىزدىكى ئۇچۇرلار بىلەن ئاپتوماتىك يېڭىلىنىپ تۇرىدۇ. Evolution ياكى Ubuntu One تور بىتى ئارقىلىق ئالاقە ئۇچۇرلىرىڭىزنى ئاسانلا كۆرەلەيسىز ھەم ئۆزگەرتەلەيسىز. Ubuntu One يەنە سىزنىڭ Evolution دىكى ئالاقە ئۇچۇرلىرىڭىزنى يانفونىڭىزدىكى ئۇچۇرلار بىلەن ماسلاشتۇرۇپ تۇرىدۇ. ++ ++ئالاقە ئۇچۇرلىرىڭىزنى Ubuntu One دىكى ئادرېس دەپتىرىڭىزگە كۆچۈرۈش، يۆتكەش ھەققىدە بىلمەكچى بولسىڭىز، توردىكى كۆرسەتمىلەرگە ۋە سوئال-جاۋابلارغا قاراڭ، ئادرېسى: ++ ++https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++ياردەم لازىم بولسا ياكى خاتالىق مەلۇم قىلماقچى بولسىڭىز Ubuntu One قوللاش بېتىدىكى تاللاشلارغا قاراڭ: ++ ++https://one.ubuntu.com/support/ ++ ++رەھمەت سىزگە. ++Ubuntu One ئەترىتى ++ ++http://one.ubuntu.com/ + +=== added file 'mail/default/ug/Makefile.am' +--- mail/default/ug/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/ug/Makefile.am 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/ug/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + +=== modified file 'mail/default/zh_CN/Inbox' +--- mail/default/zh_CN/Inbox 2010-09-01 19:56:03 +0000 ++++ mail/default/zh_CN/Inbox 2010-09-21 09:15:32 +0000 +@@ -314,3 +314,49 @@ + CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII= + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++ ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One 团队 ++To: ubuntuone-support@canonical.com ++Subject: 与 Ubuntu One 共享您的数字生活！ ++ ++自从有了 Ubuntu One，Evolution 变得更加出色了 - 私人云服务将您的数字生活整合在一 ++起。 ++ ++Ubuntu One 除了能够同步您的文件外，还可以做得更多 - 无论您是希望从任何电脑或者网络访问 ++您的联系人、笔记或者是书签，还是希望享受从云商店中获取的音乐，亦或者是将这些全部收藏导入到您的 ++iPhone 和 Android 移动电话中 - 我们在私人云服务上更上一层楼。要了解详情，请访问 ++http://one.ubuntu.com/。 ++ ++已经拥有了一个 Ubuntu One 账号？ ++启用 Ubuntu One 控制面板来将这台电脑添加到您的账户中去吧。 ++ ++ ++ 所有在 “Ubuntu One“ 地址簿中的联系人都会自动同步到您的私人 ++云。您可以在 Evolution 或者 Ubuntu One 网站上方便的游览或者修改您的联系人 ++信息。Ubuntu One 甚至可以让您移动电话的联系人与 Evolution 联系人之间保持同 ++步。 ++ ++ ++ 更多关于将您的联系人复制或者移动到 Ubuntu One 地址簿中的 ++信息，请参阅我们的网上指南和 FAQ。 ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++需要帮助或者找到了一个错误？请查看 Ubuntu One 支持选项。 ++https://one.ubuntu.com/support/ ++ ++ ++此致 ++ 敬礼 ++ ++Ubuntu One 团队 ++http://one.ubuntu.com/ + +=== added directory 'mail/default/zh_TW' +=== added file 'mail/default/zh_TW/Inbox' +--- mail/default/zh_TW/Inbox 1970-01-01 00:00:00 +0000 ++++ mail/default/zh_TW/Inbox 2010-09-21 09:15:33 +0000 +@@ -0,0 +1,38 @@ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++X-Mailer: Evolution 2.30.2 ++From: Ubuntu One 團隊 ++To: ubuntuone-support@canonical.com ++Subject: 透過 Ubuntu One 將您的數位生活統整在一起！ ++ ++Evolution 有了 Ubuntu One 變得更好用 - 您的私有雲能將您的數位生活統整在一起。 ++ ++Ubuntu One 不只是同步您的檔案 - 不管您是需要從任何電腦或透過網路存取聯絡人資料、筆記、 ++書籤，或是要從整合雲端技術的商店聆聽您喜愛的音樂，或是要將您的整個收藏傳送至 iPhone 或 ++Android 手機都可以 - 我們在私有雲的應用上領先群倫。若要深入瞭解，請見 ++http://one.ubuntu.com/ 。 ++ ++已經擁有 Ubuntu One 帳號了嗎？ ++只要啟動 Ubuntu One 控制面板就能將您的電腦加入帳號中。 ++ ++ 所有「Ubuntu One」通訊錄內的聯絡人都會自動與您的私有雲同步。您可以在 ++Evolution 內或 Ubuntu One 網站上檢視、修改聯絡人資訊，十分便利。Ubuntu One 甚至 ++能將您 Evolution 內的聯絡人資料與您的手機同步。 ++ ++ 若要瞭解如何將您的聯絡人資料複製或移動至 Ubuntu One 通訊錄的方法，請見我 ++們的線上教學與常見問答集。 ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++如果需要幫助或是發現程式錯誤，請查看 Ubuntu One 的支援選項。 ++https://one.ubuntu.com/support/ ++ ++感謝您。 ++ ++Ubuntu One 團隊 敬啟 ++http://one.ubuntu.com/ ++ + +=== added file 'mail/default/zh_TW/Makefile.am' +--- mail/default/zh_TW/Makefile.am 1970-01-01 00:00:00 +0000 ++++ mail/default/zh_TW/Makefile.am 2010-09-21 09:15:32 +0000 +@@ -0,0 +1,8 @@ ++ ++defaultlocaldir = $(privdatadir)/default/zh_TW/mail/local ++ ++defaultlocal_DATA = Inbox ++ ++EXTRA_DIST = $(defaultlocal_DATA) ++ ++-include $(top_srcdir)/git.mk + --- evolution-2.30.3.orig/debian/patches/62_no_upstream_email_notification_by_default.patch +++ evolution-2.30.3/debian/patches/62_no_upstream_email_notification_by_default.patch @@ -0,0 +1,55 @@ +# Description: not enable the notification icon by default since the message indicator is running +# Ubuntu: https://bugs.launchpad.net/bugs/331571 +# +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//plugins/mail-notification/mail-notification.c evolution-2.30.1.2.new//plugins/mail-notification/mail-notification.c +--- evolution-2.30.1.2//plugins/mail-notification/mail-notification.c 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.1.2.new//plugins/mail-notification/mail-notification.c 2010-05-17 16:19:41.097866395 +0200 +@@ -86,6 +86,17 @@ + /* Helper functions */ + /* ------------------------------------------------------------------- */ + ++/* check if we are running the stracciatella session */ ++static gboolean ++is_stracciatella(void) { ++ if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) { ++ g_debug("Running stracciatella GNOME session"); ++ return TRUE; ++ } else { ++ return FALSE; ++ } ++} ++ + static gboolean + is_part_enabled (const gchar *gconf_key) + { +@@ -972,8 +983,10 @@ + bridge, GCONF_KEY_ENABLED_DBUS, + G_OBJECT (widget), "active"); + +- widget = get_config_widget_status (); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ if (is_stracciatella()) { ++ widget = get_config_widget_status (); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ } + + widget = get_config_widget_sound (); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +@@ -1000,7 +1013,7 @@ + if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) + new_notify_dbus (t); + +- if (is_part_enabled (GCONF_KEY_ENABLED_STATUS)) ++ if ((is_stracciatella()) && is_part_enabled (GCONF_KEY_ENABLED_STATUS)) + new_notify_status (t); + + if (is_part_enabled (GCONF_KEY_ENABLED_SOUND)) +@@ -1022,7 +1035,7 @@ + if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) + read_notify_dbus (t); + +- if (is_part_enabled (GCONF_KEY_ENABLED_STATUS)) ++ if ((is_stracciatella()) && is_part_enabled (GCONF_KEY_ENABLED_STATUS)) + read_notify_status (t); + + if (is_part_enabled (GCONF_KEY_ENABLED_SOUND)) --- evolution-2.30.3.orig/debian/patches/01_ubuntu_signature.patch +++ evolution-2.30.3/debian/patches/01_ubuntu_signature.patch @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//e-util/e-signature-list.c evolution-2.30.3.new//e-util/e-signature-list.c +--- evolution-2.30.3//e-util/e-signature-list.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.3.new//e-util/e-signature-list.c 2010-09-01 18:02:32.905184000 +0200 +@@ -160,6 +160,21 @@ + return g_slist_prepend (new_sigs, autogen); + } + ++static GSList * ++add_ubuntu (ESignatureList *list, GSList *new_sigs) ++{ ++ ESignature *ubuntu; ++ gchar *ubuntu_signature_xml_ref; ++ ++ ubuntu_signature_xml_ref = g_markup_printf_escaped("/usr/share/evolution/signature.py"); ++ ubuntu = e_signature_new_from_xml (ubuntu_signature_xml_ref); ++ g_free(ubuntu_signature_xml_ref); ++ ++ e_list_append (E_LIST (list), ubuntu); ++ ++ return g_slist_prepend (new_sigs, ubuntu); ++} ++ + static void + gconf_signatures_changed (GConfClient *client, + guint cnxn_id, +@@ -231,6 +246,7 @@ + + if (!have_autogen) { + new_sigs = add_autogen (signature_list, new_sigs); ++ new_sigs = add_ubuntu (signature_list, new_sigs); + resave = TRUE; + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.3//po/POTFILES.in evolution-2.30.3.new//po/POTFILES.in +--- evolution-2.30.3//po/POTFILES.in 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.3.new//po/POTFILES.in 2010-09-01 18:02:32.905184000 +0200 +@@ -521,3 +521,4 @@ + widgets/table/gal-a11y-e-table-click-to-add.c + widgets/table/gal-a11y-e-table-column-header.c + widgets/text/e-text.c ++debian/signature.py --- evolution-2.30.3.orig/debian/patches/91_git_fix_untranslatable_list_editor.patch +++ evolution-2.30.3/debian/patches/91_git_fix_untranslatable_list_editor.patch @@ -0,0 +1,116 @@ +From b18251059b8f1e92547d8ecd52ec801adb56e513 Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero +Date: Fri, 27 Aug 2010 20:30:32 +0000 +Subject: bugs.meego.com #2329 - Contact list editor is not translated + +We had a 'context=yes' attribute in all the translatable labels, when +in fact no label has the magic marker for the context string. This was +somehow carried over from the .glade days. + +Signed-off-by: Federico Mena Quintero +--- +diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.ui b/addressbook/gui/contact-list-editor/contact-list-editor.ui +index 0c1e21c..2849efd 100644 +--- a/addressbook/gui/contact-list-editor/contact-list-editor.ui ++++ b/addressbook/gui/contact-list-editor/contact-list-editor.ui +@@ -4,7 +4,7 @@ + + True + 6 +- Contact List Editor ++ Contact List Editor + GTK_WIN_POS_CENTER + stock_contact-list + GDK_WINDOW_TYPE_HINT_NORMAL +@@ -47,7 +47,7 @@ + + True + 1 +- _List name: ++ _List name: + True + list-name-entry + +@@ -60,7 +60,7 @@ + + True + 1 +- _Where: ++ _Where: + True + source-combo-box + +@@ -108,7 +108,7 @@ + + True + 0 +- Members ++ Members + + + +@@ -142,7 +142,7 @@ + + True + 0 +- _Type an email address or drag a contact into the list below: ++ _Type an email address or drag a contact into the list below: + True + GTK_JUSTIFY_CENTER + +@@ -188,7 +188,7 @@ + + True + True +- _Hide addresses when sending mail to this list ++ _Hide addresses when sending mail to this list + True + + +@@ -211,7 +211,7 @@ + True + Add an email to the List + Add an email to the List +- gtk-add ++ gtk-add + True + 0 + +@@ -230,7 +230,7 @@ + True + Remove an email address from the List + Remove an email address from the List +- gtk-remove ++ gtk-remove + True + 0 + +@@ -251,7 +251,7 @@ + True + Insert email addresses from Address Book + Insert email addresses from Address Book +- _Select... ++ _Select... + + + +@@ -308,7 +308,7 @@ + True + True + True +- gtk-cancel ++ gtk-cancel + True + + +@@ -317,7 +317,7 @@ + + True + True +- gtk-ok ++ gtk-ok + True + + +-- +cgit v0.8.3.1