[evolution/wip/gsettings: 28/30] Merge branch 'master' into wip/gsettings
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/gsettings: 28/30] Merge branch 'master' into wip/gsettings
- Date: Mon, 14 Nov 2011 17:05:29 +0000 (UTC)
commit 7ab5ae3fc72516cceeb09a48bc5a39f7b57933de
Merge: cda5253 c430805
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Mon Nov 14 13:08:57 2011 +0100
Merge branch 'master' into wip/gsettings
capplet/settings/Makefile.am | 6 +-
capplet/settings/mail-account-view.c | 85 -
configure.ac | 2 +-
e-util/e-config.c | 29 +-
help/es/es.po | 9 +-
mail/Makefile.am | 4 +-
mail/e-mail-migrate.c | 352 +----
mail/em-account-editor.c | 590 ++++++-
mail/em-account-editor.h | 1 -
mail/em-utils.c | 27 -
mail/em-utils.h | 2 -
.../settings => mail}/mail-autoconfig/Makefile.am | 0
{capplet/settings => mail}/mail-autoconfig/README | 0
.../settings => mail}/mail-autoconfig/a.memail.jp | 0
.../mail-autoconfig/abc.plala.or.jp | 0
.../mail-autoconfig/agate.plala.or.jp | 0
.../mail-autoconfig/amail.plala.or.jp | 0
.../mail-autoconfig/amber.plala.or.jp | 0
.../mail-autoconfig/amethyst.broba.cc | 0
{capplet/settings => mail}/mail-autoconfig/aol.com | 0
.../mail-autoconfig/apost.plala.or.jp | 0
.../mail-autoconfig/aqua.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/arcor.de | 0
.../mail-autoconfig/ballade.plala.or.jp | 0
.../mail-autoconfig/bay.gunmanet.ne.jp | 0
.../mail-autoconfig/bb-niigata.jp | 0
.../mail-autoconfig/bc.iij4u.or.jp | 0
.../mail-autoconfig/beige.plala.or.jp | 0
.../mail-autoconfig/blue.plala.or.jp | 0
.../mail-autoconfig/bmail.plala.or.jp | 0
.../mail-autoconfig/bolero.plala.or.jp | 0
.../mail-autoconfig/bpost.plala.or.jp | 0
.../mail-autoconfig/brown.plala.or.jp | 0
.../mail-autoconfig/camel.plala.or.jp | 0
.../mail-autoconfig/cameo.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/cc9.ne.jp | 0
.../settings => mail}/mail-autoconfig/cek.ne.jp | 0
.../settings => mail}/mail-autoconfig/clio.ne.jp | 0
.../mail-autoconfig/cmail.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/co1.wind.jp | 0
.../settings => mail}/mail-autoconfig/co2.wind.jp | 0
.../settings => mail}/mail-autoconfig/co3.wind.jp | 0
.../mail-autoconfig/cocoa.plala.or.jp | 0
.../mail-autoconfig/coda.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/comcast.net | 0
.../mail-autoconfig/concerto.plala.or.jp | 0
.../mail-autoconfig/coral.plala.or.jp | 0
.../mail-autoconfig/courante.plala.or.jp | 0
.../mail-autoconfig/cpost.plala.or.jp | 0
.../mail-autoconfig/cream.plala.or.jp | 0
.../mail-autoconfig/dan.gunmanet.ne.jp | 0
.../mail-autoconfig/dance.plala.or.jp | 0
.../mail-autoconfig/dmail.plala.or.jp | 0
{capplet/settings => mail}/mail-autoconfig/e23.jp | 0
.../mail-autoconfig/earthlink.net | 0
.../mail-autoconfig/ebony.plala.or.jp | 0
.../mail-autoconfig/email.plala.or.jp | 0
.../mail-autoconfig/fantasy.plala.or.jp | 0
.../mail-autoconfig/flamenco.plala.or.jp | 0
.../mail-autoconfig/fmail.plala.or.jp | 0
{capplet/settings => mail}/mail-autoconfig/free.fr | 0
.../settings => mail}/mail-autoconfig/freenet.de | 0
.../mail-autoconfig/fuga.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/gmail.com | 0
.../mail-autoconfig/gmail.com imap | 0
.../mail-autoconfig/gmail.com pop | 0
.../mail-autoconfig/gmail.plala.or.jp | 0
{capplet/settings => mail}/mail-autoconfig/gmx.com | 0
{capplet/settings => mail}/mail-autoconfig/gmx.net | 0
.../settings => mail}/mail-autoconfig/go.tvm.ne.jp | 0
{capplet/settings => mail}/mail-autoconfig/goo.jp | 0
.../mail-autoconfig/googlemail.com | 0
.../mail-autoconfig/grape.plala.or.jp | 0
.../mail-autoconfig/gray.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/hal.ne.jp | 0
.../settings => mail}/mail-autoconfig/hana.or.jp | 0
.../mail-autoconfig/hotmail.co.jp | 0
.../mail-autoconfig/hotmail.co.uk | 0
.../settings => mail}/mail-autoconfig/hotmail.com | 0
.../settings => mail}/mail-autoconfig/hotmail.de | 0
.../settings => mail}/mail-autoconfig/hotmail.fr | 0
.../settings => mail}/mail-autoconfig/hotmail.it | 0
.../settings => mail}/mail-autoconfig/ic-net.or.jp | 0
.../mail-autoconfig/iiyama-catv.ne.jp | 0
.../mail-autoconfig/imail.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/inbox.lt | 0
.../settings => mail}/mail-autoconfig/inbox.lv | 0
.../mail-autoconfig/indigo.plala.or.jp | 0
.../mail-autoconfig/inet-shibata.or.jp | 0
.../mail-autoconfig/ivory.plala.or.jp | 0
.../mail-autoconfig/iwafune.ne.jp | 0
.../mail-autoconfig/jade.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/janis.or.jp | 0
.../settings => mail}/mail-autoconfig/jet.ne.jp | 0
.../mail-autoconfig/jet.ne.jp imap | 0
.../mail-autoconfig/jet.ne.jp pop | 0
.../settings => mail}/mail-autoconfig/ji.jet.ne.jp | 0
.../mail-autoconfig/jmail.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/k1.wind.jp | 0
.../mail-autoconfig/khaki.plala.or.jp | 0
.../mail-autoconfig/kmail.plala.or.jp | 0
.../mail-autoconfig/kokuyou.ne.jp | 0
.../mail-autoconfig/lapis.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/laposte.net | 0
.../mail-autoconfig/lemon.plala.or.jp | 0
.../mail-autoconfig/lilac.plala.or.jp | 0
.../mail-autoconfig/lime.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/live.co.jp | 0
.../settings => mail}/mail-autoconfig/live.co.uk | 0
.../settings => mail}/mail-autoconfig/live.com | 0
{capplet/settings => mail}/mail-autoconfig/live.de | 0
{capplet/settings => mail}/mail-autoconfig/live.fr | 0
{capplet/settings => mail}/mail-autoconfig/live.it | 0
.../mail-autoconfig/ma100.tiki.ne.jp | 0
{capplet/settings => mail}/mail-autoconfig/mac.com | 0
.../mail-autoconfig/mahoroba.ne.jp | 0
.../mail-autoconfig/mail.gunmanet.jp | 0
.../mail-autoconfig/mail.iwafune.ne.jp | 0
.../mail-autoconfig/maroon.plala.or.jp | 0
{capplet/settings => mail}/mail-autoconfig/me.com | 0
.../mail-autoconfig/minuet.plala.or.jp | 0
.../mail-autoconfig/ml.murakami.ne.jp | 0
.../mail-autoconfig/ml.shibata.ne.jp | 0
.../settings => mail}/mail-autoconfig/mnet.ne.jp | 0
.../settings => mail}/mail-autoconfig/mopera.net | 0
{capplet/settings => mail}/mail-autoconfig/msn.com | 0
.../mail-autoconfig/navy.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/nifty.com | 0
{capplet/settings => mail}/mail-autoconfig/nsat.jp | 0
.../mail-autoconfig/olive.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/online.de | 0
.../mail-autoconfig/opal.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/orange.fr | 0
.../mail-autoconfig/orange.plala.or.jp | 0
.../mail-autoconfig/orchid.plala.or.jp | 0
.../mail-autoconfig/pal.kijimadaira.jp | 0
.../mail-autoconfig/palette.plala.or.jp | 0
.../mail-autoconfig/parabox.or.jp | 0
.../mail-autoconfig/peach.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/peoplepc.com | 0
.../mail-autoconfig/plum.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/po.dcn.ne.jp | 0
.../settings => mail}/mail-autoconfig/po.wind.jp | 0
.../mail-autoconfig/polka.plala.or.jp | 0
.../mail-autoconfig/pop.shibata.ne.jp | 0
.../mail-autoconfig/purple.plala.or.jp | 0
.../mail-autoconfig/rainbow.plala.or.jp | 0
.../mail-autoconfig/red.plala.or.jp | 0
.../mail-autoconfig/rmail.plala.or.jp | 0
.../mail-autoconfig/rondo.plala.or.jp | 0
.../mail-autoconfig/rose.plala.or.jp | 0
.../mail-autoconfig/rouge.plala.or.jp | 0
.../mail-autoconfig/ruby.plala.or.jp | 0
.../mail-autoconfig/sakunet.ne.jp | 0
.../mail-autoconfig/sea.plala.or.jp | 0
.../mail-autoconfig/sepia.plala.or.jp | 0
.../mail-autoconfig/serenade.plala.or.jp | 0
.../mail-autoconfig/silk.plala.or.jp | 0
.../mail-autoconfig/silver.plala.or.jp | 0
.../mail-autoconfig/sky.plala.or.jp | 0
.../mail-autoconfig/smail.plala.or.jp | 0
.../mail-autoconfig/snow.plala.or.jp | 0
.../mail-autoconfig/so.wind.ne.jp | 0
.../mail-autoconfig/sonata.plala.or.jp | 0
.../mail-autoconfig/suite.plala.or.jp | 0
.../mail-autoconfig/symphony.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/t-online.de | 0
.../mail-autoconfig/t-online.de free | 0
.../mail-autoconfig/t-online.de imap ssl | 0
.../mail-autoconfig/t-online.de pop ssl | 0
.../mail-autoconfig/taupe.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/tiki.ne.jp | 0
.../mail-autoconfig/tmail.plala.or.jp | 0
.../mail-autoconfig/toccata.plala.or.jp | 0
.../mail-autoconfig/topaz.plala.or.jp | 0
.../mail-autoconfig/trio.plala.or.jp | 0
.../mail-autoconfig/umail.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/verizon.net | 0
.../mail-autoconfig/violet.plala.or.jp | 0
.../mail-autoconfig/vm.aikis.or.jp | 0
.../mail-autoconfig/vmail.plala.or.jp | 0
.../mail-autoconfig/vp.tiki.ne.jp | 0
.../mail-autoconfig/waltz.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/wanadoo.fr | 0
.../mail-autoconfig/wanadoo.fr imap | 0
.../mail-autoconfig/wanadoo.fr pop | 0
.../mail-autoconfig/wave.plala.or.jp | 0
{capplet/settings => mail}/mail-autoconfig/web.de | 0
.../mail-autoconfig/white.plala.or.jp | 0
.../mail-autoconfig/wine.plala.or.jp | 0
.../mail-autoconfig/wmail.plala.or.jp | 0
.../mail-autoconfig/xmail.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/xp.wind.jp | 0
.../mail-autoconfig/xpost.plala.or.jp | 0
.../settings => mail}/mail-autoconfig/xs4all.nl | 0
.../settings => mail}/mail-autoconfig/yahoo.com | 0
.../settings => mail}/mail-autoconfig/ybb.ne.jp | 0
.../mail-autoconfig/yellow.plala.or.jp | 0
.../mail-autoconfig/ymail.plala.or.jp | 0
.../mail-autoconfig/ypost.plala.or.jp | 0
.../mail-autoconfig/zmail.plala.or.jp | 0
mail/mail-config.ui | 284 +++
{capplet/settings => mail}/mail-guess-servers.c | 0
{capplet/settings => mail}/mail-guess-servers.h | 0
mail/mail-ops.c | 21 +-
mail/mail-vfolder.c | 62 +-
modules/addressbook/ldap-config.ui | 6 +-
modules/mail/e-mail-shell-backend.c | 7 +-
modules/mail/e-mail-shell-view-actions.c | 2 +
modules/mail/e-mail-shell-view.c | 2 +-
modules/online-accounts/e-online-accounts-google.c | 13 +-
po/POTFILES.in | 1 -
po/de.po | 1948 ++++++++++----------
po/es.po | 812 +++++----
po/gl.po | 1606 +++++++++--------
po/nb.po | 1197 ++++++------
shell/e-shell-view.c | 26 +-
217 files changed, 3758 insertions(+), 3336 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
