aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--capplet/settings/Makefile.am6
-rw-r--r--capplet/settings/mail-account-view.c85
-rw-r--r--configure.ac2
-rw-r--r--e-util/e-config.c29
-rw-r--r--help/es/es.po9
-rw-r--r--mail/Makefile.am4
-rw-r--r--mail/e-mail-migrate.c352
-rw-r--r--mail/em-account-editor.c590
-rw-r--r--mail/em-account-editor.h1
-rw-r--r--mail/em-utils.c27
-rw-r--r--mail/em-utils.h2
-rw-r--r--mail/mail-autoconfig/Makefile.am (renamed from capplet/settings/mail-autoconfig/Makefile.am)0
-rw-r--r--mail/mail-autoconfig/README (renamed from capplet/settings/mail-autoconfig/README)0
-rw-r--r--mail/mail-autoconfig/a.memail.jp (renamed from capplet/settings/mail-autoconfig/a.memail.jp)0
-rw-r--r--mail/mail-autoconfig/abc.plala.or.jp (renamed from capplet/settings/mail-autoconfig/abc.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/agate.plala.or.jp (renamed from capplet/settings/mail-autoconfig/agate.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/amail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/amail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/amber.plala.or.jp (renamed from capplet/settings/mail-autoconfig/amber.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/amethyst.broba.cc (renamed from capplet/settings/mail-autoconfig/amethyst.broba.cc)0
-rw-r--r--mail/mail-autoconfig/aol.com (renamed from capplet/settings/mail-autoconfig/aol.com)0
-rw-r--r--mail/mail-autoconfig/apost.plala.or.jp (renamed from capplet/settings/mail-autoconfig/apost.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/aqua.plala.or.jp (renamed from capplet/settings/mail-autoconfig/aqua.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/arcor.de (renamed from capplet/settings/mail-autoconfig/arcor.de)0
-rw-r--r--mail/mail-autoconfig/ballade.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ballade.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/bay.gunmanet.ne.jp (renamed from capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/bb-niigata.jp (renamed from capplet/settings/mail-autoconfig/bb-niigata.jp)0
-rw-r--r--mail/mail-autoconfig/bc.iij4u.or.jp (renamed from capplet/settings/mail-autoconfig/bc.iij4u.or.jp)0
-rw-r--r--mail/mail-autoconfig/beige.plala.or.jp (renamed from capplet/settings/mail-autoconfig/beige.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/blue.plala.or.jp (renamed from capplet/settings/mail-autoconfig/blue.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/bmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/bmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/bolero.plala.or.jp (renamed from capplet/settings/mail-autoconfig/bolero.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/bpost.plala.or.jp (renamed from capplet/settings/mail-autoconfig/bpost.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/brown.plala.or.jp (renamed from capplet/settings/mail-autoconfig/brown.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/camel.plala.or.jp (renamed from capplet/settings/mail-autoconfig/camel.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/cameo.plala.or.jp (renamed from capplet/settings/mail-autoconfig/cameo.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/cc9.ne.jp (renamed from capplet/settings/mail-autoconfig/cc9.ne.jp)0
-rw-r--r--mail/mail-autoconfig/cek.ne.jp (renamed from capplet/settings/mail-autoconfig/cek.ne.jp)0
-rw-r--r--mail/mail-autoconfig/clio.ne.jp (renamed from capplet/settings/mail-autoconfig/clio.ne.jp)0
-rw-r--r--mail/mail-autoconfig/cmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/cmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/co1.wind.jp (renamed from capplet/settings/mail-autoconfig/co1.wind.jp)0
-rw-r--r--mail/mail-autoconfig/co2.wind.jp (renamed from capplet/settings/mail-autoconfig/co2.wind.jp)0
-rw-r--r--mail/mail-autoconfig/co3.wind.jp (renamed from capplet/settings/mail-autoconfig/co3.wind.jp)0
-rw-r--r--mail/mail-autoconfig/cocoa.plala.or.jp (renamed from capplet/settings/mail-autoconfig/cocoa.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/coda.plala.or.jp (renamed from capplet/settings/mail-autoconfig/coda.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/comcast.net (renamed from capplet/settings/mail-autoconfig/comcast.net)0
-rw-r--r--mail/mail-autoconfig/concerto.plala.or.jp (renamed from capplet/settings/mail-autoconfig/concerto.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/coral.plala.or.jp (renamed from capplet/settings/mail-autoconfig/coral.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/courante.plala.or.jp (renamed from capplet/settings/mail-autoconfig/courante.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/cpost.plala.or.jp (renamed from capplet/settings/mail-autoconfig/cpost.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/cream.plala.or.jp (renamed from capplet/settings/mail-autoconfig/cream.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/dan.gunmanet.ne.jp (renamed from capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/dance.plala.or.jp (renamed from capplet/settings/mail-autoconfig/dance.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/dmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/dmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/e23.jp (renamed from capplet/settings/mail-autoconfig/e23.jp)0
-rw-r--r--mail/mail-autoconfig/earthlink.net (renamed from capplet/settings/mail-autoconfig/earthlink.net)0
-rw-r--r--mail/mail-autoconfig/ebony.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ebony.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/email.plala.or.jp (renamed from capplet/settings/mail-autoconfig/email.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/fantasy.plala.or.jp (renamed from capplet/settings/mail-autoconfig/fantasy.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/flamenco.plala.or.jp (renamed from capplet/settings/mail-autoconfig/flamenco.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/fmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/fmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/free.fr (renamed from capplet/settings/mail-autoconfig/free.fr)0
-rw-r--r--mail/mail-autoconfig/freenet.de (renamed from capplet/settings/mail-autoconfig/freenet.de)0
-rw-r--r--mail/mail-autoconfig/fuga.plala.or.jp (renamed from capplet/settings/mail-autoconfig/fuga.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/gmail.com (renamed from capplet/settings/mail-autoconfig/gmail.com)0
-rw-r--r--mail/mail-autoconfig/gmail.com imap (renamed from capplet/settings/mail-autoconfig/gmail.com imap)0
-rw-r--r--mail/mail-autoconfig/gmail.com pop (renamed from capplet/settings/mail-autoconfig/gmail.com pop)0
-rw-r--r--mail/mail-autoconfig/gmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/gmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/gmx.com (renamed from capplet/settings/mail-autoconfig/gmx.com)0
-rw-r--r--mail/mail-autoconfig/gmx.net (renamed from capplet/settings/mail-autoconfig/gmx.net)0
-rw-r--r--mail/mail-autoconfig/go.tvm.ne.jp (renamed from capplet/settings/mail-autoconfig/go.tvm.ne.jp)0
-rw-r--r--mail/mail-autoconfig/goo.jp (renamed from capplet/settings/mail-autoconfig/goo.jp)0
-rw-r--r--mail/mail-autoconfig/googlemail.com (renamed from capplet/settings/mail-autoconfig/googlemail.com)0
-rw-r--r--mail/mail-autoconfig/grape.plala.or.jp (renamed from capplet/settings/mail-autoconfig/grape.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/gray.plala.or.jp (renamed from capplet/settings/mail-autoconfig/gray.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/hal.ne.jp (renamed from capplet/settings/mail-autoconfig/hal.ne.jp)0
-rw-r--r--mail/mail-autoconfig/hana.or.jp (renamed from capplet/settings/mail-autoconfig/hana.or.jp)0
-rw-r--r--mail/mail-autoconfig/hotmail.co.jp (renamed from capplet/settings/mail-autoconfig/hotmail.co.jp)0
-rw-r--r--mail/mail-autoconfig/hotmail.co.uk (renamed from capplet/settings/mail-autoconfig/hotmail.co.uk)0
-rw-r--r--mail/mail-autoconfig/hotmail.com (renamed from capplet/settings/mail-autoconfig/hotmail.com)0
-rw-r--r--mail/mail-autoconfig/hotmail.de (renamed from capplet/settings/mail-autoconfig/hotmail.de)0
-rw-r--r--mail/mail-autoconfig/hotmail.fr (renamed from capplet/settings/mail-autoconfig/hotmail.fr)0
-rw-r--r--mail/mail-autoconfig/hotmail.it (renamed from capplet/settings/mail-autoconfig/hotmail.it)0
-rw-r--r--mail/mail-autoconfig/ic-net.or.jp (renamed from capplet/settings/mail-autoconfig/ic-net.or.jp)0
-rw-r--r--mail/mail-autoconfig/iiyama-catv.ne.jp (renamed from capplet/settings/mail-autoconfig/iiyama-catv.ne.jp)0
-rw-r--r--mail/mail-autoconfig/imail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/imail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/inbox.lt (renamed from capplet/settings/mail-autoconfig/inbox.lt)0
-rw-r--r--mail/mail-autoconfig/inbox.lv (renamed from capplet/settings/mail-autoconfig/inbox.lv)0
-rw-r--r--mail/mail-autoconfig/indigo.plala.or.jp (renamed from capplet/settings/mail-autoconfig/indigo.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/inet-shibata.or.jp (renamed from capplet/settings/mail-autoconfig/inet-shibata.or.jp)0
-rw-r--r--mail/mail-autoconfig/ivory.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ivory.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/iwafune.ne.jp (renamed from capplet/settings/mail-autoconfig/iwafune.ne.jp)0
-rw-r--r--mail/mail-autoconfig/jade.plala.or.jp (renamed from capplet/settings/mail-autoconfig/jade.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/janis.or.jp (renamed from capplet/settings/mail-autoconfig/janis.or.jp)0
-rw-r--r--mail/mail-autoconfig/jet.ne.jp (renamed from capplet/settings/mail-autoconfig/jet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/jet.ne.jp imap (renamed from capplet/settings/mail-autoconfig/jet.ne.jp imap)0
-rw-r--r--mail/mail-autoconfig/jet.ne.jp pop (renamed from capplet/settings/mail-autoconfig/jet.ne.jp pop)0
-rw-r--r--mail/mail-autoconfig/ji.jet.ne.jp (renamed from capplet/settings/mail-autoconfig/ji.jet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/jmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/jmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/k1.wind.jp (renamed from capplet/settings/mail-autoconfig/k1.wind.jp)0
-rw-r--r--mail/mail-autoconfig/khaki.plala.or.jp (renamed from capplet/settings/mail-autoconfig/khaki.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/kmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/kmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/kokuyou.ne.jp (renamed from capplet/settings/mail-autoconfig/kokuyou.ne.jp)0
-rw-r--r--mail/mail-autoconfig/lapis.plala.or.jp (renamed from capplet/settings/mail-autoconfig/lapis.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/laposte.net (renamed from capplet/settings/mail-autoconfig/laposte.net)0
-rw-r--r--mail/mail-autoconfig/lemon.plala.or.jp (renamed from capplet/settings/mail-autoconfig/lemon.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/lilac.plala.or.jp (renamed from capplet/settings/mail-autoconfig/lilac.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/lime.plala.or.jp (renamed from capplet/settings/mail-autoconfig/lime.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/live.co.jp (renamed from capplet/settings/mail-autoconfig/live.co.jp)0
-rw-r--r--mail/mail-autoconfig/live.co.uk (renamed from capplet/settings/mail-autoconfig/live.co.uk)0
-rw-r--r--mail/mail-autoconfig/live.com (renamed from capplet/settings/mail-autoconfig/live.com)0
-rw-r--r--mail/mail-autoconfig/live.de (renamed from capplet/settings/mail-autoconfig/live.de)0
-rw-r--r--mail/mail-autoconfig/live.fr (renamed from capplet/settings/mail-autoconfig/live.fr)0
-rw-r--r--mail/mail-autoconfig/live.it (renamed from capplet/settings/mail-autoconfig/live.it)0
-rw-r--r--mail/mail-autoconfig/ma100.tiki.ne.jp (renamed from capplet/settings/mail-autoconfig/ma100.tiki.ne.jp)0
-rw-r--r--mail/mail-autoconfig/mac.com (renamed from capplet/settings/mail-autoconfig/mac.com)0
-rw-r--r--mail/mail-autoconfig/mahoroba.ne.jp (renamed from capplet/settings/mail-autoconfig/mahoroba.ne.jp)0
-rw-r--r--mail/mail-autoconfig/mail.gunmanet.jp (renamed from capplet/settings/mail-autoconfig/mail.gunmanet.jp)0
-rw-r--r--mail/mail-autoconfig/mail.iwafune.ne.jp (renamed from capplet/settings/mail-autoconfig/mail.iwafune.ne.jp)0
-rw-r--r--mail/mail-autoconfig/maroon.plala.or.jp (renamed from capplet/settings/mail-autoconfig/maroon.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/me.com (renamed from capplet/settings/mail-autoconfig/me.com)0
-rw-r--r--mail/mail-autoconfig/minuet.plala.or.jp (renamed from capplet/settings/mail-autoconfig/minuet.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/ml.murakami.ne.jp (renamed from capplet/settings/mail-autoconfig/ml.murakami.ne.jp)0
-rw-r--r--mail/mail-autoconfig/ml.shibata.ne.jp (renamed from capplet/settings/mail-autoconfig/ml.shibata.ne.jp)0
-rw-r--r--mail/mail-autoconfig/mnet.ne.jp (renamed from capplet/settings/mail-autoconfig/mnet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/mopera.net (renamed from capplet/settings/mail-autoconfig/mopera.net)0
-rw-r--r--mail/mail-autoconfig/msn.com (renamed from capplet/settings/mail-autoconfig/msn.com)0
-rw-r--r--mail/mail-autoconfig/navy.plala.or.jp (renamed from capplet/settings/mail-autoconfig/navy.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/nifty.com (renamed from capplet/settings/mail-autoconfig/nifty.com)0
-rw-r--r--mail/mail-autoconfig/nsat.jp (renamed from capplet/settings/mail-autoconfig/nsat.jp)0
-rw-r--r--mail/mail-autoconfig/olive.plala.or.jp (renamed from capplet/settings/mail-autoconfig/olive.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/online.de (renamed from capplet/settings/mail-autoconfig/online.de)0
-rw-r--r--mail/mail-autoconfig/opal.plala.or.jp (renamed from capplet/settings/mail-autoconfig/opal.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/orange.fr (renamed from capplet/settings/mail-autoconfig/orange.fr)0
-rw-r--r--mail/mail-autoconfig/orange.plala.or.jp (renamed from capplet/settings/mail-autoconfig/orange.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/orchid.plala.or.jp (renamed from capplet/settings/mail-autoconfig/orchid.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/pal.kijimadaira.jp (renamed from capplet/settings/mail-autoconfig/pal.kijimadaira.jp)0
-rw-r--r--mail/mail-autoconfig/palette.plala.or.jp (renamed from capplet/settings/mail-autoconfig/palette.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/parabox.or.jp (renamed from capplet/settings/mail-autoconfig/parabox.or.jp)0
-rw-r--r--mail/mail-autoconfig/peach.plala.or.jp (renamed from capplet/settings/mail-autoconfig/peach.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/peoplepc.com (renamed from capplet/settings/mail-autoconfig/peoplepc.com)0
-rw-r--r--mail/mail-autoconfig/plum.plala.or.jp (renamed from capplet/settings/mail-autoconfig/plum.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/po.dcn.ne.jp (renamed from capplet/settings/mail-autoconfig/po.dcn.ne.jp)0
-rw-r--r--mail/mail-autoconfig/po.wind.jp (renamed from capplet/settings/mail-autoconfig/po.wind.jp)0
-rw-r--r--mail/mail-autoconfig/polka.plala.or.jp (renamed from capplet/settings/mail-autoconfig/polka.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/pop.shibata.ne.jp (renamed from capplet/settings/mail-autoconfig/pop.shibata.ne.jp)0
-rw-r--r--mail/mail-autoconfig/purple.plala.or.jp (renamed from capplet/settings/mail-autoconfig/purple.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/rainbow.plala.or.jp (renamed from capplet/settings/mail-autoconfig/rainbow.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/red.plala.or.jp (renamed from capplet/settings/mail-autoconfig/red.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/rmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/rmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/rondo.plala.or.jp (renamed from capplet/settings/mail-autoconfig/rondo.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/rose.plala.or.jp (renamed from capplet/settings/mail-autoconfig/rose.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/rouge.plala.or.jp (renamed from capplet/settings/mail-autoconfig/rouge.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/ruby.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ruby.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/sakunet.ne.jp (renamed from capplet/settings/mail-autoconfig/sakunet.ne.jp)0
-rw-r--r--mail/mail-autoconfig/sea.plala.or.jp (renamed from capplet/settings/mail-autoconfig/sea.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/sepia.plala.or.jp (renamed from capplet/settings/mail-autoconfig/sepia.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/serenade.plala.or.jp (renamed from capplet/settings/mail-autoconfig/serenade.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/silk.plala.or.jp (renamed from capplet/settings/mail-autoconfig/silk.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/silver.plala.or.jp (renamed from capplet/settings/mail-autoconfig/silver.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/sky.plala.or.jp (renamed from capplet/settings/mail-autoconfig/sky.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/smail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/smail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/snow.plala.or.jp (renamed from capplet/settings/mail-autoconfig/snow.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/so.wind.ne.jp (renamed from capplet/settings/mail-autoconfig/so.wind.ne.jp)0
-rw-r--r--mail/mail-autoconfig/sonata.plala.or.jp (renamed from capplet/settings/mail-autoconfig/sonata.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/suite.plala.or.jp (renamed from capplet/settings/mail-autoconfig/suite.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/symphony.plala.or.jp (renamed from capplet/settings/mail-autoconfig/symphony.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/t-online.de (renamed from capplet/settings/mail-autoconfig/t-online.de)0
-rw-r--r--mail/mail-autoconfig/t-online.de free (renamed from capplet/settings/mail-autoconfig/t-online.de free)0
-rw-r--r--mail/mail-autoconfig/t-online.de imap ssl (renamed from capplet/settings/mail-autoconfig/t-online.de imap ssl)0
-rw-r--r--mail/mail-autoconfig/t-online.de pop ssl (renamed from capplet/settings/mail-autoconfig/t-online.de pop ssl)0
-rw-r--r--mail/mail-autoconfig/taupe.plala.or.jp (renamed from capplet/settings/mail-autoconfig/taupe.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/tiki.ne.jp (renamed from capplet/settings/mail-autoconfig/tiki.ne.jp)0
-rw-r--r--mail/mail-autoconfig/tmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/tmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/toccata.plala.or.jp (renamed from capplet/settings/mail-autoconfig/toccata.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/topaz.plala.or.jp (renamed from capplet/settings/mail-autoconfig/topaz.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/trio.plala.or.jp (renamed from capplet/settings/mail-autoconfig/trio.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/umail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/umail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/verizon.net (renamed from capplet/settings/mail-autoconfig/verizon.net)0
-rw-r--r--mail/mail-autoconfig/violet.plala.or.jp (renamed from capplet/settings/mail-autoconfig/violet.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/vm.aikis.or.jp (renamed from capplet/settings/mail-autoconfig/vm.aikis.or.jp)0
-rw-r--r--mail/mail-autoconfig/vmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/vmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/vp.tiki.ne.jp (renamed from capplet/settings/mail-autoconfig/vp.tiki.ne.jp)0
-rw-r--r--mail/mail-autoconfig/waltz.plala.or.jp (renamed from capplet/settings/mail-autoconfig/waltz.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/wanadoo.fr (renamed from capplet/settings/mail-autoconfig/wanadoo.fr)0
-rw-r--r--mail/mail-autoconfig/wanadoo.fr imap (renamed from capplet/settings/mail-autoconfig/wanadoo.fr imap)0
-rw-r--r--mail/mail-autoconfig/wanadoo.fr pop (renamed from capplet/settings/mail-autoconfig/wanadoo.fr pop)0
-rw-r--r--mail/mail-autoconfig/wave.plala.or.jp (renamed from capplet/settings/mail-autoconfig/wave.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/web.de (renamed from capplet/settings/mail-autoconfig/web.de)0
-rw-r--r--mail/mail-autoconfig/white.plala.or.jp (renamed from capplet/settings/mail-autoconfig/white.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/wine.plala.or.jp (renamed from capplet/settings/mail-autoconfig/wine.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/wmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/wmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/xmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/xmail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/xp.wind.jp (renamed from capplet/settings/mail-autoconfig/xp.wind.jp)0
-rw-r--r--mail/mail-autoconfig/xpost.plala.or.jp (renamed from capplet/settings/mail-autoconfig/xpost.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/xs4all.nl (renamed from capplet/settings/mail-autoconfig/xs4all.nl)0
-rw-r--r--mail/mail-autoconfig/yahoo.com (renamed from capplet/settings/mail-autoconfig/yahoo.com)0
-rw-r--r--mail/mail-autoconfig/ybb.ne.jp (renamed from capplet/settings/mail-autoconfig/ybb.ne.jp)0
-rw-r--r--mail/mail-autoconfig/yellow.plala.or.jp (renamed from capplet/settings/mail-autoconfig/yellow.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/ymail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ymail.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/ypost.plala.or.jp (renamed from capplet/settings/mail-autoconfig/ypost.plala.or.jp)0
-rw-r--r--mail/mail-autoconfig/zmail.plala.or.jp (renamed from capplet/settings/mail-autoconfig/zmail.plala.or.jp)0
-rw-r--r--mail/mail-config.ui284
-rw-r--r--mail/mail-guess-servers.c (renamed from capplet/settings/mail-guess-servers.c)0
-rw-r--r--mail/mail-guess-servers.h (renamed from capplet/settings/mail-guess-servers.h)0
-rw-r--r--mail/mail-ops.c21
-rw-r--r--mail/mail-vfolder.c62
-rw-r--r--modules/addressbook/ldap-config.ui6
-rw-r--r--modules/mail/e-mail-shell-backend.c7
-rw-r--r--modules/mail/e-mail-shell-view-actions.c2
-rw-r--r--modules/mail/e-mail-shell-view.c2
-rw-r--r--modules/online-accounts/e-online-accounts-google.c13
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/de.po1948
-rw-r--r--po/es.po812
-rw-r--r--po/gl.po1606
-rw-r--r--po/nb.po1197
-rw-r--r--shell/e-shell-view.c26
217 files changed, 3758 insertions, 3336 deletions
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index 9bd84db94b..1367fd5a75 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = mail-autoconfig
-
privsolib_LTLIBRARIES = libevolution-mail-settings.la
libevolution_mail_settings_la_CPPFLAGS = \
@@ -48,9 +46,7 @@ libevolution_mail_settings_la_SOURCES = \
mail-capplet-shell.c \
mail-capplet-shell.h \
anjal-mail-view.h \
- anjal-mail-view.c \
- mail-guess-servers.c \
- mail-guess-servers.h
+ anjal-mail-view.c
libevolution_mail_settings_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 35c561ed50..e6fd53b576 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -33,7 +33,6 @@
#include "mail-view.h"
#include "e-util/e-config.h"
#include "mail/e-mail-backend.h"
-#include "mail-guess-servers.h"
struct _MailAccountViewPrivate {
GtkWidget *tab_str;
@@ -970,89 +969,6 @@ mav_construct_page (MailAccountView *view,
return (GtkWidget *) page;
}
-static ServerData *
-emae_check_servers (const gchar *email)
-{
- ServerData *sdata = g_new0 (ServerData, 1);
- EmailProvider *provider = g_new0 (EmailProvider, 1);
- gchar *dupe = g_strdup (email);
- gchar *tmp;
-
- /* FIXME: Find a way to free the provider once given to account settings. */
- provider->email = (gchar *) email;
- tmp = strchr (email, '@');
- tmp++;
- provider->domain = tmp;
- tmp = strchr (dupe, '@');
- *tmp = 0;
- provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe));
- g_free (dupe);
-
- if (!mail_guess_servers (provider)) {
- g_free (provider);
- g_free (sdata);
- return NULL;
- }
- /*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
- provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth,
- provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth,
- provider->recv_socket_type, provider->send_socket_type); */
-
- sdata->recv = provider->recv_hostname;
- sdata->recv_port = provider->recv_port;
- sdata->send = provider->send_hostname;
- sdata->send_port = provider->send_port;
- if (strcmp (provider->recv_type, "pop3") == 0)
- sdata->proto = g_strdup ("pop");
- else if (strcmp (provider->recv_type, "imap") == 0)
- sdata->proto = g_strdup ("imapx");
- else
- sdata->proto = provider->recv_type;
- if (provider->recv_socket_type) {
- CamelNetworkSecurityMethod method;
-
- if (g_ascii_strcasecmp (provider->recv_socket_type, "SSL") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
- else if (g_ascii_strcasecmp (provider->recv_socket_type, "secure") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
- else if (g_ascii_strcasecmp (provider->recv_socket_type, "STARTTLS") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
- else if (g_ascii_strcasecmp (provider->recv_socket_type, "TLS") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
- else
- method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
-
- sdata->security_method = method;
- sdata->recv_security_method = method;
- }
-
- if (provider->send_socket_type) {
- CamelNetworkSecurityMethod method;
-
- if (g_ascii_strcasecmp (provider->send_socket_type, "SSL") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
- else if (g_ascii_strcasecmp (provider->send_socket_type, "secure") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
- else if (g_ascii_strcasecmp (provider->send_socket_type, "STARTTLS") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
- else if (g_ascii_strcasecmp (provider->send_socket_type, "TLS") == 0)
- method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
- else
- method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
-
- sdata->send_security_method = method;
- }
-
- sdata->send_auth = provider->send_auth;
- sdata->recv_auth = provider->recv_auth;
- sdata->send_user = provider->send_username;
- sdata->recv_user = provider->recv_username;
-
- g_free (provider);
-
- return sdata;
-}
-
static void
next_page (GtkWidget *entry,
MailAccountView *mav)
@@ -1088,7 +1004,6 @@ mail_account_view_construct (MailAccountView *view,
view->original, EMAE_PAGES, backend,
"org.gnome.evolution.mail.config.accountWizard", view->wpages);
gtk_widget_hide (e_config_create_widget (E_CONFIG (view->edit->config)));
- view->edit->emae_check_servers = emae_check_servers;
if (!view->original) {
e_account_set_bool (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE);
e_account_set_bool (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_TRANSPORT_SAVE_PASSWD, TRUE);
diff --git a/configure.ac b/configure.ac
index 71198b1ec5..1152035cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1670,6 +1670,7 @@ mail/default/sr@latin/Makefile
mail/default/sv/Makefile
mail/default/zh_CN/Makefile
mail/importers/Makefile
+mail/mail-autoconfig/Makefile
maint/Makefile
modules/Makefile
modules/addressbook/Makefile
@@ -1727,7 +1728,6 @@ smime/gui/Makefile
sounds/Makefile
capplet/Makefile
capplet/settings/Makefile
-capplet/settings/mail-autoconfig/Makefile
evolution-zip
evolution-calendar.pc
evolution-mail.pc
diff --git a/e-util/e-config.c b/e-util/e-config.c
index a19bbafb3d..06117c2a9f 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -138,11 +138,11 @@ config_finalize (GObject *object)
while (link != NULL) {
struct _widget_node *node = link->data;
- /* disconnect the gtk_widget_destroyed function from the widget */
+ /* disconnect the ec_widget_destroyed function from the widget */
if (node->widget)
g_signal_handlers_disconnect_matched (
node->widget, G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, &node->widget);
+ 0, 0, NULL, NULL, node);
g_free (node);
@@ -560,6 +560,16 @@ ec_assistant_forward (gint current_page,
}
static void
+ec_widget_destroyed (GtkWidget *widget,
+ struct _widget_node *node)
+{
+ /* Use our own function instead of gtk_widget_destroyed()
+ * so it's easier to trap EConfig widgets in a debugger. */
+
+ node->widget = NULL;
+}
+
+static void
ec_rebuild (EConfig *emp)
{
EConfigPrivate *p = emp->priv;
@@ -829,6 +839,7 @@ ec_rebuild (EConfig *emp)
} else {
gtk_assistant_prepend_page (GTK_ASSISTANT (assistant), page);
}
+
gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, item->type == E_CONFIG_PAGE ? GTK_ASSISTANT_PAGE_CONTENT : GTK_ASSISTANT_PAGE_PROGRESS);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, translated_label);
gtk_widget_show_all (page);
@@ -860,7 +871,9 @@ ec_rebuild (EConfig *emp)
sectionnode = NULL;
wn->widget = page;
if (page)
- g_signal_connect (page, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+ g_signal_connect (
+ page, "destroy",
+ G_CALLBACK (ec_widget_destroyed), wn);
break;
case E_CONFIG_SECTION:
case E_CONFIG_SECTION_TABLE:
@@ -962,7 +975,9 @@ ec_rebuild (EConfig *emp)
sectionno++;
wn->widget = section;
if (section)
- g_signal_connect (section, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+ g_signal_connect (
+ section, "destroy",
+ G_CALLBACK (ec_widget_destroyed), wn);
sectionnode = wn;
break;
case E_CONFIG_ITEM:
@@ -1001,7 +1016,9 @@ ec_rebuild (EConfig *emp)
wn->widget = w;
if (w) {
- g_signal_connect (w, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+ g_signal_connect (
+ w, "destroy",
+ G_CALLBACK (ec_widget_destroyed), wn);
itemno++;
if (gtk_widget_get_visible (w))
@@ -1431,7 +1448,7 @@ e_config_page_next (EConfig *ec,
}
/**
- * e_config_page_next:
+ * e_config_page_prev:
* @ec: an #EConfig
* @pageid: The path of the page item.
*
diff --git a/help/es/es.po b/help/es/es.po
index 4b329752b7..e09e75accf 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: evolution-help.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-13 16:47+0000\n"
+"POT-Creation-Date: 2011-11-09 14:31+0000\n"
"PO-Revision-Date: 2011-10-14 12:19+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
@@ -3220,7 +3220,7 @@ msgid ""
msgstr ""
"Si usa un sistema de almacenamiento remoto como IMAP y ha creado carpetas de "
"búsqueda en ellos, la carpeta de búsqueda <gui>No coincidente</gui> también "
-"explora las carpetas en ellos. Si no crea ninguna carpeta de búsqueda que "
+"examina las carpetas en ellos. Si no crea ninguna carpeta de búsqueda que "
"busque en almacenes de correo remotos, la carpeta de búsqueda <gui>No "
"coincidente</gui> tampoco los buscará."
@@ -9657,15 +9657,10 @@ msgstr ""
"Evolution, Microsoft Outlook y Mozilla."
#: C/import-supported-file-formats.page:80(p)
-#| msgid "Outlook Express 5/6 Personal Folders (.dbx):"
msgid "Outlook Personal Folders (.pst):"
msgstr "Carpetas personales de Outlook (.pst):"
#: C/import-supported-file-formats.page:82(p)
-#| 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."
msgid ""
"A file format used to store local copies of messages, calendar events, and "
"other items within Microsoft software such as Microsoft Exchange Client, "
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 1ddbec649c..0a14a19ee9 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . default importers
+SUBDIRS = . default importers mail-autoconfig
privsolib_LTLIBRARIES = libevolution-mail.la
@@ -105,6 +105,7 @@ mailinclude_HEADERS = \
mail-autofilter.h \
mail-config.h \
mail-folder-cache.h \
+ mail-guess-servers.h \
mail-mt.h \
mail-ops.h \
mail-send-recv.h \
@@ -178,6 +179,7 @@ libevolution_mail_la_SOURCES = \
mail-autofilter.c \
mail-config.c \
mail-folder-cache.c \
+ mail-guess-servers.c \
mail-mt.c \
mail-ops.c \
mail-send-recv.c \
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 59605e24a4..f3ce503012 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -70,16 +70,6 @@
#define d(x) x
-typedef struct _MigrateStateInfo MigrateStateInfo;
-
-struct _MigrateStateInfo {
- gchar *label_name;
- gdouble progress;
-};
-
-static gboolean
-update_states_in_main_thread (MigrateStateInfo *info);
-
/* 1.4 upgrade functions */
#define EM_TYPE_MIGRATE_SESSION \
@@ -119,100 +109,9 @@ em_migrate_session_new (const gchar *user_data_dir)
"user-data-dir", user_data_dir, NULL);
}
-static GtkWidget *window;
-static GtkLabel *label;
static GtkProgressBar *progress;
static void
-em_migrate_setup_progress_dialog (const gchar *title,
- const gchar *desc)
-{
- GtkWidget *vbox, *hbox, *w;
- gchar *markup;
-
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title ((GtkWindow *) window, _("Migrating..."));
- gtk_window_set_modal ((GtkWindow *) window, TRUE);
- gtk_container_set_border_width ((GtkContainer *) window, 6);
-
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_widget_show (vbox);
- gtk_container_add ((GtkContainer *) window, vbox);
-
- w = gtk_label_new (desc);
-
- gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
- gtk_widget_show (w);
- gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0);
-
- hbox = gtk_hbox_new (FALSE, 6);
- gtk_widget_show (hbox);
- gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0);
-
- label = (GtkLabel *) gtk_label_new ("");
- gtk_widget_show ((GtkWidget *) label);
- gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0);
-
- progress = (GtkProgressBar *) gtk_progress_bar_new ();
- gtk_widget_show ((GtkWidget *) progress);
- gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0);
-
- /* Prepare the message */
- vbox = gtk_vbox_new (FALSE, 12);
- gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-
- w = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
- markup = g_strconcat (
- "<big><b>",
- title ? title : _("Migration"),
- "</b></big>", NULL);
- gtk_label_set_markup (GTK_LABEL (w), markup);
- gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
- g_free (markup);
-
- w = gtk_label_new (desc);
- gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
- gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-
- /* Progress bar */
- w = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-
- label = GTK_LABEL (gtk_label_new (""));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_label_set_line_wrap (label, TRUE);
- gtk_widget_show (GTK_WIDGET (label));
- gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (label), TRUE, TRUE, 0);
-
- progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ());
- gtk_widget_show (GTK_WIDGET (progress));
- gtk_box_pack_start (GTK_BOX (w), GTK_WIDGET (progress), TRUE, TRUE, 0);
-
- gtk_container_add (GTK_CONTAINER (window), hbox);
- gtk_widget_show_all (hbox);
- gtk_widget_show (window);
-}
-
-static void
-em_migrate_close_progress_dialog (void)
-{
- gtk_widget_destroy ((GtkWidget *) window);
-}
-
-static void
-em_migrate_set_folder_name (const gchar *folder_name)
-{
- gchar *text;
-
- text = g_strdup_printf (_("Migrating '%s':"), folder_name);
- gtk_label_set_text (label, text);
- g_free (text);
-}
-
-static void
em_migrate_set_progress (double percent)
{
gchar text[5];
@@ -566,253 +465,6 @@ em_update_sa_junk_setting_2_23 (void)
g_object_unref (client);
}
-#ifndef G_OS_WIN32
-
-static gboolean
-update_states_in_main_thread (MigrateStateInfo *info)
-{
- g_return_val_if_fail (info != NULL, FALSE);
- g_return_val_if_fail (info->label_name != NULL, FALSE);
-
- em_migrate_set_progress (info->progress);
- em_migrate_set_folder_name (info->label_name);
-
- /* XXX Why is this necessary? */
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
- return FALSE;
-}
-
-static void
-migrate_state_info_free (MigrateStateInfo *info)
-{
- g_free (info->label_name);
- g_slice_free (MigrateStateInfo, info);
-}
-
-static void
-migrate_folders (CamelStore *store,
- gboolean is_local,
- CamelFolderInfo *fi,
- const gchar *acc,
- gboolean *done,
- gint *nth_folder,
- gint total_folders)
-{
- CamelFolder *folder;
-
- while (fi) {
- MigrateStateInfo *info;
-
- *nth_folder = *nth_folder + 1;
-
- info = g_slice_new0 (MigrateStateInfo);
- info->label_name = g_strdup_printf (
- "%s/%s", acc, fi->full_name);
- info->progress = (gdouble) (*nth_folder) / total_folders;
-
- g_idle_add_full (
- G_PRIORITY_LOW, (GSourceFunc)
- update_states_in_main_thread, info,
- (GDestroyNotify) migrate_state_info_free);
-
- if (is_local)
- folder = camel_store_get_folder_sync (
- store, fi->full_name,
- CAMEL_STORE_IS_MIGRATING, NULL, NULL);
- else
- folder = camel_store_get_folder_sync (
- store, fi->full_name, 0, NULL, NULL);
-
- if (folder != NULL)
- camel_folder_summary_migrate_infos (folder->summary);
- migrate_folders (
- store, is_local, fi->child,
- acc, done, nth_folder, total_folders);
- fi = fi->next;
- }
-
- if ((*nth_folder) == (total_folders - 1))
- *done = TRUE;
-}
-
-#endif /* G_OS_WIN32 */
-
-/* This could be in CamelStore.ch */
-static void
-count_folders (CamelFolderInfo *fi,
- gint *count)
-{
- while (fi) {
- *count = *count + 1;
- count_folders (fi->child, count);
- fi = fi->next;
- }
-}
-
-static CamelStore *
-setup_local_store (EShellBackend *shell_backend,
- EMMigrateSession *session)
-{
- CamelSettings *settings;
- CamelService *service;
- const gchar *data_dir;
- gchar *path;
-
- service = camel_session_add_service (
- CAMEL_SESSION (session), "local", "mbox",
- CAMEL_PROVIDER_STORE, NULL);
-
- settings = camel_service_get_settings (service);
- data_dir = e_shell_backend_get_data_dir (shell_backend);
-
- path = g_build_filename (data_dir, "local", NULL);
- g_object_set (settings, "path", path, NULL);
- g_free (path);
-
- return CAMEL_STORE (service);
-}
-
-#ifndef G_OS_WIN32
-
-struct migrate_folders_to_db_structure {
- gchar *account_name;
- CamelStore *store;
- CamelFolderInfo *info;
- gboolean done;
- gboolean is_local_store;
-};
-
-static void
-migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs)
-{
- gint num_of_folders = 0, nth_folder = 0;
- count_folders (migrate_dbs->info, &num_of_folders);
- migrate_folders (
- migrate_dbs->store, migrate_dbs->is_local_store,
- migrate_dbs->info, migrate_dbs->account_name,
- &(migrate_dbs->done), &nth_folder, num_of_folders);
-}
-
-static void
-migrate_to_db (EShellBackend *shell_backend)
-{
- EMMigrateSession *session;
- EAccountList *accounts;
- EMailBackend *mail_backend;
- EMailSession *mail_session;
- EIterator *iter;
- gint i = 0, len;
- CamelStore *store = NULL;
- CamelSettings *settings;
- CamelFolderInfo *info;
- const gchar *data_dir;
- const gchar *path;
-
- if (!(accounts = e_get_account_list ()))
- return;
-
- mail_backend = E_MAIL_BACKEND (shell_backend);
- mail_session = e_mail_backend_get_session (mail_backend);
- data_dir = e_shell_backend_get_data_dir (shell_backend);
-
- /* Initialize the mail stores early so we can add a new one. */
- e_mail_store_init (mail_session, data_dir);
-
- iter = e_list_get_iterator ((EList *) accounts);
- len = e_list_length ((EList *) accounts);
-
- session = em_migrate_session_new (data_dir);
- camel_session_set_online ((CamelSession *) session, FALSE);
- em_migrate_setup_progress_dialog (
- _("Migrating Folders"),
- _("The summary format of the Evolution mailbox "
- "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
- "patient while Evolution migrates your folders..."));
-
- em_migrate_set_progress ((gdouble) i / (len + 1));
- store = setup_local_store (shell_backend, session);
-
- settings = camel_service_get_settings (CAMEL_SERVICE (store));
- path = camel_local_settings_get_path (CAMEL_LOCAL_SETTINGS (settings));
-
- info = camel_store_get_folder_info_sync (
- store, NULL,
- CAMEL_STORE_FOLDER_INFO_RECURSIVE |
- CAMEL_STORE_FOLDER_INFO_FAST |
- CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
- NULL, NULL);
- if (info) {
- struct migrate_folders_to_db_structure migrate_dbs;
-
- if (path != NULL && g_str_has_suffix (path, ".evolution/mail/local"))
- migrate_dbs.is_local_store = TRUE;
- else
- migrate_dbs.is_local_store = FALSE;
- migrate_dbs.account_name = _("On This Computer");
- migrate_dbs.info = info;
- migrate_dbs.store = store;
- migrate_dbs.done = FALSE;
-
- g_thread_create (
- (GThreadFunc) migrate_folders_to_db_thread,
- &migrate_dbs, TRUE, NULL);
- while (!migrate_dbs.done)
- g_main_context_iteration (NULL, TRUE);
- }
- i++;
- em_migrate_set_progress ((gdouble) i / (len + 1));
-
- while (e_iterator_is_valid (iter)) {
- EAccount *account = (EAccount *) e_iterator_get (iter);
- EAccountService *service;
-
- service = account->source;
- em_migrate_set_progress ((gdouble) i / (len + 1));
- if (account->enabled
- && service->url != NULL && service->url[0]
- && strncmp (service->url, "mbox:", 5) != 0) {
-
- store = e_mail_store_add_by_account (
- mail_session, account);
-
- info = camel_store_get_folder_info_sync (
- store, NULL,
- CAMEL_STORE_FOLDER_INFO_RECURSIVE |
- CAMEL_STORE_FOLDER_INFO_FAST |
- CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
- NULL, NULL);
- if (info) {
- struct migrate_folders_to_db_structure migrate_dbs;
-
- migrate_dbs.account_name = account->name;
- migrate_dbs.info = info;
- migrate_dbs.store = store;
- migrate_dbs.done = FALSE;
-
- g_thread_create (
- (GThreadFunc)
- migrate_folders_to_db_thread,
- &migrate_dbs, TRUE, NULL);
- while (!migrate_dbs.done)
- g_main_context_iteration (NULL, TRUE);
- } else
- printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
- }
- i++;
- e_iterator_next (iter);
-
- }
-
- g_object_unref (iter);
- em_migrate_close_progress_dialog ();
-
- g_object_unref (session);
-}
-
-#endif
-
static gboolean
mbox_to_maildir_migration_needed (EShellBackend *shell_backend)
{
@@ -1539,10 +1191,8 @@ e_mail_migrate (EShellBackend *shell_backend,
if (major < 2 || (major == 2 && minor < 22))
em_update_message_notify_settings_2_21 ();
- if (major < 2 || (major == 2 && minor < 24)) {
+ if (major < 2 || (major == 2 && minor < 24))
em_update_sa_junk_setting_2_23 ();
- migrate_to_db (shell_backend);
- }
#else
if (major < 2 || (major == 2 && minor < 24))
g_warning (
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 04d69ad211..2bc3bf3d81 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -69,6 +69,7 @@
#include "em-utils.h"
#include "mail-ops.h"
#include "mail-mt.h"
+#include "mail-guess-servers.h"
#if defined (HAVE_NSS) && defined (ENABLE_SMIME)
#include "smime/gui/e-cert-selector.h"
@@ -81,24 +82,6 @@
#define d(x)
-static ServerData mail_servers[] = {
- { "gmail", "imap.gmail.com", "smtp.gmail.com", "imap",
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT },
- { "googlemail", "imap.gmail.com", "smtp.gmail.com", "imap",
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT },
- { "yahoo", "pop3.yahoo.com", "smtp.yahoo.com", "pop",
- CAMEL_NETWORK_SECURITY_METHOD_NONE },
- { "aol", "imap.aol.com", "smtp.aol.com", "imap",
- CAMEL_NETWORK_SECURITY_METHOD_NONE },
- { "msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop",
- CAMEL_NETWORK_SECURITY_METHOD_NONE, "@", "@"},
- { "hotmail", "pop3.live.com", "smtp.live.com", "pop",
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT, "@", "@"},
- { "live.com", "pop3.live.com", "smtp.live.com", "pop",
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT, "@", "@"},
-
-};
-
/* econfig item for the extra config hings */
struct _receive_options_item {
EMConfigItem item;
@@ -214,14 +197,41 @@ struct _EMAccountEditorPrivate {
GtkButton *smime_encrypt_key_select;
GtkButton *smime_encrypt_key_clear;
+ /* Review */
+ GtkLabel *review_name;
+ GtkLabel *review_email;
+ GtkLabel *send_name;
+ GtkLabel *send_stype;
+ GtkLabel *send_saddress;
+ GtkLabel *send_encryption;
+ GtkLabel *receive_name;
+ GtkLabel *receive_stype;
+ GtkLabel *receive_saddress;
+ GtkLabel *receive_encryption;
+ GtkWidget *review_box;
+
+ /* google and yahoo specific data*/
+ gboolean is_gmail;
+ gboolean is_yahoo;
+
+ GtkWidget *calendar;
+ GtkWidget *gcontacts;
+ GtkWidget *info_label;
+
+ GtkWidget *account_label;
+ GtkWidget *gmail_link;
+ GtkWidget *yahoo_cal_box;
+ GtkWidget *yahoo_cal_entry;
+
/* for e-config callbacks, each page sets up its widgets, then they are dealed out by the get_widget callback in order*/
GHashTable *widgets;
/* for assistant page preparation */
guint identity_set : 1;
guint receive_set : 1;
+ guint receive_opt_set : 1;
guint send_set : 1;
- guint management_set : 1;
+ guint review_set : 1;
ServerData *selected_server;
};
@@ -251,7 +261,6 @@ enum {
static void em_account_editor_construct (EMAccountEditor *emae, EMAccountEditorType type, const gchar *id);
static void emae_account_folder_changed (EMFolderSelectionButton *folder, EMAccountEditor *emae);
-static ServerData * emae_check_servers (const gchar *email);
static gpointer parent_class;
@@ -1138,7 +1147,6 @@ emae_init (EMAccountEditor *emae)
emae, EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorPrivate);
emae->priv->selected_server = NULL;
- emae->emae_check_servers = emae_check_servers;
emae->priv->source.emae = emae;
emae->priv->transport.emae = emae;
emae->priv->widgets = g_hash_table_new (g_str_hash, g_str_equal);
@@ -1146,6 +1154,9 @@ emae_init (EMAccountEditor *emae)
/* Pick default storage and transport protocols. */
emae->priv->source.protocol = "imapx";
emae->priv->transport.protocol = "smtp";
+
+ emae->priv->is_gmail = FALSE;
+ emae->priv->is_yahoo = FALSE;
}
GType
@@ -2202,10 +2213,12 @@ emae_service_provider_changed (EMAccountEditorService *service)
{
EConfig *config;
EMConfigTargetSettings *target;
- CamelProvider *provider;
+ CamelProvider *provider = NULL;
const gchar *description;
- provider = camel_provider_get (service->protocol, NULL);
+ /* Protocol is NULL when server type is 'None'. */
+ if (service->protocol != NULL)
+ provider = camel_provider_get (service->protocol, NULL);
description = (provider != NULL) ? provider->description : "";
gtk_label_set_text (service->description, description);
@@ -2376,7 +2389,7 @@ emae_refresh_providers (EMAccountEditor *emae,
if (!(mail_or_news_domain
&& provider->object_types[service->type]
&& (service->type != CAMEL_PROVIDER_STORE ||
- (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0))
+ (provider->flags & CAMEL_PROVIDER_IS_SOURCE) != 0))
/* hardcode not showing providers who's transport is done in the store */
|| (service->type == CAMEL_PROVIDER_TRANSPORT
&& CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)))
@@ -2554,7 +2567,7 @@ emae_setup_service (EMAccountEditor *emae,
GtkBuilder *builder)
{
struct _service_info *info = &emae_service_info[service->type];
- CamelProvider *provider;
+ CamelProvider *provider = NULL;
CamelURL *url;
/* GtkComboBox internalizes ID strings, which for the provider
@@ -2564,7 +2577,9 @@ emae_setup_service (EMAccountEditor *emae,
service->protocol = g_intern_string (url->protocol);
camel_url_free (url);
- provider = camel_provider_get (service->protocol, NULL);
+ /* Protocol is NULL when server type is 'None'. */
+ if (service->protocol != NULL)
+ provider = camel_provider_get (service->protocol, NULL);
/* Extract all widgets we need from the builder file. */
@@ -2814,9 +2829,9 @@ emae_create_basic_assistant_page (EMAccountEditor *emae,
} else if (g_ascii_strcasecmp (page_id, "transport_page") == 0) {
title = _("Sending Email");
label = _("Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider.");
- } else if (g_ascii_strcasecmp (page_id, "management_page") == 0) {
- title = _("Account Information");
- label = _("Please enter a descriptive name for this account below.\nThis name will be used for display purposes only.");
+ } else if (g_ascii_strcasecmp (page_id, "review_page") == 0) {
+ title = _("Review Account");
+ label = _("Time to check things over before we try and connect to the server and fetch your mail.");
} else if (g_ascii_strcasecmp (page_id, "finish_page") == 0) {
page_type = GTK_ASSISTANT_PAGE_CONFIRM;
fill_space = TRUE;
@@ -3577,7 +3592,7 @@ emae_send_page (EConfig *ec,
GtkWidget *w;
GtkBuilder *builder;
- provider = emae_get_store_provider (emae);
+ provider = emae_get_transport_provider (emae);
if (provider == NULL)
return NULL;
@@ -4124,7 +4139,7 @@ static EMConfigItem emae_editor_items[] = {
static gboolean emae_editor_items_translated = FALSE;
static GtkWidget *
-emae_management_page (EConfig *ec,
+emae_review_page (EConfig *ec,
EConfigItem *item,
GtkWidget *parent,
GtkWidget *old,
@@ -4134,16 +4149,35 @@ emae_management_page (EConfig *ec,
EMAccountEditor *emae = data;
EMAccountEditorPrivate *priv = emae->priv;
GtkWidget *w;
+ GtkBuilder *builder;
+
+ builder = gtk_builder_new ();
+ e_load_ui_builder_definition (builder, "mail-config.ui");
- w = priv->management_frame;
+ priv->review_name = (GtkLabel*) e_builder_get_widget (builder, "personal-name-entry");
+ priv->review_email = (GtkLabel*) e_builder_get_widget (builder, "personal-email-entry");
+ priv->receive_stype = (GtkLabel*) e_builder_get_widget (builder, "receive_server_type");
+ priv->send_stype = (GtkLabel*) e_builder_get_widget (builder, "send_server_type");
+ priv->receive_saddress = (GtkLabel*) e_builder_get_widget (builder, "receive_server_address");
+ priv->send_saddress = (GtkLabel*) e_builder_get_widget (builder, "send_server_address");
+ priv->receive_name = (GtkLabel*) e_builder_get_widget (builder, "receive_username");
+ priv->send_name = (GtkLabel*) e_builder_get_widget (builder, "send_username");
+ priv->receive_encryption = (GtkLabel*) e_builder_get_widget (builder, "receive_encryption");
+ priv->send_encryption = (GtkLabel*) e_builder_get_widget (builder, "send_encryption");
+
+ w = e_builder_get_widget (builder, item->label);
+ priv->review_box = gtk_vbox_new (FALSE, 2);
+ gtk_widget_show (priv->review_box);
if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) {
GtkWidget *page;
page = emae_create_basic_assistant_page (
emae, GTK_ASSISTANT (parent),
- "management_page", position);
+ "review_page", position);
- gtk_widget_reparent (w, page);
+ gtk_box_pack_start (GTK_BOX (page), w, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (page), priv->review_box, FALSE, FALSE, 0);
+ gtk_widget_reparent (priv->management_frame, page);
w = page;
}
@@ -4199,7 +4233,7 @@ static EMConfigItem emae_assistant_items[] = {
{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade },
{ E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade },
- { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page },
+ { E_CONFIG_PAGE, (gchar *) "50.review", (gchar *) "vboxReviewBorder", emae_review_page },
{ E_CONFIG_PAGE_FINISH, (gchar *) "999.end", (gchar *) "finish_page", emae_widget_assistant_page },
{ 0 },
@@ -4238,7 +4272,7 @@ static gboolean
emae_service_complete (EMAccountEditor *emae,
EMAccountEditorService *service)
{
- CamelProvider *provider;
+ CamelProvider *provider = NULL;
const gchar *host = NULL;
const gchar *path = NULL;
const gchar *user = NULL;
@@ -4251,7 +4285,9 @@ emae_service_complete (EMAccountEditor *emae,
gboolean need_port;
gboolean need_user;
- provider = camel_provider_get (service->protocol, NULL);
+ /* Protocol is NULL when server type is 'None'. */
+ if (service->protocol != NULL)
+ provider = camel_provider_get (service->protocol, NULL);
if (provider == NULL)
return TRUE;
@@ -4301,17 +4337,93 @@ emae_service_complete (EMAccountEditor *emae,
static ServerData *
emae_check_servers (const gchar *email)
{
- gint len = G_N_ELEMENTS (mail_servers), i;
- gchar *server = strchr (email, '@');
-
- server++;
+ ServerData *sdata = g_new0 (ServerData, 1);
+ EmailProvider *provider = g_new0 (EmailProvider, 1);
+ gchar *dupe = g_strdup (email);
+ gchar *tmp;
+
+ /* FIXME: Find a way to free the provider once given to account settings. */
+ provider->email = (gchar *) email;
+ tmp = strchr (email, '@');
+ tmp++;
+ provider->domain = tmp;
+ tmp = strchr (dupe, '@');
+ *tmp = 0;
+ provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe));
+ g_free (dupe);
+
+ if (!mail_guess_servers (provider)) {
+ g_free (provider);
+ g_free (sdata);
+ return NULL;
+ }
+ /*printf("Recv: %s\n%s(%s), %s by %s \n Send: %s\n%s(%s), %s by %s\n via %s to %s\n",
+ provider->recv_type, provider->recv_hostname, provider->recv_port, provider->recv_username, provider->recv_auth,
+ provider->send_type, provider->send_hostname, provider->send_port, provider->send_username, provider->send_auth,
+ provider->recv_socket_type, provider->send_socket_type); */
+
+ sdata->recv = provider->recv_hostname;
+ sdata->recv_port = provider->recv_port;
+ sdata->send = provider->send_hostname;
+ sdata->send_port = provider->send_port;
+ if (strcmp (provider->recv_type, "pop3") == 0)
+ sdata->proto = g_strdup ("pop");
+ else if (strcmp (provider->recv_type, "imap") == 0)
+ sdata->proto = g_strdup ("imapx");
+ else
+ sdata->proto = provider->recv_type;
+ if (provider->recv_socket_type) {
+ CamelNetworkSecurityMethod method;
+
+ if (g_ascii_strcasecmp (provider->recv_socket_type, "SSL") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+ else if (g_ascii_strcasecmp (provider->recv_socket_type, "secure") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+ else if (g_ascii_strcasecmp (provider->recv_socket_type, "STARTTLS") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+ else if (g_ascii_strcasecmp (provider->recv_socket_type, "TLS") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+ else
+ method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
+
+ sdata->security_method = method;
+ sdata->recv_security_method = method;
+ }
- for (i = 0; i < len; i++) {
- if (strstr (server, mail_servers[i].key) != NULL)
- return &mail_servers[i];
+ if (provider->send_socket_type) {
+ CamelNetworkSecurityMethod method;
+
+ if (g_ascii_strcasecmp (provider->send_socket_type, "SSL") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+ else if (g_ascii_strcasecmp (provider->send_socket_type, "secure") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+ else if (g_ascii_strcasecmp (provider->send_socket_type, "STARTTLS") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+ else if (g_ascii_strcasecmp (provider->send_socket_type, "TLS") == 0)
+ method = CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+ else
+ method = CAMEL_NETWORK_SECURITY_METHOD_NONE;
+
+ sdata->send_security_method = method;
}
- return NULL;
+ sdata->send_auth = provider->send_auth;
+ sdata->recv_auth = provider->recv_auth;
+ sdata->send_user = provider->send_username;
+ sdata->recv_user = provider->recv_username;
+
+ g_free (provider);
+
+ return sdata;
+}
+
+static void
+emae_destroy_widget (GtkWidget *widget)
+{
+ if (widget && GTK_IS_WIDGET (widget)) {
+ gtk_widget_destroy (widget);
+ widget = NULL;
+ }
}
static gboolean
@@ -4355,7 +4467,6 @@ emae_check_complete (EConfig *ec,
if (!emae->priv->receive_set) {
ServerData *sdata;
gchar *user, *at;
- gchar *uri = g_strdup (e_account_get_string (account, E_ACCOUNT_SOURCE_URL));
CamelURL *url;
emae->priv->receive_set = 1;
@@ -4366,16 +4477,21 @@ emae_check_complete (EConfig *ec,
user[at - tmp] = 0;
at++;
- sdata = emae->priv->selected_server = emae->emae_check_servers (tmp);
- if (new_account && uri && (url = camel_url_new (uri, NULL)) != NULL) {
+ sdata = emae->priv->selected_server = emae_check_servers (tmp);
+ if (new_account && (url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL))) {
const gchar *use_user = user;
+ gchar *uri;
+
refresh = TRUE;
if (sdata && sdata->recv_user && *sdata->recv_user)
use_user = g_str_equal (sdata->recv_user, "@") ? tmp : sdata->recv_user;
+
+ camel_url_set_user (url, use_user);
gtk_entry_set_text (emae->priv->source.username, use_user);
if (sdata != NULL) {
CamelNetworkSecurityMethod method;
+
if (sdata->recv_security_method != CAMEL_NETWORK_SECURITY_METHOD_NONE)
method = sdata->recv_security_method;
else
@@ -4383,15 +4499,21 @@ emae_check_complete (EConfig *ec,
g_object_set (emae->priv->source.settings, "security-method", method, NULL);
camel_url_set_protocol (url, sdata->proto);
+ emae->priv->source.protocol = sdata->proto;
camel_url_set_host (url, sdata->recv);
if (sdata->recv_port && *sdata->recv_port)
camel_url_set_port (url, atoi (sdata->recv_port));
+
+ e_account_set_bool (account, E_ACCOUNT_SOURCE_AUTO_CHECK, TRUE);
+ e_account_set_bool (account, E_ACCOUNT_SOURCE_SAVE_PASSWD, TRUE);
+ if (g_strcmp0 (url->protocol, "pop") == 0)
+ e_account_set_bool (account, E_ACCOUNT_SOURCE_KEEP_ON_SERVER, TRUE);
+
gtk_entry_set_text (emae->priv->source.hostname, sdata->recv);
gtk_entry_set_text (emae->priv->transport.hostname, sdata->send);
} else {
camel_url_set_host (url, "");
}
- g_free (uri);
uri = camel_url_to_string (url, 0);
e_account_set_string (account, E_ACCOUNT_SOURCE_URL, uri);
if (sdata != NULL && sdata->recv_auth && *sdata->recv_auth)
@@ -4400,16 +4522,15 @@ emae_check_complete (EConfig *ec,
sdata->recv_auth);
camel_url_free (url);
+ g_free (uri);
} else
gtk_entry_set_text (emae->priv->source.username, user);
- g_free (uri);
}
} else if (!strcmp (pageid, "30.send")) {
if (!emae->priv->send_set) {
CamelURL *url;
gchar *at, *user;
- gchar *uri = (gchar *) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
ServerData *sdata;
emae->priv->send_set = 1;
@@ -4421,9 +4542,10 @@ emae_check_complete (EConfig *ec,
at++;
sdata = emae->priv->selected_server;
- if (sdata != NULL && uri && (url = camel_url_new (uri, NULL)) != NULL) {
+ if (sdata != NULL && (url = emae_account_url (emae, E_ACCOUNT_TRANSPORT_URL))) {
CamelNetworkSecurityMethod method;
const gchar *use_user = user;
+ gchar *uri;
refresh = TRUE;
@@ -4440,10 +4562,13 @@ emae_check_complete (EConfig *ec,
if (sdata->send_user && *sdata->send_user)
use_user = g_str_equal (sdata->send_user, "@") ? tmp : sdata->send_user;
+
+ camel_url_set_user (url, use_user);
gtk_entry_set_text (emae->priv->transport.username, use_user);
uri = camel_url_to_string (url, 0);
e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, uri);
+ e_account_set_bool (account, E_ACCOUNT_TRANSPORT_SAVE_PASSWD, TRUE);
g_free (uri);
camel_url_free (url);
gtk_toggle_button_set_active (emae->priv->transport.needs_auth, TRUE);
@@ -4453,27 +4578,32 @@ emae_check_complete (EConfig *ec,
sdata->send_auth);
else
emae_authtype_changed (emae->priv->transport.authtype, &emae->priv->transport);
- uri = (gchar *) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
} else
gtk_entry_set_text (emae->priv->transport.username, user);
}
} else if (!strcmp (pageid, "20.receive_options")) {
- CamelProvider *provider;
+ if (!emae->priv->receive_opt_set) {
+ CamelProvider *provider;
- provider = emae_get_store_provider (emae);
+ provider = emae_get_store_provider (emae);
- if (provider != NULL
- && emae->priv->extra_provider != provider) {
- emae->priv->extra_provider = provider;
- emae_auto_detect (emae);
+ if (provider != NULL
+ && emae->priv->extra_provider != provider) {
+ emae->priv->extra_provider = provider;
+ emae_auto_detect (emae);
+ }
+
+ emae->priv->receive_opt_set = 1;
}
- } else if (!strcmp (pageid, "40.management")) {
- if (!emae->priv->management_set) {
+ } else if (!strcmp (pageid, "50.review")) {
+ if (!emae->priv->review_set) {
gchar *template;
guint i = 0, len;
+ gchar *uri, *enc, *buff, *cal_name;
+ CamelURL *url;
+ CamelNetworkSecurityMethod method;
- emae->priv->management_set = 1;
tmp = e_account_get_string (account, E_ACCOUNT_ID_ADDRESS);
len = strlen (tmp);
template = g_alloca (len + 14);
@@ -4482,6 +4612,122 @@ emae_check_complete (EConfig *ec,
sprintf (template + len, " (%d)", i++);
gtk_entry_set_text (emae->priv->identity_entries[0], template);
+
+ gtk_label_set_text (emae->priv->review_name, e_account_get_string (account, E_ACCOUNT_ID_NAME));
+ gtk_label_set_text (emae->priv->review_email, e_account_get_string (account, E_ACCOUNT_ID_ADDRESS));
+ uri = (gchar * ) e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+ if (uri && (url = camel_url_new (uri, NULL))) {
+ gtk_label_set_text (emae->priv->receive_stype, url->protocol);
+ gtk_label_set_text (emae->priv->receive_saddress, url->host);
+ gtk_label_set_text (emae->priv->receive_name, url->user);
+ g_object_get (emae->priv->source.settings, "security-method", &method, NULL);
+ if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT)
+ enc = g_strdup (_("Always(SSL)"));
+ else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT)
+ enc = g_strdup (_("When possible(TLS)"));
+ else
+ enc = g_strdup (_("Never"));
+
+ gtk_label_set_text (emae->priv->receive_encryption, enc);
+ g_free (enc);
+ }
+ uri = (gchar * ) e_account_get_string (account, E_ACCOUNT_TRANSPORT_URL);
+ if (uri && (url = camel_url_new (uri, NULL))) {
+ gtk_label_set_text (emae->priv->send_stype, url->protocol);
+ gtk_label_set_text (emae->priv->send_saddress, url->host);
+ gtk_label_set_text (emae->priv->send_name, url->user);
+ g_object_get (emae->priv->transport.settings, "security-method", &method, NULL);
+ if (method == CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT)
+ enc = g_strdup (_("Always(SSL)"));
+ else if (method == CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT)
+ enc = g_strdup (_("When possible(TLS)"));
+ else
+ enc = g_strdup (_("Never"));
+
+ gtk_label_set_text (emae->priv->send_encryption, enc);
+ g_free (enc);
+ }
+
+ if (g_strrstr (account->source->url, "gmail") || g_strrstr (account->source->url, "googlemail")) {
+ emae->priv->is_gmail = TRUE;
+
+ emae_destroy_widget (emae->priv->gcontacts);
+ emae_destroy_widget (emae->priv->calendar);
+ emae_destroy_widget (emae->priv->account_label);
+ emae_destroy_widget (emae->priv->gmail_link);
+
+ emae->priv->gcontacts = gtk_check_button_new_with_mnemonic (_("Setup Google con_tacts with Evolution"));
+ emae->priv->calendar = gtk_check_button_new_with_mnemonic (_("Setup Google ca_lendar with Evolution"));
+
+ gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->gcontacts, TRUE);
+ gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->calendar, TRUE);
+
+ gtk_widget_show (emae->priv->gcontacts);
+ gtk_widget_show (emae->priv->calendar);
+
+ emae->priv->account_label = gtk_label_new (NULL);
+ buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Google account settings:"));
+ gtk_label_set_markup ((GtkLabel *) emae->priv->account_label, buff);
+ g_free (buff);
+ gtk_widget_show (emae->priv->account_label);
+
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->account_label, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->gcontacts, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->calendar, FALSE, FALSE, 0);
+
+ emae->priv->gmail_link = gtk_link_button_new_with_label ("https://mail.google.com/mail/?ui=2&amp;shva=1#settings/fwdandpop", _("You may need to enable IMAP access."));
+ gtk_widget_show (emae->priv->gmail_link);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->gmail_link, FALSE, FALSE, 0);
+
+ } else if ((g_strrstr(account->source->url, "yahoo.") || g_strrstr(account->source->url, "ymail.")
+ || g_strrstr(account->source->url, "rocketmail."))) {
+
+ emae->priv->is_yahoo = TRUE;
+
+ emae_destroy_widget (emae->priv->calendar);
+ emae_destroy_widget (emae->priv->info_label);
+ emae_destroy_widget (emae->priv->yahoo_cal_entry);
+ emae_destroy_widget (emae->priv->account_label);
+ emae_destroy_widget (emae->priv->yahoo_cal_box);
+
+ emae->priv->calendar = gtk_check_button_new_with_mnemonic (_("Setup _Yahoo calendar with Evolution"));
+
+ gtk_toggle_button_set_active ((GtkToggleButton *) emae->priv->calendar, TRUE);
+
+ emae->priv->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_line_wrap ((GtkLabel *) emae->priv->info_label, TRUE);
+ gtk_label_set_line_wrap_mode ((GtkLabel *) emae->priv->info_label, PANGO_WRAP_WORD);
+ gtk_label_set_selectable ((GtkLabel *) emae->priv->info_label, TRUE);
+
+ gtk_widget_show (emae->priv->calendar);
+ gtk_widget_show (emae->priv->info_label);
+
+ emae->priv->account_label = gtk_label_new (NULL);
+ buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Yahoo account settings:"));
+ gtk_label_set_markup ((GtkLabel *) emae->priv->account_label, buff);
+ g_free (buff);
+ gtk_widget_show (emae->priv->account_label);
+
+#define PACK_IN_BOX_AND_TEXT(txt,box,child,num) { GtkWidget *txtlbl = gtk_label_new_with_mnemonic (txt); gtk_label_set_mnemonic_widget ((GtkLabel*)txtlbl, child); box = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)box, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)box, child, FALSE, FALSE, num); gtk_widget_show_all (box);}
+
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->account_label, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->calendar, FALSE, FALSE, 0);
+
+ emae->priv->yahoo_cal_entry = gtk_entry_new ();
+ gtk_widget_show (emae->priv->yahoo_cal_entry);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->info_label, FALSE, FALSE, 0);
+ PACK_IN_BOX_AND_TEXT(_("Yahoo Calen_dar name:"), emae->priv->yahoo_cal_box, emae->priv->yahoo_cal_entry, 0);
+ gtk_box_pack_start ((GtkBox *) emae->priv->review_box, emae->priv->yahoo_cal_box, FALSE, FALSE, 0);
+ cal_name = g_strdup (e_account_get_string (account, E_ACCOUNT_ID_NAME));
+ cal_name = g_strdelimit(cal_name, " ", '_');
+ gtk_entry_set_text ((GtkEntry *) emae->priv->yahoo_cal_entry, cal_name);
+ g_free (cal_name);
+#undef PACK_IN_BOX_AND_TEXT
+ } else {
+ emae->priv->is_gmail = FALSE;
+ emae->priv->is_yahoo = FALSE;
+ }
+
}
}
}
@@ -4530,13 +4776,13 @@ emae_check_complete (EConfig *ec,
}
}
- if (ok && (pageid == NULL || !strcmp (pageid, "40.management"))) {
+ if (ok && (pageid == NULL || !strcmp (pageid, "50.review"))) {
ok = (tmp = e_account_get_string (account, E_ACCOUNT_NAME))
&& tmp[0]
&& ((ea = e_get_account_by_name (tmp)) == NULL
|| ea == original_account);
if (!ok) {
- d (printf ("management page incomplete\n"));
+ d (printf ("review page incomplete\n"));
}
}
@@ -4589,6 +4835,211 @@ forget_password_if_needed (EAccount *original_account,
}
}
+#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 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_google_addressbook (EMAccountEditor *emae)
+{
+ GConfClient *gconf;
+ ESourceList *slist;
+ ESourceGroup *sgrp;
+ GSList *sources;
+ gboolean source_already_exists = FALSE;
+ CamelURL *url;
+ gchar * username;
+
+ gconf = gconf_client_get_default ();
+ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" );
+ sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE);
+ url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL);
+ username = g_strdup (url->user);
+
+ sources = e_source_group_peek_sources (sgrp);
+ for (; sources; sources = sources->next) {
+ ESource *existing = (ESource *) sources->data;
+ if (!g_strcmp0 (e_source_peek_relative_uri (existing), username)) {
+ source_already_exists = TRUE;
+ break;
+ }
+ }
+
+ if (!source_already_exists) {
+ ESource *abook;
+
+ /* 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", username);
+
+ e_source_group_add_source (sgrp, abook, -1);
+ e_source_set_relative_uri (abook, username);
+ e_source_list_sync (slist, NULL);
+
+ g_object_unref (abook);
+ }
+
+ g_free (username);
+ g_object_unref (slist);
+ g_object_unref (sgrp);
+ g_object_unref (gconf);
+}
+
+static void
+setup_google_calendar (EMAccountEditor *emae)
+{
+ GConfClient *gconf;
+ ESourceList *slist;
+ ESourceGroup *sgrp;
+ ESource *calendar;
+ gchar *sanitize_uname, *username;
+ gchar *abs_uri, *rel_uri;
+ GSList *ids, *temp;
+ CamelURL *url;
+
+ gconf = gconf_client_get_default ();
+ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources");
+ sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE);
+ url = emae_account_url (emae, E_ACCOUNT_SOURCE_URL);
+ username = g_strdup (url->user);
+
+ /* 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", username);
+ e_source_set_property (calendar, "setup-username", username);
+ e_source_set_property (calendar, "default", "true");
+ e_source_set_property (calendar, "alarm", "true");
+ e_source_set_readonly (calendar, FALSE);
+
+ e_source_group_add_source (sgrp, calendar, -1);
+
+ sanitize_uname = sanitize_user_mail (username);
+
+ abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, username);
+ e_source_set_absolute_uri (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_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_free (username);
+ 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);
+ g_object_unref (gconf);
+}
+
+static void
+setup_yahoo_calendar (EMAccountEditor *emae)
+{
+ GConfClient *gconf;
+ ESourceList *slist;
+ ESourceGroup *sgrp;
+ ESource *calendar;
+ gchar *sanitize_uname;
+ gchar *abs_uri, *rel_uri;
+ GSList *ids, *temp;
+ const gchar *email;
+
+ gconf = gconf_client_get_default ();
+ email = e_account_get_string (em_account_editor_get_modified_account (emae), 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 *) emae->priv->yahoo_cal_entry));
+ rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) emae->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);
+ g_object_unref (gconf);
+}
+
static void
emae_commit (EConfig *ec,
EMAccountEditor *emae)
@@ -4605,6 +5056,17 @@ emae_commit (EConfig *ec,
modified_account = em_account_editor_get_modified_account (emae);
original_account = em_account_editor_get_original_account (emae);
+ /* check for google and yahoo specific settings */
+ if (!original_account && emae->priv->is_gmail) {
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->gcontacts))
+ setup_google_addressbook (emae);
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->calendar))
+ setup_google_calendar (emae);
+ } else if (!original_account && emae->priv->is_gmail) {
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) emae->priv->calendar))
+ setup_yahoo_calendar (emae);
+ }
+
/* Do some last minute tweaking. */
settings = emae->priv->source.settings;
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 3416b5d161..3b30112f73 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -88,7 +88,6 @@ struct _EMAccountEditor {
GtkWidget **pages; /* Pages for Anjal's page type editor */
guint do_signature:1; /* allow editing signature */
- ServerData * (*emae_check_servers) (const gchar *email);
};
struct _EMAccountEditorClass {
diff --git a/mail/em-utils.c b/mail/em-utils.c
index a3e9a049d6..a3be92d4c0 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -218,33 +218,6 @@ em_utils_uids_free (GPtrArray *uids)
g_ptr_array_free (uids, TRUE);
}
-/**
- * em_utils_check_user_can_send_mail:
- *
- * Returns %TRUE if the user has an account configured (to send mail)
- * or %FALSE otherwise.
- **/
-gboolean
-em_utils_check_user_can_send_mail (void)
-{
- EAccountList *account_list;
- EAccount *account;
-
- account_list = e_get_account_list ();
-
- if (e_list_length (E_LIST (account_list)) == 0)
- return FALSE;
-
- if (!(account = e_get_default_account ()))
- return FALSE;
-
- /* Check for a transport */
- if (!account->transport->url)
- return FALSE;
-
- return TRUE;
-}
-
/* Editing Filters/Search Folders... */
static GtkWidget *filter_editor = NULL;
diff --git a/mail/em-utils.h b/mail/em-utils.h
index b07b74b186..b7e3ec6f49 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -42,8 +42,6 @@ gboolean em_utils_prompt_user (GtkWindow *parent, const gchar *promptkey, const
GPtrArray *em_utils_uids_copy (GPtrArray *uids);
void em_utils_uids_free (GPtrArray *uids);
-gboolean em_utils_check_user_can_send_mail (void);
-
void em_utils_edit_filters (GtkWidget *parent, EMailBackend *backend);
void em_filename_make_safe (gchar *string);
void em_utils_edit_vfolders (GtkWidget *parent);
diff --git a/capplet/settings/mail-autoconfig/Makefile.am b/mail/mail-autoconfig/Makefile.am
index 451101d364..451101d364 100644
--- a/capplet/settings/mail-autoconfig/Makefile.am
+++ b/mail/mail-autoconfig/Makefile.am
diff --git a/capplet/settings/mail-autoconfig/README b/mail/mail-autoconfig/README
index ec68d405b4..ec68d405b4 100644
--- a/capplet/settings/mail-autoconfig/README
+++ b/mail/mail-autoconfig/README
diff --git a/capplet/settings/mail-autoconfig/a.memail.jp b/mail/mail-autoconfig/a.memail.jp
index 61eb90d86d..61eb90d86d 100644
--- a/capplet/settings/mail-autoconfig/a.memail.jp
+++ b/mail/mail-autoconfig/a.memail.jp
diff --git a/capplet/settings/mail-autoconfig/abc.plala.or.jp b/mail/mail-autoconfig/abc.plala.or.jp
index 549bed6cb3..549bed6cb3 100644
--- a/capplet/settings/mail-autoconfig/abc.plala.or.jp
+++ b/mail/mail-autoconfig/abc.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/agate.plala.or.jp b/mail/mail-autoconfig/agate.plala.or.jp
index 6195f58519..6195f58519 100644
--- a/capplet/settings/mail-autoconfig/agate.plala.or.jp
+++ b/mail/mail-autoconfig/agate.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/amail.plala.or.jp b/mail/mail-autoconfig/amail.plala.or.jp
index b4bd8af5fc..b4bd8af5fc 100644
--- a/capplet/settings/mail-autoconfig/amail.plala.or.jp
+++ b/mail/mail-autoconfig/amail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/amber.plala.or.jp b/mail/mail-autoconfig/amber.plala.or.jp
index ae682933ee..ae682933ee 100644
--- a/capplet/settings/mail-autoconfig/amber.plala.or.jp
+++ b/mail/mail-autoconfig/amber.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/amethyst.broba.cc b/mail/mail-autoconfig/amethyst.broba.cc
index 86276cc517..86276cc517 100644
--- a/capplet/settings/mail-autoconfig/amethyst.broba.cc
+++ b/mail/mail-autoconfig/amethyst.broba.cc
diff --git a/capplet/settings/mail-autoconfig/aol.com b/mail/mail-autoconfig/aol.com
index 7e16ab5335..7e16ab5335 100644
--- a/capplet/settings/mail-autoconfig/aol.com
+++ b/mail/mail-autoconfig/aol.com
diff --git a/capplet/settings/mail-autoconfig/apost.plala.or.jp b/mail/mail-autoconfig/apost.plala.or.jp
index c4f936a7c1..c4f936a7c1 100644
--- a/capplet/settings/mail-autoconfig/apost.plala.or.jp
+++ b/mail/mail-autoconfig/apost.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/aqua.plala.or.jp b/mail/mail-autoconfig/aqua.plala.or.jp
index 0c78abc615..0c78abc615 100644
--- a/capplet/settings/mail-autoconfig/aqua.plala.or.jp
+++ b/mail/mail-autoconfig/aqua.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/arcor.de b/mail/mail-autoconfig/arcor.de
index 953f669fd8..953f669fd8 100644
--- a/capplet/settings/mail-autoconfig/arcor.de
+++ b/mail/mail-autoconfig/arcor.de
diff --git a/capplet/settings/mail-autoconfig/ballade.plala.or.jp b/mail/mail-autoconfig/ballade.plala.or.jp
index 913390f9ee..913390f9ee 100644
--- a/capplet/settings/mail-autoconfig/ballade.plala.or.jp
+++ b/mail/mail-autoconfig/ballade.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp b/mail/mail-autoconfig/bay.gunmanet.ne.jp
index 930cf3ab09..930cf3ab09 100644
--- a/capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp
+++ b/mail/mail-autoconfig/bay.gunmanet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/bb-niigata.jp b/mail/mail-autoconfig/bb-niigata.jp
index 174f5cbc74..174f5cbc74 100644
--- a/capplet/settings/mail-autoconfig/bb-niigata.jp
+++ b/mail/mail-autoconfig/bb-niigata.jp
diff --git a/capplet/settings/mail-autoconfig/bc.iij4u.or.jp b/mail/mail-autoconfig/bc.iij4u.or.jp
index baa1d0e7a0..baa1d0e7a0 100644
--- a/capplet/settings/mail-autoconfig/bc.iij4u.or.jp
+++ b/mail/mail-autoconfig/bc.iij4u.or.jp
diff --git a/capplet/settings/mail-autoconfig/beige.plala.or.jp b/mail/mail-autoconfig/beige.plala.or.jp
index 1da18eb675..1da18eb675 100644
--- a/capplet/settings/mail-autoconfig/beige.plala.or.jp
+++ b/mail/mail-autoconfig/beige.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/blue.plala.or.jp b/mail/mail-autoconfig/blue.plala.or.jp
index 510042ee9e..510042ee9e 100644
--- a/capplet/settings/mail-autoconfig/blue.plala.or.jp
+++ b/mail/mail-autoconfig/blue.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/bmail.plala.or.jp b/mail/mail-autoconfig/bmail.plala.or.jp
index f849e6e4b6..f849e6e4b6 100644
--- a/capplet/settings/mail-autoconfig/bmail.plala.or.jp
+++ b/mail/mail-autoconfig/bmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/bolero.plala.or.jp b/mail/mail-autoconfig/bolero.plala.or.jp
index 171776a28b..171776a28b 100644
--- a/capplet/settings/mail-autoconfig/bolero.plala.or.jp
+++ b/mail/mail-autoconfig/bolero.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/bpost.plala.or.jp b/mail/mail-autoconfig/bpost.plala.or.jp
index 24c8ebd843..24c8ebd843 100644
--- a/capplet/settings/mail-autoconfig/bpost.plala.or.jp
+++ b/mail/mail-autoconfig/bpost.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/brown.plala.or.jp b/mail/mail-autoconfig/brown.plala.or.jp
index 3bd4be2168..3bd4be2168 100644
--- a/capplet/settings/mail-autoconfig/brown.plala.or.jp
+++ b/mail/mail-autoconfig/brown.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/camel.plala.or.jp b/mail/mail-autoconfig/camel.plala.or.jp
index c55faa8270..c55faa8270 100644
--- a/capplet/settings/mail-autoconfig/camel.plala.or.jp
+++ b/mail/mail-autoconfig/camel.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/cameo.plala.or.jp b/mail/mail-autoconfig/cameo.plala.or.jp
index 7376c1fffe..7376c1fffe 100644
--- a/capplet/settings/mail-autoconfig/cameo.plala.or.jp
+++ b/mail/mail-autoconfig/cameo.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/cc9.ne.jp b/mail/mail-autoconfig/cc9.ne.jp
index 28bad2cd01..28bad2cd01 100644
--- a/capplet/settings/mail-autoconfig/cc9.ne.jp
+++ b/mail/mail-autoconfig/cc9.ne.jp
diff --git a/capplet/settings/mail-autoconfig/cek.ne.jp b/mail/mail-autoconfig/cek.ne.jp
index 0af49bd435..0af49bd435 100644
--- a/capplet/settings/mail-autoconfig/cek.ne.jp
+++ b/mail/mail-autoconfig/cek.ne.jp
diff --git a/capplet/settings/mail-autoconfig/clio.ne.jp b/mail/mail-autoconfig/clio.ne.jp
index 90f1a41ba3..90f1a41ba3 100644
--- a/capplet/settings/mail-autoconfig/clio.ne.jp
+++ b/mail/mail-autoconfig/clio.ne.jp
diff --git a/capplet/settings/mail-autoconfig/cmail.plala.or.jp b/mail/mail-autoconfig/cmail.plala.or.jp
index eb2558272b..eb2558272b 100644
--- a/capplet/settings/mail-autoconfig/cmail.plala.or.jp
+++ b/mail/mail-autoconfig/cmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/co1.wind.jp b/mail/mail-autoconfig/co1.wind.jp
index e086cd7785..e086cd7785 100644
--- a/capplet/settings/mail-autoconfig/co1.wind.jp
+++ b/mail/mail-autoconfig/co1.wind.jp
diff --git a/capplet/settings/mail-autoconfig/co2.wind.jp b/mail/mail-autoconfig/co2.wind.jp
index 010477274d..010477274d 100644
--- a/capplet/settings/mail-autoconfig/co2.wind.jp
+++ b/mail/mail-autoconfig/co2.wind.jp
diff --git a/capplet/settings/mail-autoconfig/co3.wind.jp b/mail/mail-autoconfig/co3.wind.jp
index 498384cb09..498384cb09 100644
--- a/capplet/settings/mail-autoconfig/co3.wind.jp
+++ b/mail/mail-autoconfig/co3.wind.jp
diff --git a/capplet/settings/mail-autoconfig/cocoa.plala.or.jp b/mail/mail-autoconfig/cocoa.plala.or.jp
index 5387cd368d..5387cd368d 100644
--- a/capplet/settings/mail-autoconfig/cocoa.plala.or.jp
+++ b/mail/mail-autoconfig/cocoa.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/coda.plala.or.jp b/mail/mail-autoconfig/coda.plala.or.jp
index f668775d84..f668775d84 100644
--- a/capplet/settings/mail-autoconfig/coda.plala.or.jp
+++ b/mail/mail-autoconfig/coda.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/comcast.net b/mail/mail-autoconfig/comcast.net
index 56b1fa92bf..56b1fa92bf 100644
--- a/capplet/settings/mail-autoconfig/comcast.net
+++ b/mail/mail-autoconfig/comcast.net
diff --git a/capplet/settings/mail-autoconfig/concerto.plala.or.jp b/mail/mail-autoconfig/concerto.plala.or.jp
index 1c190b5d70..1c190b5d70 100644
--- a/capplet/settings/mail-autoconfig/concerto.plala.or.jp
+++ b/mail/mail-autoconfig/concerto.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/coral.plala.or.jp b/mail/mail-autoconfig/coral.plala.or.jp
index 1c52fcee37..1c52fcee37 100644
--- a/capplet/settings/mail-autoconfig/coral.plala.or.jp
+++ b/mail/mail-autoconfig/coral.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/courante.plala.or.jp b/mail/mail-autoconfig/courante.plala.or.jp
index 05976ef0b3..05976ef0b3 100644
--- a/capplet/settings/mail-autoconfig/courante.plala.or.jp
+++ b/mail/mail-autoconfig/courante.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/cpost.plala.or.jp b/mail/mail-autoconfig/cpost.plala.or.jp
index 613d3774b9..613d3774b9 100644
--- a/capplet/settings/mail-autoconfig/cpost.plala.or.jp
+++ b/mail/mail-autoconfig/cpost.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/cream.plala.or.jp b/mail/mail-autoconfig/cream.plala.or.jp
index 16e232591b..16e232591b 100644
--- a/capplet/settings/mail-autoconfig/cream.plala.or.jp
+++ b/mail/mail-autoconfig/cream.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp b/mail/mail-autoconfig/dan.gunmanet.ne.jp
index b027d98d04..b027d98d04 100644
--- a/capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp
+++ b/mail/mail-autoconfig/dan.gunmanet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/dance.plala.or.jp b/mail/mail-autoconfig/dance.plala.or.jp
index 74f90c8fbc..74f90c8fbc 100644
--- a/capplet/settings/mail-autoconfig/dance.plala.or.jp
+++ b/mail/mail-autoconfig/dance.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/dmail.plala.or.jp b/mail/mail-autoconfig/dmail.plala.or.jp
index f742605b4f..f742605b4f 100644
--- a/capplet/settings/mail-autoconfig/dmail.plala.or.jp
+++ b/mail/mail-autoconfig/dmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/e23.jp b/mail/mail-autoconfig/e23.jp
index f1f08b908a..f1f08b908a 100644
--- a/capplet/settings/mail-autoconfig/e23.jp
+++ b/mail/mail-autoconfig/e23.jp
diff --git a/capplet/settings/mail-autoconfig/earthlink.net b/mail/mail-autoconfig/earthlink.net
index 0f204b2bbd..0f204b2bbd 100644
--- a/capplet/settings/mail-autoconfig/earthlink.net
+++ b/mail/mail-autoconfig/earthlink.net
diff --git a/capplet/settings/mail-autoconfig/ebony.plala.or.jp b/mail/mail-autoconfig/ebony.plala.or.jp
index 11a275e990..11a275e990 100644
--- a/capplet/settings/mail-autoconfig/ebony.plala.or.jp
+++ b/mail/mail-autoconfig/ebony.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/email.plala.or.jp b/mail/mail-autoconfig/email.plala.or.jp
index 45a8e0d500..45a8e0d500 100644
--- a/capplet/settings/mail-autoconfig/email.plala.or.jp
+++ b/mail/mail-autoconfig/email.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/fantasy.plala.or.jp b/mail/mail-autoconfig/fantasy.plala.or.jp
index 5774cc239a..5774cc239a 100644
--- a/capplet/settings/mail-autoconfig/fantasy.plala.or.jp
+++ b/mail/mail-autoconfig/fantasy.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/flamenco.plala.or.jp b/mail/mail-autoconfig/flamenco.plala.or.jp
index 3a8ade7488..3a8ade7488 100644
--- a/capplet/settings/mail-autoconfig/flamenco.plala.or.jp
+++ b/mail/mail-autoconfig/flamenco.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/fmail.plala.or.jp b/mail/mail-autoconfig/fmail.plala.or.jp
index c4a4dbc14b..c4a4dbc14b 100644
--- a/capplet/settings/mail-autoconfig/fmail.plala.or.jp
+++ b/mail/mail-autoconfig/fmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/free.fr b/mail/mail-autoconfig/free.fr
index f97fe38504..f97fe38504 100644
--- a/capplet/settings/mail-autoconfig/free.fr
+++ b/mail/mail-autoconfig/free.fr
diff --git a/capplet/settings/mail-autoconfig/freenet.de b/mail/mail-autoconfig/freenet.de
index 1144a80c6d..1144a80c6d 100644
--- a/capplet/settings/mail-autoconfig/freenet.de
+++ b/mail/mail-autoconfig/freenet.de
diff --git a/capplet/settings/mail-autoconfig/fuga.plala.or.jp b/mail/mail-autoconfig/fuga.plala.or.jp
index f41116addd..f41116addd 100644
--- a/capplet/settings/mail-autoconfig/fuga.plala.or.jp
+++ b/mail/mail-autoconfig/fuga.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/gmail.com b/mail/mail-autoconfig/gmail.com
index f73f7e0c7f..f73f7e0c7f 100644
--- a/capplet/settings/mail-autoconfig/gmail.com
+++ b/mail/mail-autoconfig/gmail.com
diff --git a/capplet/settings/mail-autoconfig/gmail.com imap b/mail/mail-autoconfig/gmail.com imap
index f73f7e0c7f..f73f7e0c7f 100644
--- a/capplet/settings/mail-autoconfig/gmail.com imap
+++ b/mail/mail-autoconfig/gmail.com imap
diff --git a/capplet/settings/mail-autoconfig/gmail.com pop b/mail/mail-autoconfig/gmail.com pop
index 4b1a577561..4b1a577561 100644
--- a/capplet/settings/mail-autoconfig/gmail.com pop
+++ b/mail/mail-autoconfig/gmail.com pop
diff --git a/capplet/settings/mail-autoconfig/gmail.plala.or.jp b/mail/mail-autoconfig/gmail.plala.or.jp
index d369859a43..d369859a43 100644
--- a/capplet/settings/mail-autoconfig/gmail.plala.or.jp
+++ b/mail/mail-autoconfig/gmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/gmx.com b/mail/mail-autoconfig/gmx.com
index 06782b48cc..06782b48cc 100644
--- a/capplet/settings/mail-autoconfig/gmx.com
+++ b/mail/mail-autoconfig/gmx.com
diff --git a/capplet/settings/mail-autoconfig/gmx.net b/mail/mail-autoconfig/gmx.net
index 3a93fb9839..3a93fb9839 100644
--- a/capplet/settings/mail-autoconfig/gmx.net
+++ b/mail/mail-autoconfig/gmx.net
diff --git a/capplet/settings/mail-autoconfig/go.tvm.ne.jp b/mail/mail-autoconfig/go.tvm.ne.jp
index ccbb238eae..ccbb238eae 100644
--- a/capplet/settings/mail-autoconfig/go.tvm.ne.jp
+++ b/mail/mail-autoconfig/go.tvm.ne.jp
diff --git a/capplet/settings/mail-autoconfig/goo.jp b/mail/mail-autoconfig/goo.jp
index 6ddc1eadd4..6ddc1eadd4 100644
--- a/capplet/settings/mail-autoconfig/goo.jp
+++ b/mail/mail-autoconfig/goo.jp
diff --git a/capplet/settings/mail-autoconfig/googlemail.com b/mail/mail-autoconfig/googlemail.com
index f73f7e0c7f..f73f7e0c7f 100644
--- a/capplet/settings/mail-autoconfig/googlemail.com
+++ b/mail/mail-autoconfig/googlemail.com
diff --git a/capplet/settings/mail-autoconfig/grape.plala.or.jp b/mail/mail-autoconfig/grape.plala.or.jp
index 09fb378504..09fb378504 100644
--- a/capplet/settings/mail-autoconfig/grape.plala.or.jp
+++ b/mail/mail-autoconfig/grape.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/gray.plala.or.jp b/mail/mail-autoconfig/gray.plala.or.jp
index efeb3547f0..efeb3547f0 100644
--- a/capplet/settings/mail-autoconfig/gray.plala.or.jp
+++ b/mail/mail-autoconfig/gray.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/hal.ne.jp b/mail/mail-autoconfig/hal.ne.jp
index ad8e336c03..ad8e336c03 100644
--- a/capplet/settings/mail-autoconfig/hal.ne.jp
+++ b/mail/mail-autoconfig/hal.ne.jp
diff --git a/capplet/settings/mail-autoconfig/hana.or.jp b/mail/mail-autoconfig/hana.or.jp
index b2dc624348..b2dc624348 100644
--- a/capplet/settings/mail-autoconfig/hana.or.jp
+++ b/mail/mail-autoconfig/hana.or.jp
diff --git a/capplet/settings/mail-autoconfig/hotmail.co.jp b/mail/mail-autoconfig/hotmail.co.jp
index 327130587f..327130587f 100644
--- a/capplet/settings/mail-autoconfig/hotmail.co.jp
+++ b/mail/mail-autoconfig/hotmail.co.jp
diff --git a/capplet/settings/mail-autoconfig/hotmail.co.uk b/mail/mail-autoconfig/hotmail.co.uk
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/hotmail.co.uk
+++ b/mail/mail-autoconfig/hotmail.co.uk
diff --git a/capplet/settings/mail-autoconfig/hotmail.com b/mail/mail-autoconfig/hotmail.com
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/hotmail.com
+++ b/mail/mail-autoconfig/hotmail.com
diff --git a/capplet/settings/mail-autoconfig/hotmail.de b/mail/mail-autoconfig/hotmail.de
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/hotmail.de
+++ b/mail/mail-autoconfig/hotmail.de
diff --git a/capplet/settings/mail-autoconfig/hotmail.fr b/mail/mail-autoconfig/hotmail.fr
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/hotmail.fr
+++ b/mail/mail-autoconfig/hotmail.fr
diff --git a/capplet/settings/mail-autoconfig/hotmail.it b/mail/mail-autoconfig/hotmail.it
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/hotmail.it
+++ b/mail/mail-autoconfig/hotmail.it
diff --git a/capplet/settings/mail-autoconfig/ic-net.or.jp b/mail/mail-autoconfig/ic-net.or.jp
index 8a89a3ec01..8a89a3ec01 100644
--- a/capplet/settings/mail-autoconfig/ic-net.or.jp
+++ b/mail/mail-autoconfig/ic-net.or.jp
diff --git a/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp b/mail/mail-autoconfig/iiyama-catv.ne.jp
index 85f1a2725d..85f1a2725d 100644
--- a/capplet/settings/mail-autoconfig/iiyama-catv.ne.jp
+++ b/mail/mail-autoconfig/iiyama-catv.ne.jp
diff --git a/capplet/settings/mail-autoconfig/imail.plala.or.jp b/mail/mail-autoconfig/imail.plala.or.jp
index d4c8897d22..d4c8897d22 100644
--- a/capplet/settings/mail-autoconfig/imail.plala.or.jp
+++ b/mail/mail-autoconfig/imail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/inbox.lt b/mail/mail-autoconfig/inbox.lt
index c5f07659d0..c5f07659d0 100644
--- a/capplet/settings/mail-autoconfig/inbox.lt
+++ b/mail/mail-autoconfig/inbox.lt
diff --git a/capplet/settings/mail-autoconfig/inbox.lv b/mail/mail-autoconfig/inbox.lv
index ac3b317315..ac3b317315 100644
--- a/capplet/settings/mail-autoconfig/inbox.lv
+++ b/mail/mail-autoconfig/inbox.lv
diff --git a/capplet/settings/mail-autoconfig/indigo.plala.or.jp b/mail/mail-autoconfig/indigo.plala.or.jp
index 2d21e2d69e..2d21e2d69e 100644
--- a/capplet/settings/mail-autoconfig/indigo.plala.or.jp
+++ b/mail/mail-autoconfig/indigo.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/inet-shibata.or.jp b/mail/mail-autoconfig/inet-shibata.or.jp
index 8e09a319c0..8e09a319c0 100644
--- a/capplet/settings/mail-autoconfig/inet-shibata.or.jp
+++ b/mail/mail-autoconfig/inet-shibata.or.jp
diff --git a/capplet/settings/mail-autoconfig/ivory.plala.or.jp b/mail/mail-autoconfig/ivory.plala.or.jp
index a3a0b40c79..a3a0b40c79 100644
--- a/capplet/settings/mail-autoconfig/ivory.plala.or.jp
+++ b/mail/mail-autoconfig/ivory.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/iwafune.ne.jp b/mail/mail-autoconfig/iwafune.ne.jp
index d45552f08b..d45552f08b 100644
--- a/capplet/settings/mail-autoconfig/iwafune.ne.jp
+++ b/mail/mail-autoconfig/iwafune.ne.jp
diff --git a/capplet/settings/mail-autoconfig/jade.plala.or.jp b/mail/mail-autoconfig/jade.plala.or.jp
index 998ff0ce43..998ff0ce43 100644
--- a/capplet/settings/mail-autoconfig/jade.plala.or.jp
+++ b/mail/mail-autoconfig/jade.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/janis.or.jp b/mail/mail-autoconfig/janis.or.jp
index 2092e32aaf..2092e32aaf 100644
--- a/capplet/settings/mail-autoconfig/janis.or.jp
+++ b/mail/mail-autoconfig/janis.or.jp
diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp b/mail/mail-autoconfig/jet.ne.jp
index dc2c794159..dc2c794159 100644
--- a/capplet/settings/mail-autoconfig/jet.ne.jp
+++ b/mail/mail-autoconfig/jet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp imap b/mail/mail-autoconfig/jet.ne.jp imap
index 2a8bdebbda..2a8bdebbda 100644
--- a/capplet/settings/mail-autoconfig/jet.ne.jp imap
+++ b/mail/mail-autoconfig/jet.ne.jp imap
diff --git a/capplet/settings/mail-autoconfig/jet.ne.jp pop b/mail/mail-autoconfig/jet.ne.jp pop
index dc2c794159..dc2c794159 100644
--- a/capplet/settings/mail-autoconfig/jet.ne.jp pop
+++ b/mail/mail-autoconfig/jet.ne.jp pop
diff --git a/capplet/settings/mail-autoconfig/ji.jet.ne.jp b/mail/mail-autoconfig/ji.jet.ne.jp
index 7c2dfa5b6a..7c2dfa5b6a 100644
--- a/capplet/settings/mail-autoconfig/ji.jet.ne.jp
+++ b/mail/mail-autoconfig/ji.jet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/jmail.plala.or.jp b/mail/mail-autoconfig/jmail.plala.or.jp
index a8c80b2026..a8c80b2026 100644
--- a/capplet/settings/mail-autoconfig/jmail.plala.or.jp
+++ b/mail/mail-autoconfig/jmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/k1.wind.jp b/mail/mail-autoconfig/k1.wind.jp
index 80bd91ee82..80bd91ee82 100644
--- a/capplet/settings/mail-autoconfig/k1.wind.jp
+++ b/mail/mail-autoconfig/k1.wind.jp
diff --git a/capplet/settings/mail-autoconfig/khaki.plala.or.jp b/mail/mail-autoconfig/khaki.plala.or.jp
index 09b562ce68..09b562ce68 100644
--- a/capplet/settings/mail-autoconfig/khaki.plala.or.jp
+++ b/mail/mail-autoconfig/khaki.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/kmail.plala.or.jp b/mail/mail-autoconfig/kmail.plala.or.jp
index 7e88d5f88d..7e88d5f88d 100644
--- a/capplet/settings/mail-autoconfig/kmail.plala.or.jp
+++ b/mail/mail-autoconfig/kmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/kokuyou.ne.jp b/mail/mail-autoconfig/kokuyou.ne.jp
index 1a3e2a6830..1a3e2a6830 100644
--- a/capplet/settings/mail-autoconfig/kokuyou.ne.jp
+++ b/mail/mail-autoconfig/kokuyou.ne.jp
diff --git a/capplet/settings/mail-autoconfig/lapis.plala.or.jp b/mail/mail-autoconfig/lapis.plala.or.jp
index eb54651cb0..eb54651cb0 100644
--- a/capplet/settings/mail-autoconfig/lapis.plala.or.jp
+++ b/mail/mail-autoconfig/lapis.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/laposte.net b/mail/mail-autoconfig/laposte.net
index e0b1bd45aa..e0b1bd45aa 100644
--- a/capplet/settings/mail-autoconfig/laposte.net
+++ b/mail/mail-autoconfig/laposte.net
diff --git a/capplet/settings/mail-autoconfig/lemon.plala.or.jp b/mail/mail-autoconfig/lemon.plala.or.jp
index 26846d8f5c..26846d8f5c 100644
--- a/capplet/settings/mail-autoconfig/lemon.plala.or.jp
+++ b/mail/mail-autoconfig/lemon.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/lilac.plala.or.jp b/mail/mail-autoconfig/lilac.plala.or.jp
index 1283c0246e..1283c0246e 100644
--- a/capplet/settings/mail-autoconfig/lilac.plala.or.jp
+++ b/mail/mail-autoconfig/lilac.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/lime.plala.or.jp b/mail/mail-autoconfig/lime.plala.or.jp
index 94e092548b..94e092548b 100644
--- a/capplet/settings/mail-autoconfig/lime.plala.or.jp
+++ b/mail/mail-autoconfig/lime.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/live.co.jp b/mail/mail-autoconfig/live.co.jp
index 327130587f..327130587f 100644
--- a/capplet/settings/mail-autoconfig/live.co.jp
+++ b/mail/mail-autoconfig/live.co.jp
diff --git a/capplet/settings/mail-autoconfig/live.co.uk b/mail/mail-autoconfig/live.co.uk
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/live.co.uk
+++ b/mail/mail-autoconfig/live.co.uk
diff --git a/capplet/settings/mail-autoconfig/live.com b/mail/mail-autoconfig/live.com
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/live.com
+++ b/mail/mail-autoconfig/live.com
diff --git a/capplet/settings/mail-autoconfig/live.de b/mail/mail-autoconfig/live.de
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/live.de
+++ b/mail/mail-autoconfig/live.de
diff --git a/capplet/settings/mail-autoconfig/live.fr b/mail/mail-autoconfig/live.fr
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/live.fr
+++ b/mail/mail-autoconfig/live.fr
diff --git a/capplet/settings/mail-autoconfig/live.it b/mail/mail-autoconfig/live.it
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/live.it
+++ b/mail/mail-autoconfig/live.it
diff --git a/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp b/mail/mail-autoconfig/ma100.tiki.ne.jp
index d87f89eda9..d87f89eda9 100644
--- a/capplet/settings/mail-autoconfig/ma100.tiki.ne.jp
+++ b/mail/mail-autoconfig/ma100.tiki.ne.jp
diff --git a/capplet/settings/mail-autoconfig/mac.com b/mail/mail-autoconfig/mac.com
index 094425578b..094425578b 100644
--- a/capplet/settings/mail-autoconfig/mac.com
+++ b/mail/mail-autoconfig/mac.com
diff --git a/capplet/settings/mail-autoconfig/mahoroba.ne.jp b/mail/mail-autoconfig/mahoroba.ne.jp
index 43679c1446..43679c1446 100644
--- a/capplet/settings/mail-autoconfig/mahoroba.ne.jp
+++ b/mail/mail-autoconfig/mahoroba.ne.jp
diff --git a/capplet/settings/mail-autoconfig/mail.gunmanet.jp b/mail/mail-autoconfig/mail.gunmanet.jp
index 90bdf8ecf8..90bdf8ecf8 100644
--- a/capplet/settings/mail-autoconfig/mail.gunmanet.jp
+++ b/mail/mail-autoconfig/mail.gunmanet.jp
diff --git a/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp b/mail/mail-autoconfig/mail.iwafune.ne.jp
index c6340450b9..c6340450b9 100644
--- a/capplet/settings/mail-autoconfig/mail.iwafune.ne.jp
+++ b/mail/mail-autoconfig/mail.iwafune.ne.jp
diff --git a/capplet/settings/mail-autoconfig/maroon.plala.or.jp b/mail/mail-autoconfig/maroon.plala.or.jp
index d2e00e2d0d..d2e00e2d0d 100644
--- a/capplet/settings/mail-autoconfig/maroon.plala.or.jp
+++ b/mail/mail-autoconfig/maroon.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/me.com b/mail/mail-autoconfig/me.com
index 094425578b..094425578b 100644
--- a/capplet/settings/mail-autoconfig/me.com
+++ b/mail/mail-autoconfig/me.com
diff --git a/capplet/settings/mail-autoconfig/minuet.plala.or.jp b/mail/mail-autoconfig/minuet.plala.or.jp
index af72bf2644..af72bf2644 100644
--- a/capplet/settings/mail-autoconfig/minuet.plala.or.jp
+++ b/mail/mail-autoconfig/minuet.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/ml.murakami.ne.jp b/mail/mail-autoconfig/ml.murakami.ne.jp
index 54d20ae5f9..54d20ae5f9 100644
--- a/capplet/settings/mail-autoconfig/ml.murakami.ne.jp
+++ b/mail/mail-autoconfig/ml.murakami.ne.jp
diff --git a/capplet/settings/mail-autoconfig/ml.shibata.ne.jp b/mail/mail-autoconfig/ml.shibata.ne.jp
index a78346145b..a78346145b 100644
--- a/capplet/settings/mail-autoconfig/ml.shibata.ne.jp
+++ b/mail/mail-autoconfig/ml.shibata.ne.jp
diff --git a/capplet/settings/mail-autoconfig/mnet.ne.jp b/mail/mail-autoconfig/mnet.ne.jp
index 24a19b4795..24a19b4795 100644
--- a/capplet/settings/mail-autoconfig/mnet.ne.jp
+++ b/mail/mail-autoconfig/mnet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/mopera.net b/mail/mail-autoconfig/mopera.net
index 9f416f21d9..9f416f21d9 100644
--- a/capplet/settings/mail-autoconfig/mopera.net
+++ b/mail/mail-autoconfig/mopera.net
diff --git a/capplet/settings/mail-autoconfig/msn.com b/mail/mail-autoconfig/msn.com
index e11acdc3bb..e11acdc3bb 100644
--- a/capplet/settings/mail-autoconfig/msn.com
+++ b/mail/mail-autoconfig/msn.com
diff --git a/capplet/settings/mail-autoconfig/navy.plala.or.jp b/mail/mail-autoconfig/navy.plala.or.jp
index 3935216659..3935216659 100644
--- a/capplet/settings/mail-autoconfig/navy.plala.or.jp
+++ b/mail/mail-autoconfig/navy.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/nifty.com b/mail/mail-autoconfig/nifty.com
index 5b38d6240e..5b38d6240e 100644
--- a/capplet/settings/mail-autoconfig/nifty.com
+++ b/mail/mail-autoconfig/nifty.com
diff --git a/capplet/settings/mail-autoconfig/nsat.jp b/mail/mail-autoconfig/nsat.jp
index 32583b86d2..32583b86d2 100644
--- a/capplet/settings/mail-autoconfig/nsat.jp
+++ b/mail/mail-autoconfig/nsat.jp
diff --git a/capplet/settings/mail-autoconfig/olive.plala.or.jp b/mail/mail-autoconfig/olive.plala.or.jp
index f85b0232ea..f85b0232ea 100644
--- a/capplet/settings/mail-autoconfig/olive.plala.or.jp
+++ b/mail/mail-autoconfig/olive.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/online.de b/mail/mail-autoconfig/online.de
index 12c4b1e722..12c4b1e722 100644
--- a/capplet/settings/mail-autoconfig/online.de
+++ b/mail/mail-autoconfig/online.de
diff --git a/capplet/settings/mail-autoconfig/opal.plala.or.jp b/mail/mail-autoconfig/opal.plala.or.jp
index 168f59fd01..168f59fd01 100644
--- a/capplet/settings/mail-autoconfig/opal.plala.or.jp
+++ b/mail/mail-autoconfig/opal.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/orange.fr b/mail/mail-autoconfig/orange.fr
index c40c39e1ce..c40c39e1ce 100644
--- a/capplet/settings/mail-autoconfig/orange.fr
+++ b/mail/mail-autoconfig/orange.fr
diff --git a/capplet/settings/mail-autoconfig/orange.plala.or.jp b/mail/mail-autoconfig/orange.plala.or.jp
index 7baa803144..7baa803144 100644
--- a/capplet/settings/mail-autoconfig/orange.plala.or.jp
+++ b/mail/mail-autoconfig/orange.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/orchid.plala.or.jp b/mail/mail-autoconfig/orchid.plala.or.jp
index b5c8bc2130..b5c8bc2130 100644
--- a/capplet/settings/mail-autoconfig/orchid.plala.or.jp
+++ b/mail/mail-autoconfig/orchid.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/pal.kijimadaira.jp b/mail/mail-autoconfig/pal.kijimadaira.jp
index 1b91b71189..1b91b71189 100644
--- a/capplet/settings/mail-autoconfig/pal.kijimadaira.jp
+++ b/mail/mail-autoconfig/pal.kijimadaira.jp
diff --git a/capplet/settings/mail-autoconfig/palette.plala.or.jp b/mail/mail-autoconfig/palette.plala.or.jp
index 1a64ad6643..1a64ad6643 100644
--- a/capplet/settings/mail-autoconfig/palette.plala.or.jp
+++ b/mail/mail-autoconfig/palette.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/parabox.or.jp b/mail/mail-autoconfig/parabox.or.jp
index 0c99974741..0c99974741 100644
--- a/capplet/settings/mail-autoconfig/parabox.or.jp
+++ b/mail/mail-autoconfig/parabox.or.jp
diff --git a/capplet/settings/mail-autoconfig/peach.plala.or.jp b/mail/mail-autoconfig/peach.plala.or.jp
index 34c7a3df41..34c7a3df41 100644
--- a/capplet/settings/mail-autoconfig/peach.plala.or.jp
+++ b/mail/mail-autoconfig/peach.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/peoplepc.com b/mail/mail-autoconfig/peoplepc.com
index b9ec01d797..b9ec01d797 100644
--- a/capplet/settings/mail-autoconfig/peoplepc.com
+++ b/mail/mail-autoconfig/peoplepc.com
diff --git a/capplet/settings/mail-autoconfig/plum.plala.or.jp b/mail/mail-autoconfig/plum.plala.or.jp
index 5696afd5ba..5696afd5ba 100644
--- a/capplet/settings/mail-autoconfig/plum.plala.or.jp
+++ b/mail/mail-autoconfig/plum.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/po.dcn.ne.jp b/mail/mail-autoconfig/po.dcn.ne.jp
index e91d2affc7..e91d2affc7 100644
--- a/capplet/settings/mail-autoconfig/po.dcn.ne.jp
+++ b/mail/mail-autoconfig/po.dcn.ne.jp
diff --git a/capplet/settings/mail-autoconfig/po.wind.jp b/mail/mail-autoconfig/po.wind.jp
index 96b2d0f81b..96b2d0f81b 100644
--- a/capplet/settings/mail-autoconfig/po.wind.jp
+++ b/mail/mail-autoconfig/po.wind.jp
diff --git a/capplet/settings/mail-autoconfig/polka.plala.or.jp b/mail/mail-autoconfig/polka.plala.or.jp
index 087065eb7f..087065eb7f 100644
--- a/capplet/settings/mail-autoconfig/polka.plala.or.jp
+++ b/mail/mail-autoconfig/polka.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/pop.shibata.ne.jp b/mail/mail-autoconfig/pop.shibata.ne.jp
index a78346145b..a78346145b 100644
--- a/capplet/settings/mail-autoconfig/pop.shibata.ne.jp
+++ b/mail/mail-autoconfig/pop.shibata.ne.jp
diff --git a/capplet/settings/mail-autoconfig/purple.plala.or.jp b/mail/mail-autoconfig/purple.plala.or.jp
index 393d2ac841..393d2ac841 100644
--- a/capplet/settings/mail-autoconfig/purple.plala.or.jp
+++ b/mail/mail-autoconfig/purple.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/rainbow.plala.or.jp b/mail/mail-autoconfig/rainbow.plala.or.jp
index 3718ed4868..3718ed4868 100644
--- a/capplet/settings/mail-autoconfig/rainbow.plala.or.jp
+++ b/mail/mail-autoconfig/rainbow.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/red.plala.or.jp b/mail/mail-autoconfig/red.plala.or.jp
index a42e8893ff..a42e8893ff 100644
--- a/capplet/settings/mail-autoconfig/red.plala.or.jp
+++ b/mail/mail-autoconfig/red.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/rmail.plala.or.jp b/mail/mail-autoconfig/rmail.plala.or.jp
index 7ecc703e01..7ecc703e01 100644
--- a/capplet/settings/mail-autoconfig/rmail.plala.or.jp
+++ b/mail/mail-autoconfig/rmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/rondo.plala.or.jp b/mail/mail-autoconfig/rondo.plala.or.jp
index 13616d3e41..13616d3e41 100644
--- a/capplet/settings/mail-autoconfig/rondo.plala.or.jp
+++ b/mail/mail-autoconfig/rondo.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/rose.plala.or.jp b/mail/mail-autoconfig/rose.plala.or.jp
index 034f32cab4..034f32cab4 100644
--- a/capplet/settings/mail-autoconfig/rose.plala.or.jp
+++ b/mail/mail-autoconfig/rose.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/rouge.plala.or.jp b/mail/mail-autoconfig/rouge.plala.or.jp
index cbbb43ce4d..cbbb43ce4d 100644
--- a/capplet/settings/mail-autoconfig/rouge.plala.or.jp
+++ b/mail/mail-autoconfig/rouge.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/ruby.plala.or.jp b/mail/mail-autoconfig/ruby.plala.or.jp
index 427be4b3cf..427be4b3cf 100644
--- a/capplet/settings/mail-autoconfig/ruby.plala.or.jp
+++ b/mail/mail-autoconfig/ruby.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/sakunet.ne.jp b/mail/mail-autoconfig/sakunet.ne.jp
index 695b7c70c2..695b7c70c2 100644
--- a/capplet/settings/mail-autoconfig/sakunet.ne.jp
+++ b/mail/mail-autoconfig/sakunet.ne.jp
diff --git a/capplet/settings/mail-autoconfig/sea.plala.or.jp b/mail/mail-autoconfig/sea.plala.or.jp
index ddde2c1767..ddde2c1767 100644
--- a/capplet/settings/mail-autoconfig/sea.plala.or.jp
+++ b/mail/mail-autoconfig/sea.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/sepia.plala.or.jp b/mail/mail-autoconfig/sepia.plala.or.jp
index 1dce9e1cf4..1dce9e1cf4 100644
--- a/capplet/settings/mail-autoconfig/sepia.plala.or.jp
+++ b/mail/mail-autoconfig/sepia.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/serenade.plala.or.jp b/mail/mail-autoconfig/serenade.plala.or.jp
index 83bf35b7ba..83bf35b7ba 100644
--- a/capplet/settings/mail-autoconfig/serenade.plala.or.jp
+++ b/mail/mail-autoconfig/serenade.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/silk.plala.or.jp b/mail/mail-autoconfig/silk.plala.or.jp
index 1aa4b81964..1aa4b81964 100644
--- a/capplet/settings/mail-autoconfig/silk.plala.or.jp
+++ b/mail/mail-autoconfig/silk.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/silver.plala.or.jp b/mail/mail-autoconfig/silver.plala.or.jp
index 8ff9fd9ec8..8ff9fd9ec8 100644
--- a/capplet/settings/mail-autoconfig/silver.plala.or.jp
+++ b/mail/mail-autoconfig/silver.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/sky.plala.or.jp b/mail/mail-autoconfig/sky.plala.or.jp
index 9da6383b8c..9da6383b8c 100644
--- a/capplet/settings/mail-autoconfig/sky.plala.or.jp
+++ b/mail/mail-autoconfig/sky.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/smail.plala.or.jp b/mail/mail-autoconfig/smail.plala.or.jp
index 1768bfd9bc..1768bfd9bc 100644
--- a/capplet/settings/mail-autoconfig/smail.plala.or.jp
+++ b/mail/mail-autoconfig/smail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/snow.plala.or.jp b/mail/mail-autoconfig/snow.plala.or.jp
index 44267b99b1..44267b99b1 100644
--- a/capplet/settings/mail-autoconfig/snow.plala.or.jp
+++ b/mail/mail-autoconfig/snow.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/so.wind.ne.jp b/mail/mail-autoconfig/so.wind.ne.jp
index 50fd47ef1c..50fd47ef1c 100644
--- a/capplet/settings/mail-autoconfig/so.wind.ne.jp
+++ b/mail/mail-autoconfig/so.wind.ne.jp
diff --git a/capplet/settings/mail-autoconfig/sonata.plala.or.jp b/mail/mail-autoconfig/sonata.plala.or.jp
index 3834428fbd..3834428fbd 100644
--- a/capplet/settings/mail-autoconfig/sonata.plala.or.jp
+++ b/mail/mail-autoconfig/sonata.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/suite.plala.or.jp b/mail/mail-autoconfig/suite.plala.or.jp
index c8beac6b9c..c8beac6b9c 100644
--- a/capplet/settings/mail-autoconfig/suite.plala.or.jp
+++ b/mail/mail-autoconfig/suite.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/symphony.plala.or.jp b/mail/mail-autoconfig/symphony.plala.or.jp
index 311aa184ac..311aa184ac 100644
--- a/capplet/settings/mail-autoconfig/symphony.plala.or.jp
+++ b/mail/mail-autoconfig/symphony.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/t-online.de b/mail/mail-autoconfig/t-online.de
index a80ac4c316..a80ac4c316 100644
--- a/capplet/settings/mail-autoconfig/t-online.de
+++ b/mail/mail-autoconfig/t-online.de
diff --git a/capplet/settings/mail-autoconfig/t-online.de free b/mail/mail-autoconfig/t-online.de free
index a80ac4c316..a80ac4c316 100644
--- a/capplet/settings/mail-autoconfig/t-online.de free
+++ b/mail/mail-autoconfig/t-online.de free
diff --git a/capplet/settings/mail-autoconfig/t-online.de imap ssl b/mail/mail-autoconfig/t-online.de imap ssl
index e2e5fb1a76..e2e5fb1a76 100644
--- a/capplet/settings/mail-autoconfig/t-online.de imap ssl
+++ b/mail/mail-autoconfig/t-online.de imap ssl
diff --git a/capplet/settings/mail-autoconfig/t-online.de pop ssl b/mail/mail-autoconfig/t-online.de pop ssl
index 264ad0582c..264ad0582c 100644
--- a/capplet/settings/mail-autoconfig/t-online.de pop ssl
+++ b/mail/mail-autoconfig/t-online.de pop ssl
diff --git a/capplet/settings/mail-autoconfig/taupe.plala.or.jp b/mail/mail-autoconfig/taupe.plala.or.jp
index cec35b2df5..cec35b2df5 100644
--- a/capplet/settings/mail-autoconfig/taupe.plala.or.jp
+++ b/mail/mail-autoconfig/taupe.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/tiki.ne.jp b/mail/mail-autoconfig/tiki.ne.jp
index 9e54488ead..9e54488ead 100644
--- a/capplet/settings/mail-autoconfig/tiki.ne.jp
+++ b/mail/mail-autoconfig/tiki.ne.jp
diff --git a/capplet/settings/mail-autoconfig/tmail.plala.or.jp b/mail/mail-autoconfig/tmail.plala.or.jp
index d138304dc9..d138304dc9 100644
--- a/capplet/settings/mail-autoconfig/tmail.plala.or.jp
+++ b/mail/mail-autoconfig/tmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/toccata.plala.or.jp b/mail/mail-autoconfig/toccata.plala.or.jp
index 41281a7d6c..41281a7d6c 100644
--- a/capplet/settings/mail-autoconfig/toccata.plala.or.jp
+++ b/mail/mail-autoconfig/toccata.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/topaz.plala.or.jp b/mail/mail-autoconfig/topaz.plala.or.jp
index 185f1796de..185f1796de 100644
--- a/capplet/settings/mail-autoconfig/topaz.plala.or.jp
+++ b/mail/mail-autoconfig/topaz.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/trio.plala.or.jp b/mail/mail-autoconfig/trio.plala.or.jp
index 6d15fc17b4..6d15fc17b4 100644
--- a/capplet/settings/mail-autoconfig/trio.plala.or.jp
+++ b/mail/mail-autoconfig/trio.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/umail.plala.or.jp b/mail/mail-autoconfig/umail.plala.or.jp
index 2b4a0694a0..2b4a0694a0 100644
--- a/capplet/settings/mail-autoconfig/umail.plala.or.jp
+++ b/mail/mail-autoconfig/umail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/verizon.net b/mail/mail-autoconfig/verizon.net
index 0c41d38243..0c41d38243 100644
--- a/capplet/settings/mail-autoconfig/verizon.net
+++ b/mail/mail-autoconfig/verizon.net
diff --git a/capplet/settings/mail-autoconfig/violet.plala.or.jp b/mail/mail-autoconfig/violet.plala.or.jp
index a1ce58b326..a1ce58b326 100644
--- a/capplet/settings/mail-autoconfig/violet.plala.or.jp
+++ b/mail/mail-autoconfig/violet.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/vm.aikis.or.jp b/mail/mail-autoconfig/vm.aikis.or.jp
index 9c3caa70ec..9c3caa70ec 100644
--- a/capplet/settings/mail-autoconfig/vm.aikis.or.jp
+++ b/mail/mail-autoconfig/vm.aikis.or.jp
diff --git a/capplet/settings/mail-autoconfig/vmail.plala.or.jp b/mail/mail-autoconfig/vmail.plala.or.jp
index 66358ef6a8..66358ef6a8 100644
--- a/capplet/settings/mail-autoconfig/vmail.plala.or.jp
+++ b/mail/mail-autoconfig/vmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/vp.tiki.ne.jp b/mail/mail-autoconfig/vp.tiki.ne.jp
index 378a9d3b24..378a9d3b24 100644
--- a/capplet/settings/mail-autoconfig/vp.tiki.ne.jp
+++ b/mail/mail-autoconfig/vp.tiki.ne.jp
diff --git a/capplet/settings/mail-autoconfig/waltz.plala.or.jp b/mail/mail-autoconfig/waltz.plala.or.jp
index e7814cd235..e7814cd235 100644
--- a/capplet/settings/mail-autoconfig/waltz.plala.or.jp
+++ b/mail/mail-autoconfig/waltz.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr b/mail/mail-autoconfig/wanadoo.fr
index c40c39e1ce..c40c39e1ce 100644
--- a/capplet/settings/mail-autoconfig/wanadoo.fr
+++ b/mail/mail-autoconfig/wanadoo.fr
diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr imap b/mail/mail-autoconfig/wanadoo.fr imap
index 5b138e48ce..5b138e48ce 100644
--- a/capplet/settings/mail-autoconfig/wanadoo.fr imap
+++ b/mail/mail-autoconfig/wanadoo.fr imap
diff --git a/capplet/settings/mail-autoconfig/wanadoo.fr pop b/mail/mail-autoconfig/wanadoo.fr pop
index c40c39e1ce..c40c39e1ce 100644
--- a/capplet/settings/mail-autoconfig/wanadoo.fr pop
+++ b/mail/mail-autoconfig/wanadoo.fr pop
diff --git a/capplet/settings/mail-autoconfig/wave.plala.or.jp b/mail/mail-autoconfig/wave.plala.or.jp
index 611ab2a6b8..611ab2a6b8 100644
--- a/capplet/settings/mail-autoconfig/wave.plala.or.jp
+++ b/mail/mail-autoconfig/wave.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/web.de b/mail/mail-autoconfig/web.de
index d3b357f16d..d3b357f16d 100644
--- a/capplet/settings/mail-autoconfig/web.de
+++ b/mail/mail-autoconfig/web.de
diff --git a/capplet/settings/mail-autoconfig/white.plala.or.jp b/mail/mail-autoconfig/white.plala.or.jp
index 34f9a8af3f..34f9a8af3f 100644
--- a/capplet/settings/mail-autoconfig/white.plala.or.jp
+++ b/mail/mail-autoconfig/white.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/wine.plala.or.jp b/mail/mail-autoconfig/wine.plala.or.jp
index 62f66db872..62f66db872 100644
--- a/capplet/settings/mail-autoconfig/wine.plala.or.jp
+++ b/mail/mail-autoconfig/wine.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/wmail.plala.or.jp b/mail/mail-autoconfig/wmail.plala.or.jp
index 375c3010eb..375c3010eb 100644
--- a/capplet/settings/mail-autoconfig/wmail.plala.or.jp
+++ b/mail/mail-autoconfig/wmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/xmail.plala.or.jp b/mail/mail-autoconfig/xmail.plala.or.jp
index b8d7187ff5..b8d7187ff5 100644
--- a/capplet/settings/mail-autoconfig/xmail.plala.or.jp
+++ b/mail/mail-autoconfig/xmail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/xp.wind.jp b/mail/mail-autoconfig/xp.wind.jp
index bed7569308..bed7569308 100644
--- a/capplet/settings/mail-autoconfig/xp.wind.jp
+++ b/mail/mail-autoconfig/xp.wind.jp
diff --git a/capplet/settings/mail-autoconfig/xpost.plala.or.jp b/mail/mail-autoconfig/xpost.plala.or.jp
index 7d175fd750..7d175fd750 100644
--- a/capplet/settings/mail-autoconfig/xpost.plala.or.jp
+++ b/mail/mail-autoconfig/xpost.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/xs4all.nl b/mail/mail-autoconfig/xs4all.nl
index b5c4289322..b5c4289322 100644
--- a/capplet/settings/mail-autoconfig/xs4all.nl
+++ b/mail/mail-autoconfig/xs4all.nl
diff --git a/capplet/settings/mail-autoconfig/yahoo.com b/mail/mail-autoconfig/yahoo.com
index 92e6d7a70a..92e6d7a70a 100644
--- a/capplet/settings/mail-autoconfig/yahoo.com
+++ b/mail/mail-autoconfig/yahoo.com
diff --git a/capplet/settings/mail-autoconfig/ybb.ne.jp b/mail/mail-autoconfig/ybb.ne.jp
index 935a59ba95..935a59ba95 100644
--- a/capplet/settings/mail-autoconfig/ybb.ne.jp
+++ b/mail/mail-autoconfig/ybb.ne.jp
diff --git a/capplet/settings/mail-autoconfig/yellow.plala.or.jp b/mail/mail-autoconfig/yellow.plala.or.jp
index 4b71b37f72..4b71b37f72 100644
--- a/capplet/settings/mail-autoconfig/yellow.plala.or.jp
+++ b/mail/mail-autoconfig/yellow.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/ymail.plala.or.jp b/mail/mail-autoconfig/ymail.plala.or.jp
index 0f367d6b4e..0f367d6b4e 100644
--- a/capplet/settings/mail-autoconfig/ymail.plala.or.jp
+++ b/mail/mail-autoconfig/ymail.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/ypost.plala.or.jp b/mail/mail-autoconfig/ypost.plala.or.jp
index 9149c8d496..9149c8d496 100644
--- a/capplet/settings/mail-autoconfig/ypost.plala.or.jp
+++ b/mail/mail-autoconfig/ypost.plala.or.jp
diff --git a/capplet/settings/mail-autoconfig/zmail.plala.or.jp b/mail/mail-autoconfig/zmail.plala.or.jp
index 02e73a9842..02e73a9842 100644
--- a/capplet/settings/mail-autoconfig/zmail.plala.or.jp
+++ b/mail/mail-autoconfig/zmail.plala.or.jp
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 5a1ab0d8ad..02bf640a3a 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -5866,4 +5866,288 @@ For example: "Work" or "Personal"</property>
<widget name="lblForwardStyle"/>
</widgets>
</object>
+ <object class="GtkVBox" id="vboxReviewBorder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkTable" id="personal-details-table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="row_spacing">4</property>
+ <property name="column_spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="personal-details-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Personal Details:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="personal-name-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="personal-name-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="personal-email-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Email address:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="personal-email-entry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="server-details-table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">3</property>
+ <property name="row_spacing">4</property>
+ <property name="column_spacing">8</property>
+ <child>
+ <object class="GtkLabel" id="details-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Details:</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-label-receiving">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Receiving</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-label-sending">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sending</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-server-type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Server type:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-server-address">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Server address:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-user-name">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Username:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-encryption">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Encryption:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="receive_server_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="send_server_type">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="receive_server_address">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="send_server_address">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">none</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="receive_username">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="send_username">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="receive_encryption">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="send_encryption">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
</interface>
diff --git a/capplet/settings/mail-guess-servers.c b/mail/mail-guess-servers.c
index 8ab9670e8c..8ab9670e8c 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/mail/mail-guess-servers.c
diff --git a/capplet/settings/mail-guess-servers.h b/mail/mail-guess-servers.h
index 84f6090ebe..84f6090ebe 100644
--- a/capplet/settings/mail-guess-servers.h
+++ b/mail/mail-guess-servers.h
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8bdb329f36..24a494ddac 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1410,7 +1410,26 @@ expunge_pop3_stores (CamelFolder *expunging,
account->source && account->source->url &&
g_str_has_prefix (account->source->url, "pop://")) {
CamelFolder *folder;
- gboolean any_found = FALSE;
+ CamelService *service;
+ CamelSettings *settings;
+ gboolean any_found = FALSE, delete_expunged = FALSE, keep_on_server = FALSE;
+
+ service = camel_session_get_service (CAMEL_SESSION (session), account->uid);
+ if (!CAMEL_IS_STORE (service))
+ continue;
+
+ settings = camel_service_get_settings (service);
+ if (!settings)
+ continue;
+
+ g_object_get (
+ settings,
+ "delete-expunged", &delete_expunged,
+ "keep-on-server", &keep_on_server,
+ NULL);
+
+ if (!keep_on_server || !delete_expunged)
+ continue;
folder = e_mail_session_get_inbox_sync (
session, account->uid, cancellable, error);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5fe6c09d04..80d6f1ec0c 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -346,64 +346,6 @@ mv_find_folder (GQueue *queue,
return link;
}
-static gint
-uri_is_ignore (EMailBackend *backend,
- const gchar *uri)
-{
- EMailSession *session;
- CamelSession *camel_session;
- EAccountList *accounts;
- EAccount *account;
- EIterator *iter;
- const gchar *local_drafts_uri;
- const gchar *local_outbox_uri;
- const gchar *local_sent_uri;
- gint found = FALSE;
-
- local_drafts_uri =
- e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS);
- local_outbox_uri =
- e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_OUTBOX);
- local_sent_uri =
- e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT);
-
- session = e_mail_backend_get_session (backend);
- camel_session = CAMEL_SESSION (session);
-
- if (e_mail_folder_uri_equal (camel_session, local_outbox_uri, uri))
- return TRUE;
-
- if (e_mail_folder_uri_equal (camel_session, local_sent_uri, uri))
- return TRUE;
-
- if (e_mail_folder_uri_equal (camel_session, local_drafts_uri, uri))
- return TRUE;
-
- accounts = e_get_account_list ();
- iter = e_list_get_iterator (E_LIST (accounts));
-
- while (!found && e_iterator_is_valid (iter)) {
- /* XXX EIterator misuses const. */
- account = (EAccount *) e_iterator_get (iter);
-
- if (!found && account->sent_folder_uri != NULL)
- found = e_mail_folder_uri_equal (
- camel_session, uri,
- account->sent_folder_uri);
-
- if (!found && account->drafts_folder_uri != NULL)
- found = e_mail_folder_uri_equal (
- camel_session, uri,
- account->drafts_folder_uri);
-
- e_iterator_next (iter);
- }
-
- g_object_unref (iter);
-
- return found;
-}
-
/* so special we never use it */
static gint
folder_is_spethal (CamelStore *store,
@@ -455,7 +397,7 @@ mail_vfolder_add_folder (EMailBackend *backend,
GList *folders = NULL, *link;
GQueue *queue;
gint remote;
- gint is_ignore;
+ gint is_ignore = FALSE;
gchar *uri;
session = e_mail_backend_get_session (backend);
@@ -471,8 +413,6 @@ mail_vfolder_add_folder (EMailBackend *backend,
uri = e_mail_folder_uri_build (store, folder_name);
- is_ignore = uri_is_ignore (backend, uri);
-
G_LOCK (vfolder);
/* maintain the source folders lists for changed rules later on */
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui
index 99cc668efb..864e9389cf 100644
--- a/modules/addressbook/ldap-config.ui
+++ b/modules/addressbook/ldap-config.ui
@@ -247,7 +247,7 @@
<object class="GtkLabel" id="label556">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Server:</property>
+ <property name="label" translatable="yes">Ser_ver:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">server-name-entry</property>
</object>
@@ -263,7 +263,7 @@
<child>
<object class="GtkLabel" id="label555">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Use secure connection:</property>
+ <property name="label" translatable="yes">Use secure _connection:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ssl-combobox</property>
</object>
@@ -504,7 +504,7 @@
<object class="GtkLabel" id="label581">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Search _filter:</property>
+ <property name="label" translatable="yes">S_earch filter:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">search-filter-entry</property>
</object>
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index bc801dabf8..f498621852 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -160,9 +160,6 @@ action_mail_message_new_cb (GtkAction *action,
shell = e_shell_window_get_shell (shell_window);
- if (!em_utils_check_user_can_send_mail ())
- return;
-
/* Take care not to unnecessarily load the mail shell view. */
view_name = e_shell_window_get_active_view (shell_window);
if (g_strcmp0 (view_name, BACKEND_NAME) != 0)
@@ -268,9 +265,7 @@ mail_shell_backend_handle_uri_cb (EShell *shell,
gboolean handled = FALSE;
if (g_str_has_prefix (uri, "mailto:")) {
- if (em_utils_check_user_can_send_mail ())
- em_utils_compose_new_message_with_mailto (
- shell, uri, NULL);
+ em_utils_compose_new_message_with_mailto (shell, uri, NULL);
handled = TRUE;
}
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index dc94c5c9ed..2427fc1ffd 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -123,6 +123,8 @@ action_mail_account_disable_cb (GtkAction *action,
e_account_list_remove (account_list, account);
e_account_list_save (account_list);
+
+ e_shell_view_update_actions (shell_view);
}
static void
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 5759b5830f..1e80e77a3c 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -990,7 +990,7 @@ mail_shell_view_update_actions (EShellView *shell_view)
gtk_action_set_sensitive (action, sensitive);
action = ACTION (MAIL_FOLDER_PROPERTIES);
- sensitive = !folder_is_store;
+ sensitive = !folder_is_store && uri != NULL;
gtk_action_set_sensitive (action, sensitive);
action = ACTION (MAIL_FOLDER_REFRESH);
diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c
index 666c407511..07c8923609 100644
--- a/modules/online-accounts/e-online-accounts-google.c
+++ b/modules/online-accounts/e-online-accounts-google.c
@@ -139,6 +139,15 @@ online_accounts_google_sync_mail (GoaObject *goa_object,
const gchar *string;
gboolean new_account = FALSE;
+ account_list = e_get_account_list ();
+ account = e_get_account_by_uid (evo_id);
+
+ if (account) {
+ /* the account is already configured,
+ do not change user's changes */
+ return;
+ }
+
/* XXX There's nothing particularly GMail-specific about this.
* Maybe break this off into a more generic IMAP/SMTP sync
* function and then apply any GMail-specific tweaks. */
@@ -146,9 +155,6 @@ online_accounts_google_sync_mail (GoaObject *goa_object,
goa_mail = goa_object_get_mail (goa_object);
goa_account = goa_object_get_account (goa_object);
- account_list = e_get_account_list ();
- account = e_get_account_by_uid (evo_id);
-
if (account == NULL) {
account = g_object_new (E_TYPE_ACCOUNT, NULL);
account->uid = g_strdup (evo_id);
@@ -308,6 +314,7 @@ online_accounts_google_sync_calendar (GoaObject *goa_object,
uri_string = g_strdup_printf (
"caldav://%s@www.google.com/calendar/dav/%s/events",
encoded, string);
+ e_source_set_relative_uri (source, uri_string);
e_source_set_absolute_uri (source, uri_string);
g_free (uri_string);
g_free (encoded);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b86d3f8fab..d8953dbfe9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -129,7 +129,6 @@ composer/e-msg-composer.c
composer/mail-composer.error.xml
capplet/anjal-settings-main.c
capplet/settings/mail-view.c
-capplet/settings/mail-guess-servers.c
capplet/settings/mail-account-view.c
capplet/settings/mail-capplet-shell.c
capplet/settings/anjal-mail-view.c
diff --git a/po/de.po b/po/de.po
index 4b5146f81b..bf56ee8409 100644
--- a/po/de.po
+++ b/po/de.po
@@ -16,18 +16,19 @@
# Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
# Christian Kintner <mail@christian-kintner.de>, 2006, 2007.
# Andre Klapper <ak-47@gmx.net>, 2007-2009.
-# Mario Blättermann <mariobl@freenet.de>, 2010, 2011.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010, 2011.
# Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2010, 2011.
# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
# Hendrik Knackstedt <hendrik.knackstedt@t-online.de>, 2011.
+#
msgid ""
msgstr ""
"Project-Id-Version: evolution master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-10-07 14:28+0000\n"
-"PO-Revision-Date: 2011-10-08 21:33+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
+"POT-Creation-Date: 2011-11-12 16:04+0000\n"
+"PO-Revision-Date: 2011-11-13 17:21+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: Ubuntu German Translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -295,8 +296,8 @@ msgid "_Use as it is"
msgstr "_Wie es ist benutzen"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2064
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
+#: ../calendar/gui/e-calendar-view.c:2068
msgid "Anniversary"
msgstr "Jahrestag"
@@ -306,9 +307,9 @@ msgstr "Jahrestag"
#. * which, so long as it has an icon. We're just interested in
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2063 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:138
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../shell/main.c:139
msgid "Birthday"
msgstr "Geburtstag"
@@ -342,9 +343,9 @@ msgstr "Kontakteditor"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
#: ../addressbook/gui/merging/eab-contact-merging.c:390
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:1043
#: ../smime/lib/e-cert.c:833
msgid "Email"
msgstr "E-Mail"
@@ -360,7 +361,7 @@ msgstr "_Voller Name …"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
#: ../widgets/misc/e-contact-map.c:295
msgid "Home"
msgstr "Privat"
@@ -429,8 +430,8 @@ msgstr "Web-Adressen"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:1345
#: ../widgets/misc/e-contact-map.c:303
msgid "Work"
msgstr "Geschäftlich"
@@ -537,42 +538,42 @@ msgid "_Zip/Postal Code:"
msgstr "Postleit_zahl:"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
msgid "Jabber"
msgstr "Jabber"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
msgid "Yahoo"
msgstr "Yahoo"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
msgid "MSN"
msgstr "MSN"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "ICQ"
msgstr "ICQ"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
msgid "GroupWise"
msgstr "GroupWise"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
msgid "Skype"
msgstr "Skype"
@@ -717,7 +718,7 @@ msgid "_Suffix:"
msgstr "_Suffix:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
msgid "Contact List Editor"
msgstr "Kontaktlisteneditor"
@@ -734,7 +735,7 @@ msgid "_List name:"
msgstr "_Listenname:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:174
msgid "_Select..."
msgstr "A_uswählen …"
@@ -744,7 +745,7 @@ msgstr ""
"_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
"unten stehende Liste:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:869
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
msgid "Contact List Members"
msgstr "Kontaktlistenmitglieder"
@@ -752,15 +753,15 @@ msgstr "Kontaktlistenmitglieder"
msgid "_Members"
msgstr "_Mitglieder"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1514
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1516
msgid "Error adding list"
msgstr "Fehler beim Hinzufügen einer Liste"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1529
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
msgid "Error modifying list"
msgstr "Fehler beim Ändern einer Liste"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1544
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
msgid "Error removing list"
msgstr "Fehler beim Entfernen einer Liste"
@@ -928,7 +929,7 @@ msgid "Display _All Contacts"
msgstr "_Alle Kontakte anzeigen"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
msgid "Assistant"
msgstr "Assistent"
@@ -965,7 +966,7 @@ msgid "Categories"
msgstr "Kategorien"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
msgid "Company"
msgstr "Firma"
@@ -1014,22 +1015,22 @@ msgid "Journal"
msgstr "Journal"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
msgid "Manager"
msgstr "Vorgesetzter"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
msgid "Mobile Phone"
msgstr "Mobiltelefon"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Nickname"
msgstr "Spitzname"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
+#: ../addressbook/gui/widgets/eab-contact-display.c:741
msgid "Note"
msgstr "Notiz"
@@ -1064,7 +1065,7 @@ msgid "Role"
msgstr "Position"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
msgid "Spouse"
msgstr "Ehepartner"
@@ -1226,64 +1227,64 @@ msgstr "Eine Nachricht an diese Adresse senden"
msgid "Open map"
msgstr "Karte öffnen"
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:530
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "List Members:"
msgstr "Listenmitglieder:"
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
msgid "Department"
msgstr "Abteilung"
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
msgid "Profession"
msgstr "Beruf"
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
msgid "Position"
msgstr "Position"
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
msgid "Video Chat"
msgstr "Video-Chat"
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
#: ../calendar/gui/dialogs/calendar-setup.c:449
#: ../modules/calendar/e-cal-shell-view-actions.c:232
#: ../modules/calendar/e-cal-shell-view-actions.c:261
#: ../modules/calendar/e-cal-shell-view.c:523
-#: ../modules/online-accounts/e-online-accounts-google.c:294
+#: ../modules/online-accounts/e-online-accounts-google.c:302
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
#: ../widgets/misc/e-send-options.c:528
msgid "Calendar"
msgstr "Kalender"
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
#: ../calendar/gui/dialogs/event-editor.c:123
#: ../calendar/gui/dialogs/event-editor.c:350
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "Verfügbarkeit"
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
msgid "Phone"
msgstr "Telefon"
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
msgid "Fax"
msgstr "Fax"
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
msgid "Address"
msgstr "Adresse"
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
msgid "Home Page"
msgstr "Homepage"
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
msgid "Web Log"
msgstr "Weblog"
@@ -1291,8 +1292,8 @@ msgstr "Weblog"
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../capplet/settings/mail-capplet-shell.c:384
#: ../modules/addressbook/e-book-shell-backend.c:120
#: ../modules/addressbook/e-book-shell-migrate.c:144
#: ../modules/calendar/e-cal-shell-backend.c:138
@@ -1304,23 +1305,23 @@ msgstr "Weblog"
msgid "Personal"
msgstr "Persönlich"
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
+#: ../addressbook/gui/widgets/eab-contact-display.c:1010
msgid "List Members"
msgstr "Listenmitglieder"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../addressbook/gui/widgets/eab-contact-display.c:1028
msgid "Job Title"
msgstr "Tätigkeit"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+#: ../addressbook/gui/widgets/eab-contact-display.c:1065
msgid "Home page"
msgstr "Homepage"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+#: ../addressbook/gui/widgets/eab-contact-display.c:1074
msgid "Blog"
msgstr "Blog"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../addressbook/gui/widgets/eab-contact-display.c:1273
#: ../widgets/misc/e-web-view.c:980
#, c-format
msgid "Click to mail %s"
@@ -1428,19 +1429,19 @@ msgstr "Adressbuch auswählen"
msgid "list"
msgstr "Liste"
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:560
msgid "Move contact to"
msgstr "Kontakt verschieben nach"
-#: ../addressbook/gui/widgets/eab-gui-util.c:561
+#: ../addressbook/gui/widgets/eab-gui-util.c:562
msgid "Copy contact to"
msgstr "Kontakt kopieren nach"
-#: ../addressbook/gui/widgets/eab-gui-util.c:564
+#: ../addressbook/gui/widgets/eab-gui-util.c:565
msgid "Move contacts to"
msgstr "Kontakt verschieben nach"
-#: ../addressbook/gui/widgets/eab-gui-util.c:566
+#: ../addressbook/gui/widgets/eab-gui-util.c:567
msgid "Copy contacts to"
msgstr "Kontakte kopieren nach"
@@ -1518,7 +1519,7 @@ msgstr "Adressbuchliste konnte nicht abgerufen werden: %s"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:662
+#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:666
#: ../plugins/caldav/caldav-browse-server.c:220
#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
#: ../smime/gui/certificate-manager.c:313
@@ -2312,7 +2313,7 @@ msgstr "Mehr als"
#: ../calendar/gui/caltypes.xml.h:16
msgid "Occurs"
-msgstr ""
+msgstr "Vorkommen"
#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
#: ../calendar/gui/tasktypes.xml.h:19
@@ -2409,7 +2410,7 @@ msgstr "Benutzerdefinierter Erinnerungsklang"
msgid "Mes_sage:"
msgstr "_Nachricht:"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:79
msgid "Options"
msgstr "Optionen"
@@ -2502,8 +2503,8 @@ msgstr "Art:"
msgid "_Type:"
msgstr "A_rt:"
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:166
+#: ../modules/addressbook/ldap-config.ui.h:28
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:284
msgid "_Name:"
@@ -2533,11 +2534,11 @@ msgstr "_Farbe:"
#: ../calendar/gui/dialogs/calendar-setup.c:448
#: ../calendar/gui/dialogs/calendar-setup.c:460
#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:55
#: ../modules/addressbook/addressbook-config.c:1077
#: ../modules/addressbook/autocompletion-config.c:240
#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3038
+#: ../plugins/itip-formatter/itip-formatter.c:3039
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
@@ -2679,20 +2680,20 @@ msgid "Close the current window"
msgstr "Das aktuelle Fenster schließen"
#: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455 ../widgets/misc/e-focus-tracker.c:117
+#: ../shell/e-shell-window-actions.c:1464 ../widgets/misc/e-focus-tracker.c:117
#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:459
#: ../widgets/misc/e-web-view.c:1306
msgid "Copy the selection"
msgstr "Die Auswahl kopieren"
#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462 ../widgets/misc/e-focus-tracker.c:110
+#: ../shell/e-shell-window-actions.c:1471 ../widgets/misc/e-focus-tracker.c:110
#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:1300
msgid "Cut the selection"
msgstr "Die Auswahl ausschneiden"
#: ../calendar/gui/dialogs/comp-editor.c:1141
-#: ../shell/e-shell-window-actions.c:1469 ../widgets/misc/e-focus-tracker.c:131
+#: ../shell/e-shell-window-actions.c:1478 ../widgets/misc/e-focus-tracker.c:131
#: ../widgets/misc/e-focus-tracker.c:565
msgid "Delete the selection"
msgstr "Die Auswahl löschen"
@@ -2702,7 +2703,7 @@ msgid "View help"
msgstr "Hilfe anzeigen"
#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497 ../widgets/misc/e-focus-tracker.c:124
+#: ../shell/e-shell-window-actions.c:1506 ../widgets/misc/e-focus-tracker.c:124
#: ../widgets/misc/e-focus-tracker.c:560 ../widgets/misc/e-web-view.c:1312
msgid "Paste the clipboard"
msgstr "Den Inhalt der Zwischenablage einfügen"
@@ -2712,7 +2713,7 @@ msgid "Save current changes"
msgstr "Aktuelle Änderungen speichern"
#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574 ../widgets/misc/e-focus-tracker.c:138
+#: ../shell/e-shell-window-actions.c:1583 ../widgets/misc/e-focus-tracker.c:138
#: ../widgets/misc/e-focus-tracker.c:570
msgid "Select all text"
msgstr "Den gesamten Text markieren"
@@ -2725,19 +2726,19 @@ msgstr "E_instufung"
#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
#: ../mail/e-mail-browser.c:176
#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1611
#: ../widgets/menus/gal-define-views.ui.h:5
msgid "_Edit"
msgstr "_Bearbeiten"
#: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1618
#: ../widgets/misc/e-signature-editor.c:221
msgid "_File"
msgstr "_Datei"
#: ../calendar/gui/dialogs/comp-editor.c:1211
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1625
msgid "_Help"
msgstr "_Hilfe"
@@ -2751,7 +2752,7 @@ msgid "_Options"
msgstr "_Optionen"
#: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1660 ../smime/gui/smime-ui.ui.h:46
msgid "_View"
msgstr "_Ansicht"
@@ -3561,7 +3562,7 @@ msgstr "Alle"
msgid "Exceptions"
msgstr "Ausnahmen"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
msgid "Preview"
msgstr "Vorschau"
@@ -4001,7 +4002,7 @@ msgstr "Nein"
#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
#: ../modules/plugin-manager/evolution-plugin-manager.c:101
#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2690
+#: ../plugins/itip-formatter/itip-formatter.c:2691
msgid "Unknown"
msgstr "Unbekannt"
@@ -4020,13 +4021,13 @@ msgstr "%s wird geöffnet …"
#: ../calendar/gui/e-cal-model.c:3416 ../calendar/gui/e-meeting-list-view.c:214
#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2679
msgid "Accepted"
msgstr "Angenommen"
#: ../calendar/gui/e-cal-model.c:3417 ../calendar/gui/e-meeting-list-view.c:215
#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2684
+#: ../plugins/itip-formatter/itip-formatter.c:2685
msgid "Declined"
msgstr "Abgelehnt"
@@ -4038,7 +4039,7 @@ msgstr "Vorläufig"
#: ../calendar/gui/e-cal-model.c:3419 ../calendar/gui/e-meeting-list-view.c:217
#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2687
+#: ../plugins/itip-formatter/itip-formatter.c:2688
msgid "Delegated"
msgstr "Delegiert"
@@ -4113,7 +4114,7 @@ msgstr "Objekte werden aktualisiert"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
#. To Translators: It will display
#. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1908 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:539
#: ../calendar/gui/e-task-table.c:771
#, c-format
msgid "Organizer: %s <%s>"
@@ -4122,20 +4123,20 @@ msgstr "Organisator: %s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
#. With SunOne accounts, there may be no ':' in
#. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-calendar-view.c:1916 ../calendar/gui/e-memo-table.c:544
#: ../calendar/gui/e-task-table.c:775
#, c-format
msgid "Organizer: %s"
msgstr "Organisator: %s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/print.c:3344
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3344
#, c-format
msgid "Location: %s"
msgstr "Ort: %s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1959
+#: ../calendar/gui/e-calendar-view.c:1963
#, c-format
msgid "Time: %s %s"
msgstr "Zeit: %s %s"
@@ -4342,7 +4343,7 @@ msgstr "Fehlergrund: %s"
#: ../calendar/gui/e-meeting-store.c:1891
#: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/google-account-setup/google-source.c:458
#: ../plugins/publish-calendar/publish-calendar.c:337
#: ../smime/gui/component.c:54
msgid "Enter password"
@@ -4707,32 +4708,32 @@ msgstr "Kalenderansicht für eine oder mehrere Wochen"
msgid "Purging"
msgstr "Säuberungsvorgang"
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:568
+#: ../calendar/gui/itip-utils.c:681
msgid "An organizer must be set."
msgstr "Es muss ein Organisator festgelegt werden."
-#: ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:560
msgid "At least one attendee is necessary"
msgstr "Es ist mindestens ein Teilnehmer erforderlich"
-#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+#: ../calendar/gui/itip-utils.c:767 ../calendar/gui/itip-utils.c:928
msgid "Event information"
msgstr "Ereignisinformationen"
-#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
msgid "Task information"
msgstr "Aufgabeninformationen"
-#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
msgid "Memo information"
msgstr "Notiz-Informationen"
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:952
msgid "Free/Busy information"
msgstr "Verfügbarkeitsinformationen"
-#: ../calendar/gui/itip-utils.c:767
+#: ../calendar/gui/itip-utils.c:779
msgid "Calendar information"
msgstr "Kalenderinformationen"
@@ -4740,7 +4741,7 @@ msgstr "Kalenderinformationen"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:816
msgctxt "Meeting"
msgid "Accepted"
msgstr "Angenommen"
@@ -4749,7 +4750,7 @@ msgstr "Angenommen"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:823
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "Vorläufig angenommen"
@@ -4761,7 +4762,7 @@ msgstr "Vorläufig angenommen"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
+#: ../calendar/gui/itip-utils.c:830 ../calendar/gui/itip-utils.c:878
msgctxt "Meeting"
msgid "Declined"
msgstr "Abgelehnt"
@@ -4770,7 +4771,7 @@ msgstr "Abgelehnt"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:825
+#: ../calendar/gui/itip-utils.c:837
msgctxt "Meeting"
msgid "Delegated"
msgstr "Delegiert"
@@ -4778,7 +4779,7 @@ msgstr "Delegiert"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:838
+#: ../calendar/gui/itip-utils.c:850
msgctxt "Meeting"
msgid "Updated"
msgstr "Aktualisiert"
@@ -4786,7 +4787,7 @@ msgstr "Aktualisiert"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:845
+#: ../calendar/gui/itip-utils.c:857
msgctxt "Meeting"
msgid "Cancel"
msgstr "Abgesagt"
@@ -4794,7 +4795,7 @@ msgstr "Abgesagt"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:852
+#: ../calendar/gui/itip-utils.c:864
msgctxt "Meeting"
msgid "Refresh"
msgstr "Aktualisieren"
@@ -4803,31 +4804,31 @@ msgstr "Aktualisieren"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:859
+#: ../calendar/gui/itip-utils.c:871
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "Gegenvorschlag"
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:949
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Verfügbarkeitsinformationen (%s bis %s)"
-#: ../calendar/gui/itip-utils.c:945
+#: ../calendar/gui/itip-utils.c:957
msgid "iCalendar information"
msgstr "iCalendar-Informationen"
-#: ../calendar/gui/itip-utils.c:970
+#: ../calendar/gui/itip-utils.c:984
msgid "Unable to book a resource, the new event collides with some other."
msgstr ""
"Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet sich "
"mit anderen."
-#: ../calendar/gui/itip-utils.c:974
+#: ../calendar/gui/itip-utils.c:988
msgid "Unable to book a resource, error: "
msgstr "Eine Ressource kann nicht belegt werden, Fehler:"
-#: ../calendar/gui/itip-utils.c:1137
+#: ../calendar/gui/itip-utils.c:1153
msgid "You must be an attendee of the event."
msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
@@ -5081,7 +5082,7 @@ msgstr "Termine und Besprechungen"
#: ../calendar/importers/icalendar-importer.c:435
#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../plugins/itip-formatter/itip-formatter.c:2171
msgid "Opening calendar"
msgstr "Kalender wird geöffnet"
@@ -5807,7 +5808,6 @@ msgid "America/Nassau"
msgstr "Amerika/Nassau"
#: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "America/New_York"
msgstr "Amerika/New_York"
@@ -6828,7 +6828,7 @@ msgstr "Neue _Nachricht"
msgid "Open New Message window"
msgstr "Neues Nachrichtenfenster öffnen"
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1520
msgid "Configure Evolution"
msgstr "Evolution konfigurieren"
@@ -7239,90 +7239,91 @@ msgid "_Try Again"
msgstr "Erneut _versuchen"
#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:153
msgid "ID of the socket to embed in"
msgstr "Kennung des Sockets zur Einbettung"
-#: ../capplet/anjal-settings-main.c:155
+#: ../capplet/anjal-settings-main.c:154
msgid "socket"
msgstr "socket"
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
msgid "Please enter your full name."
msgstr "Bitte geben Sie Ihre vollständigen Namen ein."
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:77
msgid "Please enter your email address."
msgstr "Bitte geben Sie Ihre E-Mail-Adresse ein."
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:78
msgid "The email address you have entered is invalid."
msgstr "Die von Ihnen eingegebene E-Mail-Adresse ist ungültig."
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:79
msgid "Please enter your password."
msgstr "Bitte geben Sie Ihr Passwort ein."
-#: ../capplet/settings/mail-account-view.c:259
+#: ../capplet/settings/mail-account-view.c:258 ../mail/em-account-editor.c:4992
#: ../plugins/caldav/caldav-source.c:67
msgid "CalDAV"
msgstr "CalDAV"
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../capplet/settings/mail-account-view.c:360
+#: ../capplet/settings/mail-account-view.c:412 ../mail/em-account-editor.c:4874
+#: ../mail/em-account-editor.c:4928
+#: ../modules/online-accounts/e-online-accounts-google.c:295
+#: ../modules/online-accounts/e-online-accounts-google.c:369
#: ../plugins/google-account-setup/google-contacts-source.c:55
#: ../plugins/google-account-setup/google-source.c:87
msgid "Google"
msgstr "Google"
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
msgid "Personal details:"
msgstr "Persönliche Angaben:"
-#: ../capplet/settings/mail-account-view.c:487
+#: ../capplet/settings/mail-account-view.c:486 ../mail/mail-config.ui.h:74
msgid "Name:"
msgstr "Name:"
-#: ../capplet/settings/mail-account-view.c:496
+#: ../capplet/settings/mail-account-view.c:495 ../mail/mail-config.ui.h:45
msgid "Email address:"
msgstr "E-Mail-Adresse:"
-#: ../capplet/settings/mail-account-view.c:506
+#: ../capplet/settings/mail-account-view.c:505 ../mail/mail-config.ui.h:38
msgid "Details:"
msgstr "Details:"
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513 ../mail/mail-config.ui.h:92
msgid "Receiving"
msgstr "Abrufen läuft"
-#: ../capplet/settings/mail-account-view.c:521
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:128
msgid "Server type:"
msgstr "Servertyp:"
-#: ../capplet/settings/mail-account-view.c:530
+#: ../capplet/settings/mail-account-view.c:529 ../mail/mail-config.ui.h:127
msgid "Server address:"
msgstr "Serveradresse:"
-#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:152
msgid "Username:"
msgstr "Benutzername:"
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:547
msgid "Use encryption:"
msgstr "Verschlüsselung benutzen:"
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:587
msgid "never"
msgstr "Nie"
-#: ../capplet/settings/mail-account-view.c:565
+#: ../capplet/settings/mail-account-view.c:564 ../mail/mail-config.ui.h:112
msgid "Sending"
msgstr "Verschicken läuft"
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:606
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. If "
@@ -7333,7 +7334,7 @@ msgstr ""
"versucht, die entsprechenden Einstellungen automatisch vorzunehmen. Falls "
"dies nicht möglich sein sollte, werden Sie Ihre Servereinstellungen benötigen."
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:608
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
@@ -7344,11 +7345,11 @@ msgstr ""
"versucht, zunächst einige der von Ihnen gerade eingegebenen Werten zu "
"verwenden, doch Sie werden wahrscheinlich Änderungen vornehmen müssen."
-#: ../capplet/settings/mail-account-view.c:611
+#: ../capplet/settings/mail-account-view.c:610
msgid "You can specify more options to configure the account."
msgstr "Sie dürfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:612
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
@@ -7357,11 +7358,11 @@ msgstr ""
"wird versucht, einige Einstellungen bereits vorauszuwählen, jedoch sollten "
"Sie diese sicherheitshalber überprüfen."
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
msgid "You can specify your default settings for your account."
msgstr "Sie können Ihre Vorgabeeinstellungen für Ihr Konto festlegen."
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614 ../mail/em-account-editor.c:2831
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
@@ -7369,99 +7370,99 @@ msgstr ""
"Nun ist Zeit, alles zu überprüfen, bevor versucht wird, eine Verbindung zum "
"Server herzustellen und Ihre Nachrichten abzurufen."
-#: ../capplet/settings/mail-account-view.c:630 ../mail/em-account-editor.c:2290
-#: ../mail/em-account-editor.c:2426
+#: ../capplet/settings/mail-account-view.c:629 ../mail/em-account-editor.c:2821
+#: ../mail/em-account-editor.c:2957
msgid "Identity"
msgstr "Identität"
-#: ../capplet/settings/mail-account-view.c:630
+#: ../capplet/settings/mail-account-view.c:629
msgid "Next - Receiving mail"
msgstr "Weiter - Abrufen von E-Mails"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Receiving mail"
msgstr "Abrufen von E-Mails"
+#: ../capplet/settings/mail-account-view.c:630
#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
msgid "Next - Sending mail"
msgstr "Weiter - Verschicken von E-Mails"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Back - Identity"
msgstr "Zurück - Identität"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Next - Receiving options"
msgstr "Weiter - Empfangsoptionen"
-#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:631
msgid "Receiving options"
msgstr "Empfangsoptionen"
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving mail"
msgstr "Zurück - Abrufen von E-Mails"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Sending mail"
msgstr "Abrufen von E-Mails"
+#: ../capplet/settings/mail-account-view.c:633
#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
msgid "Next - Review account"
msgstr "Weiter - Konto überprüfen"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Next - Defaults"
msgstr "Weiter - Vorgaben"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving options"
msgstr "Zurück - Empfangsoptionen"
-#: ../capplet/settings/mail-account-view.c:635 ../mail/em-account-editor.c:3378
+#: ../capplet/settings/mail-account-view.c:634 ../mail/em-account-editor.c:3920
msgid "Defaults"
msgstr "Vorgaben"
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:634
msgid "Back - Sending mail"
msgstr "Zurück - Verschicken von E-Mails"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Review account"
msgstr "Konto überprüfen"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Finish"
msgstr "Beenden"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Back - Sending"
msgstr "Zurück - Senden"
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:759
msgid "Setup Google contacts with Evolution"
msgstr "Google-Kontakte für Evolution einrichten"
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:760
msgid "Setup Google calendar with Evolution"
msgstr "Google-Kalender für Evolution einrichten"
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:765 ../mail/em-account-editor.c:4673
msgid "You may need to enable IMAP access."
msgstr "Es wird nötig sein, den IMAP-Zugriff zu aktivieren."
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:773 ../mail/em-account-editor.c:4664
msgid "Google account settings:"
msgstr "Google-Konteneinstellungen:"
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:799
msgid "Setup Yahoo calendar with Evolution"
msgstr "Yahoo-Kalender für Evolution einrichten"
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:803 ../mail/em-account-editor.c:4692
msgid ""
"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 "
@@ -7471,34 +7472,34 @@ msgstr ""
"Kalendernamen auf diese Weise zu ermitteln. Bitte bestätigen Sie oder geben "
"Sie den Kalendernamen neu ein, falls dieser nicht korrekt ist."
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:812 ../mail/em-account-editor.c:4701
msgid "Yahoo account settings:"
msgstr "Yahoo-Konteneinstellungen:"
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:826
msgid "Yahoo Calendar name:"
msgstr "Name des Yahoo-Kalenders:"
-#: ../capplet/settings/mail-account-view.c:1098
+#: ../capplet/settings/mail-account-view.c:1013
msgid "Password:"
msgstr "Passwort:"
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1065
#: ../capplet/settings/mail-settings-view.c:254
msgid "Close Tab"
msgstr "Reiter schließen"
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1075
msgid "Account Wizard"
msgstr "Kontenassistent"
-#: ../capplet/settings/mail-capplet-shell.c:215
+#: ../capplet/settings/mail-capplet-shell.c:214
msgid "Evolution account assistant"
msgstr "Evolution-Kontoassistent"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:748 ../mail/em-folder-tree-model.c:167
+#: ../capplet/settings/mail-capplet-shell.c:376 ../mail/e-mail-local.c:75
+#: ../mail/em-folder-tree-model.c:167
#: ../modules/addressbook/e-book-shell-backend.c:100
#: ../modules/addressbook/e-book-shell-migrate.c:136
#: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7509,11 +7510,11 @@ msgstr "Evolution-Kontoassistent"
#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../widgets/misc/e-account-tree-view.c:99
#: ../widgets/misc/e-account-tree-view.c:291
-#: ../widgets/misc/e-account-tree-view.c:922
-#: ../widgets/misc/e-account-tree-view.c:980
-#: ../widgets/misc/e-account-tree-view.c:1053
-#: ../widgets/misc/e-account-tree-view.c:1130
-#: ../widgets/misc/e-account-tree-view.c:1359
+#: ../widgets/misc/e-account-tree-view.c:925
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1056
+#: ../widgets/misc/e-account-tree-view.c:1133
+#: ../widgets/misc/e-account-tree-view.c:1362
msgid "On This Computer"
msgstr "Auf diesem Rechner"
@@ -7838,12 +7839,12 @@ msgstr "Verknüpfung konnte nicht geöffnet werden."
msgid "Could not display help for Evolution."
msgstr "Hilfe für Evolution konnte nicht angezeigt werden."
-#: ../e-util/gconf-bridge.c:1332
+#: ../e-util/gconf-bridge.c:1333
#, c-format
msgid "GConf error: %s"
msgstr "GConf-Fehler: %s"
-#: ../e-util/gconf-bridge.c:1343
+#: ../e-util/gconf-bridge.c:1344
msgid "All further errors shown only on terminal."
msgstr "Weitere Fehler werden nur im Terminal ausgegeben."
@@ -8124,11 +8125,11 @@ msgid "A_dd Condition"
msgstr "Bedingung hin_zufügen"
#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:323
+#: ../mail/em-utils.c:296
msgid "Incoming"
msgstr "Eingang"
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:297
msgid "Outgoing"
msgstr "Ausgehend"
@@ -8256,42 +8257,42 @@ msgid "years"
msgstr "Jahren"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1563 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "Keine"
-#: ../mail/em-account-editor.c:946
+#: ../mail/em-account-editor.c:1645 ../mail/em-account-editor.c:4624
+#: ../mail/em-account-editor.c:4640
msgid "Never"
msgstr "Nie"
-#: ../mail/em-account-editor.c:947
+#: ../mail/em-account-editor.c:1646
msgid "Always"
msgstr "Immer"
-#: ../mail/em-account-editor.c:948
+#: ../mail/em-account-editor.c:1647
msgid "Ask for each message"
msgstr "Bei jeder Nachricht nachfragen"
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
+#: ../mail/em-account-editor.c:2377 ../widgets/misc/e-account-tree-view.c:265
msgctxt "mail-receiving"
msgid "None"
msgstr "Keine"
-#: ../mail/em-account-editor.c:2233
-msgid "Fil_e:"
-msgstr "Dat_ei:"
-
-#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
+#: ../mail/em-account-editor.c:2778 ../mail/mail-config.ui.h:168
msgid "_Path:"
msgstr "_Pfad:"
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2781
+msgid "Fil_e:"
+msgstr "Dat_ei:"
+
+#: ../mail/em-account-editor.c:2818
msgid "Mail Configuration"
msgstr "E-Mail-Konfiguration"
-#: ../mail/em-account-editor.c:2288
+#: ../mail/em-account-editor.c:2819
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -8301,7 +8302,7 @@ msgstr ""
"\n"
"Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
-#: ../mail/em-account-editor.c:2291
+#: ../mail/em-account-editor.c:2822
msgid ""
"Please enter your name and email address below. The \"optional\" fields below "
"do not need to be filled in, unless you wish to include this information in "
@@ -8312,19 +8313,19 @@ msgstr ""
"ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
"verschickten E-Mails einschließen."
-#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
+#: ../mail/em-account-editor.c:2824 ../mail/em-account-editor.c:3016
msgid "Receiving Email"
msgstr "Abrufen von E-Mails"
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2825
msgid "Please configure the following account settings."
msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
-#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
+#: ../mail/em-account-editor.c:2827 ../mail/em-account-editor.c:3626
msgid "Sending Email"
msgstr "Verschicken von E-Mails"
-#: ../mail/em-account-editor.c:2297
+#: ../mail/em-account-editor.c:2828
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -8333,23 +8334,15 @@ msgstr ""
"Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
"bitte an Ihren Systemadministrator oder Internet-Provider."
-#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Konteninformation"
-
-#: ../mail/em-account-editor.c:2300
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Bitte geben Sie unten einen bezeichnenden Namen für dieses Konto ein.\n"
-"Dieser Name wird nur zum Anzeigen verwendet."
+#: ../mail/em-account-editor.c:2830
+msgid "Review Account"
+msgstr "Konto überprüfen"
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2835
msgid "Done"
msgstr "Fertig"
-#: ../mail/em-account-editor.c:2305
+#: ../mail/em-account-editor.c:2836
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8366,28 +8359,52 @@ msgstr ""
"Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
"speichern."
-#: ../mail/em-account-editor.c:2844
+#: ../mail/em-account-editor.c:3381
msgid "Check for _new messages every"
msgstr "_Automatisch nach neuen E-Mails sehen alle"
-#: ../mail/em-account-editor.c:2852
+#: ../mail/em-account-editor.c:3389
msgid "minu_tes"
msgstr "Minu_ten"
-#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
+#: ../mail/em-account-editor.c:4062 ../mail/mail-config.ui.h:108
msgid "Security"
msgstr "Sicherheit"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:4117 ../mail/em-account-editor.c:4219
msgid "Receiving Options"
msgstr "Empfangsoptionen"
-#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
+#: ../mail/em-account-editor.c:4118 ../mail/em-account-editor.c:4220
msgid "Checking for New Messages"
msgstr "Nach neuen E-Mails sehen"
+#: ../mail/em-account-editor.c:4620 ../mail/em-account-editor.c:4636
+msgid "Always(SSL)"
+msgstr "Immer (SSL)"
+
+#: ../mail/em-account-editor.c:4622 ../mail/em-account-editor.c:4638
+msgid "When possible(TLS)"
+msgstr "Wenn möglich (TLS)"
+
+#: ../mail/em-account-editor.c:4654
+msgid "Setup Google con_tacts with Evolution"
+msgstr "Google-Kon_takte für Evolution einrichten"
+
+#: ../mail/em-account-editor.c:4655
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "Google-Ka_lender für Evolution einrichten"
+
+#: ../mail/em-account-editor.c:4688
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "_Yahoo-Kalender für Evolution einrichten"
+
+#: ../mail/em-account-editor.c:4714
+msgid "Yahoo Calen_dar name:"
+msgstr "Name des Yahoo-Kalen_ders:"
+
#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
@@ -8405,9 +8422,9 @@ msgstr "Symbolansicht"
msgid "List View"
msgstr "Listenansicht"
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1436
+#: ../shell/e-shell-window-actions.c:1443
+#: ../shell/e-shell-window-actions.c:1450
msgid "Close this window"
msgstr "Dieses Fenster schließen"
@@ -8524,7 +8541,7 @@ msgid "_Later"
msgstr "S_päter"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:677
+#: ../modules/mail/e-mail-shell-view-actions.c:681
msgid "Add Label"
msgstr "Beschriftung hinzufügen"
@@ -8553,28 +8570,28 @@ msgid "Name"
msgstr "Name"
#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:916
+#: ../mail/em-folder-tree-model.c:918
#: ../modules/mail/e-mail-shell-view-private.c:1066
#: ../modules/mail/e-mail-shell-view-private.c:1077
msgid "Inbox"
msgstr "Eingang"
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:909
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:911
#: ../modules/mail/e-mail-shell-view-private.c:1064
msgid "Drafts"
msgstr "Entwürfe"
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:920
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:922
#: ../modules/mail/e-mail-shell-view-private.c:1068
msgid "Outbox"
msgstr "Ausgang"
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:924
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:926
#: ../modules/mail/e-mail-shell-view-private.c:1070
msgid "Sent"
msgstr "Verschickt"
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:912
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:914
#: ../modules/mail/e-mail-shell-view-private.c:1072
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
@@ -8582,36 +8599,7 @@ msgstr "Verschickt"
msgid "Templates"
msgstr "Vorlagen"
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "Migrationsvorgang …"
-
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "Migration"
-
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "»%s« wird migriert:"
-
-#: ../mail/e-mail-migrate.c:726
-msgid "Migrating Folders"
-msgstr "Ordner werden migriert"
-
-#: ../mail/e-mail-migrate.c:727
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Das Zusammenfassungsformat der Evolution-E-Mail-Ordner hat sich in Evolution "
-"2.24 verändert.\n"
-"\n"
-"Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
-
-#: ../mail/e-mail-migrate.c:1523
+#: ../mail/e-mail-migrate.c:1177
#, c-format
msgid "Unable to create local mail folders at '%s': %s"
msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
@@ -8620,625 +8608,625 @@ msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
msgid "Please select a folder"
msgstr "Bitte wählen Sie einen Ordner"
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "In Ordner kopieren"
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:487
msgid "C_opy"
msgstr "K_opieren"
-#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:824 ../mail/em-filter-i18n.h:51
msgid "Move to Folder"
msgstr "In Ordner verschieben"
-#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:824 ../mail/em-folder-utils.c:487
msgid "_Move"
msgstr "_Verschieben"
-#: ../mail/e-mail-reader.c:1184 ../mail/e-mail-reader.c:1372
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1185 ../mail/e-mail-reader.c:1373
+#: ../mail/e-mail-reader.c:1413
msgid "_Do not ask me again."
msgstr "_Nicht mehr nachfragen."
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1419
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1785
msgid "A_dd Sender to Address Book"
msgstr "A_bsender zum Adressbuch hinzufügen"
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1787
msgid "Add sender to address book"
msgstr "Absender zum Adressbuch hinzufügen"
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1792
msgid "Check for _Junk"
msgstr "Über_prüfung auf unerwünschte Nachrichten"
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1794
msgid "Filter the selected messages for junk status"
msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1799
msgid "_Copy to Folder..."
msgstr "In Ordner _kopieren …"
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1801
msgid "Copy selected messages to another folder"
msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1806
msgid "_Delete Message"
msgstr "Nachricht _löschen"
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1808
msgid "Mark the selected messages for deletion"
msgstr "Die gewählten Nachrichten zum Löschen markieren"
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1813
msgid "Filter on Mailing _List..."
msgstr "Filter über Mailing_liste …"
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:1815
msgid "Create a rule to filter messages to this mailing list"
msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1820
msgid "Filter on _Recipients..."
msgstr "Filter über _Empfänger …"
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1822
msgid "Create a rule to filter messages to these recipients"
msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1827
msgid "Filter on Se_nder..."
msgstr "Filter über _Absender …"
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1829
msgid "Create a rule to filter messages from this sender"
msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1834
msgid "Filter on _Subject..."
msgstr "Filter über _Betreff …"
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1836
msgid "Create a rule to filter messages with this subject"
msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1841
msgid "A_pply Filters"
msgstr "Filter an_wenden"
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1843
msgid "Apply filter rules to the selected messages"
msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1848
msgid "_Find in Message..."
msgstr "In Nachricht _suchen …"
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1850
msgid "Search for text in the body of the displayed message"
msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1855
msgid "_Clear Flag"
msgstr "Markierung _löschen"
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1857
msgid "Remove the follow-up flag from the selected messages"
msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1862
msgid "_Flag Completed"
msgstr "Als abgeschlossen _markieren"
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1864
msgid "Set the follow-up flag to completed on the selected messages"
msgstr ""
"Für die gewählten Nachrichten die Folgenachricht-Markierung auf »vollständig« "
"setzen"
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1869
msgid "Follow _Up..."
msgstr "_Folgenachricht …"
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1871
msgid "Flag the selected messages for follow-up"
msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1876
msgid "_Attached"
msgstr "_Anhang"
-#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1878 ../mail/e-mail-reader.c:1885
msgid "Forward the selected message to someone as an attachment"
msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1883
msgid "Forward As _Attached"
msgstr "Als _Anhang weiterleiten"
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1890
msgid "_Inline"
msgstr "_Eingebettet"
-#: ../mail/e-mail-reader.c:1891 ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1892 ../mail/e-mail-reader.c:1899
msgid "Forward the selected message in the body of a new message"
msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1897
msgid "Forward As _Inline"
msgstr "_Eingebettet weiterleiten"
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1904
msgid "_Quoted"
msgstr "_Zitiert"
-#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1906 ../mail/e-mail-reader.c:1913
msgid "Forward the selected message quoted like a reply"
msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1911
msgid "Forward As _Quoted"
msgstr "_Zitiert weiterleiten"
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1918
msgid "_Load Images"
msgstr "_Bilder laden"
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1920
msgid "Force images in HTML mail to be loaded"
msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1925
msgid "_Important"
msgstr "_Wichtig"
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1927
msgid "Mark the selected messages as important"
msgstr "Die gewählten Nachrichten als wichtig markieren"
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1932
msgid "_Junk"
msgstr "Unerwü_nscht"
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1934
msgid "Mark the selected messages as junk"
msgstr "Die gewählten Nachrichten als unerwünscht markieren"
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1939
msgid "_Not Junk"
msgstr "E_rwünscht"
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1941
msgid "Mark the selected messages as not being junk"
msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1946
msgid "_Read"
msgstr "Ge_lesen"
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1948
msgid "Mark the selected messages as having been read"
msgstr "Die gewählten Nachrichten als gelesen markieren"
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1953
msgid "Uni_mportant"
msgstr "_Unwichtig"
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1955
msgid "Mark the selected messages as unimportant"
msgstr "Die gewählten Nachrichten als unwichtig markieren"
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1960
msgid "_Unread"
msgstr "_Ungelesen"
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1962
msgid "Mark the selected messages as not having been read"
msgstr "Die gewählten Nachrichten als ungelesen markieren"
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1967
msgid "_Edit as New Message..."
msgstr "Als neue _Nachricht bearbeiten …"
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1969
msgid "Open the selected messages in the composer for editing"
msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1974
msgid "Compose _New Message"
msgstr "_Nachricht verfassen"
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1976
msgid "Open a window for composing a mail message"
msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1981
msgid "_Open in New Window"
msgstr "In neuem _Fenster öffnen"
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1983
msgid "Open the selected messages in a new window"
msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1988
msgid "_Move to Folder..."
msgstr "In Ordner _verschieben …"
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1990
msgid "Move selected messages to another folder"
msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:1995
msgid "_Switch to Folder"
msgstr "Zu Ordner _wechseln"
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1997
msgid "Display the parent folder"
msgstr "Den Elternordner anzeigen"
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2002
msgid "Switch to _next tab"
msgstr "Zum _nächsten Reiter wechseln"
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2004
msgid "Switch to the next tab"
msgstr "Zum nächsten Reiter wechseln"
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2009
msgid "Switch to _previous tab"
msgstr "Zum _vorherigen Reiter wechseln"
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2011
msgid "Switch to the previous tab"
msgstr "Zum vorherigen Reiter wechseln"
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2016
msgid "Cl_ose current tab"
msgstr "Den momentan geöffneten Reiter _schließen"
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2018
msgid "Close current tab"
msgstr "Den momentan geöffneten Reiter schließen"
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2023
msgid "_Next Message"
msgstr "_Nächste Nachricht"
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2025
msgid "Display the next message"
msgstr "Die nächste Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2030
msgid "Next _Important Message"
msgstr "Nächste _wichtige Nachricht"
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2032
msgid "Display the next important message"
msgstr "Die nächste wichtige Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2037
msgid "Next _Thread"
msgstr "Nächster _Thread"
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2039
msgid "Display the next thread"
msgstr "Nächsten Thread anzeigen"
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2044
msgid "Next _Unread Message"
msgstr "Nächste _ungelesene Nachricht"
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2046
msgid "Display the next unread message"
msgstr "Die nächste ungelesene Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2051
msgid "_Previous Message"
msgstr "_Vorherige Nachricht"
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2053
msgid "Display the previous message"
msgstr "Die vorhergehende Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2058
msgid "Pr_evious Important Message"
msgstr "V_orherige wichtige Nachricht"
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2060
msgid "Display the previous important message"
msgstr "Die vorhergehende wichtige Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2065
msgid "Previous T_hread"
msgstr "Vo_rheriger Thread"
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2067
msgid "Display the previous thread"
msgstr "Den vorhergehenden Thread anzeigen"
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2072
msgid "P_revious Unread Message"
msgstr "_Vorherige ungelesene Nachricht"
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2074
msgid "Display the previous unread message"
msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2081
msgid "Print this message"
msgstr "Diese Nachricht drucken"
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2088
msgid "Preview the message to be printed"
msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2093
msgid "Re_direct"
msgstr "_Umleiten"
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2095
msgid "Redirect (bounce) the selected message to someone"
msgstr "Die gewählte Nachricht an jemanden umleiten"
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2100
msgid "Remo_ve Attachments"
msgstr "Anlagen _löschen"
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2102
msgid "Remove attachments"
msgstr "Anlagen löschen"
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2107
msgid "Remove Du_plicate Messages"
msgstr "Do_ppelte Nachrichten löschen"
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2109
msgid "Checks selected messages for duplicates"
msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
-#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2114 ../mail/mail.error.xml.h:110
#: ../modules/calendar/e-cal-shell-view-actions.c:1510
#: ../modules/mail/e-mail-attachment-handler.c:177
msgid "Reply to _All"
msgstr "Antw_ort an alle"
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2116
msgid "Compose a reply to all the recipients of the selected message"
msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
-#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
+#: ../mail/e-mail-reader.c:2121 ../mail/mail.error.xml.h:111
msgid "Reply to _List"
msgstr "Antwort an Lis_te"
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2123
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
-#: ../mail/e-mail-reader.c:2127 ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2128 ../modules/mail/e-mail-attachment-handler.c:184
msgid "_Reply to Sender"
msgstr "_Antwort an Absender"
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2130
msgid "Compose a reply to the sender of the selected message"
msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2135
msgid "_Save as mbox..."
msgstr "_Speichern als mbox …"
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2137
msgid "Save selected messages as an mbox file"
msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2142
msgid "_Message Source"
msgstr "Nachrichten-_Quelltext"
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2144
msgid "Show the raw email source of the message"
msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2156
msgid "_Undelete Message"
msgstr "Löschen der Nachricht _rückgängig"
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2158
msgid "Undelete the selected messages"
msgstr "Löschen der gewählten Nachrichten rückgängig machen"
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2163
msgid "_Normal Size"
msgstr "_Normale Größe"
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2165
msgid "Reset the text to its original size"
msgstr "Den Text auf seine Originalgröße zurücksetzen"
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2170
msgid "_Zoom In"
msgstr "Ansicht ver_größern"
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2172
msgid "Increase the text size"
msgstr "Die Textgröße heraufsetzen"
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2177
msgid "Zoom _Out"
msgstr "Ansicht ver_kleinern"
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2179
msgid "Decrease the text size"
msgstr "Die Textgröße heruntersetzen"
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2186
msgid "Create R_ule"
msgstr "_Regel anlegen"
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2193
msgid "Ch_aracter Encoding"
msgstr "Zeichenko_dierung"
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2200
msgid "F_orward As"
msgstr "_Weiterleiten als …"
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2207
msgid "_Group Reply"
msgstr "Antwort an _Gruppe"
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2214
msgid "_Go To"
msgstr "_Gehe zu"
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2221
msgid "Mar_k As"
msgstr "Mar_kieren als"
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2228
msgid "_Message"
msgstr "_Nachricht"
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2235
msgid "_Zoom"
msgstr "Ansicht ver_größern"
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2245
msgid "Search Folder from Mailing _List..."
msgstr "Suchordner über Mailing_liste …"
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2247
msgid "Create a search folder for this mailing list"
msgstr "Einen Suchordner für diese Mailingliste anlegen"
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2252
msgid "Search Folder from Recipien_ts..."
msgstr "Suchordner über _Empfänger …"
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2254
msgid "Create a search folder for these recipients"
msgstr "Einen Suchordner für diese Empfänger anlegen"
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2259
msgid "Search Folder from Sen_der..."
msgstr "Suchordner über _Absender …"
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2261
msgid "Create a search folder for this sender"
msgstr "Einen Suchordner für diesen Absender anlegen"
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2266
msgid "Search Folder from S_ubject..."
msgstr "Suchordner über _Betreff …"
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2268
msgid "Create a search folder for this subject"
msgstr "Einen Suchordner für diesen Betreff anlegen"
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2291
msgid "Mark for Follo_w Up..."
msgstr "Als _Folgenachricht markieren …"
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2299
msgid "Mark as _Important"
msgstr "Als w_ichtig markieren"
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2303
msgid "Mark as _Junk"
msgstr "Als un_erwünscht markieren"
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2307
msgid "Mark as _Not Junk"
msgstr "Als _nicht unerwünscht markieren"
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2311
msgid "Mar_k as Read"
msgstr "Als _gelesen markieren"
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2315
msgid "Mark as Uni_mportant"
msgstr "Als un_wichtig markieren"
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2319
msgid "Mark as _Unread"
msgstr "Als _ungelesen markieren"
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2363
msgid "_Caret Mode"
msgstr "Cursor-_Modus"
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2365
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2371
msgid "All Message _Headers"
msgstr "Alle Nachrichtenk_öpfe"
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2373
msgid "Show messages with all email headers"
msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
-#: ../mail/e-mail-reader.c:2668
+#: ../mail/e-mail-reader.c:2699
#, c-format
msgid "Retrieving message '%s'"
msgstr "Nachricht »%s« wird abgerufen"
#. we changed user, thus reset the chosen calendar combo too, because
#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3302 ../mail/mail-config.ui.h:32
#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:414
+#: ../plugins/google-account-setup/google-source.c:558
+#: ../plugins/google-account-setup/google-source.c:695
+#: ../widgets/misc/e-account-tree-view.c:417
msgid "Default"
msgstr "Vorgabe"
-#: ../mail/e-mail-reader.c:3424 ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3471 ../modules/mail/e-mail-attachment-handler.c:170
msgid "_Forward"
msgstr "_Weiterleiten"
-#: ../mail/e-mail-reader.c:3425
+#: ../mail/e-mail-reader.c:3472
msgid "Forward the selected message to someone"
msgstr "Die gewählte Nachricht an jemanden weiterleiten"
-#: ../mail/e-mail-reader.c:3444
+#: ../mail/e-mail-reader.c:3491
msgid "Group Reply"
msgstr "Antwort an Gruppe"
-#: ../mail/e-mail-reader.c:3445
+#: ../mail/e-mail-reader.c:3492
msgid "Reply to the mailing list, or to all recipients"
msgstr ""
"Eine Antwort an die Mailingliste oder an alle Empfänger der gewählten "
"Nachricht verfassen"
-#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3545 ../mail/em-filter-i18n.h:14
msgid "Delete"
msgstr "Löschen"
-#: ../mail/e-mail-reader.c:3531
+#: ../mail/e-mail-reader.c:3578
#: ../modules/calendar/e-cal-shell-view-actions.c:1356
#: ../widgets/misc/e-calendar.c:202
msgid "Next"
msgstr "Weiter"
-#: ../mail/e-mail-reader.c:3535
+#: ../mail/e-mail-reader.c:3582
#: ../modules/calendar/e-cal-shell-view-actions.c:1349
#: ../widgets/misc/e-calendar.c:178
msgid "Previous"
msgstr "Vorherige"
-#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3591 ../mail/mail-dialogs.ui.h:17
msgid "Reply"
msgstr "Antworten"
-#: ../mail/e-mail-reader.c:4214
+#: ../mail/e-mail-reader.c:4265
#, c-format
msgid "Folder '%s'"
msgstr "Ordner »%s«"
@@ -9280,30 +9268,30 @@ msgid_plural "Messages"
msgstr[0] "Nachricht"
msgstr[1] "Nachrichten"
-#: ../mail/e-mail-session.c:798
+#: ../mail/e-mail-session.c:833
#, c-format
msgid "Enter Passphrase for %s"
msgstr "Passwort für %s eingeben"
-#: ../mail/e-mail-session.c:802
+#: ../mail/e-mail-session.c:837
msgid "Enter Passphrase"
msgstr "Geben Sie das Passwort ein"
-#: ../mail/e-mail-session.c:806
+#: ../mail/e-mail-session.c:841
#, c-format
msgid "Enter Password for %s"
msgstr "Passwort für %s eingeben"
-#: ../mail/e-mail-session.c:810
+#: ../mail/e-mail-session.c:845
msgid "Enter Password"
msgstr "Geben Sie das Passwort ein"
-#: ../mail/e-mail-session.c:861
+#: ../mail/e-mail-session.c:896
#, c-format
msgid "User canceled operation."
msgstr "Benutzer hat Vorgang abgebrochen."
-#: ../mail/e-mail-session.c:974
+#: ../mail/e-mail-session.c:1009
#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
@@ -9311,25 +9299,35 @@ msgstr ""
"Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
"angegeben wurde."
-#: ../mail/e-mail-session.c:983
+#: ../mail/e-mail-session.c:1018
#, c-format
msgid "No account found to use, forward of the message has been cancelled."
msgstr ""
"Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
"gefunden wurde."
+#: ../mail/e-mail-session.c:1169
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s-Legitimation ist fehlgeschlagen"
+
+#: ../mail/e-mail-session.c:1243
+#, c-format
+msgid "No password was provided"
+msgstr "Es wurde kein Passwort angegeben"
+
#: ../mail/e-mail-session-utils.c:415
#, c-format
msgid "Cannot get transport for account '%s'"
msgstr "Transport für Konto »%s« konnte nicht erhalten werden"
-#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:642
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
-#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
+#: ../mail/mail-ops.c:661 ../mail/mail-ops.c:695
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -9338,13 +9336,13 @@ msgstr ""
"Anhängen an %s gescheitert: %s\n"
"Stattdessen wird versucht, an den lokalen »Verschickt«-Ordner anzuhängen."
-#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:715
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
-#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
-#: ../mail/mail-ops.c:928
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:836
+#: ../mail/mail-ops.c:932
msgid "Sending message"
msgstr "Nachricht wird verschickt"
@@ -9400,15 +9398,15 @@ msgstr "Ihre Nachricht an %s mit dem Betreff »%s« am %s wurde gelesen."
msgid "Delivery Notification for: \"%s\""
msgstr "Zustellungsbestätigung für: »%s«"
-#: ../mail/em-composer-utils.c:2600
+#: ../mail/em-composer-utils.c:2602
msgid "an unknown sender"
msgstr "ein unbekannter Absender"
-#: ../mail/em-composer-utils.c:3006
+#: ../mail/em-composer-utils.c:3008
msgid "Posting destination"
msgstr "Zielordner"
-#: ../mail/em-composer-utils.c:3007
+#: ../mail/em-composer-utils.c:3009
msgid "Choose folders to post the message to."
msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
@@ -9529,7 +9527,7 @@ msgstr "ist nicht gesetzt"
msgid "is set"
msgstr "ist gesetzt"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
msgid "Junk"
msgstr "Unerwünscht"
@@ -9705,54 +9703,54 @@ msgstr "_Anlegen"
msgid "Folder _name:"
msgstr "Ordner_name:"
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:648
msgid "Folder names cannot contain '/'"
msgstr "Ordnernamen dürfen das Slash-Zeichen »/« nicht enthalten"
-#: ../mail/em-folder-tree.c:768
+#: ../mail/em-folder-tree.c:773
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1595
msgid "Mail Folder Tree"
msgstr "E-Mail-Ordnerbaum"
-#: ../mail/em-folder-tree.c:2067 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2093 ../mail/em-folder-utils.c:115
#, c-format
msgid "Moving folder %s"
msgstr "Ordner %s wird verschoben"
-#: ../mail/em-folder-tree.c:2070 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2096 ../mail/em-folder-utils.c:117
#, c-format
msgid "Copying folder %s"
msgstr "Ordner %s wird kopiert"
-#: ../mail/em-folder-tree.c:2077 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2303
#, c-format
msgid "Moving messages into folder %s"
msgstr "Nachrichten werden in den Ordner %s verschoben"
-#: ../mail/em-folder-tree.c:2081 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2305
#, c-format
msgid "Copying messages into folder %s"
msgstr "Nachrichten werden in den Ordner %s kopiert"
-#: ../mail/em-folder-tree.c:2100
+#: ../mail/em-folder-tree.c:2126
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr ""
"Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
-#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
-#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1062
+#: ../mail/mail-vfolder.c:1174 ../widgets/misc/e-account-tree-view.c:100
#: ../widgets/misc/e-account-tree-view.c:301
-#: ../widgets/misc/e-account-tree-view.c:924
-#: ../widgets/misc/e-account-tree-view.c:983
-#: ../widgets/misc/e-account-tree-view.c:1055
-#: ../widgets/misc/e-account-tree-view.c:1132
-#: ../widgets/misc/e-account-tree-view.c:1387
+#: ../widgets/misc/e-account-tree-view.c:927
+#: ../widgets/misc/e-account-tree-view.c:986
+#: ../widgets/misc/e-account-tree-view.c:1058
+#: ../widgets/misc/e-account-tree-view.c:1135
+#: ../widgets/misc/e-account-tree-view.c:1390
msgid "Search Folders"
msgstr "Suchordner"
@@ -9762,7 +9760,7 @@ msgstr "Suchordner"
msgid "UNMATCHED"
msgstr "OHNE TREFFER"
-#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
+#: ../mail/em-folder-tree-model.c:988 ../mail/em-folder-tree-model.c:1282
msgid "Loading..."
msgstr "Ladevorgang …"
@@ -10021,61 +10019,81 @@ msgstr "Seite %d von %d"
msgid "No HTML stream available"
msgstr "Kein HTML-Datenstrom verfügbar"
-#: ../mail/em-subscription-editor.c:1165
+#: ../mail/em-subscription-editor.c:832
+msgid "_Subscribe"
+msgstr "A_bonnieren"
+
+#: ../mail/em-subscription-editor.c:839
+msgid "Su_bscribe to shown"
+msgstr "Angezeigte a_bonnieren"
+
+#: ../mail/em-subscription-editor.c:846
+msgid "Subscribe to _all"
+msgstr "_Alle abonnieren"
+
+#: ../mail/em-subscription-editor.c:933 ../mail/em-subscription-editor.c:1772
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+msgid "_Unsubscribe"
+msgstr "Ab_bestellen"
+
+#: ../mail/em-subscription-editor.c:940
+msgid "Unsu_bscribe from hidden"
+msgstr "Verborgene a_bbestellen"
+
+#: ../mail/em-subscription-editor.c:947
+msgid "Unsubscribe from _all"
+msgstr "Alle _abbestellen"
+
+#: ../mail/em-subscription-editor.c:1618
msgid "Folder Subscriptions"
msgstr "Ordnerabonnements"
-#: ../mail/em-subscription-editor.c:1204
+#: ../mail/em-subscription-editor.c:1657
msgid "_Account:"
msgstr "_Konto:"
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1672
msgid "Clear Search"
msgstr "Suchfeld leeren"
-#: ../mail/em-subscription-editor.c:1237
+#: ../mail/em-subscription-editor.c:1690
msgid "Sho_w items that contain:"
msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1735
msgid "Subscribe to the selected folder"
msgstr "Den gewählten Ordner abonnieren"
-#: ../mail/em-subscription-editor.c:1277
+#: ../mail/em-subscription-editor.c:1736
msgid "Su_bscribe"
msgstr "A_bonnieren"
-#: ../mail/em-subscription-editor.c:1288
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../mail/em-subscription-editor.c:1771
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
msgid "Unsubscribe from the selected folder"
msgstr "Den gewählten Ordner abbestellen"
-#: ../mail/em-subscription-editor.c:1289
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
-msgid "_Unsubscribe"
-msgstr "Ab_bestellen"
-
-#: ../mail/em-subscription-editor.c:1300
+#: ../mail/em-subscription-editor.c:1801
msgid "Collapse all folders"
msgstr "Alle Ordner einklappen"
-#: ../mail/em-subscription-editor.c:1301
+#: ../mail/em-subscription-editor.c:1802
msgid "C_ollapse All"
msgstr "Alle _einklappen"
-#: ../mail/em-subscription-editor.c:1311
+#: ../mail/em-subscription-editor.c:1812
msgid "Expand all folders"
msgstr "Alle Ordner aufklappen"
-#: ../mail/em-subscription-editor.c:1312
+#: ../mail/em-subscription-editor.c:1813
msgid "E_xpand All"
msgstr "Alle _aufklappen"
-#: ../mail/em-subscription-editor.c:1322
+#: ../mail/em-subscription-editor.c:1823
msgid "Refresh the folder list"
msgstr "Die Ordnerliste auffrischen"
-#: ../mail/em-subscription-editor.c:1334
+#: ../mail/em-subscription-editor.c:1835
msgid "Stop the current operation"
msgstr "Den momentan ausgeführten Vorgang abbrechen"
@@ -10096,11 +10114,11 @@ msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
msgid "_Do not show this message again"
msgstr "Diese _Meldung nicht mehr anzeigen"
-#: ../mail/em-utils.c:335
+#: ../mail/em-utils.c:308
msgid "Message Filters"
msgstr "Nachrichtenfilter"
-#: ../mail/em-utils.c:920
+#: ../mail/em-utils.c:893
#, c-format
msgid "Messages from %s"
msgstr "Nachrichten von %s"
@@ -10473,7 +10491,7 @@ msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren."
msgid "Enable/disable caret mode"
msgstr "Eingabezeiger aktivieren/deaktivieren"
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:47
msgid "Encode file names in an Outlook/GMail way"
msgstr "Dateinamen wie Outlook und GMail kodieren"
@@ -11499,13 +11517,13 @@ msgstr "Zielor_dner:"
#: ../mail/importers/evolution-mbox-importer.c:145
#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:462
+#: ../plugins/pst-import/pst-importer.c:546
msgid "Select folder"
msgstr "Ordner wählen"
#: ../mail/importers/evolution-mbox-importer.c:146
#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:463
+#: ../plugins/pst-import/pst-importer.c:547
msgid "Select folder to import into"
msgstr "Wählen Sie den Ordner, in den importiert werden soll"
@@ -11534,7 +11552,7 @@ msgstr "E-Mail-Postfach wird importiert"
#. Destination folder, was set in our widget
#: ../mail/importers/mail-importer.c:153
#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:663
+#: ../plugins/pst-import/pst-importer.c:753
#, c-format
msgid "Importing '%s'"
msgstr "»%s« wird importiert"
@@ -11608,6 +11626,10 @@ msgstr[1] ""
"gerade entfernten Ordner verwenden:\n"
"»%s«."
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Konteninformation"
+
#: ../mail/mail-config.ui.h:2
msgid "Add Ne_w Signature..."
msgstr "N_eue Signatur …"
@@ -11746,356 +11768,364 @@ msgstr "Nachricht löschen"
msgid "Delete junk messages on e_xit"
msgstr "Unerwünscht-Ordner beim Beenden lee_ren"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
msgid "Displayed Message Headers"
msgstr "Angezeigte Nachrichtenköpfe"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr ""
"_Nachrichten nicht als Unerwünscht markieren, wenn Absender im Adressbuch"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "Nicht zitieren"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "_Entwurfsordner:"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "_E-Mail-Adresse:"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
msgid "Empty trash folders on e_xit"
msgstr "Müllordner beim Beenden _leeren"
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
msgid "Encry_ption certificate:"
msgstr "_Verschlüsselungszertifikat:"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
msgid "Encrypt out_going messages (by default)"
msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
+msgid "Encryption:"
+msgstr "Verschlüsselung:"
+
+#: ../mail/mail-config.ui.h:51
msgid "F_all back to threading messages by subject"
msgstr "Zurückfallen auf be_treffsbezogenes Threading der Nachrichten"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed Width Font:"
msgstr "_Dicktengleiche Schrift:"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
msgid "Format messages in _HTML"
msgstr "Nachrichten in _HTML formatieren"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
msgid "Full Nam_e:"
msgstr "_Voller Name:"
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:56
msgid "Group Reply goes only to mailing list, if possible"
msgstr "Gruppenantwort nur an Mailingliste, wenn möglich"
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
msgid "HTML Messages"
msgstr "HTML-Nachrichten"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
msgid "H_TTP Proxy:"
msgstr "H_TTP-Proxy:"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "Header content"
msgstr "Inhalt der Kopfzeile"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Header name"
msgstr "Name der Kopfzeile"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
msgid "Headers"
msgstr "Kopfzeilen"
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
msgid "Highlight _quotations with"
msgstr "Zitate _hervorheben mit"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
msgid "Ignore Reply-To: for mailing lists"
msgstr "»Antwort an« bei Mailinglisten ignorieren"
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:64
msgid "Inline"
msgstr "Eingebettet"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
msgid "Inline (Outlook style)"
msgstr "Eingebettet (Outlook-Stil)"
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:67 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Beschriftungen"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
msgid "Languages Table"
msgstr "Sprachtabelle"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
msgid "Loading Images"
msgstr "Bilder werden geladen"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
msgid "Mail Headers Table"
msgstr "E-Mail-Kopf-Tabelle"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
msgid "Mailbox location"
msgstr "Ort des Postfachs"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:72
msgid "Message Display"
msgstr "Nachrichtenanzeige"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
msgid "Message Receipts"
msgstr "Lesebestätigungen"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:75
msgid "No _Proxy for:"
msgstr "Kein _Proxy für:"
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+#: ../mail/mail-config.ui.h:76 ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
msgstr "Keine Verschlüsselung"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:77
msgid "Option is ignored if a match for custom junk headers is found."
msgstr ""
"Einstellung wird ignoriert, falls eine benutzerdefinierte unerwünschte "
"Kopfzeile gefunden wird."
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:78
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "Zusätzliche Informationen"
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:80
msgid "Or_ganization:"
msgstr "_Organisation:"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:81
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG-_Schlüsselkennung:"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:82
msgid "Pass_word:"
msgstr "_Passwort:"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:83
+msgid "Personal Details:"
+msgstr "Persönliche Angaben:"
+
+#: ../mail/mail-config.ui.h:84
#: ../modules/calendar/e-calendar-preferences.ui.h:21
msgid "Pick a color"
msgstr "Eine Farbe auswählen"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
msgid "Port:"
msgstr "Port:"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
msgid "Proxy Settings"
msgstr "Proxy-Einstellungen"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
msgid "Quoted"
msgstr "Zitiert"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
msgid "Re_member password"
msgstr "Passwort _merken"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
msgid "Re_ply-To:"
msgstr "_Antwort an:"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:93
msgid "Remember _password"
msgstr "_Passwort merken"
# CHECK
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:94
msgid "Replies and Forwards"
msgstr "Antworten und Weiterleitungen"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:95
msgid "Required Information"
msgstr "Benötigte Informationen"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:96
msgid "SHA1"
msgstr "SHA1"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:97
msgid "SHA256"
msgstr "SHA256"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:98
msgid "SHA384"
msgstr "SHA384"
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:99
msgid "SHA512"
msgstr "SHA512"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:100
msgid "SOC_KS Proxy:"
msgstr "SOC_KS-Proxy:"
-#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:101 ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "SSL-Verschlüsselung"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
msgid "SSL is not supported in this build of Evolution"
msgstr "SSL wird von dieser Erstellung von Evolution nicht unterstützt"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
msgid "S_earch for sender photograph only in local address books"
msgstr "_Nach Foto des Absenders nur in lokalen Adressbüchern suchen"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
msgid "S_elect..."
msgstr "A_uswählen …"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
msgid "S_end message receipts:"
msgstr "Lese_bestätigungen verschicken:"
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:106
msgid "S_tandard Font:"
msgstr "_Standard-Schrift:"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
msgid "Secure MIME (S/MIME)"
msgstr "Sicheres MIME (S/MIME)"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
msgid "Select HTML fixed width font"
msgstr "Dicktengleiche HTML-Schrift wählen"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
msgid "Select HTML variable width font"
msgstr "HTML-Proportionalschrift wählen"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
msgid "Sender Photograph"
msgstr "Foto des Absenders"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:114
msgid "Sending a _private reply to a mailing list message"
msgstr "_Private Antwort auf eine Listennachricht senden"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:116
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr ""
"Nachricht mit Empfängern senden, die nicht als E-Mail-Ad_resse angegeben "
"wurden"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
msgid "Sending a message with an _empty subject line"
msgstr "Nachrichten mit _leerem Betreff senden"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:120
msgid "Sending a message with only _Bcc recipients defined"
msgstr "Nachricht mit ausschließlich _Blindkopie-Empfängern senden"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
msgid "Sending a reply to a large _number of recipients"
msgstr "Antwort an zahlreiche Empfänger se_nden"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
msgid "Sent _Messages Folder:"
msgstr "Ordner für _verschickte Nachrichten:"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
msgid "Ser_ver requires authentication"
msgstr "Server erfordert _Legitimation"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
msgid "Server Configuration"
msgstr "Serverkonfiguration"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:126
msgid "Server _Type:"
msgstr "_Server-Art:"
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:129
msgid "Set custom junk header"
msgstr "Benutzerdefinierte Unerwünscht-Kopfzeile hinzufügen"
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:130
msgid "Si_gning algorithm:"
msgstr "Si_gnaturalgorithmus:"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:131
msgid "Sig_natures"
msgstr "Sig_naturen"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:132
msgid "Sig_ning certificate:"
msgstr "Signatur_zertifikat:"
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:133
msgid "Signat_ure:"
msgstr "_Signatur:"
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:134
msgid "Signatures"
msgstr "Signaturen"
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:135
msgid "Signing _algorithm:"
msgstr "Signatur_algorithmus:"
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:136
msgid "Special Folders"
msgstr "Spezielle Ordner"
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:137
msgid "Spell Checking"
msgstr "Rechtschreibprüfung"
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:138
msgid "Start _typing at the bottom on replying"
msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:139
msgid "Start up"
msgstr "Startvorgang"
-#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:140 ../modules/addressbook/ldap-config.ui.h:21
msgid "TLS encryption"
msgstr "TLS-Verschlüsselung"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:141
msgid "T_ype:"
msgstr "T_yp:"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -12103,7 +12133,7 @@ msgstr ""
"Diese Sprachliste enthält ausschließlich die Sprachen, für die ein Wörterbuch "
"installiert sind."
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12113,7 +12143,7 @@ msgstr ""
"verwendet. Der von Ihnen angegebene Name\n"
"wird lediglich zur Anzeige verwendet."
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:146
msgid ""
"To help avoid email accidents and embarrassments, ask for confirmation before "
"taking the following checkmarked actions:"
@@ -12121,7 +12151,7 @@ msgstr ""
"Um Ärgernisse und ungewollte Ergebnisse zu vermeiden, bei folgenden "
"markierten Aktionen um Bestätigung nachfragen:"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12129,142 +12159,150 @@ msgstr ""
"Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
"zum Beispiel »Geschäftlich« oder »Persönlich«."
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:149
msgid "Us_ername:"
msgstr "_Benutzername:"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:150
msgid "Use Authe_ntication"
msgstr "_Legitimation benutzen"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:151
msgid "User _Name:"
msgstr "_Benutzername:"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
msgid "_Add Signature"
msgstr "Signatur _hinzufügen"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
msgid "_Always load images from the Internet"
msgstr "Bilder _immer aus dem Internet laden"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
msgid "_Authentication Type"
msgstr "_Legitimationsart"
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:156
msgid "_Direct connection to the Internet"
msgstr "_Direkte Internetverbindung"
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
msgid "_Forward style:"
msgstr "_Weiterleitungsstil:"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
msgid "_Junk Folder:"
msgstr "_Unerwünscht-Ordner:"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
msgid "_Keep signature above the original message on replying"
msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
msgid "_Languages"
msgstr "_Sprachen"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
msgid "_Load images only in messages from contacts"
msgstr "Bilder nur in Nachrichten von Kontakten _laden"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
msgid "_Lookup in local address book only"
msgstr "Nur in _lokalen Adressbüchern suchen"
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
msgid "_Make this my default account"
msgstr "Dieses zum Vo_rgabekonto machen"
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:165
msgid "_Manual proxy configuration:"
msgstr "_Manuelle Proxy-Konfiguration:"
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
msgid "_Never load images from the Internet"
msgstr "Bilder _nie aus dem Internet laden"
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
msgid "_Port:"
msgstr "_Port:"
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:170
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr ""
"_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
"wünschen"
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:171
msgid "_Reply style:"
msgstr "_Antwortstil:"
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:172
msgid "_Script:"
msgstr "_Skript:"
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:173
msgid "_Secure HTTP Proxy:"
msgstr "_Sicherer HTTP-Proxy:"
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:175
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "_Server:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:177
msgid "_Show animated images"
msgstr "_Animierte Bilder anzeigen"
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:178
msgid "_Show the photograph of sender in the message preview"
msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:179
msgid "_Trash Folder:"
msgstr "M_üllordner:"
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:180
msgid "_Use secure connection:"
msgstr "_Sichere Verbindung verwenden:"
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:181
msgid "_Use system defaults"
msgstr "_Vorgabe benutzen"
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:182
msgid "_Use the same fonts as other applications"
msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:183 ../smime/gui/smime-ui.ui.h:48
msgid "a"
msgstr "a"
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:49
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:185
msgid "color"
msgstr "Farbe"
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:186
msgid "description"
msgstr "Beschreibung"
+#: ../mail/mail-config.ui.h:187
+msgid "label"
+msgstr "Beschriftung"
+
+#: ../mail/mail-config.ui.h:188
+msgid "none"
+msgstr "Keine"
+
#: ../mail/mail-dialogs.ui.h:1
msgid "All active remote folders"
msgstr "Alle aktiven fernen Ordner"
@@ -12375,65 +12413,65 @@ msgstr "Gewählte Nachrichten filtern"
msgid "Fetching Mail"
msgstr "E-Mail wird abgerufen"
-#: ../mail/mail-ops.c:843
+#: ../mail/mail-ops.c:847
#, c-format
msgid "Sending message %d of %d"
msgstr "Nachricht %d von %d wird verschickt"
-#: ../mail/mail-ops.c:891
+#: ../mail/mail-ops.c:895
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
-#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
+#: ../mail/mail-ops.c:899 ../mail/mail-send-recv.c:840
msgid "Canceled."
msgstr "Abgebrochen."
-#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
+#: ../mail/mail-ops.c:901 ../mail/mail-send-recv.c:842
msgid "Complete."
msgstr "Abgeschlossen."
-#: ../mail/mail-ops.c:1012
+#: ../mail/mail-ops.c:1016
#, c-format
msgid "Moving messages to '%s'"
msgstr "Nachrichten werden nach »%s« verschoben"
-#: ../mail/mail-ops.c:1013
+#: ../mail/mail-ops.c:1017
#, c-format
msgid "Copying messages to '%s'"
msgstr "Nachrichten werden nach »%s« kopiert"
-#: ../mail/mail-ops.c:1131
+#: ../mail/mail-ops.c:1135
#, c-format
msgid "Storing folder '%s'"
msgstr "Ordner »%s« wird gespeichert"
-#: ../mail/mail-ops.c:1206
+#: ../mail/mail-ops.c:1211
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Konto »%s« wird gesäubert und gespeichert"
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1212
#, c-format
msgid "Storing account '%s'"
msgstr "Konto »%s« wird gespeichert"
-#: ../mail/mail-ops.c:1269
+#: ../mail/mail-ops.c:1274
#, c-format
msgid "Refreshing folder '%s'"
msgstr "Ordner »%s« wird aufgefrischt"
-#: ../mail/mail-ops.c:1459
+#: ../mail/mail-ops.c:1483
#, c-format
msgid "Expunging folder '%s'"
msgstr "Ordner »%s« wird gesäubert"
-#: ../mail/mail-ops.c:1544
+#: ../mail/mail-ops.c:1568
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Müll in »%s« wird geleert"
-#: ../mail/mail-ops.c:1646
+#: ../mail/mail-ops.c:1670
#, c-format
msgid "Disconnecting %s"
msgstr "»%s« wird getrennt"
@@ -12468,17 +12506,17 @@ msgstr "Nach neuen E-Mails sehen"
msgid "Could not create spool directory '%s': %s"
msgstr "Spool-Ordner »%s« konnte nicht angelegt werden: %s"
-#: ../mail/mail-tools.c:106
+#: ../mail/mail-tools.c:113
#, c-format
msgid "Trying to movemail a non-mbox source '%s'"
msgstr "Es wurde versucht, movemail auf eine nicht-mbox-Quelle »%s« auszuführen"
-#: ../mail/mail-tools.c:215
+#: ../mail/mail-tools.c:225
#, c-format
msgid "Forwarded message - %s"
msgstr "Weitergeleitete Nachricht - %s"
-#: ../mail/mail-tools.c:217
+#: ../mail/mail-tools.c:227
msgid "Forwarded message"
msgstr "Weitergeleitete Nachricht"
@@ -12497,7 +12535,7 @@ msgstr "Suchordner für »%s« werden aktualisiert: %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
+#: ../mail/mail-vfolder.c:618
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
@@ -12515,11 +12553,11 @@ msgstr[1] ""
"entfernten Ordner verwenden:\n"
"»%s«."
-#: ../mail/mail-vfolder.c:1314
+#: ../mail/mail-vfolder.c:1249
msgid "Edit Search Folder"
msgstr "Suchordner bearbeiten"
-#: ../mail/mail-vfolder.c:1423
+#: ../mail/mail-vfolder.c:1358
msgid "New Search Folder"
msgstr "Neuer Suchordner"
@@ -13283,7 +13321,7 @@ msgid "_Discard changes"
msgstr "Änderungen _verwerfen"
#: ../mail/mail.error.xml.h:160
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1116
msgid "_Empty Trash"
msgstr "_Müll leeren"
@@ -13403,7 +13441,7 @@ msgid "Follow-up"
msgstr "Folgenachricht"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5094
msgid "Generating message list"
msgstr "Nachrichtenliste wird erzeugt"
@@ -13452,23 +13490,23 @@ msgstr "Größe"
msgid "Subject - Trimmed"
msgstr "Betreff - Gekürzt"
-#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1556
msgid "Body contains"
msgstr "Rumpf enthält"
-#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1563
msgid "Message contains"
msgstr "Nachricht enthält"
-#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1570
msgid "Recipients contain"
msgstr "Empfänger enthalten"
-#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1577
msgid "Sender contains"
msgstr "Absender enthält"
-#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1584
msgid "Subject contains"
msgstr "Betreff enthält"
@@ -13741,10 +13779,10 @@ msgstr "Ein neues Adressbuch anlegen"
#. Create the contacts group
#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/addressbook/e-book-shell-view.c:402
#: ../modules/calendar/e-cal-shell-backend.c:115
#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
+#: ../modules/online-accounts/e-online-accounts-google.c:376
msgid "Contacts"
msgstr "Kontakte"
@@ -13808,7 +13846,7 @@ msgstr "Karte mit allen Kontakten des gewählten Adressbuchs anzeigen"
#: ../modules/calendar/e-cal-shell-view-actions.c:1405
#: ../modules/calendar/e-memo-shell-view-actions.c:640
#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1193
msgid "_Rename..."
msgstr "_Umbenennen …"
@@ -13889,7 +13927,7 @@ msgstr "A_ktionen"
#: ../modules/addressbook/e-book-shell-view-actions.c:940
#: ../modules/calendar/e-memo-shell-view-actions.c:677
#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
msgid "_Preview"
msgstr "_Vorschau"
@@ -13928,7 +13966,7 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
#: ../modules/addressbook/e-book-shell-view-actions.c:1018
#: ../modules/calendar/e-memo-shell-view-actions.c:747
#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1462
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
msgid "_Classic View"
msgstr "_Klassische Ansicht"
@@ -13940,7 +13978,7 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
#: ../modules/addressbook/e-book-shell-view-actions.c:1025
#: ../modules/calendar/e-memo-shell-view-actions.c:754
#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
msgid "_Vertical View"
msgstr "_Vertikale Ansicht"
@@ -13966,7 +14004,7 @@ msgstr "Nicht einsortiert"
#: ../modules/calendar/e-cal-shell-view-actions.c:1727
#: ../modules/calendar/e-memo-shell-view-actions.c:781
#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
#: ../shell/e-shell-content.c:664
msgid "Advanced Search"
msgstr "Erweiterte Suche"
@@ -14001,23 +14039,23 @@ msgstr "Als VCard _speichern …"
msgid "Save selected contacts as a vCard"
msgstr "Gewählte Kontakte als vCard speichern"
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
msgid "_Forward Contacts"
msgstr "Kontakte weiter_leiten"
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
msgid "_Forward Contact"
msgstr "Kontakt weiter_leiten"
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
msgid "_Send Message to Contacts"
msgstr "_Nachricht an Kontakte schicken"
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
msgid "_Send Message to List"
msgstr "_Nachricht an Liste schicken"
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
msgid "_Send Message to Contact"
msgstr "_Nachricht an Kontakt schicken"
@@ -14071,17 +14109,17 @@ msgid "One"
msgstr "Eins"
#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "S_earch filter:"
+msgstr "Such_filter:"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search Filter"
msgstr "Suchfilter"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _base:"
msgstr "Such_basis:"
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "Such_filter:"
-
#: ../modules/addressbook/ldap-config.ui.h:16
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14091,40 +14129,48 @@ msgstr ""
"Wird er nicht verändert, so wird die voreingestellte Suche auf den Typ "
"»Person« durchgeführt."
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Ser_ver:"
+msgstr "Ser_ver:"
+
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Sub"
msgstr "Sub"
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "Supported Search Bases"
msgstr "Unterstützte Suchbasen"
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Use secure _connection:"
+msgstr "_Sichere Verbindung verwenden:"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "Using distinguished name (DN)"
msgstr "Eindeutiger Name (DN) wird verwendet"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "Using email address"
msgstr "E-Mail-Adresse verwenden"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Download limit:"
msgstr "_Download-Limit:"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
msgid "_Find Possible Search Bases"
msgstr "Unterstützte Suchbasen _suchen"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Login method:"
msgstr "An_meldemethode:"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Search scope:"
msgstr "_Suchbereich:"
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Timeout:"
msgstr "_Zeitüberschreitung:"
@@ -15363,7 +15409,7 @@ msgstr "Termine der nächsten 7 Tage"
#: ../modules/calendar/e-cal-shell-view-actions.c:1710
msgid "Occurs Less Than 5 Times"
-msgstr ""
+msgstr "Kommt weniger als fünf Mal vor"
#: ../modules/calendar/e-cal-shell-view-actions.c:1741
#: ../modules/calendar/e-memo-shell-view-actions.c:795
@@ -15615,7 +15661,7 @@ msgstr[0] "%d Notiz"
msgstr[1] "%d Notizen"
#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
+#: ../modules/calendar/e-task-shell-view-private.c:583
#, c-format
msgid "%d selected"
msgstr "%d gewählt"
@@ -15784,18 +15830,18 @@ msgstr "Aufgabe löschen"
msgid "Expunging"
msgstr "Wird gesäubert"
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:579
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d Aufgabe"
msgstr[1] "%d Aufgaben"
-#: ../modules/mail/em-account-prefs.c:258
+#: ../modules/mail/em-account-prefs.c:263
msgid "Evolution Account Assistant"
msgstr "Evolution-Kontoassistent"
-#: ../modules/mail/em-account-prefs.c:307
+#: ../modules/mail/em-account-prefs.c:312
msgid "Account Editor"
msgstr "Konteneditor"
@@ -15805,21 +15851,21 @@ msgstr "Konteneditor"
msgid "%d attached messages"
msgstr "%d beigelegte Nachrichten"
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:192
msgctxt "New"
msgid "_Mail Message"
msgstr "_E-Mail-Nachricht"
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:194
msgid "Compose a new mail message"
msgstr "Eine neue E-Mail-Nachricht verfassen"
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:202
msgctxt "New"
msgid "Mail _Folder"
msgstr "E-Mail-_Ordner"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:204
msgid "Create a new mail folder"
msgstr "Einen neuen E-Mail-Ordner anlegen"
@@ -15839,297 +15885,297 @@ msgstr "Editoreinstellungen"
msgid "Network Preferences"
msgstr "Netzwerkeinstellungen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
#: ../modules/mail/e-mail-shell-view.c:960
msgid "_Disable Account"
msgstr "Konto _deaktivieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
msgid "Disable this account"
msgstr "Dieses Konto deaktivieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
msgid "Permanently remove all the deleted messages from all folders"
msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
msgid "_Download Messages for Offline Usage"
msgstr "_Nachrichten für Offline-Benutzung herunterladen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
msgid "Download messages of accounts and folders marked for offline usage"
msgstr ""
"Nachrichten von Konten/Ordnern herunterladen, die für den Offline-Modus "
"markiert sind"
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
msgid "Fl_ush Outbox"
msgstr "E-Mails aus A_usgang verschicken"
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
msgid "_Copy Folder To..."
msgstr "Ordner _kopieren nach …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
msgid "Copy the selected folder into another folder"
msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
msgid "Permanently remove this folder"
msgstr "Diesen Ordner dauerhaft entfernen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
msgid "E_xpunge"
msgstr "_Säubern"
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
msgid "Permanently remove all deleted messages from this folder"
msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
msgid "Mar_k All Messages as Read"
msgstr "Alle Nachrichten als gelesen _markieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
msgid "Mark all messages in the folder as read"
msgstr "Alle Nachrichten im Ordner als gelesen markieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1165
msgid "_Move Folder To..."
msgstr "Ordner verschie_ben nach …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
msgid "Move the selected folder into another folder"
msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1172
msgid "_New..."
msgstr "_Neu …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
msgid "Create a new folder for storing mail"
msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
msgid "Change the properties of this folder"
msgstr "Die Eigenschaften dieses Ordners ändern"
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
msgid "Refresh the folder"
msgstr "Den Ordner auffrischen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
msgid "Change the name of this folder"
msgstr "Den Namen dieses Ordners ändern"
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
msgid "Select Message _Thread"
msgstr "Nachrichten-_Thread auswählen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1202
msgid "Select all messages in the same thread as the selected message"
msgstr "Alle Nachrichten im selben Thread wie die gewählte Nachricht markieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
msgid "Select Message S_ubthread"
msgstr "Nachrichten-_Subthread auswählen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
msgid "Select all replies to the currently selected message"
msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
msgid "Empty _Trash"
msgstr "_Müll leeren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
msgid "_New Label"
msgstr "_Neue Beschriftung"
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
msgid "N_one"
msgstr "_Keine"
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
msgid "_Manage Subscriptions"
msgstr "Abonnements _verwalten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
msgid "Send / _Receive"
msgstr "Verschicken/Ab_rufen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
msgid "Send queued items and retrieve new items"
msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
msgid "R_eceive All"
msgstr "Alle _empfangen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
msgid "Receive new items from all accounts"
msgstr "Neue Objekte in von allen Konten empfangen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
msgid "_Send All"
msgstr "Alle _verschicken"
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
msgid "Send queued items in all accounts"
msgstr "Objekte in den Warteschlangen aller Konten verschicken"
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
#: ../widgets/misc/e-activity-proxy.c:310
msgid "Cancel"
msgstr "Abbrechen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
msgid "Cancel the current mail operation"
msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
msgid "Collapse All _Threads"
msgstr "Alle _Threads einklappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
msgid "Collapse all message threads"
msgstr "Alle Nachrichten-Threads einklappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
msgid "E_xpand All Threads"
msgstr "Alle Threads a_usklappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
msgid "Expand all message threads"
msgstr "Alle Nachrichten-Threads ausklappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
msgid "_Message Filters"
msgstr "Nachrichtenf_ilter"
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
msgid "Create or edit rules for filtering new mail"
msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
msgid "_Subscriptions..."
msgstr "A_bonnements …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
msgid "F_older"
msgstr "_Ordner"
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
msgid "_Label"
msgstr "Bes_chriftung"
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
msgid "C_reate Search Folder From Search..."
msgstr "Sucho_rdner aus Suche anlegen …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1368
msgid "Search F_olders"
msgstr "S_uchordner"
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
msgid "Create or edit search folder definitions"
msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
msgid "_New Folder..."
msgstr "Ordner a_nlegen …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
msgid "Show Message _Preview"
msgstr "Nachrichten_vorschau anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
msgid "Show message preview pane"
msgstr "Nachrichten-Vorschaufenster anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
msgid "Show _Deleted Messages"
msgstr "Gel_öschte Nachrichten anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
msgid "Show deleted messages with a line through them"
msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
msgid "_Group By Threads"
msgstr "Nach Threads _gruppieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
msgid "Threaded message list"
msgstr "Nachrichtenliste nach Threads sortieren"
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
msgid "Show message preview below the message list"
msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
msgid "Show message preview alongside the message list"
msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
msgid "All Messages"
msgstr "Alle Nachrichten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
msgid "Important Messages"
msgstr "Wichtige Nachrichten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1497
msgid "Last 5 Days' Messages"
msgstr "Nachrichten der letzten fünf Tage"
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1504
msgid "Messages Not Junk"
msgstr "Nachrichten sind nicht unerwünscht"
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
msgid "Messages with Attachments"
msgstr "Nachrichten mit Anlagen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1518
msgid "No Label"
msgstr "Keine Beschriftung"
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1525
msgid "Read Messages"
msgstr "Gelesene Nachrichten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1532
msgid "Recent Messages"
msgstr "Letzte Nachrichten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
msgid "Unread Messages"
msgstr "Ungelesene Nachrichten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
msgid "Subject or Addresses contain"
msgstr "Betreff oder Adresse enthält"
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
msgid "All Accounts"
msgstr "Alle Konten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
msgid "Current Account"
msgstr "Derzeitiges Konto"
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
msgid "Current Folder"
msgstr "Derzeitiger Ordner"
@@ -16213,7 +16259,7 @@ msgstr "Verschicken/Abrufen"
#: ../modules/mail/em-composer-prefs.c:498
#: ../modules/plugin-manager/evolution-plugin-manager.c:360
#: ../plugins/publish-calendar/publish-calendar.c:849
-#: ../widgets/misc/e-account-tree-view.c:385
+#: ../widgets/misc/e-account-tree-view.c:388
msgid "Enabled"
msgstr "Aktiv"
@@ -16291,7 +16337,7 @@ msgstr ""
"Evolution wird in den Online-Modus zurückkehren, sobald eine "
"Netzwerkverbindung hergestellt ist."
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+#: ../modules/online-accounts/camel-sasl-xoauth.c:388
msgid ""
"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
"from which to obtain an authentication token."
@@ -16299,11 +16345,11 @@ msgstr ""
"Es konnte kein zugehöriges Konto im org.gnome.OnlineAccounts-Dienst gefunden "
"werden, von dem eine Authentifizierung bestätigt werden könnte."
-#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#: ../modules/online-accounts/camel-sasl-xoauth.c:475
msgid "OAuth"
msgstr "OAuth"
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+#: ../modules/online-accounts/camel-sasl-xoauth.c:477
msgid ""
"This option will connect to the server by way of the GNOME Online Accounts "
"service"
@@ -16448,16 +16494,12 @@ msgstr "Willkommen"
#: ../modules/startup-wizard/evolution-startup-wizard.c:508
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect to "
-"your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
+"your email accounts, and to import files from other applications."
msgstr ""
"Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen, Ihre E-"
-"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
-"\n"
-"Klicken Sie auf »Vor«, um fortzufahren. "
+"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren."
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
msgid "Loading accounts..."
msgstr "Konten werden geladen …"
@@ -16701,7 +16743,7 @@ msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
+"Are you sure you want to restore Evolution from the selected backup file?"
msgstr ""
"Sind Sie sicher, dass Evolution aus dem ausgewählten Archiv wiederhergestellt "
"werden soll?"
@@ -16719,11 +16761,11 @@ msgid "Insufficient Permissions"
msgstr "Unzureichende Berechtigungen"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
+msgid "Invalid Evolution backup file"
msgstr "Ungültiges Evolution-Sicherungsarchiv"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
+msgid "Please select a valid backup file to restore."
msgstr "Bitte wählen Sie ein gültiges Evolution-Archiv zur Wiederherstellung."
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16743,8 +16785,8 @@ msgstr ""
msgid ""
"To restore your data and settings, you must first close Evolution. Please "
"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your back "
-"up."
+"all your current Evolution data and settings and restore them from your "
+"backup."
msgstr ""
"Um Ihre Daten und Einstellungen wiederherzustellen, müssen Sie zuerst "
"Evolution beenden. Stellen Sie bitte sicher, dass Sie ungesicherte Änderungen "
@@ -16921,7 +16963,7 @@ msgstr "_Sichere Verbindung verwenden"
#: ../plugins/caldav/caldav-source.c:249
#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:660
#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
msgid "User_name:"
msgstr "_Benutzername:"
@@ -16935,7 +16977,7 @@ msgstr "Server nach einem Kal_ender durchsuchen"
#: ../plugins/calendar-http/calendar-http.c:129
#: ../plugins/calendar-weather/calendar-weather.c:421
#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:675
+#: ../plugins/google-account-setup/google-source.c:666
msgid "Re_fresh:"
msgstr "Auf_frischen:"
@@ -17345,14 +17387,14 @@ msgstr ""
msgid "Server"
msgstr "Server"
-#: ../plugins/google-account-setup/google-source.c:459
+#: ../plugins/google-account-setup/google-source.c:457
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr ""
"Geben Sie das Passwort für den Benutzer %s ein, um auf die Liste der "
"abonnierten Kalender zuzugreifen."
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:569
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -17361,17 +17403,17 @@ msgstr ""
"Daten konnten nicht vom Google-Server empfangen werden.\n"
"%s"
-#: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:820
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/google-account-setup/google-source.c:569
+#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:1083
msgid "Unknown error."
msgstr "Unbekannter Fehler."
-#: ../plugins/google-account-setup/google-source.c:679
+#: ../plugins/google-account-setup/google-source.c:670
msgid "Cal_endar:"
msgstr "_Kalender:"
-#: ../plugins/google-account-setup/google-source.c:714
+#: ../plugins/google-account-setup/google-source.c:705
msgid "Retrieve _List"
msgstr "_Liste abrufen"
@@ -17391,12 +17433,12 @@ msgstr "Eingebettetes Bild"
msgid "View image attachments directly in mail messages."
msgstr "Bildanhänge direkt innerhalb von Nachrichten anzeigen."
-#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.c:335
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "Benutzerdefinierte Kopfzeilen"
-#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.c:347
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "IMAP-Kopfzeilen"
@@ -17476,122 +17518,122 @@ msgstr "Diese Aufgabe wurde in keiner Aufgabenliste gefunden"
msgid "Unable to find this memo in any memo list"
msgstr "Diese Notiz wurde in keiner Notizliste gefunden"
-#: ../plugins/itip-formatter/itip-formatter.c:1082
+#: ../plugins/itip-formatter/itip-formatter.c:1083
msgid "Opening the calendar. Please wait..."
msgstr "Kalender wird geöffnet. Bitte warten …"
-#: ../plugins/itip-formatter/itip-formatter.c:1085
+#: ../plugins/itip-formatter/itip-formatter.c:1086
msgid "Searching for an existing version of this appointment"
msgstr "Eine bestehende Version dieses Termins wird gesucht"
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1363
msgid "Unable to parse item"
msgstr "Element kann nicht analysiert werden"
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1452
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Element kann nicht zu Kalender »%s« gesendet werden. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1464
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "In Kalender »%s« als »Angenommen« eingetragen"
-#: ../plugins/itip-formatter/itip-formatter.c:1467
+#: ../plugins/itip-formatter/itip-formatter.c:1468
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "In Kalender »%s« als »Vorläufig angenommen« eingetragen"
-#: ../plugins/itip-formatter/itip-formatter.c:1472
+#: ../plugins/itip-formatter/itip-formatter.c:1473
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "In Kalender »%s« als »Abgelehnt« eingetragen"
-#: ../plugins/itip-formatter/itip-formatter.c:1477
+#: ../plugins/itip-formatter/itip-formatter.c:1478
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "In Kalender »%s« als »Abgesagt« eingetragen"
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1580
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Der Organisator hat den Vertreter %s entfernt "
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1587
msgid "Sent a cancelation notice to the delegate"
msgstr "Dem Vertreter wurde eine Absagenachricht zugestellt"
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1589
msgid "Could not send the cancelation notice to the delegate"
msgstr "Die Absagenachricht konnte dem Vertreter nicht zugestellt werden"
-#: ../plugins/itip-formatter/itip-formatter.c:1700
+#: ../plugins/itip-formatter/itip-formatter.c:1701
msgid "Attendee status could not be updated because the status is invalid"
msgstr ""
"Teilnehmerstatus konnte auf Grund eines ungültigen Zustands nicht "
"aktualisiert werden"
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1730
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Teilnehmer konnte nicht aktualisiert werden. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1733
+#: ../plugins/itip-formatter/itip-formatter.c:1734
msgid "Attendee status updated"
msgstr "Teilnehmerstatus aktualisiert"
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1738
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
"existiert"
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:1760
msgid "Meeting information sent"
msgstr "Besprechungsinformationen wurden verschickt"
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1763
msgid "Task information sent"
msgstr "Aufgabeninformationen wurden verschickt"
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/itip-formatter/itip-formatter.c:1766
msgid "Memo information sent"
msgstr "Notizinformationen wurden verschickt"
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1775
msgid "Unable to send meeting information, the meeting does not exist"
msgstr ""
"Verschicken der Besprechungsinformationen nicht möglich, die Besprechung "
"existiert nicht"
-#: ../plugins/itip-formatter/itip-formatter.c:1777
+#: ../plugins/itip-formatter/itip-formatter.c:1778
msgid "Unable to send task information, the task does not exist"
msgstr ""
"Verschicken der Aufgabeninformationen nicht möglich, die Aufgabe existiert "
"nicht"
-#: ../plugins/itip-formatter/itip-formatter.c:1780
+#: ../plugins/itip-formatter/itip-formatter.c:1781
msgid "Unable to send memo information, the memo does not exist"
msgstr ""
"Verschicken der Notizinformationen nicht möglich, die Notiz existiert nicht"
#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1846
+#: ../plugins/itip-formatter/itip-formatter.c:1847
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1852
msgid "Save Calendar"
msgstr "Kalender speichern"
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
msgid "The calendar attached is not valid"
msgstr "Der beigelegte Kalender ist ungültig"
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1927
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17599,15 +17641,15 @@ msgstr ""
"Die Nachricht gibt an, einen Kalender zu enthalten. Dieser Kalender ist "
"jedoch kein gültiger iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
-msgid "The item in the calendar is not valid"
-msgstr "Das Element im Kalender ist ungültig"
-
#: ../plugins/itip-formatter/itip-formatter.c:1967
#: ../plugins/itip-formatter/itip-formatter.c:1995
#: ../plugins/itip-formatter/itip-formatter.c:2104
+msgid "The item in the calendar is not valid"
+msgstr "Das Element im Kalender ist ungültig"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../plugins/itip-formatter/itip-formatter.c:2105
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17615,11 +17657,11 @@ msgstr ""
"Die Nachricht enthält einen Kalender. Dieser beinhaltet allerdings keine "
"Ereignisse, Aufgaben oder Verfügbarkeitsinformationen."
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../plugins/itip-formatter/itip-formatter.c:2009
msgid "The calendar attached contains multiple items"
msgstr "Der beigelegte Kalender enthält mehrere Elemente."
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/itip-formatter/itip-formatter.c:2010
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17627,44 +17669,44 @@ msgstr ""
"Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
"der Kalender importiert werden."
-#: ../plugins/itip-formatter/itip-formatter.c:2665
+#: ../plugins/itip-formatter/itip-formatter.c:2666
msgctxt "cal-itip"
msgid "None"
msgstr "Keine"
-#: ../plugins/itip-formatter/itip-formatter.c:2681
+#: ../plugins/itip-formatter/itip-formatter.c:2682
msgid "Tentatively Accepted"
msgstr "Vorläufig angenommen"
-#: ../plugins/itip-formatter/itip-formatter.c:2799
+#: ../plugins/itip-formatter/itip-formatter.c:2800
msgid "This meeting recurs"
msgstr "Diese Besprechung wird wiederholt"
-#: ../plugins/itip-formatter/itip-formatter.c:2802
+#: ../plugins/itip-formatter/itip-formatter.c:2803
msgid "This task recurs"
msgstr "Diese Aufgabe wird wiederholt"
-#: ../plugins/itip-formatter/itip-formatter.c:2805
+#: ../plugins/itip-formatter/itip-formatter.c:2806
msgid "This memo recurs"
msgstr "Diese Notiz wird wiederholt"
-#: ../plugins/itip-formatter/itip-formatter.c:3029
+#: ../plugins/itip-formatter/itip-formatter.c:3030
msgid "Meeting Invitations"
msgstr "Besprechungseinladungen"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3054
+#: ../plugins/itip-formatter/itip-formatter.c:3055
msgid "_Delete message after acting"
msgstr "_Löschen der Nachricht nach Abarbeitung"
-#: ../plugins/itip-formatter/itip-formatter.c:3064
-#: ../plugins/itip-formatter/itip-formatter.c:3097
+#: ../plugins/itip-formatter/itip-formatter.c:3065
+#: ../plugins/itip-formatter/itip-formatter.c:3098
msgid "Conflict Search"
msgstr "Konfliktsuche"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3079
+#: ../plugins/itip-formatter/itip-formatter.c:3080
msgid "Select the calendars to search for meeting conflicts"
msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
@@ -18317,12 +18359,12 @@ msgid "Notifies you when new mail messages arrive."
msgstr "Beim Eintreffen neuer E-Mails benachrichtigen"
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:239
+#: ../plugins/mail-to-task/mail-to-task.c:238
#, c-format
msgid "Created from a mail by %s"
msgstr "Erstellt aus einer Nachricht an %s"
-#: ../plugins/mail-to-task/mail-to-task.c:610
+#: ../plugins/mail-to-task/mail-to-task.c:609
#, c-format
msgid ""
"Selected calendar contains event '%s' already. Would you like to edit the old "
@@ -18331,7 +18373,7 @@ msgstr ""
"Der ausgewählte Kalender enthält bereits das Ereignis »%s«. Möchten Sie das "
"alte Ereignis bearbeiten?"
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#: ../plugins/mail-to-task/mail-to-task.c:612
#, c-format
msgid ""
"Selected task list contains task '%s' already. Would you like to edit the old "
@@ -18340,7 +18382,7 @@ msgstr ""
"Die ausgewählte Aufgabenliste enthält bereits die Aufgabe »%s«. Möchten Sie "
"die alte Aufgabe bearbeiten?"
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:615
#, c-format
msgid ""
"Selected memo list contains memo '%s' already. Would you like to edit the old "
@@ -18349,7 +18391,7 @@ msgstr ""
"Die ausgewählte Notizliste enthält bereits die Notiz »%s«. Möchten Sie die "
"alte Notiz bearbeiten?"
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:632
#, c-format
msgid ""
"You have selected %d mails to be converted to events. Do you really want to "
@@ -18358,7 +18400,7 @@ msgstr ""
"Sie haben %d Nachrichten ausgewählt, die in Ereignisse umgewandelt werden "
"sollen. Wollen Sie diese wirklich alle hinzufügen?"
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:635
#, c-format
msgid ""
"You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18367,7 +18409,7 @@ msgstr ""
"Sie haben %d Nachrichten ausgewählt, die in Aufgaben umgewandelt werden "
"sollen. Wollen Sie diese wirklich alle hinzufügen?"
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:638
#, c-format
msgid ""
"You have selected %d mails to be converted to memos. Do you really want to "
@@ -18376,29 +18418,29 @@ msgstr ""
"Sie haben %d Nachrichten ausgewählt, die in Notizen umgewandelt werden "
"sollen. Wollen Sie diese wirklich alle hinzufügen?"
-#: ../plugins/mail-to-task/mail-to-task.c:658
+#: ../plugins/mail-to-task/mail-to-task.c:657
msgid "Do you wish to continue converting remaining mails?"
msgstr "Soll die Umwandlung der verbleibenden Nachrichten fortgesetzt werden?"
-#: ../plugins/mail-to-task/mail-to-task.c:733
+#: ../plugins/mail-to-task/mail-to-task.c:732
msgid "[No Summary]"
msgstr "[Keine Zusammenfassung]"
-#: ../plugins/mail-to-task/mail-to-task.c:745
+#: ../plugins/mail-to-task/mail-to-task.c:744
msgid "Invalid object returned from a server"
msgstr "Ein ungültiges Objekt wurde vom Server zurückgegeben."
-#: ../plugins/mail-to-task/mail-to-task.c:795
+#: ../plugins/mail-to-task/mail-to-task.c:794
#, c-format
msgid "An error occurred during processing: %s"
msgstr "Ein Fehler ist während der Verarbeitung aufgetreten: %s"
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:819
#, c-format
msgid "Cannot open calendar. %s"
msgstr "Kalender konnte nicht geöffnet werden. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:827
+#: ../plugins/mail-to-task/mail-to-task.c:826
msgid ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
@@ -18406,7 +18448,7 @@ msgstr ""
"Die gewählte Quelle ist schreibgeschützt, daher kann kein neues Ereignis "
"erstellt werden. Bitte wählen Sie eine andere Quelle aus."
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../plugins/mail-to-task/mail-to-task.c:829
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
@@ -18414,7 +18456,7 @@ msgstr ""
"Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Aufgabe "
"erstellt werden. Bitte wählen Sie eine andere Quelle aus."
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../plugins/mail-to-task/mail-to-task.c:832
msgid ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
@@ -18422,44 +18464,44 @@ msgstr ""
"Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Notiz "
"erstellt werden. Bitte wählen Sie eine andere Quelle aus."
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1083
#, c-format
msgid "Cannot get source list. %s"
msgstr "Die Liste der Quelle konnte nicht erhalten werden. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1147
+#: ../plugins/mail-to-task/mail-to-task.c:1146
msgid "No writable calendar is available."
msgstr "Keine schreibbarer Kalender verfügbar."
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1238
msgid "Create an _Event"
msgstr "Ein _Ereignis anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1241
+#: ../plugins/mail-to-task/mail-to-task.c:1240
msgid "Create a new event from the selected message"
msgstr "Ein neues Ereignis mit Hilfe der gewählten Nachricht anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1245
msgid "Create a Mem_o"
msgstr "Eine _Notiz anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1248
+#: ../plugins/mail-to-task/mail-to-task.c:1247
msgid "Create a new memo from the selected message"
msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1252
msgid "Create a _Task"
msgstr "Eine _Aufgabe anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../plugins/mail-to-task/mail-to-task.c:1254
msgid "Create a new task from the selected message"
msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1262
msgid "Create a _Meeting"
msgstr "Eine _Besprechung anlegen"
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1264
msgid "Create a new meeting from the selected message"
msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
@@ -18630,7 +18672,7 @@ msgstr "Im derzeitigen Ordner und in _Unterordnern"
msgid "In Current _Folder Only"
msgstr "Nur im _derzeitigen Ordner"
-#: ../plugins/mark-all-read/mark-all-read.c:575
+#: ../plugins/mark-all-read/mark-all-read.c:569
msgid "Mark Me_ssages as Read"
msgstr "Nachrichten als gelesen _markieren"
@@ -18707,31 +18749,31 @@ msgstr "Outlook PST-Importeur"
msgid "Outlook personal folders (.pst)"
msgstr "Persönliche Outlook-Ordner (.pst)"
-#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:536
msgid "_Mail"
msgstr "_E-Mail"
-#: ../plugins/pst-import/pst-importer.c:471
+#: ../plugins/pst-import/pst-importer.c:556
msgid "Destination folder:"
msgstr "Zielordner:"
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:564
msgid "_Address Book"
msgstr "_Adressbuch"
-#: ../plugins/pst-import/pst-importer.c:482
+#: ../plugins/pst-import/pst-importer.c:569
msgid "A_ppointments"
msgstr "_Termine"
-#: ../plugins/pst-import/pst-importer.c:486 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:574 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Aufgaben"
-#: ../plugins/pst-import/pst-importer.c:490
+#: ../plugins/pst-import/pst-importer.c:579
msgid "_Journal entries"
msgstr "_Journal-Einträge"
-#: ../plugins/pst-import/pst-importer.c:600
+#: ../plugins/pst-import/pst-importer.c:690
msgid "Importing Outlook data"
msgstr "Outlook-Daten werden importiert"
@@ -18884,8 +18926,8 @@ msgstr "_Benutzername:"
msgid "iCal"
msgstr "iCal"
-#: ../plugins/publish-calendar/publish-format-fb.c:95
-#: ../plugins/publish-calendar/publish-format-ical.c:92
+#: ../plugins/publish-calendar/publish-format-fb.c:94
+#: ../plugins/publish-calendar/publish-format-ical.c:91
#, c-format
msgid "Could not publish calendar: Calendar backend no longer exists"
msgstr ""
@@ -19270,7 +19312,7 @@ msgstr "Seitenleiste anzeigen"
msgid "Skip development warning dialog"
msgstr "Entwicklungs-Warndialog nicht anzeigen"
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:311
msgid "Start in offline mode"
msgstr "Im Offline-Modus starten"
@@ -19483,273 +19525,278 @@ msgstr ""
"Christian Kintner <mail@christian-kintner.de>\n"
"Andre Klapper <ak-47@gmx.net>\n"
"Christian Kirbach <christian.kirbach@googlemail.com>\n"
-"Mario Blättermann <mariobl@freenet.de>\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>"
#: ../shell/e-shell-window-actions.c:656
msgid "Evolution Website"
msgstr "Evolution-Webseite"
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:911
msgid "Categories Editor"
msgstr "Kategorien-Editor"
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1246
msgid "Bug Buddy is not installed."
msgstr "Bug-Buddy ist nicht installiert."
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:1248
msgid "Bug Buddy could not be run."
msgstr "Bug-Buddy konnte nicht gestartet werden."
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:1429
msgid "Show information about Evolution"
msgstr "Informationen zu Evolution anzeigen"
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1448
msgid "_Close Window"
msgstr "Fenster s_chließen"
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1455
msgid "_Contents"
msgstr "_Inhalte"
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1457
msgid "Open the Evolution User Guide"
msgstr "Das Benutzerhandbuch von Evolution öffnen"
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1483
msgid "_Forget Passwords"
msgstr "Passwörter ver_werfen"
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1485
msgid "Forget all remembered passwords"
msgstr "Alle gemerkten Passwörter verwerfen"
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1490
msgid "I_mport..."
msgstr "Impor_tieren …"
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1492
msgid "Import data from other programs"
msgstr "Daten aus anderen Programmen importieren"
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1497
msgid "New _Window"
msgstr "Neues F_enster"
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1499
msgid "Create a new window displaying this view"
msgstr "Ein neues Fenster öffnen, das diese Ansicht anzeigt"
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1511
msgid "Available Cate_gories"
msgstr "Verfügbare Kate_gorien"
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1513
msgid "Manage available categories"
msgstr "Verfügbare Kategorien verwalten"
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1525
msgid "_Quick Reference"
msgstr "_Kurzreferenz"
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1527
msgid "Show Evolution's shortcut keys"
msgstr "Die Tastenkürzel von Evolution anzeigen"
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1534
msgid "Exit the program"
msgstr "Das Programm beenden"
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1539
msgid "_Advanced Search..."
msgstr "Er_weiterte Suche …"
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1541
msgid "Construct a more advanced search"
msgstr "Erweiterte Suche ausführen"
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1548
msgid "Clear the current search parameters"
msgstr "Die aktuellen Suchparameter leeren"
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1553
msgid "_Edit Saved Searches..."
msgstr "Gespeicherte Suchen _bearbeiten …"
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1555
msgid "Manage your saved searches"
msgstr "Ihre gespeicherten Suchvorgänge verwalten"
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1562
msgid "Click here to change the search type"
msgstr "Klicken Sie hier, um den Suchtypen zu ändern"
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1567
msgid "_Find Now"
msgstr "_Jetzt suchen"
#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1569
msgid "Execute the current search parameters"
msgstr "Die aktuellen Suchparameter anwenden"
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1574
msgid "_Save Search..."
msgstr "Suche _speichern …"
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1576
msgid "Save the current search parameters"
msgstr "Die aktuellen Suchparameter speichern"
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1588
msgid "Submit _Bug Report..."
msgstr "Fehler_bericht einschicken …"
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1590
msgid "Submit a bug report using Bug Buddy"
msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1595
msgid "_Work Offline"
msgstr "_Offline arbeiten"
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1597
msgid "Put Evolution into offline mode"
msgstr "Evolution in den Offline-Modus versetzen"
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1602
msgid "_Work Online"
msgstr "_Online arbeiten"
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1604
msgid "Put Evolution into online mode"
msgstr "Evolution in den Online-Modus versetzen"
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1632
msgid "Lay_out"
msgstr "_Anordnung"
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1639
msgid "_New"
msgstr "_Neu"
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1646
msgid "_Search"
msgstr "_Suchen"
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1653
msgid "_Switcher Appearance"
msgstr "Erscheinungsbild der Knö_pfe"
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1667
msgid "_Window"
msgstr "_Fenster"
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1696
msgid "Show Side _Bar"
msgstr "Sei_tenleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1698
msgid "Show the side bar"
msgstr "Seitenleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1704
msgid "Show _Buttons"
msgstr "_Knöpfe anzeigen"
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1706
msgid "Show the switcher buttons"
msgstr "Umschaltknöpfe anzeigen"
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1712
msgid "Show _Status Bar"
msgstr "Stat_usleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1714
msgid "Show the status bar"
msgstr "Die Statusleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1720
msgid "Show _Tool Bar"
msgstr "_Werkzeugleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1722
msgid "Show the tool bar"
msgstr "Die Werkzeugleiste anzeigen"
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1744
msgid "_Icons Only"
msgstr "Nur S_ymbole"
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1746
msgid "Display window buttons with icons only"
msgstr "Fensterknöpfe nur als Symbole anzeigen"
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1751
msgid "_Text Only"
msgstr "Nur _Text"
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1753
msgid "Display window buttons with text only"
msgstr "Fensterknöpfe nur als Text anzeigen"
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1758
msgid "Icons _and Text"
msgstr "Symbole _und Text"
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1760
msgid "Display window buttons with icons and text"
msgstr "Fensterknöpfe mit Symbolen und Text anzeigen"
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1765
msgid "Tool_bar Style"
msgstr "_Werkzeugleistenstil"
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1767
msgid "Display window buttons using the desktop toolbar setting"
msgstr "Fensterknöpfe mit der Systemeinstellung für Werkzeugleisten anzeigen"
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1775
msgid "Define Views..."
msgstr "Ansichten definieren …"
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1777
msgid "Create or edit views"
msgstr "Ansicht er_stellen oder bearbeiten"
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1782
msgid "Save Custom View..."
msgstr "Benutzerdefinierte Ansicht speichern …"
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1784
msgid "Save current custom view"
msgstr "Aktuelle benutzerdefinierte Ansicht speichern"
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1791
msgid "C_urrent View"
msgstr "A_ktuelle Ansicht"
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1801
msgid "Custom View"
msgstr "Benutzerdefinierte Ansicht"
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1803
msgid "Current view is a customized view"
msgstr "Aktuelle Ansicht ist eine benutzerdefinierte Ansicht"
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1813
msgid "Change the page settings for your current printer"
msgstr "Die Seiteneinstellungen für Ihren aktuellen Drucker ändern"
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:2203
#, c-format
msgid "Switch to %s"
msgstr "Zu %s wechseln"
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:2323
+#, c-format
+msgid "Select view: %s"
+msgstr "Ansicht wählen: %s"
+
+#: ../shell/e-shell-window-actions.c:2423
msgid "Execute these search parameters"
msgstr "Diese Suchparameter ausführen"
@@ -19776,7 +19823,7 @@ msgid "Preparing to quit..."
msgstr "Beenden wird vorbereitet …"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:193
+#: ../shell/main.c:194
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19815,7 +19862,7 @@ msgstr ""
"Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
"gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
-#: ../shell/main.c:217
+#: ../shell/main.c:218
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19823,13 +19870,13 @@ msgstr ""
"Vielen Dank\n"
"Das Evolution-Team\n"
-#: ../shell/main.c:224
+#: ../shell/main.c:225
msgid "Do not tell me again"
msgstr "Nicht mehr anzeigen"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../shell/main.c:304
+#: ../shell/main.c:305
msgid ""
"Start Evolution showing the specified component. Available options are "
"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19837,51 +19884,51 @@ msgstr ""
"Evolution mit einer bestimmten Komponente starten. Mögliche Optionen sind "
"»mail«, »calendar«, »contacts« und »memos«"
-#: ../shell/main.c:308
+#: ../shell/main.c:309
msgid "Apply the given geometry to the main window"
msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
-#: ../shell/main.c:312
+#: ../shell/main.c:313
msgid "Start in online mode"
msgstr "Im Online-Modus starten"
-#: ../shell/main.c:314
+#: ../shell/main.c:315
msgid "Ignore network availability"
msgstr "Verfügbarkeit des Netzwerks ignorieren"
-#: ../shell/main.c:316
+#: ../shell/main.c:317
msgid "Start in \"express\" mode"
msgstr "Im Express-Modus starten"
-#: ../shell/main.c:319
+#: ../shell/main.c:320
msgid "Forcibly shut down Evolution"
msgstr "Evolution zum Herunterfahren zwingen"
-#: ../shell/main.c:322
+#: ../shell/main.c:323
msgid "Send the debugging output of all components to a file."
msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
-#: ../shell/main.c:324
+#: ../shell/main.c:325
msgid "Disable loading of any plugins."
msgstr "Das Laden von allen Plugins deaktivieren."
-#: ../shell/main.c:326
+#: ../shell/main.c:327
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
-#: ../shell/main.c:330
+#: ../shell/main.c:331
msgid "Import URIs or file names given as rest of arguments."
msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
-#: ../shell/main.c:332
+#: ../shell/main.c:333
msgid "Request a running Evolution process to quit"
msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:507 ../shell/main.c:515
msgid "- The Evolution PIM and Email Client"
msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
-#: ../shell/main.c:579
+#: ../shell/main.c:580
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19890,7 +19937,7 @@ msgstr ""
"%s: »--online« und »--offline« können nicht gemeinsam verwendet werden.\n"
" Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
-#: ../shell/main.c:585
+#: ../shell/main.c:586
#, c-format
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
@@ -20313,16 +20360,16 @@ msgid "Trust the authenticity of this certificate"
msgstr "Auf die Authentizität dieses Zertifikats vertrauen"
#: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify email users."
-msgstr "Dieser CA bei der Identifikation von E-Mail-Benutzern vertrauen."
+msgid "Trust this CA to identify _email users."
+msgstr "Dieser CA bei der Identifikation von _E-Mail-Benutzern vertrauen."
#: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
-msgstr "Dieser CA bei der Identifikation von Software-Entwicklern vertrauen."
+msgid "Trust this CA to identify _software developers."
+msgstr "Dieser CA bei der Identifikation von _Software-Entwicklern vertrauen."
#: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify websites."
-msgstr "Dieser Zertifizierungsstelle bei der Website-Identifikation vertrauen."
+msgid "Trust this CA to identify _websites."
+msgstr "Dieser Zertifizierungsstelle bei der _Website-Identifikation vertrauen."
#: ../smime/gui/smime-ui.ui.h:38
msgid "Validity"
@@ -20638,19 +20685,19 @@ msgstr "Mit _Status"
msgid "UTC"
msgstr "UTC"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "Select a Time Zone"
msgstr "Eine Zeitzone wählen"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
msgid "Time Zones"
msgstr "Zeitzonen"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
msgid "Timezone drop-down combination box"
msgstr "Auswahlliste für die Zeitzone"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -20660,7 +20707,7 @@ msgstr ""
"wählen Sie eine Zeitzone.\n"
"Mit der rechten Maustaste können Sie die Ansicht verkleinern."
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
msgid "_Selection"
msgstr "Au_swahl"
@@ -20720,11 +20767,11 @@ msgstr "Die von Evolution _vorgegebene Reihenfolge für Konten verwenden"
msgid "De_fault"
msgstr "_Vorgabe"
-#: ../widgets/misc/e-account-tree-view.c:404
+#: ../widgets/misc/e-account-tree-view.c:407
msgid "Account Name"
msgstr "Kontoname"
-#: ../widgets/misc/e-account-tree-view.c:435
+#: ../widgets/misc/e-account-tree-view.c:438
msgid "Protocol"
msgstr "Protokoll"
@@ -21673,14 +21720,44 @@ msgstr "Klicken"
msgid "sort"
msgstr "Sortieren"
-#: ../widgets/text/e-text.c:2325
+#: ../widgets/text/e-text.c:2328
msgid "Select All"
msgstr "Alle auswählen"
-#: ../widgets/text/e-text.c:2337
+#: ../widgets/text/e-text.c:2340
msgid "Input Methods"
msgstr "Eingabemethoden"
+#~ msgid ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+#~ msgstr ""
+#~ "Bitte geben Sie unten einen bezeichnenden Namen für dieses Konto ein.\n"
+#~ "Dieser Name wird nur zum Anzeigen verwendet."
+
+#~ msgid "Migrating..."
+#~ msgstr "Migrationsvorgang …"
+
+#~ msgid "Migration"
+#~ msgstr "Migration"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "»%s« wird migriert:"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "Ordner werden migriert"
+
+#~ msgid ""
+#~ "The summary format of the Evolution mailbox folders has been moved to "
+#~ "SQLite since Evolution 2.24.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Das Zusammenfassungsformat der Evolution-E-Mail-Ordner hat sich in "
+#~ "Evolution 2.24 verändert.\n"
+#~ "\n"
+#~ "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
+
#~ msgid "Composer load/attach directory"
#~ msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
@@ -22101,9 +22178,6 @@ msgstr "Eingabemethoden"
#~ msgid "Read items marked _private"
#~ msgstr "Gelesene Objekte als _privat kennzeichnen"
-#~ msgid "Subscribe to my _alarms"
-#~ msgstr "Eigene A_larme weitergeben"
-
#~ msgid "Subscribe to my _notifications"
#~ msgstr "Eigene Hin_weise weitergeben"
diff --git a/po/es.po b/po/es.po
index 1c55731799..446397eae0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,14 +12,14 @@
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
#
-#: ../shell/main.c:564
+#: ../shell/main.c:567
msgid ""
msgstr ""
"Project-Id-Version: evolution.master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-10-28 16:23+0000\n"
-"PO-Revision-Date: 2011-10-30 15:19+0100\n"
+"POT-Creation-Date: 2011-11-12 16:04+0000\n"
+"PO-Revision-Date: 2011-11-12 20:12+0100\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -283,7 +283,7 @@ msgid "_Use as it is"
msgstr "_Usar tal cual es"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
#: ../calendar/gui/e-calendar-view.c:2068
msgid "Anniversary"
msgstr "Aniversario"
@@ -294,9 +294,9 @@ msgstr "Aniversario"
#. * which, so long as it has an icon. We're just interested in
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:138
+#: ../shell/main.c:139
msgid "Birthday"
msgstr "Cumpleaños"
@@ -330,9 +330,9 @@ msgstr "Editor de contactos"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
#: ../addressbook/gui/merging/eab-contact-merging.c:390
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:1043
#: ../smime/lib/e-cert.c:833
msgid "Email"
msgstr "Correo-e"
@@ -348,7 +348,7 @@ msgstr "_Nombre completo…"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
#: ../widgets/misc/e-contact-map.c:295
msgid "Home"
msgstr "Domicilio"
@@ -417,8 +417,8 @@ msgstr "Direcciones web"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:1345
#: ../widgets/misc/e-contact-map.c:303
msgid "Work"
msgstr "Trabajo"
@@ -525,42 +525,42 @@ msgid "_Zip/Postal Code:"
msgstr "_Código postal:"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
msgid "Jabber"
msgstr "Jabber"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
msgid "Yahoo"
msgstr "Yahoo"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
msgid "MSN"
msgstr "MSN"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "ICQ"
msgstr "ICQ"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
msgid "GroupWise"
msgstr "GroupWise"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
msgid "Skype"
msgstr "Skype"
@@ -722,7 +722,7 @@ msgid "_List name:"
msgstr "_Nombre de la lista:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:174
msgid "_Select..."
msgstr "_Seleccionar…"
@@ -913,7 +913,7 @@ msgid "Display _All Contacts"
msgstr "Mostrar t_odos los contactos"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
msgid "Assistant"
msgstr "Secretario"
@@ -950,7 +950,7 @@ msgid "Categories"
msgstr "Categorías"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
msgid "Company"
msgstr "Empresa"
@@ -999,22 +999,22 @@ msgid "Journal"
msgstr "Diario"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
msgid "Manager"
msgstr "Jefe"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
msgid "Mobile Phone"
msgstr "Teléfono móvil"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Nickname"
msgstr "Apodo"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
+#: ../addressbook/gui/widgets/eab-contact-display.c:741
msgid "Note"
msgstr "Nota"
@@ -1049,7 +1049,7 @@ msgid "Role"
msgstr "Papel"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
msgid "Spouse"
msgstr "Cónyuge"
@@ -1210,64 +1210,64 @@ msgstr "Enviar un correo a esta dirección"
msgid "Open map"
msgstr "Abrir mapa"
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:530
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "List Members:"
msgstr "Listar miembros:"
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
msgid "Department"
msgstr "Departamento"
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
msgid "Profession"
msgstr "Profesión"
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
msgid "Position"
msgstr "Posición"
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
msgid "Video Chat"
msgstr "Charla por vídeo"
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
#: ../calendar/gui/dialogs/calendar-setup.c:449
#: ../modules/calendar/e-cal-shell-view-actions.c:232
#: ../modules/calendar/e-cal-shell-view-actions.c:261
#: ../modules/calendar/e-cal-shell-view.c:523
-#: ../modules/online-accounts/e-online-accounts-google.c:296
+#: ../modules/online-accounts/e-online-accounts-google.c:302
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
#: ../widgets/misc/e-send-options.c:528
msgid "Calendar"
msgstr "Calendario"
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
#: ../calendar/gui/dialogs/event-editor.c:123
#: ../calendar/gui/dialogs/event-editor.c:350
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "Disponibilidad"
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
msgid "Phone"
msgstr "Teléfono"
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
msgid "Fax"
msgstr "Fax"
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
msgid "Address"
msgstr "Dirección"
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
msgid "Home Page"
msgstr "Página personal"
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
msgid "Web Log"
msgstr "Diario web"
@@ -1275,7 +1275,7 @@ msgstr "Diario web"
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
#: ../capplet/settings/mail-capplet-shell.c:384
#: ../modules/addressbook/e-book-shell-backend.c:120
#: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -1288,23 +1288,23 @@ msgstr "Diario web"
msgid "Personal"
msgstr "Privado"
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
+#: ../addressbook/gui/widgets/eab-contact-display.c:1010
msgid "List Members"
msgstr "Listar miembros"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../addressbook/gui/widgets/eab-contact-display.c:1028
msgid "Job Title"
msgstr "Puesto"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+#: ../addressbook/gui/widgets/eab-contact-display.c:1065
msgid "Home page"
msgstr "Página personal"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+#: ../addressbook/gui/widgets/eab-contact-display.c:1074
msgid "Blog"
msgstr "Diario web"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../addressbook/gui/widgets/eab-contact-display.c:1273
#: ../widgets/misc/e-web-view.c:980
#, c-format
msgid "Click to mail %s"
@@ -1410,19 +1410,19 @@ msgstr "Seleccione la libreta de direcciones"
msgid "list"
msgstr "lista"
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:560
msgid "Move contact to"
msgstr "Mover contacto a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:561
+#: ../addressbook/gui/widgets/eab-gui-util.c:562
msgid "Copy contact to"
msgstr "Copiar contacto a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:564
+#: ../addressbook/gui/widgets/eab-gui-util.c:565
msgid "Move contacts to"
msgstr "Mover contactos a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:566
+#: ../addressbook/gui/widgets/eab-gui-util.c:567
msgid "Copy contacts to"
msgstr "Copiar contactos a"
@@ -2368,7 +2368,7 @@ msgstr "Sonido de recordatorio personalizado"
msgid "Mes_sage:"
msgstr "_Mensaje:"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:79
msgid "Options"
msgstr "Opciones"
@@ -2461,8 +2461,8 @@ msgstr "Tipo:"
msgid "_Type:"
msgstr "_Tipo:"
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:166
+#: ../modules/addressbook/ldap-config.ui.h:28
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:284
msgid "_Name:"
@@ -2496,7 +2496,7 @@ msgstr "Colo_r:"
#: ../calendar/gui/dialogs/calendar-setup.c:448
#: ../calendar/gui/dialogs/calendar-setup.c:460
#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:55
#: ../modules/addressbook/addressbook-config.c:1077
#: ../modules/addressbook/autocompletion-config.c:240
#: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -3503,7 +3503,7 @@ msgstr "Cada"
msgid "Exceptions"
msgstr "Excepciones"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
msgid "Preview"
msgstr "Vista previa"
@@ -7168,82 +7168,83 @@ msgstr "El ID del socket en el que empotrarse"
msgid "socket"
msgstr "socket"
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
msgid "Please enter your full name."
msgstr "Introduzca su nombre completo."
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:77
msgid "Please enter your email address."
msgstr "Introduzca su dirección de correo-e."
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:78
msgid "The email address you have entered is invalid."
msgstr "La dirección de correo-e que ha introducido no es válida."
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:79
msgid "Please enter your password."
msgstr "Introduzca su contraseña."
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:258
+#: ../mail/em-account-editor.c:4992 ../plugins/caldav/caldav-source.c:67
msgid "CalDAV"
msgstr "CalDAV"
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:289
-#: ../modules/online-accounts/e-online-accounts-google.c:362
+#: ../capplet/settings/mail-account-view.c:360
+#: ../capplet/settings/mail-account-view.c:412
+#: ../mail/em-account-editor.c:4874 ../mail/em-account-editor.c:4928
+#: ../modules/online-accounts/e-online-accounts-google.c:295
+#: ../modules/online-accounts/e-online-accounts-google.c:369
#: ../plugins/google-account-setup/google-contacts-source.c:55
#: ../plugins/google-account-setup/google-source.c:87
msgid "Google"
msgstr "Google"
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
msgid "Personal details:"
msgstr "Detalles personales:"
-#: ../capplet/settings/mail-account-view.c:487
+#: ../capplet/settings/mail-account-view.c:486 ../mail/mail-config.ui.h:74
msgid "Name:"
msgstr "Nombre:"
-#: ../capplet/settings/mail-account-view.c:496
+#: ../capplet/settings/mail-account-view.c:495 ../mail/mail-config.ui.h:45
msgid "Email address:"
msgstr "Dirección de correo-e:"
-#: ../capplet/settings/mail-account-view.c:506
+#: ../capplet/settings/mail-account-view.c:505 ../mail/mail-config.ui.h:38
msgid "Details:"
msgstr "Detalles:"
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513 ../mail/mail-config.ui.h:92
msgid "Receiving"
msgstr "Recepción de correo"
-#: ../capplet/settings/mail-account-view.c:521
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:128
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: ../capplet/settings/mail-account-view.c:530
+#: ../capplet/settings/mail-account-view.c:529 ../mail/mail-config.ui.h:127
msgid "Server address:"
msgstr "Dirección del servidor:"
-#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:152
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:547
msgid "Use encryption:"
msgstr "Usar cifrado:"
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:587
msgid "never"
msgstr "nunca"
-#: ../capplet/settings/mail-account-view.c:565
+#: ../capplet/settings/mail-account-view.c:564 ../mail/mail-config.ui.h:112
msgid "Sending"
msgstr "Opciones de envío"
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:606
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
@@ -7254,7 +7255,7 @@ msgstr ""
"averiguar los ajustes. Si no se puede hacer automáticamente necesitará "
"también los detalles del servidor."
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:608
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
@@ -7264,11 +7265,11 @@ msgstr ""
"Intrdúzcalos debajo. Se ha intentado hacer una aproximación inicial con los "
"detallas que ha introducido pero puede que tenga que cambiarlos."
-#: ../capplet/settings/mail-account-view.c:611
+#: ../capplet/settings/mail-account-view.c:610
msgid "You can specify more options to configure the account."
msgstr "Puede especificar más opciones para configurar la cuenta."
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:612
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
@@ -7276,11 +7277,12 @@ msgstr ""
"Ahora se necesitan sus ajustes para el envío de correo. Se intentaron hacer "
"algunas averiguaciones pero debería comprobarlas para asegurarse."
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
msgid "You can specify your default settings for your account."
msgstr "Puede especificar sus ajustes predeterminados para su cuenta."
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2831
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
@@ -7288,100 +7290,103 @@ msgstr ""
"Hora de comprobar los ajustes antes de intentar conectar con el servidor y "
"obtener su correo."
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2290 ../mail/em-account-editor.c:2426
+#: ../capplet/settings/mail-account-view.c:629
+#: ../mail/em-account-editor.c:2821 ../mail/em-account-editor.c:2957
msgid "Identity"
msgstr "Identidad"
-#: ../capplet/settings/mail-account-view.c:630
+#: ../capplet/settings/mail-account-view.c:629
msgid "Next - Receiving mail"
msgstr "Siguiente - Recepción de correo"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Receiving mail"
msgstr "Recepción de correo"
+#: ../capplet/settings/mail-account-view.c:630
#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
msgid "Next - Sending mail"
msgstr "Siguiente - Envío de correo"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Back - Identity"
msgstr "Atrás - Identidad"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Next - Receiving options"
msgstr "Siguiente - Opciones de recepción"
-#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:631
msgid "Receiving options"
msgstr "Opciones de recepción"
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving mail"
msgstr "Siguiente - Recepción de correo"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Sending mail"
msgstr "Envío de correo"
+#: ../capplet/settings/mail-account-view.c:633
#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
msgid "Next - Review account"
msgstr "Siguiente - Revisar la cuenta"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Next - Defaults"
msgstr "Siguiente - Predeterminados"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving options"
msgstr "Atrás - Opciones de recepción"
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3378
+#: ../capplet/settings/mail-account-view.c:634
+#: ../mail/em-account-editor.c:3920
msgid "Defaults"
msgstr "Predeterminados"
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:634
msgid "Back - Sending mail"
msgstr "Atrás - Envío de correo"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Review account"
msgstr "Revisar la cuenta"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Finish"
msgstr "Finalizar"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Back - Sending"
msgstr "Atras - Envío"
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:759
msgid "Setup Google contacts with Evolution"
msgstr "Configurar los contactos de Google con Evolution"
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:760
msgid "Setup Google calendar with Evolution"
msgstr "Configurar el calendario de Google con Evolution"
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:765
+#: ../mail/em-account-editor.c:4673
msgid "You may need to enable IMAP access."
msgstr "Puede que deba activar el acceso IMAP."
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:773
+#: ../mail/em-account-editor.c:4664
msgid "Google account settings:"
msgstr "Configuración de la cuenta de Google:"
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:799
msgid "Setup Yahoo calendar with Evolution"
msgstr "Configurar el calendario de Yahoo con Evolution"
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:803
+#: ../mail/em-account-editor.c:4692
msgid ""
"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 "
@@ -7391,24 +7396,25 @@ msgstr ""
"el nombre del calendario. Confirme y vuelva a introducir el nombre del "
"calendario si no es correcto."
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:812
+#: ../mail/em-account-editor.c:4701
msgid "Yahoo account settings:"
msgstr "Configuración de la cuenta de Yahoo:"
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:826
msgid "Yahoo Calendar name:"
msgstr "Nombre del calendario de Yahoo:"
-#: ../capplet/settings/mail-account-view.c:1098
+#: ../capplet/settings/mail-account-view.c:1013
msgid "Password:"
msgstr "Contraseña:"
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1065
#: ../capplet/settings/mail-settings-view.c:254
msgid "Close Tab"
msgstr "Cerrar pestaña"
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1075
msgid "Account Wizard"
msgstr "Asistente de cuentas"
@@ -7418,7 +7424,7 @@ msgstr "Asistente de cuentas de Evolution"
#. create the local source group
#: ../capplet/settings/mail-capplet-shell.c:376 ../mail/e-mail-local.c:75
-#: ../mail/e-mail-migrate.c:753 ../mail/em-folder-tree-model.c:167
+#: ../mail/em-folder-tree-model.c:167
#: ../modules/addressbook/e-book-shell-backend.c:100
#: ../modules/addressbook/e-book-shell-migrate.c:136
#: ../modules/calendar/e-cal-shell-backend.c:113
@@ -8037,11 +8043,11 @@ msgid "A_dd Condition"
msgstr "Añadir a_cción"
#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:323
+#: ../mail/em-utils.c:296
msgid "Incoming"
msgstr "Entrante"
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:297
msgid "Outgoing"
msgstr "Saliente"
@@ -8167,42 +8173,42 @@ msgid "years"
msgstr "años"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1563 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "Ninguna"
-#: ../mail/em-account-editor.c:946
+#: ../mail/em-account-editor.c:1645 ../mail/em-account-editor.c:4624
+#: ../mail/em-account-editor.c:4640
msgid "Never"
msgstr "Nunca"
-#: ../mail/em-account-editor.c:947
+#: ../mail/em-account-editor.c:1646
msgid "Always"
msgstr "Siempre"
-#: ../mail/em-account-editor.c:948
+#: ../mail/em-account-editor.c:1647
msgid "Ask for each message"
msgstr "Preguntar por cada mensaje"
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
+#: ../mail/em-account-editor.c:2377 ../widgets/misc/e-account-tree-view.c:265
msgctxt "mail-receiving"
msgid "None"
msgstr "Ninguna"
-#: ../mail/em-account-editor.c:2233
-msgid "Fil_e:"
-msgstr "_Archivo:"
-
-#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
+#: ../mail/em-account-editor.c:2778 ../mail/mail-config.ui.h:168
msgid "_Path:"
msgstr "R_uta:"
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2781
+msgid "Fil_e:"
+msgstr "_Archivo:"
+
+#: ../mail/em-account-editor.c:2818
msgid "Mail Configuration"
msgstr "Configuración del correo"
-#: ../mail/em-account-editor.c:2288
+#: ../mail/em-account-editor.c:2819
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -8212,7 +8218,7 @@ msgstr ""
"\n"
"Para comenzar, pulse «Continuar»."
-#: ../mail/em-account-editor.c:2291
+#: ../mail/em-account-editor.c:2822
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -8222,19 +8228,19 @@ msgstr ""
"hace falta que los rellene, a menos que quiera incluir esta información en "
"el correo-e que envíe."
-#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
+#: ../mail/em-account-editor.c:2824 ../mail/em-account-editor.c:3016
msgid "Receiving Email"
msgstr "Recepción de correo"
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2825
msgid "Please configure the following account settings."
msgstr "Configure las siguientes opciones de la cuenta."
-#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
+#: ../mail/em-account-editor.c:2827 ../mail/em-account-editor.c:3626
msgid "Sending Email"
msgstr "Envío de correo"
-#: ../mail/em-account-editor.c:2297
+#: ../mail/em-account-editor.c:2828
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -8243,23 +8249,16 @@ msgstr ""
"seguro, pregúntele a su administrador de sistemas o a su Proveedor de "
"Servicios de Internet."
-#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Información de la cuenta"
-
-#: ../mail/em-account-editor.c:2300
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
-"Este nombre se usará sólo para mostrarlo."
+#: ../mail/em-account-editor.c:2830
+#| msgid "Review account"
+msgid "Review Account"
+msgstr "Revisar cuenta"
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2835
msgid "Done"
msgstr "Hecho"
-#: ../mail/em-account-editor.c:2305
+#: ../mail/em-account-editor.c:2836
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8273,28 +8272,58 @@ msgstr ""
"\n"
"Pulse «Aplicar» para guardar su configuración."
-#: ../mail/em-account-editor.c:2844
+#: ../mail/em-account-editor.c:3381
msgid "Check for _new messages every"
msgstr "Comprobar si hay mensajes _nuevos cada"
-#: ../mail/em-account-editor.c:2852
+#: ../mail/em-account-editor.c:3389
msgid "minu_tes"
msgstr "minuto_s"
-#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
+#: ../mail/em-account-editor.c:4062 ../mail/mail-config.ui.h:108
msgid "Security"
msgstr "Seguridad"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:4117 ../mail/em-account-editor.c:4219
msgid "Receiving Options"
msgstr "Opciones de recepción"
-#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
+#: ../mail/em-account-editor.c:4118 ../mail/em-account-editor.c:4220
msgid "Checking for New Messages"
msgstr "Comprobando si hay mensajes nuevos"
+#: ../mail/em-account-editor.c:4620 ../mail/em-account-editor.c:4636
+#| msgid "Always"
+msgid "Always(SSL)"
+msgstr "Siempre (SSL)"
+
+#: ../mail/em-account-editor.c:4622 ../mail/em-account-editor.c:4638
+#| msgid "Whenever Possible"
+msgid "When possible(TLS)"
+msgstr "Cuando sea posible (TLS)"
+
+#: ../mail/em-account-editor.c:4654
+#| msgid "Setup Google contacts with Evolution"
+msgid "Setup Google con_tacts with Evolution"
+msgstr "Configurar los con_tactos de Google con Evolution"
+
+#: ../mail/em-account-editor.c:4655
+#| msgid "Setup Google calendar with Evolution"
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "Configurar el ca_lendario de Google con Evolution"
+
+#: ../mail/em-account-editor.c:4688
+#| msgid "Setup Yahoo calendar with Evolution"
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "Configurar el calendario de _Yahoo con Evolution"
+
+#: ../mail/em-account-editor.c:4714
+#| msgid "Yahoo Calendar name:"
+msgid "Yahoo Calen_dar name:"
+msgstr "Nombre del calen_dario de Yahoo:"
+
#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
@@ -8491,36 +8520,7 @@ msgstr "Correo enviado"
msgid "Templates"
msgstr "Plantillas"
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "Migrando…"
-
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "Migración"
-
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando «%s»:"
-
-#: ../mail/e-mail-migrate.c:729
-msgid "Migrating Folders"
-msgstr "Migrando carpetas"
-
-#: ../mail/e-mail-migrate.c:730
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El formato de resúmenes de las carpetas del buzón de Evolution se ha movido "
-"a sqlite desde Evolution 2.24.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetas…"
-
-#: ../mail/e-mail-migrate.c:1525
+#: ../mail/e-mail-migrate.c:1177
#, c-format
msgid "Unable to create local mail folders at '%s': %s"
msgstr "No se pueden crear las carpetas de correo local en: «%s»: %s"
@@ -9447,7 +9447,7 @@ msgstr "no está configurado"
msgid "is set"
msgstr "está configurado"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
msgid "Junk"
msgstr "SPAM"
@@ -9662,8 +9662,8 @@ msgstr "Copiando los mensajes a la carpeta %s"
msgid "Cannot drop message(s) into toplevel store"
msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
-#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1122
-#: ../mail/mail-vfolder.c:1234 ../widgets/misc/e-account-tree-view.c:100
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1062
+#: ../mail/mail-vfolder.c:1174 ../widgets/misc/e-account-tree-view.c:100
#: ../widgets/misc/e-account-tree-view.c:301
#: ../widgets/misc/e-account-tree-view.c:927
#: ../widgets/misc/e-account-tree-view.c:986
@@ -10030,11 +10030,11 @@ msgstr[1] "¿Está seguro de que quiere abrir %d mensajes a la vez?"
msgid "_Do not show this message again"
msgstr "_No mostrar otra vez este mensaje."
-#: ../mail/em-utils.c:335
+#: ../mail/em-utils.c:308
msgid "Message Filters"
msgstr "Filtros de mensajes"
-#: ../mail/em-utils.c:920
+#: ../mail/em-utils.c:893
#, c-format
msgid "Messages from %s"
msgstr "Mensajes de %s"
@@ -10409,7 +10409,7 @@ msgstr ""
msgid "Enable/disable caret mode"
msgstr "Activar/desactivar modo cursor"
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:47
msgid "Encode file names in an Outlook/GMail way"
msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
@@ -11532,6 +11532,10 @@ msgstr[1] ""
"«%s» debiado a la carpeta eliminada\n"
"«%s»."
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Información de la cuenta"
+
#: ../mail/mail-config.ui.h:2
msgid "Add Ne_w Signature..."
msgstr "Añadir firma _nueva…"
@@ -11671,357 +11675,367 @@ msgstr "Eliminar correo-e"
msgid "Delete junk messages on e_xit"
msgstr "Eliminar los mensajes SPAM al _salir"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Firmar digitalmente los mensajes s_alientes (por omisión)"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
msgid "Displayed Message Headers"
msgstr "Cabeceras mostradas del mensaje"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr ""
"_No marcar los mensajes como basura si el remitente está en mi libreta de "
"direcciones"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "No entrecomillar"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "Carpeta de _borradores:"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "Dir_ección de correo-e:"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
msgid "Empty trash folders on e_xit"
msgstr "Vaciar _papelera al salir"
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
msgid "Encry_ption certificate:"
msgstr "Certificado de ci_frado:"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
msgid "Encrypt out_going messages (by default)"
msgstr "Cifrar mensajes _salientes (por omisión)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "Cifrado:"
+
+#: ../mail/mail-config.ui.h:51
msgid "F_all back to threading messages by subject"
msgstr "Agrupar los mensajes por _asunto"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed Width Font:"
msgstr "Tipografía de anchura _fija:"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
msgid "Format messages in _HTML"
msgstr "Dar formato _HTML a los mensajes"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
msgid "Full Nam_e:"
msgstr "Nombre co_mpleto:"
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:56
msgid "Group Reply goes only to mailing list, if possible"
msgstr "Responder al grupo sólo envía a la lista de correo, si es posible"
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
msgid "HTML Messages"
msgstr "Mensajes HTML"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
msgid "H_TTP Proxy:"
msgstr "Proxy H_TTP:"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "Header content"
msgstr "Contenido de la cabecera"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Header name"
msgstr "Nombre de la cabecera"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
msgid "Headers"
msgstr "Cabeceras"
# Esta cadena debe permanecer así
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
msgid "Highlight _quotations with"
msgstr "Resaltar texto _citado con este color:"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
msgid "Ignore Reply-To: for mailing lists"
msgstr "Ignorar «Responder a:» para listas de correo"
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:64
msgid "Inline"
msgstr "En línea"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
msgid "Inline (Outlook style)"
msgstr "En línea (estilo Outlook)"
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:67 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Etiquetas"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
msgid "Languages Table"
msgstr "Tabla de idiomas"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
msgid "Loading Images"
msgstr "Cargando imágenes"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
msgid "Mail Headers Table"
msgstr "Tabla de cabeceras de correo"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
msgid "Mailbox location"
msgstr "Dirección del buzón"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:72
msgid "Message Display"
msgstr "Mostrado de mensajes"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
msgid "Message Receipts"
msgstr "Destinatarios del mensaje"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:75
msgid "No _Proxy for:"
msgstr "Sin _proxy para:"
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+#: ../mail/mail-config.ui.h:76 ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
msgstr "Sin cifrado"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:77
msgid "Option is ignored if a match for custom junk headers is found."
msgstr ""
"Esta opción se omitirá si se encuentra alguna coincidencia para una cabecera "
"de SPAM personalizada."
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:78
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "Información opcional"
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:80
msgid "Or_ganization:"
msgstr "Organi_zación:"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:81
msgid "PGP/GPG _Key ID:"
msgstr "ID de c_lave GPG/PGP:"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:82
msgid "Pass_word:"
msgstr "_Contraseña:"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:83
+#| msgid "Personal details:"
+msgid "Personal Details:"
+msgstr "Detalles personales:"
+
+#: ../mail/mail-config.ui.h:84
#: ../modules/calendar/e-calendar-preferences.ui.h:21
msgid "Pick a color"
msgstr "Elija un color"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
msgid "Port:"
msgstr "Puerto:"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
msgid "Proxy Settings"
msgstr "Ajustes del proxy"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
msgid "Quoted"
msgstr "Citado"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
msgid "Re_member password"
msgstr "_Recordar contraseña"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
msgid "Re_ply-To:"
msgstr "Res_ponder a:"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:93
msgid "Remember _password"
msgstr "Recordar contrase_ña"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:94
msgid "Replies and Forwards"
msgstr "Respuestas y reenvíos"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:95
msgid "Required Information"
msgstr "Información requerida"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:96
msgid "SHA1"
msgstr "SHA1"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:97
msgid "SHA256"
msgstr "SHA256"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:98
msgid "SHA384"
msgstr "SHA384"
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:99
msgid "SHA512"
msgstr "SHA512"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:100
msgid "SOC_KS Proxy:"
msgstr "Proxy SOC_KS:"
-#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:101 ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "Cifrado SSL"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
msgid "SSL is not supported in this build of Evolution"
msgstr "Esta compilación de Evolution no soporta SSL"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
msgid "S_earch for sender photograph only in local address books"
msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
msgid "S_elect..."
msgstr "S_eleccionar…"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
msgid "S_end message receipts:"
msgstr "_Enviar confirmaciones de mensajes:"
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:106
msgid "S_tandard Font:"
msgstr "Tipografía _estándar:"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
msgid "Secure MIME (S/MIME)"
msgstr "MIME seguro (S/MIME)"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
msgid "Select HTML fixed width font"
msgstr "Selecciona letra de anchura fija para HTML"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
msgid "Select HTML variable width font"
msgstr "Selecciona letra de anchura variable en HTML"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
msgid "Sender Photograph"
msgstr "Foto del remitente"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:114
msgid "Sending a _private reply to a mailing list message"
msgstr "Enviando una respuesta priva_da a una lista de correo"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:116
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr ""
"Enviando un mensaje con destinata_rios no introducidos como direcciones de "
"correo"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
msgid "Sending a message with an _empty subject line"
msgstr "Enviando un correo con una línea de asunto _vacía"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:120
msgid "Sending a message with only _Bcc recipients defined"
msgstr "Enviando la respuesta sólo a los destinatarios definidos en _Cco"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
msgid "Sending a reply to a large _number of recipients"
msgstr "Enviando la respuesta a un gran _número de destinatarios"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
msgid "Sent _Messages Folder:"
msgstr "Carpeta de _mensajes enviados:"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
msgid "Ser_ver requires authentication"
msgstr "El ser_vidor requiere autenticación"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
msgid "Server Configuration"
msgstr "Configuración del servidor"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:126
msgid "Server _Type:"
msgstr "_Tipo de servidor:"
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:129
msgid "Set custom junk header"
msgstr "Establecer cabecera de SPAM personalizada"
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:130
msgid "Si_gning algorithm:"
msgstr "Algoritmo de _firma:"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:131
msgid "Sig_natures"
msgstr "_Firmas"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:132
msgid "Sig_ning certificate:"
msgstr "Certificado de _firma:"
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:133
msgid "Signat_ure:"
msgstr "_Firma:"
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:134
msgid "Signatures"
msgstr "Firmas"
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:135
msgid "Signing _algorithm:"
msgstr "_Algoritmo de firma:"
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:136
msgid "Special Folders"
msgstr "Carpetas especiales"
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:137
msgid "Spell Checking"
msgstr "Ortografía"
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:138
msgid "Start _typing at the bottom on replying"
msgstr "Comenzar a _escribir en la parte final al responder"
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:139
msgid "Start up"
msgstr "Inicio"
-#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:140 ../modules/addressbook/ldap-config.ui.h:21
msgid "TLS encryption"
msgstr "Cifrado TLS"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:141
msgid "T_ype:"
msgstr "T_ipo:"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -12029,7 +12043,7 @@ msgstr ""
"La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
"hay instalado un diccionario."
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12039,7 +12053,7 @@ msgstr ""
"El nombre que especifique se usará únicamente \n"
"para mostrarlo por pantalla. "
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:146
msgid ""
"To help avoid email accidents and embarrassments, ask for confirmation "
"before taking the following checkmarked actions:"
@@ -12047,7 +12061,7 @@ msgstr ""
"Para evitar accidentes y situaciones embarazosas con el correo-e, pedir "
"confirmación antes de realizar las siguientes acciones marcadas:"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12055,142 +12069,152 @@ msgstr ""
"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
"Por ejemplo: «Trabajo» o «Personal»"
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:149
msgid "Us_ername:"
msgstr "_Usuario:"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:150
msgid "Use Authe_ntication"
msgstr "Usar aute_nticación"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:151
msgid "User _Name:"
msgstr "_Nombre de usuario:"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
msgid "_Add Signature"
msgstr "_Añadir firma"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
msgid "_Always load images from the Internet"
msgstr "_Siempre cargar las imágenes desde Internet"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
msgid "_Authentication Type"
msgstr "Tipo de _autenticación"
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:156
msgid "_Direct connection to the Internet"
msgstr "Conexión _directa a Internet"
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr ""
"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
msgid "_Forward style:"
msgstr "_Estilo de reenvío:"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
msgid "_Junk Folder:"
msgstr "Carpeta de _SPAM:"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
msgid "_Keep signature above the original message on replying"
msgstr "_Mantener la firma por encima del mensaje original al responder"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
msgid "_Languages"
msgstr "_Idiomas"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
msgid "_Load images only in messages from contacts"
msgstr "Cargar i_mágenes en los mensajes de mis contactos"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
msgid "_Lookup in local address book only"
msgstr "_Buscar sólo en la libreta de direcciones local"
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
msgid "_Make this my default account"
msgstr "_Hacer que ésta sea mi cuenta predeterminada"
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:165
msgid "_Manual proxy configuration:"
msgstr "Configuración _manual del proxy:"
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
msgid "_Never load images from the Internet"
msgstr "_Nunca cargar imágenes desde Internet"
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
msgid "_Port:"
msgstr "_Puerto:"
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:170
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:171
msgid "_Reply style:"
msgstr "Estilo de _respuesta:"
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:172
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:173
msgid "_Secure HTTP Proxy:"
msgstr "Proxy HTTP _seguro:"
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:175
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "_Servidor:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:177
msgid "_Show animated images"
msgstr "_Mostrar las imágenes animadas"
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:178
msgid "_Show the photograph of sender in the message preview"
msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:179
msgid "_Trash Folder:"
msgstr "Carpeta de p_apelera:"
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:180
msgid "_Use secure connection:"
msgstr "Usar _conexión segura:"
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:181
msgid "_Use system defaults"
msgstr "_Usar los valores predeterminados del sistema"
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:182
msgid "_Use the same fonts as other applications"
msgstr "_Usar las mismas tipografías que en otras aplicaciones"
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:183 ../smime/gui/smime-ui.ui.h:48
msgid "a"
msgstr "am"
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:49
msgid "b"
msgstr "por"
# Esta traducción debe mantenerse así
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:185
msgid "color"
msgstr "color"
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:186
msgid "description"
msgstr "descripción"
+#: ../mail/mail-config.ui.h:187
+#| msgid "Label"
+msgid "label"
+msgstr "etiqueta"
+
+#: ../mail/mail-config.ui.h:188
+#| msgid "None"
+msgid "none"
+msgstr "ninguna"
+
#: ../mail/mail-dialogs.ui.h:1
msgid "All active remote folders"
msgstr "Todas las carpetas remotas activas"
@@ -12349,17 +12373,17 @@ msgstr "Almacenando cuenta «%s»"
msgid "Refreshing folder '%s'"
msgstr "Actualizando carpeta «%s»"
-#: ../mail/mail-ops.c:1464
+#: ../mail/mail-ops.c:1483
#, c-format
msgid "Expunging folder '%s'"
msgstr "Compactando carpeta «%s»"
-#: ../mail/mail-ops.c:1549
+#: ../mail/mail-ops.c:1568
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Vaciando papelera en «%s»"
-#: ../mail/mail-ops.c:1651
+#: ../mail/mail-ops.c:1670
#, c-format
msgid "Disconnecting %s"
msgstr "Desconectando de «%s»"
@@ -12423,7 +12447,7 @@ msgstr "Actualizando carpetas de búsqueda para «%s»: %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
+#: ../mail/mail-vfolder.c:618
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12441,11 +12465,11 @@ msgstr[1] ""
"«%s» se han modificado para dar cuenta de la carpeta eliminada\n"
"«%s»."
-#: ../mail/mail-vfolder.c:1309
+#: ../mail/mail-vfolder.c:1249
msgid "Edit Search Folder"
msgstr "Editar carpeta de búsqueda"
-#: ../mail/mail-vfolder.c:1418
+#: ../mail/mail-vfolder.c:1358
msgid "New Search Folder"
msgstr "Carpeta de búsqueda nueva"
@@ -13302,7 +13326,7 @@ msgid "Follow-up"
msgstr "Seguimiento"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5094
msgid "Generating message list"
msgstr "Generando la lista de mensajes"
@@ -13652,10 +13676,10 @@ msgstr "Crea una libreta de direcciones nueva"
#. Create the contacts group
#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/addressbook/e-book-shell-view.c:402
#: ../modules/calendar/e-cal-shell-backend.c:115
#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../modules/online-accounts/e-online-accounts-google.c:376
msgid "Contacts"
msgstr "Contactos"
@@ -13911,23 +13935,23 @@ msgstr "G_uardar como vCard…"
msgid "Save selected contacts as a vCard"
msgstr "Guardar los contactos seleccionados como VCard"
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
msgid "_Forward Contacts"
msgstr "_Reenviar contactos"
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
msgid "_Forward Contact"
msgstr "_Reenviar contacto"
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
msgid "_Send Message to Contacts"
msgstr "_Enviar un correo a los contactos"
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
msgid "_Send Message to List"
msgstr "_Enviar un correo a la lista"
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
msgid "_Send Message to Contact"
msgstr "_Enviar un correo al contacto"
@@ -13980,17 +14004,17 @@ msgid "One"
msgstr "Uno"
#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "S_earch filter:"
+msgstr "_Filtro de búsqueda:"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search Filter"
msgstr "Filtro de búsqueda"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _base:"
msgstr "_Base de búsqueda:"
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "_Filtro de búsqueda:"
-
#: ../modules/addressbook/ldap-config.ui.h:16
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14000,40 +14024,48 @@ msgstr ""
"modifica, la búsqueda predeterminada se realizará sobre la clase de objetos "
"de tipo «person»."
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Ser_ver:"
+msgstr "_Servidor:"
+
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Sub"
msgstr "Sub"
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "Supported Search Bases"
msgstr "Bases de búsqueda soportadas"
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Use secure _connection:"
+msgstr "Usar _conexión segura:"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "Using distinguished name (DN)"
msgstr "Usando Nombre distintivo (DN)"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "Using email address"
msgstr "Usando dirección de correo-e"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Download limit:"
msgstr "Límite de _descarga:"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
msgid "_Find Possible Search Bases"
msgstr "_Buscar bases de búsqueda posibles"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Login method:"
msgstr "Método de _inicio de sesión:"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Search scope:"
msgstr "Á_mbito de búsqueda:"
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Timeout:"
msgstr "_Tiempo de expiración:"
@@ -15744,37 +15776,37 @@ msgstr "Editor de cuentas"
msgid "%d attached messages"
msgstr "%d mensajes adjuntos"
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:192
msgctxt "New"
msgid "_Mail Message"
msgstr "_Mensaje de correo"
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:194
msgid "Compose a new mail message"
msgstr "Redacta un mensaje de correo nuevo"
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:202
msgctxt "New"
msgid "Mail _Folder"
msgstr "_Carpeta de correo"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:204
msgid "Create a new mail folder"
msgstr "Crea una carpeta de correo nueva"
-#: ../modules/mail/e-mail-shell-backend.c:414
+#: ../modules/mail/e-mail-shell-backend.c:409
msgid "Mail Accounts"
msgstr "Cuentas de correo"
-#: ../modules/mail/e-mail-shell-backend.c:422
+#: ../modules/mail/e-mail-shell-backend.c:417
msgid "Mail Preferences"
msgstr "Opciones de correo"
-#: ../modules/mail/e-mail-shell-backend.c:430
+#: ../modules/mail/e-mail-shell-backend.c:425
msgid "Composer Preferences"
msgstr "Preferencias del editor"
-#: ../modules/mail/e-mail-shell-backend.c:438
+#: ../modules/mail/e-mail-shell-backend.c:433
msgid "Network Preferences"
msgstr "Preferencias de red"
@@ -16384,12 +16416,6 @@ msgid "Welcome"
msgstr "Bienvenido"
#: ../modules/startup-wizard/evolution-startup-wizard.c:508
-#| msgid ""
-#| "Welcome to Evolution. The next few screens will allow Evolution to "
-#| "connect to your email accounts, and to import files from other "
-#| "applications. \n"
-#| "\n"
-#| "Please click the \"Forward\" button to continue. "
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
"to your email accounts, and to import files from other applications."
@@ -17333,12 +17359,12 @@ msgstr "Imagen en línea"
msgid "View image attachments directly in mail messages."
msgstr "Ver los adjuntos directamente en los mensajes de correo."
-#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.c:335
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "Cabeceras personalizadas"
-#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.c:347
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "Cabeceras IMAP"
@@ -19203,7 +19229,7 @@ msgstr "La barra lateral es visible"
msgid "Skip development warning dialog"
msgstr "Saltar el diálogo de advertencia de desarrollo"
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:311
msgid "Start in offline mode"
msgstr "Iniciar en modo desconectado"
@@ -19716,7 +19742,7 @@ msgid "Preparing to quit..."
msgstr "Preparándose para salir…"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:193
+#: ../shell/main.c:194
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19752,7 +19778,7 @@ msgstr ""
"Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
"esperamos su contribución.\n"
-#: ../shell/main.c:217
+#: ../shell/main.c:218
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19760,13 +19786,13 @@ msgstr ""
"Gracias\n"
"El equipo de Evolution\n"
-#: ../shell/main.c:224
+#: ../shell/main.c:225
msgid "Do not tell me again"
msgstr "No preguntarme más veces"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../shell/main.c:304
+#: ../shell/main.c:305
msgid ""
"Start Evolution showing the specified component. Available options are "
"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19774,51 +19800,51 @@ msgstr ""
"Iniciar Evolution mostrando el componente especificado. Las opciones "
"disponibles son «mail», «calendar», «contacts», «tasks» y «memos»."
-#: ../shell/main.c:308
+#: ../shell/main.c:309
msgid "Apply the given geometry to the main window"
msgstr "Aplicar la geometría proporcionada a la ventana principal"
-#: ../shell/main.c:312
+#: ../shell/main.c:313
msgid "Start in online mode"
msgstr "Iniciar en modo conectado"
-#: ../shell/main.c:314
+#: ../shell/main.c:315
msgid "Ignore network availability"
msgstr "Ignorar la disponibilidad de la red"
-#: ../shell/main.c:316
+#: ../shell/main.c:317
msgid "Start in \"express\" mode"
msgstr "Iniciar en modo «exprés»"
-#: ../shell/main.c:319
+#: ../shell/main.c:320
msgid "Forcibly shut down Evolution"
msgstr "Forzar el cierre de Evolution"
-#: ../shell/main.c:322
+#: ../shell/main.c:323
msgid "Send the debugging output of all components to a file."
msgstr "Envía la salida de depuración de todos los componentes a un archivo."
-#: ../shell/main.c:324
+#: ../shell/main.c:325
msgid "Disable loading of any plugins."
msgstr "Desactivar la carga de cualquier complemento."
-#: ../shell/main.c:326
+#: ../shell/main.c:327
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Desactivar la vista previa del correo, contactos y tareas."
-#: ../shell/main.c:330
+#: ../shell/main.c:331
msgid "Import URIs or file names given as rest of arguments."
msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
-#: ../shell/main.c:332
+#: ../shell/main.c:333
msgid "Request a running Evolution process to quit"
msgstr "Solicitar que el proceso de ejecución de Evolution finalice"
-#: ../shell/main.c:506 ../shell/main.c:514
+#: ../shell/main.c:507 ../shell/main.c:515
msgid "- The Evolution PIM and Email Client"
msgstr "El cliente de correo-e y GIP Evolution"
-#: ../shell/main.c:577
+#: ../shell/main.c:580
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19827,7 +19853,7 @@ msgstr ""
"%s: --online y --offline no se pueden usar a la vez.\n"
" Ejecute «%s --help» para obtener más información\n"
-#: ../shell/main.c:583
+#: ../shell/main.c:586
#, c-format
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
@@ -21614,6 +21640,37 @@ msgstr "Seleccionar todo"
msgid "Input Methods"
msgstr "Métodos de entrada"
+#~ msgid ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+#~ msgstr ""
+#~ "Introduzca un nombre descriptivo para esta cuenta en el espacio de "
+#~ "abajo.\n"
+#~ "Este nombre se usará sólo para mostrarlo."
+
+#~ msgid "Migrating..."
+#~ msgstr "Migrando…"
+
+#~ msgid "Migration"
+#~ msgstr "Migración"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "Migrando «%s»:"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "Migrando carpetas"
+
+#~ msgid ""
+#~ "The summary format of the Evolution mailbox folders has been moved to "
+#~ "SQLite since Evolution 2.24.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "El formato de resúmenes de las carpetas del buzón de Evolution se ha "
+#~ "movido a sqlite desde Evolution 2.24.\n"
+#~ "\n"
+#~ "Tenga paciencia mientras Evolution migra sus carpetas…"
+
#~ msgid "Composer load/attach directory"
#~ msgstr "Carpeta de carga/adjuntos del editor"
@@ -27663,9 +27720,6 @@ msgstr "Métodos de entrada"
#~ msgid "Find Possible Search Bases"
#~ msgstr "Buscar bases de búsqueda posibles"
-#~ msgid "Whenever Possible"
-#~ msgstr "Cuando sea posible"
-
#~ msgid "_Add Address Book"
#~ msgstr "_Añadir libreta de direcciones"
diff --git a/po/gl.po b/po/gl.po
index d06e6f54e4..fff1739ed6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
# Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011.
# Fran Dieguez <frandieguez@gnome.org>, 2010, 2011.
#
-#: ../shell/main.c:566
+#: ../shell/main.c:567
msgid ""
msgstr ""
"Project-Id-Version: evolution-master-po-gl-53747.merged\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-18 00:21+0200\n"
-"PO-Revision-Date: 2011-10-18 00:21+0200\n"
+"POT-Creation-Date: 2011-11-13 18:39+0100\n"
+"PO-Revision-Date: 2011-11-13 18:40+0100\n"
"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
"Language: gl\n"
@@ -282,7 +282,7 @@ msgid "_Use as it is"
msgstr "_Usar tal como está"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
#: ../calendar/gui/e-calendar-view.c:2068
msgid "Anniversary"
msgstr "Aniversario"
@@ -293,9 +293,9 @@ msgstr "Aniversario"
#. * which, so long as it has an icon. We're just interested in
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:138
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../shell/main.c:139
msgid "Birthday"
msgstr "Aniversario"
@@ -329,9 +329,9 @@ msgstr "Editor de contactos"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
#: ../addressbook/gui/merging/eab-contact-merging.c:390
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:1043
#: ../smime/lib/e-cert.c:833
msgid "Email"
msgstr "Correo electrónico"
@@ -347,7 +347,7 @@ msgstr "_Nome completo…"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
#: ../widgets/misc/e-contact-map.c:295
msgid "Home"
msgstr "Particular"
@@ -416,8 +416,8 @@ msgstr "Enderezos web"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:1345
#: ../widgets/misc/e-contact-map.c:303
msgid "Work"
msgstr "Traballo"
@@ -524,42 +524,42 @@ msgid "_Zip/Postal Code:"
msgstr "_Código Postal:"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
msgid "Jabber"
msgstr "Jabber"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
msgid "Yahoo"
msgstr "Yahoo"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
msgid "MSN"
msgstr "MSN"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "ICQ"
msgstr "ICQ"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
msgid "GroupWise"
msgstr "GroupWise"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
msgid "Skype"
msgstr "Skype"
@@ -721,7 +721,7 @@ msgid "_List name:"
msgstr "Nome da _lista:"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:174
msgid "_Select..."
msgstr "_Seleccionar…"
@@ -912,7 +912,7 @@ msgid "Display _All Contacts"
msgstr "Mostrar _todos os contactos"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
msgid "Assistant"
msgstr "Secretaria/o"
@@ -949,7 +949,7 @@ msgid "Categories"
msgstr "Categorías"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
msgid "Company"
msgstr "Empresa"
@@ -998,22 +998,22 @@ msgid "Journal"
msgstr "Xornal"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
msgid "Manager"
msgstr "Director"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
msgid "Mobile Phone"
msgstr "Teléfono móbil"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Nickname"
msgstr "Alcume"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
+#: ../addressbook/gui/widgets/eab-contact-display.c:741
msgid "Note"
msgstr "Nota"
@@ -1048,7 +1048,7 @@ msgid "Role"
msgstr "Función"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
msgid "Spouse"
msgstr "Cónxuxe"
@@ -1209,64 +1209,64 @@ msgstr "Enviar unha mensaxe a este enderezo"
msgid "Open map"
msgstr "Abrir mapa"
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:530
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "List Members:"
msgstr "Membros da lista:"
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
msgid "Department"
msgstr "Departamento"
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
msgid "Profession"
msgstr "Profesión"
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
msgid "Position"
msgstr "Cargo"
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
msgid "Video Chat"
msgstr "Videoconferencia"
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
#: ../calendar/gui/dialogs/calendar-setup.c:449
#: ../modules/calendar/e-cal-shell-view-actions.c:232
#: ../modules/calendar/e-cal-shell-view-actions.c:261
#: ../modules/calendar/e-cal-shell-view.c:523
-#: ../modules/online-accounts/e-online-accounts-google.c:296
+#: ../modules/online-accounts/e-online-accounts-google.c:302
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
#: ../widgets/misc/e-send-options.c:528
msgid "Calendar"
msgstr "Calendario"
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
#: ../calendar/gui/dialogs/event-editor.c:123
#: ../calendar/gui/dialogs/event-editor.c:350
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "Dispoñibilidade"
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
msgid "Phone"
msgstr "Teléfono"
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
msgid "Fax"
msgstr "Fax"
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
msgid "Address"
msgstr "Enderezo"
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
msgid "Home Page"
msgstr "Páxina persoal"
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
msgid "Web Log"
msgstr "Diario web"
@@ -1274,8 +1274,8 @@ msgstr "Diario web"
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../capplet/settings/mail-capplet-shell.c:384
#: ../modules/addressbook/e-book-shell-backend.c:120
#: ../modules/addressbook/e-book-shell-migrate.c:144
#: ../modules/calendar/e-cal-shell-backend.c:138
@@ -1287,23 +1287,23 @@ msgstr "Diario web"
msgid "Personal"
msgstr "Persoal"
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
+#: ../addressbook/gui/widgets/eab-contact-display.c:1010
msgid "List Members"
msgstr "Membros da lista"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../addressbook/gui/widgets/eab-contact-display.c:1028
msgid "Job Title"
msgstr "Posto de traballo"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+#: ../addressbook/gui/widgets/eab-contact-display.c:1065
msgid "Home page"
msgstr "Páxina web"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+#: ../addressbook/gui/widgets/eab-contact-display.c:1074
msgid "Blog"
msgstr "Blogue"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../addressbook/gui/widgets/eab-contact-display.c:1273
#: ../widgets/misc/e-web-view.c:980
#, c-format
msgid "Click to mail %s"
@@ -1410,19 +1410,19 @@ msgstr "Seleccionar a axenda de enderezos"
msgid "list"
msgstr "lista"
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:560
msgid "Move contact to"
msgstr "Mover o contacto a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:561
+#: ../addressbook/gui/widgets/eab-gui-util.c:562
msgid "Copy contact to"
msgstr "Copiar o contacto a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:564
+#: ../addressbook/gui/widgets/eab-gui-util.c:565
msgid "Move contacts to"
msgstr "Mover os contactos a"
-#: ../addressbook/gui/widgets/eab-gui-util.c:566
+#: ../addressbook/gui/widgets/eab-gui-util.c:567
msgid "Copy contacts to"
msgstr "Copiar os contactos a"
@@ -1500,7 +1500,7 @@ msgstr "Non foi posíbel obter unha lista das axendas de enderezos: %s"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:662
+#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:666
#: ../plugins/caldav/caldav-browse-server.c:220
#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
#: ../smime/gui/certificate-manager.c:313
@@ -2375,7 +2375,7 @@ msgstr "Son de recordatorio personalizado"
msgid "Mes_sage:"
msgstr "Mensa_xe:"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:79
msgid "Options"
msgstr "Opcións"
@@ -2468,8 +2468,8 @@ msgstr "Tipo:"
msgid "_Type:"
msgstr "_Tipo:"
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:166
+#: ../modules/addressbook/ldap-config.ui.h:28
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:284
msgid "_Name:"
@@ -2503,11 +2503,11 @@ msgstr "Co_r:"
#: ../calendar/gui/dialogs/calendar-setup.c:448
#: ../calendar/gui/dialogs/calendar-setup.c:460
#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:55
#: ../modules/addressbook/addressbook-config.c:1077
#: ../modules/addressbook/autocompletion-config.c:240
#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3038
+#: ../plugins/itip-formatter/itip-formatter.c:3039
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
@@ -3517,7 +3517,7 @@ msgstr "Cada"
msgid "Exceptions"
msgstr "Excepcións"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
msgid "Preview"
msgstr "Vista previa"
@@ -3956,7 +3956,7 @@ msgstr "Non"
#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
#: ../modules/plugin-manager/evolution-plugin-manager.c:101
#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2690
+#: ../plugins/itip-formatter/itip-formatter.c:2691
msgid "Unknown"
msgstr "Descoñecido"
@@ -3976,14 +3976,14 @@ msgstr "Abrindo %s"
#: ../calendar/gui/e-cal-model.c:3416
#: ../calendar/gui/e-meeting-list-view.c:214
#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2679
msgid "Accepted"
msgstr "Aceptado"
#: ../calendar/gui/e-cal-model.c:3417
#: ../calendar/gui/e-meeting-list-view.c:215
#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2684
+#: ../plugins/itip-formatter/itip-formatter.c:2685
msgid "Declined"
msgstr "Rexeitado"
@@ -3997,7 +3997,7 @@ msgstr "Provisional"
#: ../calendar/gui/e-cal-model.c:3419
#: ../calendar/gui/e-meeting-list-view.c:217
#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2687
+#: ../plugins/itip-formatter/itip-formatter.c:2688
msgid "Delegated"
msgstr "Delegado"
@@ -5041,7 +5041,7 @@ msgstr "Citas e reunións"
#: ../calendar/importers/icalendar-importer.c:435
#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../plugins/itip-formatter/itip-formatter.c:2171
msgid "Opening calendar"
msgstr "Abrindo o calendario"
@@ -5768,7 +5768,6 @@ msgid "America/Nassau"
msgstr "América/Nassau"
#: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "America/New_York"
msgstr "América/Nova_York"
@@ -7186,90 +7185,91 @@ msgid "_Try Again"
msgstr "Tentar outra vez"
#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:153
msgid "ID of the socket to embed in"
msgstr "ID do socket para encaixar"
-#: ../capplet/anjal-settings-main.c:155
+#: ../capplet/anjal-settings-main.c:154
msgid "socket"
msgstr "socket"
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
msgid "Please enter your full name."
msgstr "Introduza o seu nome completo."
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:77
msgid "Please enter your email address."
msgstr "Introduza o seu enderezo de correo electrónico:"
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:78
msgid "The email address you have entered is invalid."
msgstr "O enderezo de correo electrónico introducido é incorrecto."
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:79
msgid "Please enter your password."
msgstr "Introduza o seu contrasinal."
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:67
+#: ../capplet/settings/mail-account-view.c:258
+#: ../mail/em-account-editor.c:4998 ../plugins/caldav/caldav-source.c:67
msgid "CalDAV"
msgstr "CalDAV"
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:289
-#: ../modules/online-accounts/e-online-accounts-google.c:362
+#: ../capplet/settings/mail-account-view.c:360
+#: ../capplet/settings/mail-account-view.c:412
+#: ../mail/em-account-editor.c:4880 ../mail/em-account-editor.c:4934
+#: ../modules/online-accounts/e-online-accounts-google.c:295
+#: ../modules/online-accounts/e-online-accounts-google.c:369
#: ../plugins/google-account-setup/google-contacts-source.c:55
#: ../plugins/google-account-setup/google-source.c:87
msgid "Google"
msgstr "Google"
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
msgid "Personal details:"
msgstr "Información persoal:"
-#: ../capplet/settings/mail-account-view.c:487
+#: ../capplet/settings/mail-account-view.c:486 ../mail/mail-config.ui.h:74
msgid "Name:"
msgstr "Nome:"
-#: ../capplet/settings/mail-account-view.c:496
+#: ../capplet/settings/mail-account-view.c:495 ../mail/mail-config.ui.h:45
msgid "Email address:"
msgstr "Enderezo de correo:"
-#: ../capplet/settings/mail-account-view.c:506
+#: ../capplet/settings/mail-account-view.c:505 ../mail/mail-config.ui.h:38
msgid "Details:"
msgstr "Información:"
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513 ../mail/mail-config.ui.h:92
msgid "Receiving"
msgstr "Recibindo"
-#: ../capplet/settings/mail-account-view.c:521
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:128
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: ../capplet/settings/mail-account-view.c:530
+#: ../capplet/settings/mail-account-view.c:529 ../mail/mail-config.ui.h:127
msgid "Server address:"
msgstr "Endrezo do servidor:"
-#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:538 ../mail/mail-config.ui.h:152
msgid "Username:"
msgstr "Nome do usuario:"
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:547
msgid "Use encryption:"
msgstr "Usar cifrado:"
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:587
msgid "never"
msgstr "nunca"
-#: ../capplet/settings/mail-account-view.c:565
+#: ../capplet/settings/mail-account-view.c:564 ../mail/mail-config.ui.h:112
msgid "Sending"
msgstr "Enviando"
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:606
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
@@ -7280,7 +7280,7 @@ msgstr ""
"configurar automaticamente os axustes. Se non é posíbel facelo de forma "
"automatica necesitará a información do seu servidor."
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:608
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
@@ -7290,11 +7290,11 @@ msgstr ""
"electrónico. Introdúzaos embaixo. Tentouse iniciar o proceso coa información "
"que inseriu pero posíbelmente teña que cambiala."
-#: ../capplet/settings/mail-account-view.c:611
+#: ../capplet/settings/mail-account-view.c:610
msgid "You can specify more options to configure the account."
msgstr "Pode indicar máis opcións para configurar a conta."
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:612
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
@@ -7302,11 +7302,12 @@ msgstr ""
"Agora necesítanse os seus axustes para enviar o correo. Tentouse detectalos "
"automaticamente pero debería comprobalos para asegurar a súa corrección."
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
msgid "You can specify your default settings for your account."
msgstr "Pode indicar os axustes predeterminados para a conta."
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2835
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
@@ -7314,100 +7315,103 @@ msgstr ""
"Tempo para comprobar os axustes antes de tentar conectar co servidor e obter "
"o seu correo electrónico"
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2290 ../mail/em-account-editor.c:2426
+#: ../capplet/settings/mail-account-view.c:629
+#: ../mail/em-account-editor.c:2825 ../mail/em-account-editor.c:2961
msgid "Identity"
msgstr "Identidade"
-#: ../capplet/settings/mail-account-view.c:630
+#: ../capplet/settings/mail-account-view.c:629
msgid "Next - Receiving mail"
msgstr "Seguinte - Recepción do correo"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Receiving mail"
msgstr "Recepción do correo"
+#: ../capplet/settings/mail-account-view.c:630
#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
msgid "Next - Sending mail"
msgstr "Seguinte - Envío do correo"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Back - Identity"
msgstr "Anterior - Identidade"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Next - Receiving options"
msgstr "Seguinte - Opcións de recepción"
-#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:631
msgid "Receiving options"
msgstr "Opcións de recepción"
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving mail"
msgstr "Anterior - Recepción do correo"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Sending mail"
msgstr "Envío do correo"
+#: ../capplet/settings/mail-account-view.c:633
#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
msgid "Next - Review account"
msgstr "Seguinte - Revisar a conta"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Next - Defaults"
msgstr "Seguinte - Predefinicións"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving options"
msgstr "Anterior - Opcións de recepción"
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3378
+#: ../capplet/settings/mail-account-view.c:634
+#: ../mail/em-account-editor.c:3924
msgid "Defaults"
msgstr "Predefinicións"
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:634
msgid "Back - Sending mail"
msgstr "Anterior - Envío do correo"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Review account"
msgstr "Revisar a conta"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Finish"
msgstr "Finalizar"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Back - Sending"
msgstr "Anterior - Envío"
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:759
msgid "Setup Google contacts with Evolution"
msgstr "Configurar os contactos WebDAV co Evolution."
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:760
msgid "Setup Google calendar with Evolution"
msgstr "Configurar o calendario de Google co Evolution."
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:765
+#: ../mail/em-account-editor.c:4679
msgid "You may need to enable IMAP access."
msgstr "Pode que deba activar o acceso IMAP."
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:773
+#: ../mail/em-account-editor.c:4670
msgid "Google account settings:"
msgstr "Axustes da conta de Google:"
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:799
msgid "Setup Yahoo calendar with Evolution"
msgstr "Configurar o calendario Yahoo co Evolution"
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:803
+#: ../mail/em-account-editor.c:4698
msgid ""
"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 "
@@ -7416,34 +7420,35 @@ msgstr ""
"Os calendarios de Yahoo noméanse con nome_apelido. Tentouse formar o nome do "
"calendario. Se non é válido confirme ou reintroduza o nome do calendario."
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:812
+#: ../mail/em-account-editor.c:4707
msgid "Yahoo account settings:"
msgstr "Axustes da conta de Yahoo:"
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:826
msgid "Yahoo Calendar name:"
msgstr "Nome do calendario de Yahoo:"
-#: ../capplet/settings/mail-account-view.c:1098
+#: ../capplet/settings/mail-account-view.c:1013
msgid "Password:"
msgstr "Contrasinal:"
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1065
#: ../capplet/settings/mail-settings-view.c:254
msgid "Close Tab"
msgstr "Pechar a lapela"
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1075
msgid "Account Wizard"
msgstr "Asistente da conta"
-#: ../capplet/settings/mail-capplet-shell.c:215
+#: ../capplet/settings/mail-capplet-shell.c:214
msgid "Evolution account assistant"
msgstr "Asistente de contas do Evolution"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:748 ../mail/em-folder-tree-model.c:167
+#: ../capplet/settings/mail-capplet-shell.c:376 ../mail/e-mail-local.c:75
+#: ../mail/em-folder-tree-model.c:167
#: ../modules/addressbook/e-book-shell-backend.c:100
#: ../modules/addressbook/e-book-shell-migrate.c:136
#: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7454,11 +7459,11 @@ msgstr "Asistente de contas do Evolution"
#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../widgets/misc/e-account-tree-view.c:99
#: ../widgets/misc/e-account-tree-view.c:291
-#: ../widgets/misc/e-account-tree-view.c:922
-#: ../widgets/misc/e-account-tree-view.c:980
-#: ../widgets/misc/e-account-tree-view.c:1053
-#: ../widgets/misc/e-account-tree-view.c:1130
-#: ../widgets/misc/e-account-tree-view.c:1359
+#: ../widgets/misc/e-account-tree-view.c:925
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1056
+#: ../widgets/misc/e-account-tree-view.c:1133
+#: ../widgets/misc/e-account-tree-view.c:1362
msgid "On This Computer"
msgstr "Neste computador"
@@ -7781,12 +7786,12 @@ msgstr "Non foi posíbel abrir a ligazón."
msgid "Could not display help for Evolution."
msgstr "Non foi posíbel mostrar a axuda do Evolution."
-#: ../e-util/gconf-bridge.c:1332
+#: ../e-util/gconf-bridge.c:1333
#, c-format
msgid "GConf error: %s"
msgstr "Erro do GConf: %s"
-#: ../e-util/gconf-bridge.c:1343
+#: ../e-util/gconf-bridge.c:1344
msgid "All further errors shown only on terminal."
msgstr "Todos os erros posteriores mostraranse só no terminal."
@@ -8073,11 +8078,11 @@ msgid "A_dd Condition"
msgstr "Enga_dir unha condición"
#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:323
+#: ../mail/em-utils.c:296
msgid "Incoming"
msgstr "Entrante"
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:297
msgid "Outgoing"
msgstr "Saínte"
@@ -8203,42 +8208,42 @@ msgid "years"
msgstr "anos"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1563 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "Ningún"
-#: ../mail/em-account-editor.c:946
+#: ../mail/em-account-editor.c:1645 ../mail/em-account-editor.c:4630
+#: ../mail/em-account-editor.c:4646
msgid "Never"
msgstr "Nunca"
-#: ../mail/em-account-editor.c:947
+#: ../mail/em-account-editor.c:1646
msgid "Always"
msgstr "Sempre"
-#: ../mail/em-account-editor.c:948
+#: ../mail/em-account-editor.c:1647
msgid "Ask for each message"
msgstr "Preguntar para cada mensaxe"
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
+#: ../mail/em-account-editor.c:2379 ../widgets/misc/e-account-tree-view.c:265
msgctxt "mail-receiving"
msgid "None"
msgstr "Ningún"
-#: ../mail/em-account-editor.c:2233
-msgid "Fil_e:"
-msgstr "Fich_eiro:"
-
-#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
+#: ../mail/em-account-editor.c:2782 ../mail/mail-config.ui.h:168
msgid "_Path:"
msgstr "_Ruta:"
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2785
+msgid "Fil_e:"
+msgstr "Fich_eiro:"
+
+#: ../mail/em-account-editor.c:2822
msgid "Mail Configuration"
msgstr "Configuración do correo"
-#: ../mail/em-account-editor.c:2288
+#: ../mail/em-account-editor.c:2823
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -8248,7 +8253,7 @@ msgstr ""
"\n"
"Prema en «Continuar» para comezar."
-#: ../mail/em-account-editor.c:2291
+#: ../mail/em-account-editor.c:2826
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -8258,19 +8263,19 @@ msgstr ""
"necesitan encherse, a non ser que desexe incluír esta información no correo "
"que envíe."
-#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
+#: ../mail/em-account-editor.c:2828 ../mail/em-account-editor.c:3020
msgid "Receiving Email"
msgstr "Recepción de correo"
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2829
msgid "Please configure the following account settings."
msgstr "Configurar os seguintes axustes da conta."
-#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
+#: ../mail/em-account-editor.c:2831 ../mail/em-account-editor.c:3630
msgid "Sending Email"
msgstr "Envío de correo"
-#: ../mail/em-account-editor.c:2297
+#: ../mail/em-account-editor.c:2832
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -8279,23 +8284,15 @@ msgstr ""
"seguro, pregunte ao administrador do sistema ou provedor de acceso a "
"Internet."
-#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Información da conta"
-
-#: ../mail/em-account-editor.c:2300
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Introduza un nome descritivo para esta conta no espazo inferior.\n"
-"Este nome usarase só para a vista."
+#: ../mail/em-account-editor.c:2834
+msgid "Review Account"
+msgstr "Revisar conta"
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2839
msgid "Done"
msgstr "Feito"
-#: ../mail/em-account-editor.c:2305
+#: ../mail/em-account-editor.c:2840
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8310,28 +8307,52 @@ msgstr ""
"\n"
"Prema en «Aplicar» para gardar os axustes."
-#: ../mail/em-account-editor.c:2844
+#: ../mail/em-account-editor.c:3385
msgid "Check for _new messages every"
msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
-#: ../mail/em-account-editor.c:2852
+#: ../mail/em-account-editor.c:3393
msgid "minu_tes"
msgstr "minu_tos"
-#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
+#: ../mail/em-account-editor.c:4066 ../mail/mail-config.ui.h:108
msgid "Security"
msgstr "Seguranza"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:4121 ../mail/em-account-editor.c:4223
msgid "Receiving Options"
msgstr "Opcións de recepción"
-#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
+#: ../mail/em-account-editor.c:4122 ../mail/em-account-editor.c:4224
msgid "Checking for New Messages"
msgstr "Comprobando se hai mensaxes novas"
+#: ../mail/em-account-editor.c:4626 ../mail/em-account-editor.c:4642
+msgid "Always(SSL)"
+msgstr "Sempre (SSL)"
+
+#: ../mail/em-account-editor.c:4628 ../mail/em-account-editor.c:4644
+msgid "When possible(TLS)"
+msgstr "Cando sexa posíbel (TLS)"
+
+#: ../mail/em-account-editor.c:4660
+msgid "Setup Google con_tacts with Evolution"
+msgstr "Configurar os con_tactos de Google con Evolution"
+
+#: ../mail/em-account-editor.c:4661
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "Configurar o ca_lendario de Google con Evolution"
+
+#: ../mail/em-account-editor.c:4694
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "Configurar o calendario _Yahoo con Evolution"
+
+#: ../mail/em-account-editor.c:4720
+msgid "Yahoo Calen_dar name:"
+msgstr "Nome do calen_dario de Yahoo:"
+
#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
@@ -8470,7 +8491,7 @@ msgid "_Later"
msgstr "_Máis tarde"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:677
+#: ../modules/mail/e-mail-shell-view-actions.c:683
msgid "Add Label"
msgstr "Engadir unha etiqueta"
@@ -8499,28 +8520,28 @@ msgid "Name"
msgstr "Nome"
#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:916
+#: ../mail/em-folder-tree-model.c:918
#: ../modules/mail/e-mail-shell-view-private.c:1066
#: ../modules/mail/e-mail-shell-view-private.c:1077
msgid "Inbox"
msgstr "Caixa de entrada"
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:909
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:911
#: ../modules/mail/e-mail-shell-view-private.c:1064
msgid "Drafts"
msgstr "Borradores"
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:920
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:922
#: ../modules/mail/e-mail-shell-view-private.c:1068
msgid "Outbox"
msgstr "Caixa de saída"
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:924
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:926
#: ../modules/mail/e-mail-shell-view-private.c:1070
msgid "Sent"
msgstr "Enviados"
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:912
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:914
#: ../modules/mail/e-mail-shell-view-private.c:1072
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
@@ -8528,36 +8549,7 @@ msgstr "Enviados"
msgid "Templates"
msgstr "Modelos"
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "Migrando…"
-
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "Migración"
-
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando «%s»:"
-
-#: ../mail/e-mail-migrate.c:726
-msgid "Migrating Folders"
-msgstr "Migrando cartafoles"
-
-#: ../mail/e-mail-migrate.c:727
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"O formato do resumo dos cartafoles das caixas de correo do Evolution moveuse "
-"ao SQLite desde o Evolution 2.24.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles…"
-
-#: ../mail/e-mail-migrate.c:1523
+#: ../mail/e-mail-migrate.c:1177
#, c-format
msgid "Unable to create local mail folders at '%s': %s"
msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
@@ -8566,625 +8558,625 @@ msgstr "Non é posíbel crear os cartafoles de correo local en «%s»: %s"
msgid "Please select a folder"
msgstr "Seleccionar un cartafol"
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "Copiar ao cartafol"
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:487
msgid "C_opy"
msgstr "C_opiar"
-#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:824 ../mail/em-filter-i18n.h:51
msgid "Move to Folder"
msgstr "Mover ao cartafol"
-#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:824 ../mail/em-folder-utils.c:487
msgid "_Move"
msgstr "_Mover"
-#: ../mail/e-mail-reader.c:1184 ../mail/e-mail-reader.c:1372
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1185 ../mail/e-mail-reader.c:1373
+#: ../mail/e-mail-reader.c:1413
msgid "_Do not ask me again."
msgstr "_Non preguntar de novo."
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1419
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "_Ignorar sempre «Responder a:» para as listas de correo."
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1785
msgid "A_dd Sender to Address Book"
msgstr "Enga_dir o remitente á axenda de enderezos"
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1787
msgid "Add sender to address book"
msgstr "Engadir o remitente á axenda de enderezos"
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1792
msgid "Check for _Junk"
msgstr "Comprobar se hai correo li_xo"
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1794
msgid "Filter the selected messages for junk status"
msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1799
msgid "_Copy to Folder..."
msgstr "_Copiar ao cartafol…"
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1801
msgid "Copy selected messages to another folder"
msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1806
msgid "_Delete Message"
msgstr "E_liminar a mensaxe"
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1808
msgid "Mark the selected messages for deletion"
msgstr "Marcar as mensaxes seleccionadas para eliminalas"
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1813
msgid "Filter on Mailing _List..."
msgstr "Filtrar pola _lista de correo…"
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:1815
msgid "Create a rule to filter messages to this mailing list"
msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1820
msgid "Filter on _Recipients..."
msgstr "Filtrar polos _destinatarios…"
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1822
msgid "Create a rule to filter messages to these recipients"
msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1827
msgid "Filter on Se_nder..."
msgstr "Filtrar polo re_mitente…"
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1829
msgid "Create a rule to filter messages from this sender"
msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1834
msgid "Filter on _Subject..."
msgstr "Filtrar polo a_sunto…"
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1836
msgid "Create a rule to filter messages with this subject"
msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1841
msgid "A_pply Filters"
msgstr "_Aplicar os filtros"
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1843
msgid "Apply filter rules to the selected messages"
msgstr "Aplicar as regras de filtrado ás mensaxes seleccionadas"
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1848
msgid "_Find in Message..."
msgstr "_Buscar na mensaxe…"
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1850
msgid "Search for text in the body of the displayed message"
msgstr "Buscar un texto no corpo da mensaxe mostrada"
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1855
msgid "_Clear Flag"
msgstr "E_liminar a marca"
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1857
msgid "Remove the follow-up flag from the selected messages"
msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1862
msgid "_Flag Completed"
msgstr "_Marcar como completado"
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1864
msgid "Set the follow-up flag to completed on the selected messages"
msgstr ""
"Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1869
msgid "Follow _Up..."
msgstr "Seguimento…"
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1871
msgid "Flag the selected messages for follow-up"
msgstr "Marcar as mensaxes seleccionadas para o seguimento"
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1876
msgid "_Attached"
msgstr "_Anexada"
-#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1878 ../mail/e-mail-reader.c:1885
msgid "Forward the selected message to someone as an attachment"
msgstr "Reencamiñar a mensaxe seleccionada como un anexo"
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1883
msgid "Forward As _Attached"
msgstr "Reencamiñar como un _anexo"
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1890
msgid "_Inline"
msgstr "_Inserida"
-#: ../mail/e-mail-reader.c:1891 ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1892 ../mail/e-mail-reader.c:1899
msgid "Forward the selected message in the body of a new message"
msgstr "Reencamiñar a mensaxe seleccionada no corpo dunha mensaxe nova"
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1897
msgid "Forward As _Inline"
msgstr "Reencamiñar _inserida"
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1904
msgid "_Quoted"
msgstr "_Citada"
-#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1906 ../mail/e-mail-reader.c:1913
msgid "Forward the selected message quoted like a reply"
msgstr "Reencamiñar a mensaxe seleccionada citada como unha resposta"
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1911
msgid "Forward As _Quoted"
msgstr "Reencamiñar _citada"
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1918
msgid "_Load Images"
msgstr "_Cargar as imaxes"
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1920
msgid "Force images in HTML mail to be loaded"
msgstr "Forzar a carga de imaxes no correo HTML"
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1925
msgid "_Important"
msgstr "_Importante"
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1927
msgid "Mark the selected messages as important"
msgstr "Marcar as mensaxes seleccionadas como importantes"
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1932
msgid "_Junk"
msgstr "_Correo lixo"
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1934
msgid "Mark the selected messages as junk"
msgstr "Marcar as mensaxes seleccionadas como correo lixo"
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1939
msgid "_Not Junk"
msgstr "_Non é correo lixo"
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1941
msgid "Mark the selected messages as not being junk"
msgstr "Marcar as mensaxes seleccionadas como non lixo"
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1946
msgid "_Read"
msgstr "_Lida"
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1948
msgid "Mark the selected messages as having been read"
msgstr "Marcar as mensaxes seleccionadas como lidas"
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1953
msgid "Uni_mportant"
msgstr "Non i_mportante"
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1955
msgid "Mark the selected messages as unimportant"
msgstr "Marcar as mensaxes seleccionadas como non importantes"
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1960
msgid "_Unread"
msgstr "_Sen ler"
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1962
msgid "Mark the selected messages as not having been read"
msgstr "Marcar as mensaxes seleccionadas como non lidas"
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1967
msgid "_Edit as New Message..."
msgstr "_Editar como unha mensaxe nova…"
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1969
msgid "Open the selected messages in the composer for editing"
msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1974
msgid "Compose _New Message"
msgstr "Redactar unha mensaxe _nova"
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1976
msgid "Open a window for composing a mail message"
msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1981
msgid "_Open in New Window"
msgstr "Abrir nunha xanela n_ova"
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1983
msgid "Open the selected messages in a new window"
msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1988
msgid "_Move to Folder..."
msgstr "_Mover ao cartafol…"
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1990
msgid "Move selected messages to another folder"
msgstr "Mover as mensaxes seleccionadas a outro cartafol"
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:1995
msgid "_Switch to Folder"
msgstr "_Cambiar ao cartafol"
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1997
msgid "Display the parent folder"
msgstr "Mostrar o cartafol pai"
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2002
msgid "Switch to _next tab"
msgstr "Cambiar á lapela segui_nte"
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2004
msgid "Switch to the next tab"
msgstr "Cambiar á lapela seguinte"
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2009
msgid "Switch to _previous tab"
msgstr "Cambiar á lapela a_nterior"
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2011
msgid "Switch to the previous tab"
msgstr "Cambiar á lapela anterior"
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2016
msgid "Cl_ose current tab"
msgstr "Pe_char a lapela actual"
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2018
msgid "Close current tab"
msgstr "Pechar a lapela actual"
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2023
msgid "_Next Message"
msgstr "Segui_nte mensaxe"
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2025
msgid "Display the next message"
msgstr "Mostrar a seguinte mensaxe"
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2030
msgid "Next _Important Message"
msgstr "Seguinte mensaxe _importante"
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2032
msgid "Display the next important message"
msgstr "Mostrar a seguinte mensaxe importante"
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2037
msgid "Next _Thread"
msgstr "Seguin_te conversa"
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2039
msgid "Display the next thread"
msgstr "Mostrar a seguinte conversa"
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2044
msgid "Next _Unread Message"
msgstr "Seguinte mensaxe _sen ler"
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2046
msgid "Display the next unread message"
msgstr "Mostrar a seguinte mensaxe non lida"
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2051
msgid "_Previous Message"
msgstr "_Mensaxe anterior"
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2053
msgid "Display the previous message"
msgstr "Mostrar a mensaxe anterior"
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2058
msgid "Pr_evious Important Message"
msgstr "Ant_erior mensaxe importante"
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2060
msgid "Display the previous important message"
msgstr "Mostrar a anterior mensaxe importante"
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2065
msgid "Previous T_hread"
msgstr "_Conversa anterior"
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2067
msgid "Display the previous thread"
msgstr "Mostrar a conversa anterior"
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2072
msgid "P_revious Unread Message"
msgstr "Ante_rior mensaxe sen ler"
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2074
msgid "Display the previous unread message"
msgstr "Mostrar a anterior mensaxe non lida"
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2081
msgid "Print this message"
msgstr "Imprimir esta mensaxe"
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2088
msgid "Preview the message to be printed"
msgstr "Previsualizar a mensaxe que se vai imprimir"
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2093
msgid "Re_direct"
msgstr "Re_direccionar"
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2095
msgid "Redirect (bounce) the selected message to someone"
msgstr "Redireccionar a alguén a mensaxe seleccionada"
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2100
msgid "Remo_ve Attachments"
msgstr "Eliminar os _anexos"
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2102
msgid "Remove attachments"
msgstr "Eliminar os anexos"
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2107
msgid "Remove Du_plicate Messages"
msgstr "Eliminar as mensaxes du_plicadas"
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2109
msgid "Checks selected messages for duplicates"
msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
-#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2114 ../mail/mail.error.xml.h:110
#: ../modules/calendar/e-cal-shell-view-actions.c:1510
#: ../modules/mail/e-mail-attachment-handler.c:177
msgid "Reply to _All"
msgstr "Responder a t_odos"
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2116
msgid "Compose a reply to all the recipients of the selected message"
msgstr ""
"Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
-#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
+#: ../mail/e-mail-reader.c:2121 ../mail/mail.error.xml.h:111
msgid "Reply to _List"
msgstr "Responder á _lista"
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2123
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Responder á rolda de correo remitente da mensaxe seleccionada"
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2128
#: ../modules/mail/e-mail-attachment-handler.c:184
msgid "_Reply to Sender"
msgstr "_Responder ao remitente"
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2130
msgid "Compose a reply to the sender of the selected message"
msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2135
msgid "_Save as mbox..."
msgstr "Gardar como mbox…"
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2137
msgid "Save selected messages as an mbox file"
msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2142
msgid "_Message Source"
msgstr "Fonte da _mensaxe"
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2144
msgid "Show the raw email source of the message"
msgstr "Mostrar a fonte en bruto da mensaxe"
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2156
msgid "_Undelete Message"
msgstr "_Recuperar a mensaxe"
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2158
msgid "Undelete the selected messages"
msgstr "Recuperar as mensaxes seleccionadas"
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2163
msgid "_Normal Size"
msgstr "Tamaño _normal"
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2165
msgid "Reset the text to its original size"
msgstr "Restabelecer o texto ao seu tamaño orixinal"
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2170
msgid "_Zoom In"
msgstr "_Ampliar"
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2172
msgid "Increase the text size"
msgstr "Aumentar o tamaño do texto"
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2177
msgid "Zoom _Out"
msgstr "_Reducir"
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2179
msgid "Decrease the text size"
msgstr "Diminuír o tamaño do texto"
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2186
msgid "Create R_ule"
msgstr "Crear unha r_egra"
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2193
msgid "Ch_aracter Encoding"
msgstr "Codificación de car_acteres"
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2200
msgid "F_orward As"
msgstr "Reencamiñar c_omo…"
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2207
msgid "_Group Reply"
msgstr "_Responder ao grupo"
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2214
msgid "_Go To"
msgstr "_Ir a"
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2221
msgid "Mar_k As"
msgstr "Mar_car como"
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2228
msgid "_Message"
msgstr "_Mensaxe"
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2235
msgid "_Zoom"
msgstr "A_mpliar"
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2245
msgid "Search Folder from Mailing _List..."
msgstr "Cartafol de busca por _lista de correo…"
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2247
msgid "Create a search folder for this mailing list"
msgstr "Crear un cartafol de busca para esta rolda de correo"
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2252
msgid "Search Folder from Recipien_ts..."
msgstr "Cartafol de busca por des_tinatarios…"
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2254
msgid "Create a search folder for these recipients"
msgstr "Crear un cartafol de busca para estes destinatarios"
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2259
msgid "Search Folder from Sen_der..."
msgstr "Cartafol de busca por _remitente…"
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2261
msgid "Create a search folder for this sender"
msgstr "Crear un cartafol de busca para este remitente"
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2266
msgid "Search Folder from S_ubject..."
msgstr "Cartafol de busca por as_unto…"
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2268
msgid "Create a search folder for this subject"
msgstr "Crear un cartafol de busca para este asunto"
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2291
msgid "Mark for Follo_w Up..."
msgstr "Marcar para _seguimento…"
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2299
msgid "Mark as _Important"
msgstr "Marcar como _importante"
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2303
msgid "Mark as _Junk"
msgstr "Marcar como correo l_ixo"
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2307
msgid "Mark as _Not Junk"
msgstr "Desmarcar como correo lixo"
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2311
msgid "Mar_k as Read"
msgstr "Marcar como _lida"
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2315
msgid "Mark as Uni_mportant"
msgstr "Marcar como non im_portante"
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2319
msgid "Mark as _Unread"
msgstr "Marcar como _non lida"
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2363
msgid "_Caret Mode"
msgstr "Activar o _cursor"
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2365
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2371
msgid "All Message _Headers"
msgstr "Todas as ca_beceiras da mensaxe"
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2373
msgid "Show messages with all email headers"
msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
-#: ../mail/e-mail-reader.c:2668
+#: ../mail/e-mail-reader.c:2699
#, c-format
msgid "Retrieving message '%s'"
msgstr "Recuperando a mensaxe «%s»"
#. we changed user, thus reset the chosen calendar combo too, because
#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3302 ../mail/mail-config.ui.h:32
#: ../plugins/google-account-setup/google-source.c:316
#: ../plugins/google-account-setup/google-source.c:558
#: ../plugins/google-account-setup/google-source.c:695
-#: ../widgets/misc/e-account-tree-view.c:414
+#: ../widgets/misc/e-account-tree-view.c:417
msgid "Default"
msgstr "predeterminado"
-#: ../mail/e-mail-reader.c:3424
+#: ../mail/e-mail-reader.c:3471
#: ../modules/mail/e-mail-attachment-handler.c:170
msgid "_Forward"
msgstr "_Reencamiñar"
-#: ../mail/e-mail-reader.c:3425
+#: ../mail/e-mail-reader.c:3472
msgid "Forward the selected message to someone"
msgstr "Reencamiñar a mensaxe seleccionada"
-#: ../mail/e-mail-reader.c:3444
+#: ../mail/e-mail-reader.c:3491
msgid "Group Reply"
msgstr "Responder ao grupo"
-#: ../mail/e-mail-reader.c:3445
+#: ../mail/e-mail-reader.c:3492
msgid "Reply to the mailing list, or to all recipients"
msgstr "Responder á lista de correo ou a todos os destinatarios"
-#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3545 ../mail/em-filter-i18n.h:14
msgid "Delete"
msgstr "Eliminar"
-#: ../mail/e-mail-reader.c:3531
+#: ../mail/e-mail-reader.c:3578
#: ../modules/calendar/e-cal-shell-view-actions.c:1356
#: ../widgets/misc/e-calendar.c:202
msgid "Next"
msgstr "Seguinte"
-#: ../mail/e-mail-reader.c:3535
+#: ../mail/e-mail-reader.c:3582
#: ../modules/calendar/e-cal-shell-view-actions.c:1349
#: ../widgets/misc/e-calendar.c:178
msgid "Previous"
msgstr "Anterior"
-#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3591 ../mail/mail-dialogs.ui.h:17
msgid "Reply"
msgstr "Responder"
-#: ../mail/e-mail-reader.c:4214
+#: ../mail/e-mail-reader.c:4265
#, c-format
msgid "Folder '%s'"
msgstr "Cartafol «%s»"
@@ -9227,47 +9219,47 @@ msgid_plural "Messages"
msgstr[0] "Mensaxe"
msgstr[1] "Mensaxes"
-#: ../mail/e-mail-session.c:798
+#: ../mail/e-mail-session.c:833
#, c-format
msgid "Enter Passphrase for %s"
msgstr "Introducir a frase de paso para %s"
-#: ../mail/e-mail-session.c:802
+#: ../mail/e-mail-session.c:837
msgid "Enter Passphrase"
msgstr "Introducir a frase de paso"
-#: ../mail/e-mail-session.c:806
+#: ../mail/e-mail-session.c:841
#, c-format
msgid "Enter Password for %s"
msgstr "Introducir o contrasinal para %s"
-#: ../mail/e-mail-session.c:810
+#: ../mail/e-mail-session.c:845
msgid "Enter Password"
msgstr "Introducir o contrasinal"
-#: ../mail/e-mail-session.c:861
+#: ../mail/e-mail-session.c:896
#, c-format
msgid "User canceled operation."
msgstr "O usuario cancelou a operación."
-#: ../mail/e-mail-session.c:974
+#: ../mail/e-mail-session.c:1009
#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr ""
"Non se proporcionou ningún enderezo de destino, o reencamiñamento cancelouse."
-#: ../mail/e-mail-session.c:983
+#: ../mail/e-mail-session.c:1018
#, c-format
msgid "No account found to use, forward of the message has been cancelled."
msgstr "Non se atopou ningunha conta que usar, o reencamiñamento cancelouse."
-#: ../mail/e-mail-session.c:1134
+#: ../mail/e-mail-session.c:1169
#, c-format
msgid "%s authentication failed"
msgstr "A autenticación %s fallou"
-#: ../mail/e-mail-session.c:1201
+#: ../mail/e-mail-session.c:1243
#, c-format
msgid "No password was provided"
msgstr "Non se forneceu ningún contrasinal"
@@ -9277,13 +9269,13 @@ msgstr "Non se forneceu ningún contrasinal"
msgid "Cannot get transport for account '%s'"
msgstr "Non é posíbel obter o servizo de transporte para a conta «%s»"
-#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:642
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Produciuse un fallo ao aplicar os filtros ao correo saínte: %s"
#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
-#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
+#: ../mail/mail-ops.c:661 ../mail/mail-ops.c:695
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -9292,13 +9284,13 @@ msgstr ""
"Produciuse un fallo ao anexar a %s: %s\n"
"No seu lugar anexaranse ao cartafol local «Enviados»."
-#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:715
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "Produciuse un fallo ao anexar ao cartafol local «Enviados»: %s"
-#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
-#: ../mail/mail-ops.c:928
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:836
+#: ../mail/mail-ops.c:932
msgid "Sending message"
msgstr "Enviando a mensaxe"
@@ -9354,15 +9346,15 @@ msgstr "A mensaxe a %s sobre «%s» o %s leuse."
msgid "Delivery Notification for: \"%s\""
msgstr "Notificación de recepción para: «%s»"
-#: ../mail/em-composer-utils.c:2600
+#: ../mail/em-composer-utils.c:2602
msgid "an unknown sender"
msgstr "un remitente descoñecido"
-#: ../mail/em-composer-utils.c:3006
+#: ../mail/em-composer-utils.c:3008
msgid "Posting destination"
msgstr "Destino da publicación"
-#: ../mail/em-composer-utils.c:3007
+#: ../mail/em-composer-utils.c:3009
msgid "Choose folders to post the message to."
msgstr "Escolla os cartafoles nos que publicar a mensaxe."
@@ -9483,7 +9475,7 @@ msgstr "non está estabelecido"
msgid "is set"
msgstr "está estabelecido"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
msgid "Junk"
msgstr "Correo lixo"
@@ -9673,39 +9665,39 @@ msgstr "%s (%u%s)"
msgid "Mail Folder Tree"
msgstr "Árbore de cartafoles de correo"
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2093 ../mail/em-folder-utils.c:115
#, c-format
msgid "Moving folder %s"
msgstr "Movendo o cartafol %s"
-#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2096 ../mail/em-folder-utils.c:117
#, c-format
msgid "Copying folder %s"
msgstr "Copiando o cartafol %s"
-#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2303
#, c-format
msgid "Moving messages into folder %s"
msgstr "Movendo as mensaxes ao cartafol %s"
-#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2305
#, c-format
msgid "Copying messages into folder %s"
msgstr "Copiando as mensaxes ao cartafol %s"
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2126
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "Non é posíbel soltar as mensaxe(s) no almacenamento do nivel superior"
-#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
-#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1062
+#: ../mail/mail-vfolder.c:1174 ../widgets/misc/e-account-tree-view.c:100
#: ../widgets/misc/e-account-tree-view.c:301
-#: ../widgets/misc/e-account-tree-view.c:924
-#: ../widgets/misc/e-account-tree-view.c:983
-#: ../widgets/misc/e-account-tree-view.c:1055
-#: ../widgets/misc/e-account-tree-view.c:1132
-#: ../widgets/misc/e-account-tree-view.c:1387
+#: ../widgets/misc/e-account-tree-view.c:927
+#: ../widgets/misc/e-account-tree-view.c:986
+#: ../widgets/misc/e-account-tree-view.c:1058
+#: ../widgets/misc/e-account-tree-view.c:1135
+#: ../widgets/misc/e-account-tree-view.c:1390
msgid "Search Folders"
msgstr "Cartafoles de busca"
@@ -9714,7 +9706,7 @@ msgstr "Cartafoles de busca"
msgid "UNMATCHED"
msgstr "SEN COINCIDENCIAS"
-#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
+#: ../mail/em-folder-tree-model.c:988 ../mail/em-folder-tree-model.c:1282
msgid "Loading..."
msgstr "Cargando…"
@@ -9985,7 +9977,7 @@ msgid "Subscribe to _all"
msgstr "Subscribirse a _todas"
#: ../mail/em-subscription-editor.c:933 ../mail/em-subscription-editor.c:1772
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
msgid "_Unsubscribe"
msgstr "Cancelar a s_ubscrición"
@@ -10022,7 +10014,7 @@ msgid "Su_bscribe"
msgstr "Su_bscribir"
#: ../mail/em-subscription-editor.c:1771
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
msgid "Unsubscribe from the selected folder"
msgstr "Cancelar a subscrición ao cartafol seleccionado"
@@ -10066,11 +10058,11 @@ msgstr[1] "Está seguro de que desexa abrir %d mensaxes á vez?"
msgid "_Do not show this message again"
msgstr "_Non mostrar esta mensaxe outra vez"
-#: ../mail/em-utils.c:335
+#: ../mail/em-utils.c:308
msgid "Message Filters"
msgstr "Filtros de mensaxe"
-#: ../mail/em-utils.c:920
+#: ../mail/em-utils.c:893
#, c-format
msgid "Messages from %s"
msgstr "Mensaxes de %s"
@@ -10440,7 +10432,7 @@ msgstr ""
msgid "Enable/disable caret mode"
msgstr "Activar/desactivar o modo de cursor"
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:47
msgid "Encode file names in an Outlook/GMail way"
msgstr "Codificar os nomes de ficheiro á forma de Outlook/GMail\""
@@ -11486,7 +11478,7 @@ msgstr "Importando a caixa de correo"
#. Destination folder, was set in our widget
#: ../mail/importers/mail-importer.c:153
#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:751
+#: ../plugins/pst-import/pst-importer.c:753
#, c-format
msgid "Importing '%s'"
msgstr "Importando «%s»"
@@ -11559,6 +11551,10 @@ msgstr[1] ""
"para ter en conta o cartafol eliminado\n"
"«%s»."
+#: ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Información da conta"
+
#: ../mail/mail-config.ui.h:2
msgid "Add Ne_w Signature..."
msgstr "Engadir unha sinatura _nova…"
@@ -11698,355 +11694,363 @@ msgstr "Eliminar o correo"
msgid "Delete junk messages on e_xit"
msgstr "Eliminar o correo lixo ao saí_r"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
msgid "Digitally sign o_utgoing messages (by default)"
msgstr "Asinar dixitalmente as mensaxes saínt_es (predeterminado)"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
msgid "Displayed Message Headers"
msgstr "Mostrar as cabeceiras da mensaxe"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr ""
"Non ma_rcar as mensaxes como correo lixo se o remitente está na miña axenda "
"de enderezos"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "Non citar"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "Carta_fol dos borradores:"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "_Enderezo de correo:"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:46
msgid "Empty trash folders on e_xit"
msgstr "Baleirar os cartafoles do lixo ao _saír"
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:48
msgid "Encry_ption certificate:"
msgstr "Certificado de ci_frado:"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
msgid "Encrypt out_going messages (by default)"
msgstr "Cifrar as mensaxes saín_tes (predeterminado)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
+msgid "Encryption:"
+msgstr "Cifrado:"
+
+#: ../mail/mail-config.ui.h:51
msgid "F_all back to threading messages by subject"
msgstr "Volver agrupar as mensaxes polo _asunto"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed Width Font:"
msgstr "Tipo de l_etra de largura fixa:"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
msgid "Format messages in _HTML"
msgstr "Formatar as mensaxes en _HTML"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
msgid "Full Nam_e:"
msgstr "Nom_e completo:"
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:56
msgid "Group Reply goes only to mailing list, if possible"
msgstr "A resposta ao grupo vai unicamente á lista de correo, se é posíbel"
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
msgid "HTML Messages"
msgstr "Mensaxes HTML"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
msgid "H_TTP Proxy:"
msgstr "Proxy H_TTP:"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "Header content"
msgstr "Contido da cabeceira"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Header name"
msgstr "Nome da cabeceira"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
msgid "Headers"
msgstr "Cabeceiras"
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
msgid "Highlight _quotations with"
msgstr "Realzar as _citas con"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
msgid "Ignore Reply-To: for mailing lists"
msgstr "Ignorar «Responder a:» para as listas de correo"
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:64
msgid "Inline"
msgstr "Inseridas"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
msgid "Inline (Outlook style)"
msgstr "Inseridas (estilo Outlook)"
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:67 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "Etiquetas"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
msgid "Languages Table"
msgstr "Táboa de idiomas"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
msgid "Loading Images"
msgstr "Cargando as imaxes"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
msgid "Mail Headers Table"
msgstr "Táboa de cabeceiras de correo"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
msgid "Mailbox location"
msgstr "Localización da caixa de correo"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:72
msgid "Message Display"
msgstr "Vista das mensaxes"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
msgid "Message Receipts"
msgstr "Confirmacións de lectura das mensaxes"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:75
msgid "No _Proxy for:"
msgstr "Sen pro_xy para:"
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+#: ../mail/mail-config.ui.h:76 ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
msgstr "Sen cifrado"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:77
msgid "Option is ignored if a match for custom junk headers is found."
msgstr ""
"Ignorarase a opción se se atopa algunha coincidencia para as cabeceiras "
"personalizadas do correo lixo."
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:78
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "Información opcional"
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:80
msgid "Or_ganization:"
msgstr "Organi_zación:"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:81
msgid "PGP/GPG _Key ID:"
msgstr "ID da _chave PGP/GPG:"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:82
msgid "Pass_word:"
msgstr "Con_trasinal:"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:83
+msgid "Personal Details:"
+msgstr "Detalles persoais:"
+
+#: ../mail/mail-config.ui.h:84
#: ../modules/calendar/e-calendar-preferences.ui.h:21
msgid "Pick a color"
msgstr "Seleccionar unha cor"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
msgid "Port:"
msgstr "Porto:"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
msgid "Proxy Settings"
msgstr "Axustes da proxy"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
msgid "Quoted"
msgstr "Citado"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
msgid "Re_member password"
msgstr "Le_mbrar o contrasinal"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
msgid "Re_ply-To:"
msgstr "Res_ponder a:"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:93
msgid "Remember _password"
msgstr "Lembrar o _contrasinal"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:94
msgid "Replies and Forwards"
msgstr "Respostas e reencamiñamentos"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:95
msgid "Required Information"
msgstr "Información solicitada"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:96
msgid "SHA1"
msgstr "SHA1"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:97
msgid "SHA256"
msgstr "SHA256"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:98
msgid "SHA384"
msgstr "SHA384"
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:99
msgid "SHA512"
msgstr "SHA512"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:100
msgid "SOC_KS Proxy:"
msgstr "Proxy SOC_KS:"
-#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:101 ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "Cifrado SSL"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
msgid "SSL is not supported in this build of Evolution"
msgstr "SSL non é compatíbel con esta versión do Evolution"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
msgid "S_earch for sender photograph only in local address books"
msgstr "B_uscar a fotografía do remitente só nas axendas de enderezos locais"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
msgid "S_elect..."
msgstr "S_eleccionar…"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
msgid "S_end message receipts:"
msgstr "_Enviar as confirmacións de lectura das mensaxes:"
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:106
msgid "S_tandard Font:"
msgstr "Tipo de letra es_tándar:"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
msgid "Secure MIME (S/MIME)"
msgstr "MIME seguro (S/MIME)"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
msgid "Select HTML fixed width font"
msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:110
msgid "Select HTML variable width font"
msgstr "Seleccionar o tipo de letra de largura variábel para HTML"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:111
msgid "Sender Photograph"
msgstr "Fotografía do remitente"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:114
msgid "Sending a _private reply to a mailing list message"
msgstr "Enviar unha resposta _privada á mensaxes da lista de correo"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:116
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr ""
"Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
msgid "Sending a message with an _empty subject line"
msgstr "Enviar unha m_ensaxe co asunto baleiro"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:120
msgid "Sending a message with only _Bcc recipients defined"
msgstr "Enviar unha mensaxe só con destinatarios _Bcc definidos"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
msgid "Sending a reply to a large _number of recipients"
msgstr "Enviar unha resposta a un grande _número de destinatarios"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
msgid "Sent _Messages Folder:"
msgstr "Cartafol das _mensaxes enviadas:"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:124
msgid "Ser_ver requires authentication"
msgstr "O ser_vidor solicita autenticación"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:125
msgid "Server Configuration"
msgstr "Configuración do servidor"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:126
msgid "Server _Type:"
msgstr "_Tipo de servidor:"
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:129
msgid "Set custom junk header"
msgstr "Estabelecer cabeceira de SPAM personalizada"
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:130
msgid "Si_gning algorithm:"
msgstr "Algoritmo da si_natura:"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:131
msgid "Sig_natures"
msgstr "Sinaturas"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:132
msgid "Sig_ning certificate:"
msgstr "Certificado de si_natura:"
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:133
msgid "Signat_ure:"
msgstr "Sinat_ura:"
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:134
msgid "Signatures"
msgstr "Sinaturas"
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:135
msgid "Signing _algorithm:"
msgstr "_Algoritmo da sinatura:"
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:136
msgid "Special Folders"
msgstr "Cartafoles especiais"
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:137
msgid "Spell Checking"
msgstr "Comprobación ortográfica"
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:138
msgid "Start _typing at the bottom on replying"
msgstr "Comezar a escribir ao final da respos_ta"
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:139
msgid "Start up"
msgstr "Iniciar"
-#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:140 ../modules/addressbook/ldap-config.ui.h:21
msgid "TLS encryption"
msgstr "Cifrado TLS"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:141
msgid "T_ype:"
msgstr "T_ipo:"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -12054,7 +12058,7 @@ msgstr ""
"Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
"instalado un dicionario."
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12064,7 +12068,7 @@ msgstr ""
"sinatura. O nome que indique usarase\n"
"só a efectos de vista. "
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:146
msgid ""
"To help avoid email accidents and embarrassments, ask for confirmation "
"before taking the following checkmarked actions:"
@@ -12072,7 +12076,7 @@ msgstr ""
"Para evitar accidentes co correo e outras incomodidades pedir a confirmación "
"antes de realizar as seguintes accións marcadas:"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12080,141 +12084,149 @@ msgstr ""
"Indique o nome polo que desexa identificar esta conta.\n"
"Por exemplo: «Traballo» ou «Persoal»"
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:149
msgid "Us_ername:"
msgstr "Nom_e do usuario:"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:150
msgid "Use Authe_ntication"
msgstr "Usar aute_nticación"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:151
msgid "User _Name:"
msgstr "_Nome do usuario:"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:153
msgid "_Add Signature"
msgstr "_Engadir unha sinatura"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:154
msgid "_Always load images from the Internet"
msgstr "C_argar sempre as imaxes desde Internet"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:155
msgid "_Authentication Type"
msgstr "Tipo de _autenticación"
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:156
msgid "_Direct connection to the Internet"
msgstr "Conexión _directa a Internet"
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:157
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr ""
"Non asinar as solicitudes _de reunión (para a compatibilidade co Outlook)"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:158
msgid "_Forward style:"
msgstr "Estilo do _reencamiñamento:"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:159
msgid "_Junk Folder:"
msgstr "Cartafol do coreo _lixo:"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:160
msgid "_Keep signature above the original message on replying"
msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:161
msgid "_Languages"
msgstr "I_diomas"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:162
msgid "_Load images only in messages from contacts"
msgstr "Ca_rgar as imaxes só nas mensaxes dos contactos"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:163
msgid "_Lookup in local address book only"
msgstr "Buscar só nas axendas de enderezos _locais"
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:164
msgid "_Make this my default account"
msgstr "Facer desta a _miña conta predeterminada"
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:165
msgid "_Manual proxy configuration:"
msgstr "Configuración _manual do proxy:"
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:167
msgid "_Never load images from the Internet"
msgstr "_Non cargar nunca as imaxes desde Internet"
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
msgid "_Port:"
msgstr "_Porto:"
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:170
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:171
msgid "_Reply style:"
msgstr "Estilo da _resposta:"
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:172
msgid "_Script:"
msgstr "_Script:"
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:173
msgid "_Secure HTTP Proxy:"
msgstr "Proxy HTTP _segura:"
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:175
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "_Servidor:"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:177
msgid "_Show animated images"
msgstr "Mo_strar as imaxes animadas"
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:178
msgid "_Show the photograph of sender in the message preview"
msgstr "_Mostrar a fotografía do remitente na vista previa das mensaxes"
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:179
msgid "_Trash Folder:"
msgstr "Cartafo_l do lixo:"
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:180
msgid "_Use secure connection:"
msgstr "_Usar unha conexión segura:"
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:181
msgid "_Use system defaults"
msgstr "_Usar as predefinicións do sistema"
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:182
msgid "_Use the same fonts as other applications"
msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:183 ../smime/gui/smime-ui.ui.h:48
msgid "a"
msgstr "a"
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:49
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:185
msgid "color"
msgstr "cor"
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:186
msgid "description"
msgstr "descrición"
+#: ../mail/mail-config.ui.h:187
+msgid "label"
+msgstr "etiqueta"
+
+#: ../mail/mail-config.ui.h:188
+msgid "none"
+msgstr "ningunha"
+
#: ../mail/mail-dialogs.ui.h:1
msgid "All active remote folders"
msgstr "Todos os cartafoles remotos activos"
@@ -12325,65 +12337,65 @@ msgstr "Filtrando as mensaxes seleccionadas"
msgid "Fetching Mail"
msgstr "Recibindo o correo"
-#: ../mail/mail-ops.c:843
+#: ../mail/mail-ops.c:847
#, c-format
msgid "Sending message %d of %d"
msgstr "Enviando a mensaxe %d de %d"
-#: ../mail/mail-ops.c:891
+#: ../mail/mail-ops.c:895
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
-#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
+#: ../mail/mail-ops.c:899 ../mail/mail-send-recv.c:840
msgid "Canceled."
msgstr "Cancelado."
-#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
+#: ../mail/mail-ops.c:901 ../mail/mail-send-recv.c:842
msgid "Complete."
msgstr "Completado."
-#: ../mail/mail-ops.c:1012
+#: ../mail/mail-ops.c:1016
#, c-format
msgid "Moving messages to '%s'"
msgstr "Movendo as mensaxes a «%s»"
-#: ../mail/mail-ops.c:1013
+#: ../mail/mail-ops.c:1017
#, c-format
msgid "Copying messages to '%s'"
msgstr "Copiando as mensaxes a «%s»"
-#: ../mail/mail-ops.c:1131
+#: ../mail/mail-ops.c:1135
#, c-format
msgid "Storing folder '%s'"
msgstr "Gardando o cartafol «%s»"
-#: ../mail/mail-ops.c:1206
+#: ../mail/mail-ops.c:1211
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Expurgando e gardando a conta «%s»"
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1212
#, c-format
msgid "Storing account '%s'"
msgstr "Gardando a conta «%s»"
-#: ../mail/mail-ops.c:1269
+#: ../mail/mail-ops.c:1274
#, c-format
msgid "Refreshing folder '%s'"
msgstr "Actualizando o cartafol «%s»"
-#: ../mail/mail-ops.c:1459
+#: ../mail/mail-ops.c:1483
#, c-format
msgid "Expunging folder '%s'"
msgstr "Expurgando o cartafol «%s»"
-#: ../mail/mail-ops.c:1544
+#: ../mail/mail-ops.c:1568
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Baleirando o lixo de «%s»"
-#: ../mail/mail-ops.c:1646
+#: ../mail/mail-ops.c:1670
#, c-format
msgid "Disconnecting %s"
msgstr "Desconectando %s"
@@ -12418,17 +12430,17 @@ msgstr "Comprobando se hai correo novo"
msgid "Could not create spool directory '%s': %s"
msgstr "Non foi posíbel crear o cartafol spool «%s»: %s"
-#: ../mail/mail-tools.c:106
+#: ../mail/mail-tools.c:113
#, c-format
msgid "Trying to movemail a non-mbox source '%s'"
msgstr "Tentativa de movemail sobre unha fonte non-mbox «%s»"
-#: ../mail/mail-tools.c:215
+#: ../mail/mail-tools.c:225
#, c-format
msgid "Forwarded message - %s"
msgstr "Mensaxe reencamiñada - %s"
-#: ../mail/mail-tools.c:217
+#: ../mail/mail-tools.c:227
msgid "Forwarded message"
msgstr "Mensaxe reencamiñada"
@@ -12447,7 +12459,7 @@ msgstr "Actualizando os cartafoles de busca para «%s» : %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
+#: ../mail/mail-vfolder.c:618
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12465,11 +12477,11 @@ msgstr[1] ""
"«%s» modificáronse debido a que se eliminou o cartafol\n"
"«%s»."
-#: ../mail/mail-vfolder.c:1314
+#: ../mail/mail-vfolder.c:1249
msgid "Edit Search Folder"
msgstr "Editar o cartafol de busca"
-#: ../mail/mail-vfolder.c:1423
+#: ../mail/mail-vfolder.c:1358
msgid "New Search Folder"
msgstr "Novo cartafol de busca"
@@ -13213,7 +13225,7 @@ msgid "_Discard changes"
msgstr "_Rexeitar as modificacións"
#: ../mail/mail.error.xml.h:160
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
msgid "_Empty Trash"
msgstr "_Baleirar o lixo"
@@ -13336,7 +13348,7 @@ msgid "Follow-up"
msgstr "Seguimento"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5094
msgid "Generating message list"
msgstr "Xerando a lista de mensaxes"
@@ -13386,27 +13398,27 @@ msgid "Subject - Trimmed"
msgstr "Asunto - Recortado"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1558
msgid "Body contains"
msgstr "O corpo contén"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
msgid "Message contains"
msgstr "A mensaxe contén"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
msgid "Recipients contain"
msgstr "Os destinatarios conteñen"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
msgid "Sender contains"
msgstr "O remitente contén"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
msgid "Subject contains"
msgstr "O asunto contén"
@@ -13684,10 +13696,10 @@ msgstr "Crear unha axenda de enderezos nova"
#. Create the contacts group
#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/addressbook/e-book-shell-view.c:402
#: ../modules/calendar/e-cal-shell-backend.c:115
#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../modules/online-accounts/e-online-accounts-google.c:376
msgid "Contacts"
msgstr "Contactos"
@@ -13750,7 +13762,7 @@ msgstr ""
#: ../modules/calendar/e-cal-shell-view-actions.c:1405
#: ../modules/calendar/e-memo-shell-view-actions.c:640
#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
msgid "_Rename..."
msgstr "_Renomear…"
@@ -13831,7 +13843,7 @@ msgstr "_Accións"
#: ../modules/addressbook/e-book-shell-view-actions.c:940
#: ../modules/calendar/e-memo-shell-view-actions.c:677
#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
msgid "_Preview"
msgstr "Vista _previa"
@@ -13869,7 +13881,7 @@ msgstr "Mostrar mapas na xanela de vista previa de contactos"
#: ../modules/addressbook/e-book-shell-view-actions.c:1018
#: ../modules/calendar/e-memo-shell-view-actions.c:747
#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1462
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
msgid "_Classic View"
msgstr "Vista _clásica"
@@ -13880,7 +13892,7 @@ msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
#: ../modules/addressbook/e-book-shell-view-actions.c:1025
#: ../modules/calendar/e-memo-shell-view-actions.c:754
#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
msgid "_Vertical View"
msgstr "Vista _vertical"
@@ -13906,7 +13918,7 @@ msgstr "Sen coincidencias"
#: ../modules/calendar/e-cal-shell-view-actions.c:1727
#: ../modules/calendar/e-memo-shell-view-actions.c:781
#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
#: ../shell/e-shell-content.c:664
msgid "Advanced Search"
msgstr "Busca avanzada"
@@ -13942,23 +13954,23 @@ msgstr "_Gardar como vCard…"
msgid "Save selected contacts as a vCard"
msgstr "Gardar os contactos seleccionados como unha VCard"
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
msgid "_Forward Contacts"
msgstr "_Reencamiñar os contactos"
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
msgid "_Forward Contact"
msgstr "_Reencamiñar o contacto"
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
msgid "_Send Message to Contacts"
msgstr "Enviar unha _mensaxe aos contactos"
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
msgid "_Send Message to List"
msgstr "Enviar unha _mensaxe á lista"
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
msgid "_Send Message to Contact"
msgstr "Enviar unha _mensaxe ao contacto"
@@ -14011,17 +14023,17 @@ msgid "One"
msgstr "Un"
#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "S_earch filter:"
+msgstr "_Filtro de busca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search Filter"
msgstr "Filtro de busca"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _base:"
msgstr "_Base de busca:"
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "_Filtro de busca:"
-
#: ../modules/addressbook/ldap-config.ui.h:16
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14030,40 +14042,48 @@ msgstr ""
"Filtro de busca é o tipo de obxecto que buscar. Se isto non se modifica, a "
"busca predeterminada realizarase no tipo «persoa»."
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Ser_ver:"
+msgstr "Ser_vidor:"
+
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Sub"
msgstr "Do"
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "Supported Search Bases"
msgstr "Bases de busca compatíbeis"
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Use secure _connection:"
+msgstr "Usar unha _conexión segura:"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "Using distinguished name (DN)"
msgstr "Empregar o nome distintivo (DN)"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "Using email address"
msgstr "Usando enderezo de correo"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Download limit:"
msgstr "Límite de _descarga:"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
msgid "_Find Possible Search Bases"
msgstr "_Procurar as bases de busca posíbeis"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Login method:"
msgstr "Método de _inicio de sesión:"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Search scope:"
msgstr "Ámbito da bu_sca:"
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Timeout:"
msgstr "_Tempo de espera:"
@@ -15565,7 +15585,7 @@ msgstr[0] "%d nota"
msgstr[1] "%d notas"
#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
+#: ../modules/calendar/e-task-shell-view-private.c:583
#, c-format
msgid "%d selected"
msgstr "%d seleccionada"
@@ -15733,18 +15753,18 @@ msgstr "Eliminar a tarefa"
msgid "Expunging"
msgstr "Compactando"
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:579
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d tarefa"
msgstr[1] "%d tarefas"
-#: ../modules/mail/em-account-prefs.c:258
+#: ../modules/mail/em-account-prefs.c:263
msgid "Evolution Account Assistant"
msgstr "Asistente de contas do Evolution"
-#: ../modules/mail/em-account-prefs.c:307
+#: ../modules/mail/em-account-prefs.c:312
msgid "Account Editor"
msgstr "Editor de contas"
@@ -15755,21 +15775,21 @@ msgstr "Editor de contas"
msgid "%d attached messages"
msgstr "%d mensaxes anexadas"
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:192
msgctxt "New"
msgid "_Mail Message"
msgstr "_Mensaxe de correo"
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:194
msgid "Compose a new mail message"
msgstr "Escribir unha mensaxe de correo nova"
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:202
msgctxt "New"
msgid "Mail _Folder"
msgstr "Carta_fol de correo"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:204
msgid "Create a new mail folder"
msgstr "Crear un novo cartafol de correo"
@@ -15789,300 +15809,300 @@ msgstr "Preferencias do editor"
msgid "Network Preferences"
msgstr "Preferencias de rede"
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
#: ../modules/mail/e-mail-shell-view.c:960
msgid "_Disable Account"
msgstr "_Desactivar a conta"
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
msgid "Disable this account"
msgstr "Desactivar esta conta"
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
msgid "Permanently remove all the deleted messages from all folders"
msgstr ""
"Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
msgid "_Download Messages for Offline Usage"
msgstr "_Descargar as mensaxes para o uso sen conexión"
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
msgid "Download messages of accounts and folders marked for offline usage"
msgstr ""
"Descargar as mensaxes das contas e cartafoles marcados para uso sen conexión"
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1132
msgid "Fl_ush Outbox"
msgstr "Lim_par a caixa de saída"
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
msgid "_Copy Folder To..."
msgstr "_Copiar o cartafol a…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
msgid "Copy the selected folder into another folder"
msgstr "Copiar o cartafol seleccionado noutro cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
msgid "Permanently remove this folder"
msgstr "Eliminar permanentemente este cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
msgid "E_xpunge"
msgstr "Com_pactar"
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1155
msgid "Permanently remove all deleted messages from this folder"
msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
msgid "Mar_k All Messages as Read"
msgstr "Ma_rcar todas as mensaxes como lidas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
msgid "Mark all messages in the folder as read"
msgstr "Marcar todas as mensaxes do cartafol como lidas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
msgid "_Move Folder To..."
msgstr "_Mover o cartafol a…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
msgid "Move the selected folder into another folder"
msgstr "Mover o cartafol seleccionado a outro cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
msgid "_New..."
msgstr "_Novo…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
msgid "Create a new folder for storing mail"
msgstr "Crear un cartafol novo para gardar o correo"
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
msgid "Change the properties of this folder"
msgstr "Modificar as propiedades deste cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
msgid "Refresh the folder"
msgstr "Actualizar o cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
msgid "Change the name of this folder"
msgstr "Modificar o nome deste cartafol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1202
msgid "Select Message _Thread"
msgstr "Seleccionar a _conversa desta mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1204
msgid "Select all messages in the same thread as the selected message"
msgstr ""
"Seleccionar todas as mensaxes da mesma conversa que a mensaxe seleccionada"
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
msgid "Select Message S_ubthread"
msgstr "Seleccionar a conversa sec_undaria desta mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
msgid "Select all replies to the currently selected message"
msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
msgid "Empty _Trash"
msgstr "Baleirar o _lixo"
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
msgid "Permanently remove all the deleted messages from all accounts"
msgstr ""
"Eliminar permanentemente todas as mensaxes eliminadas de todas as contas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
msgid "_New Label"
msgstr "Etiqueta _nova"
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
msgid "N_one"
msgstr "Nin_gún"
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
msgid "_Manage Subscriptions"
msgstr "Xestionar as _subscricións"
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr ""
"Subscribir ou eliminar as subscricións a cartafoles en servidores remotos"
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
msgid "Send / _Receive"
msgstr "Enviar / _Recibir"
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
msgid "Send queued items and retrieve new items"
msgstr "Enviar os elementos da cola e obter os elementos novos"
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
msgid "R_eceive All"
msgstr "R_ecibir todos"
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
msgid "Receive new items from all accounts"
msgstr "Recibir os elementos novos de todas as contas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
msgid "_Send All"
msgstr "_Enviar todos"
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
msgid "Send queued items in all accounts"
msgstr "Enviar os elementos da cola de todas as contas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
#: ../widgets/misc/e-activity-proxy.c:310
msgid "Cancel"
msgstr "Cancelar"
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1304
msgid "Cancel the current mail operation"
msgstr "Cancelar a operación de correo actual"
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
msgid "Collapse All _Threads"
msgstr "Pregar todos as _conversas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
msgid "Collapse all message threads"
msgstr "Pregar todos as conversas da mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
msgid "E_xpand All Threads"
msgstr "D_espregar todas as conversas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
msgid "Expand all message threads"
msgstr "Despregar todas as conversas da mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
msgid "_Message Filters"
msgstr "Filtros de _mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
msgid "Create or edit rules for filtering new mail"
msgstr "Crear ou editar regras para o filtrado do correo novo"
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
msgid "_Subscriptions..."
msgstr "_Subscricións…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
msgid "F_older"
msgstr "Cartaf_ol"
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1346
msgid "_Label"
msgstr "_Etiqueta"
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1363
msgid "C_reate Search Folder From Search..."
msgstr "C_rear un cartafol de busca a partir da busca…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
msgid "Search F_olders"
msgstr "Cartaf_oles de busca"
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
msgid "Create or edit search folder definitions"
msgstr "Crear ou editar as definicións dos cartafoles de busca"
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
msgid "_New Folder..."
msgstr "Cartafol _novo…"
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
msgid "Show Message _Preview"
msgstr "Mostrar a vista _previa da mensaxe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
msgid "Show message preview pane"
msgstr "Mostrar o panel de vista previa das mensaxes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
msgid "Show _Deleted Messages"
msgstr "Mostrar as mensaxes _eliminadas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
msgid "Show deleted messages with a line through them"
msgstr "Mostrar as mensaxes eliminadas riscándoas."
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
msgid "_Group By Threads"
msgstr "A_grupar por conversas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
msgid "Threaded message list"
msgstr "Lista de mensaxes por conversas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
msgid "Show message preview below the message list"
msgstr "Mostrar a vista previa da mensaxe embaixo da lista de mensaxes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
msgid "Show message preview alongside the message list"
msgstr "Mostrar a vista previa da mensaxe a carón da lista de mensaxes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
msgid "All Messages"
msgstr "Todas as mensaxes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1492
msgid "Important Messages"
msgstr "Mensaxes importantes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1499
msgid "Last 5 Days' Messages"
msgstr "Mensaxes dos últimos 5 días"
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1506
msgid "Messages Not Junk"
msgstr "Mensaxes que non son lixo"
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
msgid "Messages with Attachments"
msgstr "Mensaxes con anexos"
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1520
msgid "No Label"
msgstr "Sen etiqueta"
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
msgid "Read Messages"
msgstr "Mensaxes lidas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1534
msgid "Recent Messages"
msgstr "Mensaxes recentes"
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
msgid "Unread Messages"
msgstr "Mensaxes sen ler"
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
msgid "Subject or Addresses contain"
msgstr "O asunto ou os enderezos conteñen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
msgid "All Accounts"
msgstr "Todas as contas"
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
msgid "Current Account"
msgstr "Conta actual"
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
msgid "Current Folder"
msgstr "Cartafol actual"
@@ -16166,7 +16186,7 @@ msgstr "Enviar / Recibir"
#: ../modules/mail/em-composer-prefs.c:498
#: ../modules/plugin-manager/evolution-plugin-manager.c:360
#: ../plugins/publish-calendar/publish-calendar.c:849
-#: ../widgets/misc/e-account-tree-view.c:385
+#: ../widgets/misc/e-account-tree-view.c:388
msgid "Enabled"
msgstr "Activado"
@@ -16243,7 +16263,7 @@ msgid ""
msgstr ""
"O Evolution conectarase de novo cando se estabeleza a conexión coa rede"
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+#: ../modules/online-accounts/camel-sasl-xoauth.c:388
msgid ""
"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
"from which to obtain an authentication token."
@@ -16251,11 +16271,11 @@ msgstr ""
"Non foi posíbel atopar a conta correspondente no servizo org.gnome."
"OnlineAccounts desde a que obter un token de autenticación."
-#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#: ../modules/online-accounts/camel-sasl-xoauth.c:475
msgid "OAuth"
msgstr "OAuth"
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+#: ../modules/online-accounts/camel-sasl-xoauth.c:477
msgid ""
"This option will connect to the server by way of the GNOME Online Accounts "
"service"
@@ -16399,17 +16419,13 @@ msgstr "Benvido/a"
#: ../modules/startup-wizard/evolution-startup-wizard.c:508
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
+"to your email accounts, and to import files from other applications."
msgstr ""
-"Benvido/a ao Evolution. As seguintes pantallas permitirán que o Evolution se "
-"conecte coas súas contas de correo e importar ficheiros desde outros "
-"aplicativos. \n"
-"\n"
-"Prema o botón «Adiante» para continuar. "
+"Benvido/a ao Evolution. As seguintes pantallas permitiranlle conectar "
+"Evolution coas súas contas de correo e importar ficheiros desde outros "
+"aplicativos."
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
msgid "Loading accounts..."
msgstr "Cargando contas…"
@@ -17314,8 +17330,8 @@ msgstr ""
"%s"
#: ../plugins/google-account-setup/google-source.c:569
-#: ../plugins/mail-to-task/mail-to-task.c:820
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:1083
msgid "Unknown error."
msgstr "Erro descoñecido."
@@ -17343,12 +17359,12 @@ msgstr "Imaxe inserida"
msgid "View image attachments directly in mail messages."
msgstr "Mostrar as imaxes anexadas directamente nas mensaxes de correo."
-#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.c:335
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "Cabeceiras personalizadas"
-#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.c:347
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "Cabeceiras IMAP"
@@ -17428,117 +17444,117 @@ msgstr "Non é posíbel atopar esta tarefa en ningunha lista de tarefas"
msgid "Unable to find this memo in any memo list"
msgstr "Non é posíbel atopar esta nota en ningunha lista de notas"
-#: ../plugins/itip-formatter/itip-formatter.c:1082
+#: ../plugins/itip-formatter/itip-formatter.c:1083
msgid "Opening the calendar. Please wait..."
msgstr "Abrindo o calendario. Agarde…"
-#: ../plugins/itip-formatter/itip-formatter.c:1085
+#: ../plugins/itip-formatter/itip-formatter.c:1086
msgid "Searching for an existing version of this appointment"
msgstr "Buscando unha versión existente desta cita"
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1363
msgid "Unable to parse item"
msgstr "Non é posíbel analizar o elemento"
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1452
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Non é posíbel enviar o elemento ao calendario «%s». %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1464
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Enviado ao calendario «%s» como aceptado"
-#: ../plugins/itip-formatter/itip-formatter.c:1467
+#: ../plugins/itip-formatter/itip-formatter.c:1468
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Enviado ao calendario «%s» como provisional"
-#: ../plugins/itip-formatter/itip-formatter.c:1472
+#: ../plugins/itip-formatter/itip-formatter.c:1473
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Enviado ao calendario «%s» como rexeitado"
-#: ../plugins/itip-formatter/itip-formatter.c:1477
+#: ../plugins/itip-formatter/itip-formatter.c:1478
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Enviado ao calendario «%s» como cancelado"
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1580
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "O organizador eliminou o delegado %s "
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1587
msgid "Sent a cancelation notice to the delegate"
msgstr "Enviouse unha notificación de cancelación ao delegado"
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1589
msgid "Could not send the cancelation notice to the delegate"
msgstr "Non foi posíbel enviar unha notificación de cancelación ao delegado"
-#: ../plugins/itip-formatter/itip-formatter.c:1700
+#: ../plugins/itip-formatter/itip-formatter.c:1701
msgid "Attendee status could not be updated because the status is invalid"
msgstr ""
"Non foi posíbel actualizar o estado de participante debido a que o estado "
"non é válido"
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1730
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Non é posíbel actualizar o participante. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1733
+#: ../plugins/itip-formatter/itip-formatter.c:1734
msgid "Attendee status updated"
msgstr "Actualizouse o estado de participante"
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1738
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Non foi posíbel actualizar o estado de participante porque xa non existe o "
"elemento"
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:1760
msgid "Meeting information sent"
msgstr "Enviouse a información da reunión"
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1763
msgid "Task information sent"
msgstr "Enviouse a información da tarefa"
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/itip-formatter/itip-formatter.c:1766
msgid "Memo information sent"
msgstr "Enviouse a información da nota"
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1775
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Non é posíbel enviar a información da reunión, a reunión non existe"
-#: ../plugins/itip-formatter/itip-formatter.c:1777
+#: ../plugins/itip-formatter/itip-formatter.c:1778
msgid "Unable to send task information, the task does not exist"
msgstr "Non é posíbel enviar a información da tarefa, a tarefa non existe"
-#: ../plugins/itip-formatter/itip-formatter.c:1780
+#: ../plugins/itip-formatter/itip-formatter.c:1781
msgid "Unable to send memo information, the memo does not exist"
msgstr "Non é posíbel enviar a información da nota, a nota non existe"
#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1846
+#: ../plugins/itip-formatter/itip-formatter.c:1847
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1852
msgid "Save Calendar"
msgstr "Gardar o calendario"
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
msgid "The calendar attached is not valid"
msgstr "O calendario anexado non é válido"
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1927
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17546,15 +17562,15 @@ msgstr ""
"A mensaxe di que contén un calendario pero o calendario non é un iCalendar "
"correcto."
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
-msgid "The item in the calendar is not valid"
-msgstr "O elemento do calendario non é válido"
-
#: ../plugins/itip-formatter/itip-formatter.c:1967
#: ../plugins/itip-formatter/itip-formatter.c:1995
#: ../plugins/itip-formatter/itip-formatter.c:2104
+msgid "The item in the calendar is not valid"
+msgstr "O elemento do calendario non é válido"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../plugins/itip-formatter/itip-formatter.c:2105
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17562,11 +17578,11 @@ msgstr ""
"A mensaxe contén un calendario pero o calendario non contén actividades, "
"tarefas nin información de dispoñibilidade"
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../plugins/itip-formatter/itip-formatter.c:2009
msgid "The calendar attached contains multiple items"
msgstr "O calendario anexado contén múltiples elementos"
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/itip-formatter/itip-formatter.c:2010
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17574,44 +17590,44 @@ msgstr ""
"Para procesar todos estes elementos, debería gardarse o ficheiro e "
"importarse o calendario"
-#: ../plugins/itip-formatter/itip-formatter.c:2665
+#: ../plugins/itip-formatter/itip-formatter.c:2666
msgctxt "cal-itip"
msgid "None"
msgstr "Ningún"
-#: ../plugins/itip-formatter/itip-formatter.c:2681
+#: ../plugins/itip-formatter/itip-formatter.c:2682
msgid "Tentatively Accepted"
msgstr "Aceptado provisionalmente"
-#: ../plugins/itip-formatter/itip-formatter.c:2799
+#: ../plugins/itip-formatter/itip-formatter.c:2800
msgid "This meeting recurs"
msgstr "Esta cita repítese"
-#: ../plugins/itip-formatter/itip-formatter.c:2802
+#: ../plugins/itip-formatter/itip-formatter.c:2803
msgid "This task recurs"
msgstr "Esta tarefa repítese"
-#: ../plugins/itip-formatter/itip-formatter.c:2805
+#: ../plugins/itip-formatter/itip-formatter.c:2806
msgid "This memo recurs"
msgstr "Esta nota repítese"
-#: ../plugins/itip-formatter/itip-formatter.c:3029
+#: ../plugins/itip-formatter/itip-formatter.c:3030
msgid "Meeting Invitations"
msgstr "Convites a reunións"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3054
+#: ../plugins/itip-formatter/itip-formatter.c:3055
msgid "_Delete message after acting"
msgstr "E_liminar a mensaxe despois da acción"
-#: ../plugins/itip-formatter/itip-formatter.c:3064
-#: ../plugins/itip-formatter/itip-formatter.c:3097
+#: ../plugins/itip-formatter/itip-formatter.c:3065
+#: ../plugins/itip-formatter/itip-formatter.c:3098
msgid "Conflict Search"
msgstr "Busca de conflitos"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3079
+#: ../plugins/itip-formatter/itip-formatter.c:3080
msgid "Select the calendars to search for meeting conflicts"
msgstr "Seleccionar os calendarios nos que buscar conflitos entre reunións"
@@ -18260,12 +18276,12 @@ msgid "Notifies you when new mail messages arrive."
msgstr "Notificar a chegada de mensaxes novas."
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:239
+#: ../plugins/mail-to-task/mail-to-task.c:238
#, c-format
msgid "Created from a mail by %s"
msgstr "Creado desde un correo electrónico por %s"
-#: ../plugins/mail-to-task/mail-to-task.c:610
+#: ../plugins/mail-to-task/mail-to-task.c:609
#, c-format
msgid ""
"Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18274,7 +18290,7 @@ msgstr ""
"O calendario seleccionado xa contén unha actividade «%s». Desexa editar a "
"actividade antiga?"
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#: ../plugins/mail-to-task/mail-to-task.c:612
#, c-format
msgid ""
"Selected task list contains task '%s' already. Would you like to edit the "
@@ -18283,7 +18299,7 @@ msgstr ""
"A lista de tarefas seleccionadas xa contén unha tarefa «%s». Desexa editar a "
"tarefa antiga?"
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:615
#, c-format
msgid ""
"Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18292,7 +18308,7 @@ msgstr ""
"A lista de notas seleccionada xa contén unha nota «%s» . Desexa editar a "
"nota antiga?"
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:632
#, c-format
msgid ""
"You have selected %d mails to be converted to events. Do you really want to "
@@ -18301,7 +18317,7 @@ msgstr ""
"Seleccionou %d correos para convertelos en actividades. Desexa engadilos "
"todos?"
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:635
#, c-format
msgid ""
"You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18309,7 +18325,7 @@ msgid ""
msgstr ""
"Seleccionou %d correos para convertelos en tarefas. Desexa engadilos todos?"
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:638
#, c-format
msgid ""
"You have selected %d mails to be converted to memos. Do you really want to "
@@ -18317,29 +18333,29 @@ msgid ""
msgstr ""
"Seleccionou %d correos para convertelos en notas. Desexa engadilos todos?"
-#: ../plugins/mail-to-task/mail-to-task.c:658
+#: ../plugins/mail-to-task/mail-to-task.c:657
msgid "Do you wish to continue converting remaining mails?"
msgstr "Desexa continuar convertendo os correos restantes?"
-#: ../plugins/mail-to-task/mail-to-task.c:733
+#: ../plugins/mail-to-task/mail-to-task.c:732
msgid "[No Summary]"
msgstr "[Sen resumo]"
-#: ../plugins/mail-to-task/mail-to-task.c:745
+#: ../plugins/mail-to-task/mail-to-task.c:744
msgid "Invalid object returned from a server"
msgstr "O obxecto devolto por un servidor non é válido"
-#: ../plugins/mail-to-task/mail-to-task.c:795
+#: ../plugins/mail-to-task/mail-to-task.c:794
#, c-format
msgid "An error occurred during processing: %s"
msgstr "Produciuse un erro no proceso: %s"
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:819
#, c-format
msgid "Cannot open calendar. %s"
msgstr "Non é posíbel abrir o calendario. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:827
+#: ../plugins/mail-to-task/mail-to-task.c:826
msgid ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
@@ -18347,7 +18363,7 @@ msgstr ""
"A fonte seleccionada é só de lectura polo que non é posíbel crear "
"actividades nela. Seleccione outra fonte."
-#: ../plugins/mail-to-task/mail-to-task.c:830
+#: ../plugins/mail-to-task/mail-to-task.c:829
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
@@ -18355,7 +18371,7 @@ msgstr ""
"A fonte seleccionada é só de lectura polo que non é posíbel crear tarefas "
"nela. Seleccione outra fonte."
-#: ../plugins/mail-to-task/mail-to-task.c:833
+#: ../plugins/mail-to-task/mail-to-task.c:832
msgid ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
@@ -18363,44 +18379,44 @@ msgstr ""
"A fonte seleccionada é só de lectura polo que non é posíbel crear notas "
"nela. Seleccione outra fonte."
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1083
#, c-format
msgid "Cannot get source list. %s"
msgstr "Non é posíbel obter a lista fonte. %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1147
+#: ../plugins/mail-to-task/mail-to-task.c:1146
msgid "No writable calendar is available."
msgstr "Non hai ningún calendario escribíbel dispoñíbel."
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1238
msgid "Create an _Event"
msgstr "Cr_ear unha actividade"
-#: ../plugins/mail-to-task/mail-to-task.c:1241
+#: ../plugins/mail-to-task/mail-to-task.c:1240
msgid "Create a new event from the selected message"
msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1245
msgid "Create a Mem_o"
msgstr "Crear unha n_ota"
-#: ../plugins/mail-to-task/mail-to-task.c:1248
+#: ../plugins/mail-to-task/mail-to-task.c:1247
msgid "Create a new memo from the selected message"
msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
-#: ../plugins/mail-to-task/mail-to-task.c:1253
+#: ../plugins/mail-to-task/mail-to-task.c:1252
msgid "Create a _Task"
msgstr "Crear unha _tarefa"
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../plugins/mail-to-task/mail-to-task.c:1254
msgid "Create a new task from the selected message"
msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1262
msgid "Create a _Meeting"
msgstr "Crear unha _reunión"
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1264
msgid "Create a new meeting from the selected message"
msgstr "Crear unha reunión nova a partir da mensaxe seleccionada"
@@ -18654,27 +18670,27 @@ msgstr "Cartafoles persoais do Outlook (.pst)"
msgid "_Mail"
msgstr "_Correo"
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:556
msgid "Destination folder:"
msgstr "Cartafol de destino:"
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../plugins/pst-import/pst-importer.c:564
msgid "_Address Book"
msgstr "_Axenda de enderezos"
-#: ../plugins/pst-import/pst-importer.c:567
+#: ../plugins/pst-import/pst-importer.c:569
msgid "A_ppointments"
msgstr "Ci_tas"
-#: ../plugins/pst-import/pst-importer.c:572 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:574 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Tarefas"
-#: ../plugins/pst-import/pst-importer.c:577
+#: ../plugins/pst-import/pst-importer.c:579
msgid "_Journal entries"
msgstr "Entradas do _xornal"
-#: ../plugins/pst-import/pst-importer.c:688
+#: ../plugins/pst-import/pst-importer.c:690
msgid "Importing Outlook data"
msgstr "Importación de datos do Outlook"
@@ -18827,8 +18843,8 @@ msgstr "_Nome do usuario:"
msgid "iCal"
msgstr "iCal"
-#: ../plugins/publish-calendar/publish-format-fb.c:95
-#: ../plugins/publish-calendar/publish-format-ical.c:92
+#: ../plugins/publish-calendar/publish-format-fb.c:94
+#: ../plugins/publish-calendar/publish-format-ical.c:91
#, c-format
msgid "Could not publish calendar: Calendar backend no longer exists"
msgstr ""
@@ -19211,7 +19227,7 @@ msgstr "A barra lateral está visíbel"
msgid "Skip development warning dialog"
msgstr "Saltar o diálogo de aviso de desenvolvemento"
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:311
msgid "Start in offline mode"
msgstr "Iniciar en modo sen conexión"
@@ -19407,7 +19423,7 @@ msgstr "vCard (.vcf)"
msgid "All Files (*)"
msgstr "Todos os ficheiros (*)"
-#: ../shell/e-shell-view.c:296
+#: ../shell/e-shell-view.c:299
msgid "Saving user interface state"
msgstr "Gardando o estado da interface do usuario"
@@ -19721,7 +19737,7 @@ msgid "Preparing to quit..."
msgstr "Preparando a saída…"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:193
+#: ../shell/main.c:194
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19758,7 +19774,7 @@ msgstr ""
"Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
"agardamos con ansias as súas colaboracións!\n"
-#: ../shell/main.c:217
+#: ../shell/main.c:218
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19766,13 +19782,13 @@ msgstr ""
"Grazas\n"
"O equipo do Evolution\n"
-#: ../shell/main.c:224
+#: ../shell/main.c:225
msgid "Do not tell me again"
msgstr "Non preguntarme de novo"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../shell/main.c:304
+#: ../shell/main.c:305
msgid ""
"Start Evolution showing the specified component. Available options are "
"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19780,52 +19796,52 @@ msgstr ""
"Iniciar o Evolution mostrando o compoñente indicado. As opción dispoñíbeis "
"son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
-#: ../shell/main.c:308
+#: ../shell/main.c:309
msgid "Apply the given geometry to the main window"
msgstr "Aplicar a xeometría indicada á xanela principal"
-#: ../shell/main.c:312
+#: ../shell/main.c:313
msgid "Start in online mode"
msgstr "Iniciar en modo conectado"
-#: ../shell/main.c:314
+#: ../shell/main.c:315
msgid "Ignore network availability"
msgstr "Ignorar a dispoñibilidade da rede"
-#: ../shell/main.c:316
+#: ../shell/main.c:317
msgid "Start in \"express\" mode"
msgstr "Iniciar en modo «express»"
-#: ../shell/main.c:319
+#: ../shell/main.c:320
msgid "Forcibly shut down Evolution"
msgstr "Forzar o peche do Evolution"
-#: ../shell/main.c:322
+#: ../shell/main.c:323
msgid "Send the debugging output of all components to a file."
msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
-#: ../shell/main.c:324
+#: ../shell/main.c:325
msgid "Disable loading of any plugins."
msgstr "Desactivar a carga de todos os engadidos."
-#: ../shell/main.c:326
+#: ../shell/main.c:327
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
-#: ../shell/main.c:330
+#: ../shell/main.c:331
msgid "Import URIs or file names given as rest of arguments."
msgstr ""
"Importar os URIs ou nomes de ficheiros fornecidos como resto dos argumentos."
-#: ../shell/main.c:332
+#: ../shell/main.c:333
msgid "Request a running Evolution process to quit"
msgstr "Solicitar a saída dun proceso de execución do Evolution"
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:507 ../shell/main.c:515
msgid "- The Evolution PIM and Email Client"
msgstr "- Cliente de correo e XIP Evolution"
-#: ../shell/main.c:579
+#: ../shell/main.c:580
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19834,7 +19850,7 @@ msgstr ""
"%s: --online e --offline non poden usarse á vez.\n"
" Use «%s --help» para máis información.\n"
-#: ../shell/main.c:585
+#: ../shell/main.c:586
#, c-format
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
@@ -20581,19 +20597,19 @@ msgstr "Con e_stado"
msgid "UTC"
msgstr "UTC"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "Select a Time Zone"
msgstr "Seleccionar un fuso horario"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
msgid "Time Zones"
msgstr "Fusos horarios"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
msgid "Timezone drop-down combination box"
msgstr "Caixa de combinación despregábel para o fuso horario"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -20603,7 +20619,7 @@ msgstr ""
"fuso horario.\n"
"Use o botón dereito para reducir."
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
msgid "_Selection"
msgstr "_Selección"
@@ -20663,11 +20679,11 @@ msgstr "Usar _orde predeterminado de Evolution para as contas"
msgid "De_fault"
msgstr "Prede_finido"
-#: ../widgets/misc/e-account-tree-view.c:404
+#: ../widgets/misc/e-account-tree-view.c:407
msgid "Account Name"
msgstr "Nome da conta"
-#: ../widgets/misc/e-account-tree-view.c:435
+#: ../widgets/misc/e-account-tree-view.c:438
msgid "Protocol"
msgstr "Protocolo"
@@ -21622,6 +21638,36 @@ msgstr "Seleccionar todo"
msgid "Input Methods"
msgstr "Métodos de entrada"
+#~ msgid ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+#~ msgstr ""
+#~ "Introduza un nome descritivo para esta conta no espazo inferior.\n"
+#~ "Este nome usarase só para a vista."
+
+#~ msgid "Migrating..."
+#~ msgstr "Migrando…"
+
+#~ msgid "Migration"
+#~ msgstr "Migración"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "Migrando «%s»:"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "Migrando cartafoles"
+
+#~ msgid ""
+#~ "The summary format of the Evolution mailbox folders has been moved to "
+#~ "SQLite since Evolution 2.24.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "O formato do resumo dos cartafoles das caixas de correo do Evolution "
+#~ "moveuse ao SQLite desde o Evolution 2.24.\n"
+#~ "\n"
+#~ "Sexa paciente mentres o Evolution migra os seus cartafoles…"
+
#~ msgid "Composer load/attach directory"
#~ msgstr "Cartafol para cargar/anexar do editor de mensaxes"
diff --git a/po/nb.po b/po/nb.po
index ed4d3d393b..fe2602b31b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@
# Kjartan Maraas <kmaraas@gnome.org>, 1998-2011.
# Terance Edward Sola <terance@lyse.net>, 2005.
# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
-#: ../shell/main.c:566
+#: ../shell/main.c:567
msgid ""
msgstr ""
"Project-Id-Version: evolution 3.3.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-19 22:29+0200\n"
-"PO-Revision-Date: 2011-10-19 22:31+0200\n"
+"POT-Creation-Date: 2011-11-12 12:10+0100\n"
+"PO-Revision-Date: 2011-11-12 18:03+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: Norsk bokmål\n"
@@ -264,7 +264,7 @@ msgid "_Use as it is"
msgstr "Br_uk som den er"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
#: ../calendar/gui/e-calendar-view.c:2068
msgid "Anniversary"
msgstr "Bryllupsdag"
@@ -275,9 +275,9 @@ msgstr "Bryllupsdag"
#. * which, so long as it has an icon. We're just interested in
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:138
+#: ../shell/main.c:139
msgid "Birthday"
msgstr "Fødselsdag"
@@ -311,9 +311,9 @@ msgstr "Kontaktredigering"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
#: ../addressbook/gui/merging/eab-contact-merging.c:390
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:1043
#: ../smime/lib/e-cert.c:833
msgid "Email"
msgstr "E-post"
@@ -329,7 +329,7 @@ msgstr "Fullt _navn …"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
#: ../widgets/misc/e-contact-map.c:295
msgid "Home"
msgstr "Hjemme"
@@ -398,8 +398,8 @@ msgstr "Nettadresser"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:1345
#: ../widgets/misc/e-contact-map.c:303
msgid "Work"
msgstr "Arbeid"
@@ -506,42 +506,42 @@ msgid "_Zip/Postal Code:"
msgstr "_Zip/postnummer:"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
msgid "Jabber"
msgstr "Jabber"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
msgid "Yahoo"
msgstr "Yahoo"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
msgid "MSN"
msgstr "MSN"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
msgid "ICQ"
msgstr "ICQ"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
msgid "GroupWise"
msgstr "GroupWise"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
msgid "Skype"
msgstr "Skype"
@@ -893,7 +893,7 @@ msgid "Display _All Contacts"
msgstr "Vis _alle kontakter"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
msgid "Assistant"
msgstr "Assistent"
@@ -930,7 +930,7 @@ msgid "Categories"
msgstr "Kategorier"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
msgid "Company"
msgstr "Firma"
@@ -979,22 +979,22 @@ msgid "Journal"
msgstr "Journal"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
msgid "Manager"
msgstr "Leder"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
msgid "Mobile Phone"
msgstr "Mobiltelefon"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Nickname"
msgstr "Kallenavn"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
+#: ../addressbook/gui/widgets/eab-contact-display.c:741
msgid "Note"
msgstr "Kommentar"
@@ -1029,7 +1029,7 @@ msgid "Role"
msgstr "Rolle"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
msgid "Spouse"
msgstr "Ektefelle"
@@ -1190,64 +1190,64 @@ msgstr "Send en e-postmelding til denne adressen"
msgid "Open map"
msgstr "Åpne kart"
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:530
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
msgid "List Members:"
msgstr "Listemedlemmer:"
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
msgid "Department"
msgstr "Avdeling"
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
msgid "Profession"
msgstr "Yrke"
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
msgid "Position"
msgstr "Stilling"
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
msgid "Video Chat"
msgstr "Videosamtale"
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
#: ../calendar/gui/dialogs/calendar-setup.c:449
#: ../modules/calendar/e-cal-shell-view-actions.c:232
#: ../modules/calendar/e-cal-shell-view-actions.c:261
#: ../modules/calendar/e-cal-shell-view.c:523
-#: ../modules/online-accounts/e-online-accounts-google.c:296
+#: ../modules/online-accounts/e-online-accounts-google.c:302
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
#: ../widgets/misc/e-send-options.c:528
msgid "Calendar"
msgstr "Kalender"
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
#: ../calendar/gui/dialogs/event-editor.c:123
#: ../calendar/gui/dialogs/event-editor.c:350
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "Ledig/opptatt"
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
msgid "Phone"
msgstr "Telefon"
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
msgid "Fax"
msgstr "Faks"
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
msgid "Address"
msgstr "Adresse"
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
msgid "Home Page"
msgstr "Hjemmeside"
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
msgid "Web Log"
msgstr "Nettdagbok"
@@ -1255,7 +1255,7 @@ msgstr "Nettdagbok"
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
#: ../capplet/settings/mail-capplet-shell.c:384
#: ../modules/addressbook/e-book-shell-backend.c:120
#: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -1268,23 +1268,23 @@ msgstr "Nettdagbok"
msgid "Personal"
msgstr "Personlig"
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
+#: ../addressbook/gui/widgets/eab-contact-display.c:1010
msgid "List Members"
msgstr "Listemedlemmer"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../addressbook/gui/widgets/eab-contact-display.c:1028
msgid "Job Title"
msgstr "Jobbtittel"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
+#: ../addressbook/gui/widgets/eab-contact-display.c:1065
msgid "Home page"
msgstr "Hjemmeside"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
+#: ../addressbook/gui/widgets/eab-contact-display.c:1074
msgid "Blog"
msgstr "Weblogg"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../addressbook/gui/widgets/eab-contact-display.c:1273
#: ../widgets/misc/e-web-view.c:980
#, c-format
msgid "Click to mail %s"
@@ -1386,19 +1386,19 @@ msgstr "Velg adressebok"
msgid "list"
msgstr "liste"
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:560
msgid "Move contact to"
msgstr "Flytt kontakt til"
-#: ../addressbook/gui/widgets/eab-gui-util.c:561
+#: ../addressbook/gui/widgets/eab-gui-util.c:562
msgid "Copy contact to"
msgstr "Kopier kontakt til"
-#: ../addressbook/gui/widgets/eab-gui-util.c:564
+#: ../addressbook/gui/widgets/eab-gui-util.c:565
msgid "Move contacts to"
msgstr "Flytt kontakter til"
-#: ../addressbook/gui/widgets/eab-gui-util.c:566
+#: ../addressbook/gui/widgets/eab-gui-util.c:567
msgid "Copy contacts to"
msgstr "Kopier kontakter til"
@@ -1476,7 +1476,7 @@ msgstr "Kunne ikke hente liste med adressebøker: %s"
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:662
+#: ../mail/em-folder-tree.c:679 ../mail/mail-ops.c:666
#: ../plugins/caldav/caldav-browse-server.c:220
#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
#: ../smime/gui/certificate-manager.c:313
@@ -2431,7 +2431,7 @@ msgid "_Type:"
msgstr "_Type:"
#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:28
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:284
msgid "_Name:"
@@ -2464,7 +2464,7 @@ msgstr "Fa_rge:"
#: ../modules/addressbook/addressbook-config.c:1077
#: ../modules/addressbook/autocompletion-config.c:240
#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3038
+#: ../plugins/itip-formatter/itip-formatter.c:3039
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
@@ -3899,7 +3899,7 @@ msgstr "Nei"
#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
#: ../modules/plugin-manager/evolution-plugin-manager.c:101
#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2690
+#: ../plugins/itip-formatter/itip-formatter.c:2691
msgid "Unknown"
msgstr "Ukjent"
@@ -3919,14 +3919,14 @@ msgstr "Åpner %s"
#: ../calendar/gui/e-cal-model.c:3416
#: ../calendar/gui/e-meeting-list-view.c:214
#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../plugins/itip-formatter/itip-formatter.c:2679
msgid "Accepted"
msgstr "Godtatt"
#: ../calendar/gui/e-cal-model.c:3417
#: ../calendar/gui/e-meeting-list-view.c:215
#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2684
+#: ../plugins/itip-formatter/itip-formatter.c:2685
msgid "Declined"
msgstr "Avslått"
@@ -3940,7 +3940,7 @@ msgstr "Tentativ"
#: ../calendar/gui/e-cal-model.c:3419
#: ../calendar/gui/e-meeting-list-view.c:217
#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2687
+#: ../plugins/itip-formatter/itip-formatter.c:2688
msgid "Delegated"
msgstr "Delegert"
@@ -4982,7 +4982,7 @@ msgstr "Avtaler og møter"
#: ../calendar/importers/icalendar-importer.c:435
#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../plugins/itip-formatter/itip-formatter.c:2171
msgid "Opening calendar"
msgstr "Åpner kalender"
@@ -5708,7 +5708,6 @@ msgid "America/Nassau"
msgstr "Amerika/Nassau"
#: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "America/New_York"
msgstr "Amerika/New_York"
@@ -7130,82 +7129,82 @@ msgstr "ID for pluggen vi skal koble til"
msgid "socket"
msgstr "plugg"
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
msgid "Please enter your full name."
msgstr "Vennligst oppgi ditt fulle navn."
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:77
msgid "Please enter your email address."
msgstr "Vennligst oppgi din e-postadresse."
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:78
msgid "The email address you have entered is invalid."
msgstr "E-postadressen du oppga er ugyldig."
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:79
msgid "Please enter your password."
msgstr "Vennligst oppgi ditt passord."
-#: ../capplet/settings/mail-account-view.c:259
+#: ../capplet/settings/mail-account-view.c:258
#: ../plugins/caldav/caldav-source.c:67
msgid "CalDAV"
msgstr "CalDAV"
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:289
-#: ../modules/online-accounts/e-online-accounts-google.c:362
+#: ../capplet/settings/mail-account-view.c:360
+#: ../capplet/settings/mail-account-view.c:412
+#: ../modules/online-accounts/e-online-accounts-google.c:295
+#: ../modules/online-accounts/e-online-accounts-google.c:369
#: ../plugins/google-account-setup/google-contacts-source.c:55
#: ../plugins/google-account-setup/google-source.c:87
msgid "Google"
msgstr "Google"
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
msgid "Personal details:"
msgstr "Personlige detaljer:"
-#: ../capplet/settings/mail-account-view.c:487
+#: ../capplet/settings/mail-account-view.c:486
msgid "Name:"
msgstr "Navn:"
-#: ../capplet/settings/mail-account-view.c:496
+#: ../capplet/settings/mail-account-view.c:495
msgid "Email address:"
msgstr "E-postadresse:"
-#: ../capplet/settings/mail-account-view.c:506
+#: ../capplet/settings/mail-account-view.c:505
msgid "Details:"
msgstr "Detaljer:"
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513
msgid "Receiving"
msgstr "Mottar"
-#: ../capplet/settings/mail-account-view.c:521
+#: ../capplet/settings/mail-account-view.c:520
msgid "Server type:"
msgstr "Tjenertype:"
-#: ../capplet/settings/mail-account-view.c:530
+#: ../capplet/settings/mail-account-view.c:529
msgid "Server address:"
msgstr "Tjeneradresse:"
-#: ../capplet/settings/mail-account-view.c:539
+#: ../capplet/settings/mail-account-view.c:538
msgid "Username:"
msgstr "Brukernavn:"
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:547
msgid "Use encryption:"
msgstr "Bruk kryptering:"
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
+#: ../capplet/settings/mail-account-view.c:552
+#: ../capplet/settings/mail-account-view.c:587
msgid "never"
msgstr "aldri"
-#: ../capplet/settings/mail-account-view.c:565
+#: ../capplet/settings/mail-account-view.c:564
msgid "Sending"
msgstr "Sender"
-#: ../capplet/settings/mail-account-view.c:607
+#: ../capplet/settings/mail-account-view.c:606
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
@@ -7215,7 +7214,7 @@ msgstr ""
"postadresse og passord under så skal vi prøve ut alle innstillingene. Hvis "
"det ikke lar seg gjøre automatisk må du oppgi detaljer for tjeneren også."
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:608
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
@@ -7225,11 +7224,11 @@ msgstr ""
"automatisk. Vennligst oppgi dem nedenfor. Har forsøkt å lage et utgangspunkt "
"med detaljene du nettopp oppga, men du må kanskje endre dem."
-#: ../capplet/settings/mail-account-view.c:611
+#: ../capplet/settings/mail-account-view.c:610
msgid "You can specify more options to configure the account."
msgstr "Du kan oppgi flere alternativer for å konfigurere kontoen."
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:612
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
@@ -7237,11 +7236,11 @@ msgstr ""
"Nå trengs innstillingene for å sende e-post. Har prøvd å gjette litt men du "
"bør se over dem for å være sikker."
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
msgid "You can specify your default settings for your account."
msgstr "Du kan oppgi forvalgte innstillinger for kontoen."
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
@@ -7249,100 +7248,100 @@ msgstr ""
"Se over innstillingene før forsøk på å koble til tjeneren for å hente e-"
"posten din."
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2290 ../mail/em-account-editor.c:2426
+#: ../capplet/settings/mail-account-view.c:629
+#: ../mail/em-account-editor.c:2791 ../mail/em-account-editor.c:2927
msgid "Identity"
msgstr "Identitet"
-#: ../capplet/settings/mail-account-view.c:630
+#: ../capplet/settings/mail-account-view.c:629
msgid "Next - Receiving mail"
msgstr "Neste - mottak av e-post"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Receiving mail"
msgstr "Mottak av e-post"
+#: ../capplet/settings/mail-account-view.c:630
#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
msgid "Next - Sending mail"
msgstr "Neste - Utsendelse av e-post"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Back - Identity"
msgstr "Tilbake - Identitet"
-#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:630
msgid "Next - Receiving options"
msgstr "Neste - Alternativer for mottak"
-#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:631
msgid "Receiving options"
msgstr "Alternativer for mottak"
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving mail"
msgstr "Tilbake - Mottak av e-post"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Sending mail"
msgstr "Utsendelse av e-post"
+#: ../capplet/settings/mail-account-view.c:633
#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
msgid "Next - Review account"
msgstr "Neste - Se over konto"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Next - Defaults"
msgstr "Neste - Forvalg"
-#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:633
msgid "Back - Receiving options"
msgstr "Tilbake - Alternativer for mottak"
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3378
+#: ../capplet/settings/mail-account-view.c:634
+#: ../mail/em-account-editor.c:3890
msgid "Defaults"
msgstr "Forvalg"
-#: ../capplet/settings/mail-account-view.c:635
+#: ../capplet/settings/mail-account-view.c:634
msgid "Back - Sending mail"
msgstr "Tilbake - Utsendelse av e-post"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Review account"
msgstr "Se over konto"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Finish"
msgstr "Fullfør"
-#: ../capplet/settings/mail-account-view.c:637
+#: ../capplet/settings/mail-account-view.c:636
msgid "Back - Sending"
msgstr "Tilbake - Utsendelse"
-#: ../capplet/settings/mail-account-view.c:760
+#: ../capplet/settings/mail-account-view.c:759
msgid "Setup Google contacts with Evolution"
msgstr "Sett opp Google-kontakter i Evolution"
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:760
msgid "Setup Google calendar with Evolution"
msgstr "Sett opp Google-kalender i Evolution."
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:765
msgid "You may need to enable IMAP access."
msgstr "Du må kanskje slå på IMAP-tilgang."
-#: ../capplet/settings/mail-account-view.c:774
+#: ../capplet/settings/mail-account-view.c:773
msgid "Google account settings:"
msgstr "Innstillinger for Google-konto:"
-#: ../capplet/settings/mail-account-view.c:800
+#: ../capplet/settings/mail-account-view.c:799
msgid "Setup Yahoo calendar with Evolution"
msgstr "Sett opp Yahoo-kalender i Evolution"
-#: ../capplet/settings/mail-account-view.c:804
+#: ../capplet/settings/mail-account-view.c:803
msgid ""
"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 "
@@ -7352,24 +7351,24 @@ msgstr ""
"kalendernavnet. Vennligst bekreft og oppgi kalendernavnet på nytt hvis det "
"ikke er korrekt."
-#: ../capplet/settings/mail-account-view.c:813
+#: ../capplet/settings/mail-account-view.c:812
msgid "Yahoo account settings:"
msgstr "Innstillinger for Yahoo-konto:"
-#: ../capplet/settings/mail-account-view.c:827
+#: ../capplet/settings/mail-account-view.c:826
msgid "Yahoo Calendar name:"
msgstr "Navn på Yahoo-kalender"
-#: ../capplet/settings/mail-account-view.c:1098
+#: ../capplet/settings/mail-account-view.c:1013
msgid "Password:"
msgstr "Passord:"
-#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-account-view.c:1065
#: ../capplet/settings/mail-settings-view.c:254
msgid "Close Tab"
msgstr "Lukk fane"
-#: ../capplet/settings/mail-account-view.c:1160
+#: ../capplet/settings/mail-account-view.c:1075
msgid "Account Wizard"
msgstr "Kontoveiviser"
@@ -7378,8 +7377,8 @@ msgid "Evolution account assistant"
msgstr "Evolution kontoassistent"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:376 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:748 ../mail/em-folder-tree-model.c:167
+#: ../capplet/settings/mail-capplet-shell.c:376 ../mail/e-mail-local.c:75
+#: ../mail/em-folder-tree-model.c:167
#: ../modules/addressbook/e-book-shell-backend.c:100
#: ../modules/addressbook/e-book-shell-migrate.c:136
#: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7390,11 +7389,11 @@ msgstr "Evolution kontoassistent"
#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../widgets/misc/e-account-tree-view.c:99
#: ../widgets/misc/e-account-tree-view.c:291
-#: ../widgets/misc/e-account-tree-view.c:922
-#: ../widgets/misc/e-account-tree-view.c:980
-#: ../widgets/misc/e-account-tree-view.c:1053
-#: ../widgets/misc/e-account-tree-view.c:1130
-#: ../widgets/misc/e-account-tree-view.c:1359
+#: ../widgets/misc/e-account-tree-view.c:925
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1056
+#: ../widgets/misc/e-account-tree-view.c:1133
+#: ../widgets/misc/e-account-tree-view.c:1362
msgid "On This Computer"
msgstr "På denne datamaskinen"
@@ -7715,12 +7714,12 @@ msgstr "Kunne ikke åpne lenken."
msgid "Could not display help for Evolution."
msgstr "Kunne ikke vise hjelp for Evolution."
-#: ../e-util/gconf-bridge.c:1332
+#: ../e-util/gconf-bridge.c:1333
#, c-format
msgid "GConf error: %s"
msgstr "GConf-feil: %s"
-#: ../e-util/gconf-bridge.c:1343
+#: ../e-util/gconf-bridge.c:1344
msgid "All further errors shown only on terminal."
msgstr "Alle videre feil blir kun vist på konsollet."
@@ -7994,11 +7993,11 @@ msgid "A_dd Condition"
msgstr "Legg til _kriterie"
#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:323
+#: ../mail/em-utils.c:296
msgid "Incoming"
msgstr "Innkommende"
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:297
msgid "Outgoing"
msgstr "Utgående"
@@ -8124,42 +8123,41 @@ msgid "years"
msgstr "år"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1533 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "Ingen"
-#: ../mail/em-account-editor.c:946
+#: ../mail/em-account-editor.c:1615
msgid "Never"
msgstr "Aldri"
-#: ../mail/em-account-editor.c:947
+#: ../mail/em-account-editor.c:1616
msgid "Always"
msgstr "Alltid"
-#: ../mail/em-account-editor.c:948
+#: ../mail/em-account-editor.c:1617
msgid "Ask for each message"
msgstr "Spør for hver melding"
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
+#: ../mail/em-account-editor.c:2347 ../widgets/misc/e-account-tree-view.c:265
msgctxt "mail-receiving"
msgid "None"
msgstr "Ingen"
-#: ../mail/em-account-editor.c:2233
-msgid "Fil_e:"
-msgstr "_Fil:"
-
-#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
+#: ../mail/em-account-editor.c:2748 ../mail/mail-config.ui.h:158
msgid "_Path:"
msgstr "S_ti:"
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2751
+msgid "Fil_e:"
+msgstr "_Fil:"
+
+#: ../mail/em-account-editor.c:2788
msgid "Mail Configuration"
msgstr "E-post-konfigurasjon"
-#: ../mail/em-account-editor.c:2288
+#: ../mail/em-account-editor.c:2789
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -8169,7 +8167,7 @@ msgstr ""
"\n"
"Klikk «Fortsett» for å begynne."
-#: ../mail/em-account-editor.c:2291
+#: ../mail/em-account-editor.c:2792
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -8179,19 +8177,19 @@ msgstr ""
"under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
"informasjonen i meldingene du sender."
-#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
+#: ../mail/em-account-editor.c:2794 ../mail/em-account-editor.c:2986
msgid "Receiving Email"
msgstr "Innkommende e-post"
-#: ../mail/em-account-editor.c:2294
+#: ../mail/em-account-editor.c:2795
msgid "Please configure the following account settings."
msgstr "Vennligst konfigurer følgende kontoinnstillinger."
-#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
+#: ../mail/em-account-editor.c:2797 ../mail/em-account-editor.c:3596
msgid "Sending Email"
msgstr "Utgående e-post"
-#: ../mail/em-account-editor.c:2297
+#: ../mail/em-account-editor.c:2798
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -8199,11 +8197,11 @@ msgstr ""
"Vennligst skriv inn informasjon om måten du sender e-post. Hvis du ikke er "
"sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
-#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2800 ../mail/mail-config.ui.h:1
msgid "Account Information"
msgstr "Kontoinformasjon"
-#: ../mail/em-account-editor.c:2300
+#: ../mail/em-account-editor.c:2801
msgid ""
"Please enter a descriptive name for this account below.\n"
"This name will be used for display purposes only."
@@ -8211,11 +8209,11 @@ msgstr ""
"Vennligst oppgi et beskrivende navn for denne kontoen i feltet under.\n"
"Dette navnet vil kun bli brukt som et visningsnavn."
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2805
msgid "Done"
msgstr "Ferdig"
-#: ../mail/em-account-editor.c:2305
+#: ../mail/em-account-editor.c:2806
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -8229,25 +8227,25 @@ msgstr ""
"\n"
"Klikk «Bruk» for å lagre dine innstillinger."
-#: ../mail/em-account-editor.c:2844
+#: ../mail/em-account-editor.c:3351
msgid "Check for _new messages every"
msgstr "Se etter _nye meldinger hver(t)"
-#: ../mail/em-account-editor.c:2852
+#: ../mail/em-account-editor.c:3359
msgid "minu_tes"
msgstr "minu_tter"
-#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
+#: ../mail/em-account-editor.c:4032 ../mail/mail-config.ui.h:102
msgid "Security"
msgstr "Sikkerhet"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:4087 ../mail/em-account-editor.c:4170
msgid "Receiving Options"
msgstr "Alternativer for mottak"
-#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
+#: ../mail/em-account-editor.c:4088 ../mail/em-account-editor.c:4171
msgid "Checking for New Messages"
msgstr "Ser etter nye meldinger"
@@ -8389,7 +8387,7 @@ msgid "_Later"
msgstr "_Senere"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:677
+#: ../modules/mail/e-mail-shell-view-actions.c:681
msgid "Add Label"
msgstr "Legg til etikett"
@@ -8418,28 +8416,28 @@ msgid "Name"
msgstr "Navn"
#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:916
+#: ../mail/em-folder-tree-model.c:918
#: ../modules/mail/e-mail-shell-view-private.c:1066
#: ../modules/mail/e-mail-shell-view-private.c:1077
msgid "Inbox"
msgstr "Innboks"
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:909
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:911
#: ../modules/mail/e-mail-shell-view-private.c:1064
msgid "Drafts"
msgstr "Skisser"
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:920
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:922
#: ../modules/mail/e-mail-shell-view-private.c:1068
msgid "Outbox"
msgstr "Utboks"
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:924
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:926
#: ../modules/mail/e-mail-shell-view-private.c:1070
msgid "Sent"
msgstr "Sendt"
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:912
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:914
#: ../modules/mail/e-mail-shell-view-private.c:1072
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
@@ -8447,36 +8445,7 @@ msgstr "Sendt"
msgid "Templates"
msgstr "Maler"
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "Flytter …"
-
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "Flytting"
-
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Flytter «%s»:"
-
-#: ../mail/e-mail-migrate.c:726
-msgid "Migrating Folders"
-msgstr "Flytter mapper"
-
-#: ../mail/e-mail-migrate.c:727
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Sammendragsformat for Evolutions e-postmapper bruker sqlite fra Evolution "
-"2.24.\n"
-"\n"
-"Vennligst vent mens Evolution migrere dine mapper …"
-
-#: ../mail/e-mail-migrate.c:1523
+#: ../mail/e-mail-migrate.c:1177
#, c-format
msgid "Unable to create local mail folders at '%s': %s"
msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
@@ -8485,623 +8454,623 @@ msgstr "Kunne ikke opprette lokale e-postmapper i «%s»: %s"
msgid "Please select a folder"
msgstr "Vennligst velg en mappe"
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "Kopier til mappe"
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:487
msgid "C_opy"
msgstr "K_opier"
-#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:824 ../mail/em-filter-i18n.h:51
msgid "Move to Folder"
msgstr "Flytt til mappe"
-#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:824 ../mail/em-folder-utils.c:487
msgid "_Move"
msgstr "_Flytt"
-#: ../mail/e-mail-reader.c:1184 ../mail/e-mail-reader.c:1372
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1185 ../mail/e-mail-reader.c:1373
+#: ../mail/e-mail-reader.c:1413
msgid "_Do not ask me again."
msgstr "_Ikke spør meg igjen."
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1419
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "_Alltid ignorer Reply-To: for e-postlister."
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1785
msgid "A_dd Sender to Address Book"
msgstr "L_egg til avsender i adressebok"
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1787
msgid "Add sender to address book"
msgstr "Legg til avsender i adressebok"
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1792
msgid "Check for _Junk"
msgstr "Sjekk etter _uønsket e-post"
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1794
msgid "Filter the selected messages for junk status"
msgstr "Filtrer valgte meldinger etter uønsket e-poststatus"
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1799
msgid "_Copy to Folder..."
msgstr "K_opier til mappe …"
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1801
msgid "Copy selected messages to another folder"
msgstr "Kopier valgte meldinger til en annen mappe"
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1806
msgid "_Delete Message"
msgstr "_Slett melding"
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1808
msgid "Mark the selected messages for deletion"
msgstr "Merk valgte meldinger for sletting"
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1813
msgid "Filter on Mailing _List..."
msgstr "Filtrer på e-post_liste …"
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:1815
msgid "Create a rule to filter messages to this mailing list"
msgstr "Lag en regel for å filtrere meldinger til denne meldingslisten"
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1820
msgid "Filter on _Recipients..."
msgstr "Filtrer på mottake_re …"
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1822
msgid "Create a rule to filter messages to these recipients"
msgstr "Lag en regel for å filtrere meldinger til disse mottakerene"
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1827
msgid "Filter on Se_nder..."
msgstr "Filtrer på se_nder …"
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1829
msgid "Create a rule to filter messages from this sender"
msgstr "Lag en regel for å filtrere meldinger fra denne avsenderen"
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1834
msgid "Filter on _Subject..."
msgstr "Filtrer på e_mne …"
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1836
msgid "Create a rule to filter messages with this subject"
msgstr "Lag en regel for filtrering av meldinger med dette emnet"
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1841
msgid "A_pply Filters"
msgstr "_Påfør filtre"
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1843
msgid "Apply filter rules to the selected messages"
msgstr "Aktiver filterregler på de valgte meldingene"
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1848
msgid "_Find in Message..."
msgstr "_Finn i melding …"
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1850
msgid "Search for text in the body of the displayed message"
msgstr "Søk etter tekst i kroppen av vist melding"
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1855
msgid "_Clear Flag"
msgstr "F_jern flagg"
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1857
msgid "Remove the follow-up flag from the selected messages"
msgstr "Fjern flagg for oppfølging fra valgte meldinger"
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1862
msgid "_Flag Completed"
msgstr "Merk som _fullført"
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1864
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "Sett flagg for oppfølging til fullført på valgte meldinger"
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:1869
msgid "Follow _Up..."
msgstr "Følg _opp …"
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1871
msgid "Flag the selected messages for follow-up"
msgstr "Merk valgte meldinger for oppfølging"
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1876
msgid "_Attached"
msgstr "L_agt ved"
-#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1878 ../mail/e-mail-reader.c:1885
msgid "Forward the selected message to someone as an attachment"
msgstr "Videresend den valgte meldingen til noen som et vedlegg"
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:1883
msgid "Forward As _Attached"
msgstr "Videresend s_om vedlegg"
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1890
msgid "_Inline"
msgstr "_I meldingen"
-#: ../mail/e-mail-reader.c:1891 ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1892 ../mail/e-mail-reader.c:1899
msgid "Forward the selected message in the body of a new message"
msgstr "Videresend den valgte meldingen i kroppen av en ny melding"
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1897
msgid "Forward As _Inline"
msgstr "V_ideresend som vedlegg"
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1904
msgid "_Quoted"
msgstr "_Sitert"
-#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1906 ../mail/e-mail-reader.c:1913
msgid "Forward the selected message quoted like a reply"
msgstr "Videresend den valgte meldingen sitert som et svar"
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1911
msgid "Forward As _Quoted"
msgstr "Videresend s_om sitat"
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1918
msgid "_Load Images"
msgstr "_Last bilder"
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1920
msgid "Force images in HTML mail to be loaded"
msgstr "Tvungen lasting av bilder i HTML e-post"
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1925
msgid "_Important"
msgstr "V_iktig"
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1927
msgid "Mark the selected messages as important"
msgstr "Merk valgte meldinger som viktige"
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1932
msgid "_Junk"
msgstr "_Uønsket e-post"
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1934
msgid "Mark the selected messages as junk"
msgstr "Merk valgte meldinger som uønsket e-post"
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1939
msgid "_Not Junk"
msgstr "_Ikke uønsket e-post"
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1941
msgid "Mark the selected messages as not being junk"
msgstr "Merk valgte meldinger som ønsket e-post"
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1946
msgid "_Read"
msgstr "_Les"
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1948
msgid "Mark the selected messages as having been read"
msgstr "Merk valgte meldinger som lest"
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1953
msgid "Uni_mportant"
msgstr "_Ikke viktig"
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1955
msgid "Mark the selected messages as unimportant"
msgstr "Merk valgte meldinger som uviktige"
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1960
msgid "_Unread"
msgstr "_Ulest"
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1962
msgid "Mark the selected messages as not having been read"
msgstr "Merk valgte meldinger som ulest"
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1967
msgid "_Edit as New Message..."
msgstr "R_ediger som ny melding …"
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1969
msgid "Open the selected messages in the composer for editing"
msgstr "Åpne valgte meldinger i redigeringskomponenten"
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1974
msgid "Compose _New Message"
msgstr "Skriv _ny melding"
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1976
msgid "Open a window for composing a mail message"
msgstr "Åpne et vindu for å skrive en e-post melding"
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1981
msgid "_Open in New Window"
msgstr "_Åpne i _nytt vindu"
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1983
msgid "Open the selected messages in a new window"
msgstr "Åpne valgte meldinger i et nytt vindu"
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1988
msgid "_Move to Folder..."
msgstr "Fl_ytt til mappe …"
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1990
msgid "Move selected messages to another folder"
msgstr "Flytt valgte meldinger til en annen mappe"
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:1995
msgid "_Switch to Folder"
msgstr "_Bytt til mappe"
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1997
msgid "Display the parent folder"
msgstr "Vis opphavsmappe"
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2002
msgid "Switch to _next tab"
msgstr "Bytt til _neste fane"
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2004
msgid "Switch to the next tab"
msgstr "Bytt til neste fane"
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2009
msgid "Switch to _previous tab"
msgstr "Bytt til _forrige fane"
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2011
msgid "Switch to the previous tab"
msgstr "Bytt til forrige fane"
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2016
msgid "Cl_ose current tab"
msgstr "L_ukk aktiv fane"
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2018
msgid "Close current tab"
msgstr "Lukk aktiv fane"
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2023
msgid "_Next Message"
msgstr "_Neste melding"
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2025
msgid "Display the next message"
msgstr "Vis neste melding"
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2030
msgid "Next _Important Message"
msgstr "Neste v_iktige melding"
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2032
msgid "Display the next important message"
msgstr "Vis neste viktige melding"
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2037
msgid "Next _Thread"
msgstr "Neste _tråd"
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2039
msgid "Display the next thread"
msgstr "Vis neste tråd"
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2044
msgid "Next _Unread Message"
msgstr "Neste _uleste melding"
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2046
msgid "Display the next unread message"
msgstr "Vis neste uleste melding"
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2051
msgid "_Previous Message"
msgstr "_Forrige melding"
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2053
msgid "Display the previous message"
msgstr "Vis forrige melding"
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2058
msgid "Pr_evious Important Message"
msgstr "Forrig_e viktige melding"
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2060
msgid "Display the previous important message"
msgstr "Vis forrige viktige melding"
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2065
msgid "Previous T_hread"
msgstr "Forrige trå_d"
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2067
msgid "Display the previous thread"
msgstr "Vis forrige tråd"
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2072
msgid "P_revious Unread Message"
msgstr "Fo_rrige uleste melding"
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2074
msgid "Display the previous unread message"
msgstr "Vis forrige uleste melding"
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2081
msgid "Print this message"
msgstr "Skriv ut denne meldingen"
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2088
msgid "Preview the message to be printed"
msgstr "Forhåndsvis meldingen som skal skrives ut"
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2093
msgid "Re_direct"
msgstr "Om_diriger"
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2095
msgid "Redirect (bounce) the selected message to someone"
msgstr "Omdiriger (bounce) den valgte meldingen til noen"
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2100
msgid "Remo_ve Attachments"
msgstr "Fjern _vedlegg"
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2102
msgid "Remove attachments"
msgstr "Fjern vedlegg"
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2107
msgid "Remove Du_plicate Messages"
msgstr "Fjern du_plikatmeldinger"
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2109
msgid "Checks selected messages for duplicates"
msgstr "Sjekk valgte meldinger for duplikater"
-#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2114 ../mail/mail.error.xml.h:110
#: ../modules/calendar/e-cal-shell-view-actions.c:1510
#: ../modules/mail/e-mail-attachment-handler.c:177
msgid "Reply to _All"
msgstr "Svar til _alle"
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2116
msgid "Compose a reply to all the recipients of the selected message"
msgstr "Skriv et svar til alle mottakere av den valgte meldingen"
-#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
+#: ../mail/e-mail-reader.c:2121 ../mail/mail.error.xml.h:111
msgid "Reply to _List"
msgstr "Svar til _listen"
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2123
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Skriv et svar til e-postlisten for den valgte meldingen"
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2128
#: ../modules/mail/e-mail-attachment-handler.c:184
msgid "_Reply to Sender"
msgstr "Sva_r til avsender"
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2130
msgid "Compose a reply to the sender of the selected message"
msgstr "Skriv et svar til avsender av den valgte meldingen"
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2135
msgid "_Save as mbox..."
msgstr "Lagre _som mbox …"
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2137
msgid "Save selected messages as an mbox file"
msgstr "Lagre valgte meldinger som en mbox-fil"
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2142
msgid "_Message Source"
msgstr "_Meldingskilde"
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2144
msgid "Show the raw email source of the message"
msgstr "Vis e-post meldingen i sin råe form"
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2156
msgid "_Undelete Message"
msgstr "_Angre sletting av melding"
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2158
msgid "Undelete the selected messages"
msgstr "Angre sletting av valgte meldinger"
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2163
msgid "_Normal Size"
msgstr "_Normal størrelse"
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2165
msgid "Reset the text to its original size"
msgstr "Ta teksten tilbake til sin opprinnelige størrelse"
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2170
msgid "_Zoom In"
msgstr "_Zoom inn"
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2172
msgid "Increase the text size"
msgstr "Større tekst"
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2177
msgid "Zoom _Out"
msgstr "Zoom _ut"
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2179
msgid "Decrease the text size"
msgstr "Mindre skrift"
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2186
msgid "Create R_ule"
msgstr "Opprett _regel"
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2193
msgid "Ch_aracter Encoding"
msgstr "Tegn_koding"
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2200
msgid "F_orward As"
msgstr "Videresend s_om"
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2207
msgid "_Group Reply"
msgstr "_Gruppesvar"
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2214
msgid "_Go To"
msgstr "_Gå til"
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2221
msgid "Mar_k As"
msgstr "Mer_k som"
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2228
msgid "_Message"
msgstr "_Melding"
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2235
msgid "_Zoom"
msgstr "_Zoom"
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2245
msgid "Search Folder from Mailing _List..."
msgstr "Søkemappe på e-post_liste …"
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2247
msgid "Create a search folder for this mailing list"
msgstr "Lag en søkemappe for denne e-postlisten"
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2252
msgid "Search Folder from Recipien_ts..."
msgstr "Søkemappe fra mo_ttakere …"
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2254
msgid "Create a search folder for these recipients"
msgstr "Lag en søkemappe for disse mottakerene"
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2259
msgid "Search Folder from Sen_der..."
msgstr "Søkemappe for avsen_der …"
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2261
msgid "Create a search folder for this sender"
msgstr "Lag en søkemappe for denne avsenderen"
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2266
msgid "Search Folder from S_ubject..."
msgstr "Søkemappe for _emne …"
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2268
msgid "Create a search folder for this subject"
msgstr "Lag en søkemappe for dette emnet"
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2291
msgid "Mark for Follo_w Up..."
msgstr "Merk for oppføl_ging …"
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2299
msgid "Mark as _Important"
msgstr "Merk som v_iktig"
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2303
msgid "Mark as _Junk"
msgstr "Merk som _uønsket e-post"
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2307
msgid "Mark as _Not Junk"
msgstr "Merk som _gyldig melding"
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2311
msgid "Mar_k as Read"
msgstr "Mer_k som lest"
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2315
msgid "Mark as Uni_mportant"
msgstr "_Merk som uviktig"
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2319
msgid "Mark as _Unread"
msgstr "Merk som _ulest"
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2363
msgid "_Caret Mode"
msgstr "Markør_modus"
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2365
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Vis en blinkende markør i kroppen av meldinger som vises"
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2371
msgid "All Message _Headers"
msgstr "Alle meldings_hoder"
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2373
msgid "Show messages with all email headers"
msgstr "Vis meldinger med alle meldingshoder"
-#: ../mail/e-mail-reader.c:2668
+#: ../mail/e-mail-reader.c:2699
#, c-format
msgid "Retrieving message '%s'"
msgstr "Henter melding «%s»"
#. we changed user, thus reset the chosen calendar combo too, because
#. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3302 ../mail/mail-config.ui.h:32
#: ../plugins/google-account-setup/google-source.c:316
#: ../plugins/google-account-setup/google-source.c:558
#: ../plugins/google-account-setup/google-source.c:695
-#: ../widgets/misc/e-account-tree-view.c:414
+#: ../widgets/misc/e-account-tree-view.c:417
msgid "Default"
msgstr "Forvalgt"
-#: ../mail/e-mail-reader.c:3424
+#: ../mail/e-mail-reader.c:3471
#: ../modules/mail/e-mail-attachment-handler.c:170
msgid "_Forward"
msgstr "_Videresend"
-#: ../mail/e-mail-reader.c:3425
+#: ../mail/e-mail-reader.c:3472
msgid "Forward the selected message to someone"
msgstr "Videresend den valgte meldingen til noen"
-#: ../mail/e-mail-reader.c:3444
+#: ../mail/e-mail-reader.c:3491
msgid "Group Reply"
msgstr "Gruppesvar"
-#: ../mail/e-mail-reader.c:3445
+#: ../mail/e-mail-reader.c:3492
msgid "Reply to the mailing list, or to all recipients"
msgstr "Svar til e-postlisten eller til alle mottakere"
-#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3545 ../mail/em-filter-i18n.h:14
msgid "Delete"
msgstr "Slett"
-#: ../mail/e-mail-reader.c:3531
+#: ../mail/e-mail-reader.c:3578
#: ../modules/calendar/e-cal-shell-view-actions.c:1356
#: ../widgets/misc/e-calendar.c:202
msgid "Next"
msgstr "Neste"
-#: ../mail/e-mail-reader.c:3535
+#: ../mail/e-mail-reader.c:3582
#: ../modules/calendar/e-cal-shell-view-actions.c:1349
#: ../widgets/misc/e-calendar.c:178
msgid "Previous"
msgstr "Forrige"
-#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3591 ../mail/mail-dialogs.ui.h:17
msgid "Reply"
msgstr "Svar"
-#: ../mail/e-mail-reader.c:4214
+#: ../mail/e-mail-reader.c:4265
#, c-format
msgid "Folder '%s'"
msgstr "Mappe «%s»"
@@ -9144,46 +9113,46 @@ msgid_plural "Messages"
msgstr[0] "Melding"
msgstr[1] "Meldinger"
-#: ../mail/e-mail-session.c:798
+#: ../mail/e-mail-session.c:833
#, c-format
msgid "Enter Passphrase for %s"
msgstr "Skriv inn passord for %s"
-#: ../mail/e-mail-session.c:802
+#: ../mail/e-mail-session.c:837
msgid "Enter Passphrase"
msgstr "Skriv inn passord"
-#: ../mail/e-mail-session.c:806
+#: ../mail/e-mail-session.c:841
#, c-format
msgid "Enter Password for %s"
msgstr "Skriv inn passord for %s"
-#: ../mail/e-mail-session.c:810
+#: ../mail/e-mail-session.c:845
msgid "Enter Password"
msgstr "Skriv inn passord"
-#: ../mail/e-mail-session.c:861
+#: ../mail/e-mail-session.c:896
#, c-format
msgid "User canceled operation."
msgstr "Operasjon avbrutt av bruker."
-#: ../mail/e-mail-session.c:974
+#: ../mail/e-mail-session.c:1009
#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr "Ingen måladresse oppgitt. Videresending av meldingen ble avbrutt."
-#: ../mail/e-mail-session.c:983
+#: ../mail/e-mail-session.c:1018
#, c-format
msgid "No account found to use, forward of the message has been cancelled."
msgstr "Fant ingen konto å bruke. Videresending av meldingen ble avbrutt."
-#: ../mail/e-mail-session.c:1134
+#: ../mail/e-mail-session.c:1169
#, c-format
msgid "%s authentication failed"
msgstr "%s autentisering feilet"
-#: ../mail/e-mail-session.c:1201
+#: ../mail/e-mail-session.c:1243
#, c-format
msgid "No password was provided"
msgstr "Passord ikke oppgitt"
@@ -9193,13 +9162,13 @@ msgstr "Passord ikke oppgitt"
msgid "Cannot get transport for account '%s'"
msgstr "Kan ikke hente transport for konto «%s»"
-#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:642
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Feil under påføring av utgående filtre: %s"
#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
-#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
+#: ../mail/mail-ops.c:661 ../mail/mail-ops.c:695
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -9208,13 +9177,13 @@ msgstr ""
"Kunne ikke legge til i %s: %s\n"
"Legger til i lokal «Sendt»-mappe i stedet."
-#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:715
#, c-format
msgid "Failed to append to local 'Sent' folder: %s"
msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
-#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
-#: ../mail/mail-ops.c:928
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:836
+#: ../mail/mail-ops.c:932
msgid "Sending message"
msgstr "Sender melding"
@@ -9270,15 +9239,15 @@ msgstr "Din melding til %s om «%s» den %s er har blitt lest."
msgid "Delivery Notification for: \"%s\""
msgstr "Varsling om ny e-post for «%s»"
-#: ../mail/em-composer-utils.c:2600
+#: ../mail/em-composer-utils.c:2602
msgid "an unknown sender"
msgstr "en ukjent avsender"
-#: ../mail/em-composer-utils.c:3006
+#: ../mail/em-composer-utils.c:3008
msgid "Posting destination"
msgstr "Destinasjon for post"
-#: ../mail/em-composer-utils.c:3007
+#: ../mail/em-composer-utils.c:3009
msgid "Choose folders to post the message to."
msgstr "Velg mapper meldingen skal postes til."
@@ -9589,39 +9558,39 @@ msgstr "%s (%u%s)"
msgid "Mail Folder Tree"
msgstr "Tre for e-postmapper"
-#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2093 ../mail/em-folder-utils.c:115
#, c-format
msgid "Moving folder %s"
msgstr "Flytter mappe %s"
-#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2096 ../mail/em-folder-utils.c:117
#, c-format
msgid "Copying folder %s"
msgstr "Kopierer mappe %s"
-#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2303
#, c-format
msgid "Moving messages into folder %s"
msgstr "Flytter meldinger til mappe %s"
-#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2305
#, c-format
msgid "Copying messages into folder %s"
msgstr "Kopierer meldinger til mappe %s"
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2126
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
-#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
-#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1062
+#: ../mail/mail-vfolder.c:1174 ../widgets/misc/e-account-tree-view.c:100
#: ../widgets/misc/e-account-tree-view.c:301
-#: ../widgets/misc/e-account-tree-view.c:924
-#: ../widgets/misc/e-account-tree-view.c:983
-#: ../widgets/misc/e-account-tree-view.c:1055
-#: ../widgets/misc/e-account-tree-view.c:1132
-#: ../widgets/misc/e-account-tree-view.c:1387
+#: ../widgets/misc/e-account-tree-view.c:927
+#: ../widgets/misc/e-account-tree-view.c:986
+#: ../widgets/misc/e-account-tree-view.c:1058
+#: ../widgets/misc/e-account-tree-view.c:1135
+#: ../widgets/misc/e-account-tree-view.c:1390
msgid "Search Folders"
msgstr "Søkemapper"
@@ -9630,7 +9599,7 @@ msgstr "Søkemapper"
msgid "UNMATCHED"
msgstr "UTEN TREFF"
-#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
+#: ../mail/em-folder-tree-model.c:988 ../mail/em-folder-tree-model.c:1282
msgid "Loading..."
msgstr "Laster …"
@@ -9900,7 +9869,7 @@ msgid "Subscribe to _all"
msgstr "Abonner på _alle"
#: ../mail/em-subscription-editor.c:933 ../mail/em-subscription-editor.c:1772
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
msgid "_Unsubscribe"
msgstr "_Fjern abonnement"
@@ -9937,7 +9906,7 @@ msgid "Su_bscribe"
msgstr "A_bonner"
#: ../mail/em-subscription-editor.c:1771
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
msgid "Unsubscribe from the selected folder"
msgstr "Fjern abonnement på valgt mappe"
@@ -9981,11 +9950,11 @@ msgstr[1] "Er du sikker på at du vil åpne %d meldinger samtidig?"
msgid "_Do not show this message again"
msgstr "Ikke vis _denne meldingen igjen"
-#: ../mail/em-utils.c:335
+#: ../mail/em-utils.c:308
msgid "Message Filters"
msgstr "Meldingsfiltre"
-#: ../mail/em-utils.c:920
+#: ../mail/em-utils.c:893
#, c-format
msgid "Messages from %s"
msgstr "Meldinger fra %s"
@@ -11292,7 +11261,7 @@ msgstr "Importerer postboks"
#. Destination folder, was set in our widget
#: ../mail/importers/mail-importer.c:153
#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:751
+#: ../plugins/pst-import/pst-importer.c:753
#, c-format
msgid "Importing '%s'"
msgstr "Importerer «%s»"
@@ -11839,7 +11808,7 @@ msgstr "S_tart skriving under meldingen ved svar"
msgid "Start up"
msgstr "Oppstart"
-#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:21
msgid "TLS encryption"
msgstr "TLS-kryptering"
@@ -11949,7 +11918,7 @@ msgstr "_Manuell konfigurasjon av proxy:"
msgid "_Never load images from the Internet"
msgstr "Aldri last bilder fra Internett"
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:29
msgid "_Port:"
msgstr "_Port:"
@@ -11969,7 +11938,7 @@ msgstr "_Skript:"
msgid "_Secure HTTP Proxy:"
msgstr "_Sikker HTTP-proxy:"
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "Tj_ener:"
@@ -11987,7 +11956,7 @@ msgstr "Vi_s bilde av avsender i forhåndsvisning av meldingen"
msgid "_Trash Folder:"
msgstr "Mappe for _papirkurv:"
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:170
msgid "_Use secure connection:"
msgstr "Br_uk sikker forbindelse:"
@@ -12125,65 +12094,65 @@ msgstr "Filtrerer valgte meldinger"
msgid "Fetching Mail"
msgstr "Henter e-post"
-#: ../mail/mail-ops.c:843
+#: ../mail/mail-ops.c:847
#, c-format
msgid "Sending message %d of %d"
msgstr "Sender melding %d av %d"
-#: ../mail/mail-ops.c:891
+#: ../mail/mail-ops.c:895
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Feil under sending av %d av %d meldinger"
-#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
+#: ../mail/mail-ops.c:899 ../mail/mail-send-recv.c:840
msgid "Canceled."
msgstr "Avbrutt."
-#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
+#: ../mail/mail-ops.c:901 ../mail/mail-send-recv.c:842
msgid "Complete."
msgstr "Fullført."
-#: ../mail/mail-ops.c:1012
+#: ../mail/mail-ops.c:1016
#, c-format
msgid "Moving messages to '%s'"
msgstr "Flytter meldinger til «%s»"
-#: ../mail/mail-ops.c:1013
+#: ../mail/mail-ops.c:1017
#, c-format
msgid "Copying messages to '%s'"
msgstr "Kopierer meldinger til «%s»"
-#: ../mail/mail-ops.c:1131
+#: ../mail/mail-ops.c:1135
#, c-format
msgid "Storing folder '%s'"
msgstr "Lagrer mappe «%s»"
-#: ../mail/mail-ops.c:1206
+#: ../mail/mail-ops.c:1211
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Tømmer og lagrer konto «%s»"
-#: ../mail/mail-ops.c:1207
+#: ../mail/mail-ops.c:1212
#, c-format
msgid "Storing account '%s'"
msgstr "Lagrer konto «%s»"
-#: ../mail/mail-ops.c:1269
+#: ../mail/mail-ops.c:1274
#, c-format
msgid "Refreshing folder '%s'"
msgstr "Oppdaterer mappe «%s»"
-#: ../mail/mail-ops.c:1459
+#: ../mail/mail-ops.c:1483
#, c-format
msgid "Expunging folder '%s'"
msgstr "Tømmer mappe «%s»"
-#: ../mail/mail-ops.c:1544
+#: ../mail/mail-ops.c:1568
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Tømmer søppel i «%s»"
-#: ../mail/mail-ops.c:1646
+#: ../mail/mail-ops.c:1670
#, c-format
msgid "Disconnecting %s"
msgstr "Kobler fra %s"
@@ -12218,17 +12187,17 @@ msgstr "Ser etter nye meldinger"
msgid "Could not create spool directory '%s': %s"
msgstr "Kan ikke opprette spool-katalog «%s»: %s"
-#: ../mail/mail-tools.c:106
+#: ../mail/mail-tools.c:113
#, c-format
msgid "Trying to movemail a non-mbox source '%s'"
msgstr "Prøver å bruke movemail på en kilde, «%s», som ikke er i mbox-format"
-#: ../mail/mail-tools.c:215
+#: ../mail/mail-tools.c:225
#, c-format
msgid "Forwarded message - %s"
msgstr "Videresendt melding - %s"
-#: ../mail/mail-tools.c:217
+#: ../mail/mail-tools.c:227
msgid "Forwarded message"
msgstr "Videresendt melding"
@@ -12247,7 +12216,7 @@ msgstr "Oppdaterer søkemapper for «%s» : %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
+#: ../mail/mail-vfolder.c:618
#, c-format
msgid ""
"The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12265,11 +12234,11 @@ msgstr[1] ""
"%s ble oppdatert fordi de brukte en mappe som ble slettet\n"
"«%s»."
-#: ../mail/mail-vfolder.c:1314
+#: ../mail/mail-vfolder.c:1249
msgid "Edit Search Folder"
msgstr "Rediger søkemappe"
-#: ../mail/mail-vfolder.c:1423
+#: ../mail/mail-vfolder.c:1358
msgid "New Search Folder"
msgstr "Ny søkemappe"
@@ -12994,7 +12963,7 @@ msgid "_Discard changes"
msgstr "_Forkast endringene"
#: ../mail/mail.error.xml.h:160
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1116
msgid "_Empty Trash"
msgstr "_Tøm papirkurven"
@@ -13114,7 +13083,7 @@ msgid "Follow-up"
msgstr "Følg opp"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5094
msgid "Generating message list"
msgstr "Genererer meldingsliste"
@@ -13164,27 +13133,27 @@ msgid "Subject - Trimmed"
msgstr "Forkortet emne"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
msgid "Body contains"
msgstr "Kropp inneholder"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
msgid "Message contains"
msgstr "Melding inneholder"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
msgid "Recipients contain"
msgstr "Mottakere inneholder"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
msgid "Sender contains"
msgstr "Avsender inneholder"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
msgid "Subject contains"
msgstr "Emne inneholder"
@@ -13451,10 +13420,10 @@ msgstr "Opprett en ny adressebok"
#. Create the contacts group
#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/addressbook/e-book-shell-view.c:402
#: ../modules/calendar/e-cal-shell-backend.c:115
#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../modules/online-accounts/e-online-accounts-google.c:376
msgid "Contacts"
msgstr "Kontakter"
@@ -13516,7 +13485,7 @@ msgstr "Vis kart med alle kontakter fra valgt adressebok"
#: ../modules/calendar/e-cal-shell-view-actions.c:1405
#: ../modules/calendar/e-memo-shell-view-actions.c:640
#: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1193
msgid "_Rename..."
msgstr "End_re navn …"
@@ -13597,7 +13566,7 @@ msgstr "H_andlinger"
#: ../modules/addressbook/e-book-shell-view-actions.c:940
#: ../modules/calendar/e-memo-shell-view-actions.c:677
#: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
msgid "_Preview"
msgstr "_Forhåndsvis"
@@ -13635,7 +13604,7 @@ msgstr "Vis kart i forhåndsvisning av kontakter"
#: ../modules/addressbook/e-book-shell-view-actions.c:1018
#: ../modules/calendar/e-memo-shell-view-actions.c:747
#: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1462
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
msgid "_Classic View"
msgstr "_Klassisk visning"
@@ -13646,7 +13615,7 @@ msgstr "Vis forhåndsvisning av kontakt under kontaktlisten"
#: ../modules/addressbook/e-book-shell-view-actions.c:1025
#: ../modules/calendar/e-memo-shell-view-actions.c:754
#: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1469
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
msgid "_Vertical View"
msgstr "_Vertikal visning"
@@ -13672,7 +13641,7 @@ msgstr "Ingen treff"
#: ../modules/calendar/e-cal-shell-view-actions.c:1727
#: ../modules/calendar/e-memo-shell-view-actions.c:781
#: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
#: ../shell/e-shell-content.c:664
msgid "Advanced Search"
msgstr "Avansert søk"
@@ -13707,23 +13676,23 @@ msgstr "Lagre _som vCard …"
msgid "Save selected contacts as a vCard"
msgstr "Lagre valgte kontakter som et vCard"
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
msgid "_Forward Contacts"
msgstr "_Videresend kontakter"
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
msgid "_Forward Contact"
msgstr "_Videresend kontakt"
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
msgid "_Send Message to Contacts"
msgstr "_Send melding til kontakter"
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
msgid "_Send Message to List"
msgstr "_Send melding til liste"
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
msgid "_Send Message to Contact"
msgstr "_Send melding til kontakt"
@@ -13776,17 +13745,17 @@ msgid "One"
msgstr "En"
#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "S_earch filter:"
+msgstr "Søk_efilter:"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search Filter"
msgstr "Søkefilter"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _base:"
msgstr "Søke_base:"
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "Søke_filter:"
-
#: ../modules/addressbook/ldap-config.ui.h:16
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -13795,40 +13764,48 @@ msgstr ""
"Søkefilter angir type objekter det skal søkes etter når et søk utføres. Hvis "
"dette ikke endres vil søket bruke objektklassen «person» som forvalg."
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Ser_ver:"
+msgstr "T_jener:"
+
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Sub"
msgstr "Sub"
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "Supported Search Bases"
msgstr "Støttede søkebaser"
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Use secure _connection:"
+msgstr "Bruk sikker til_kobling:"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "Using distinguished name (DN)"
msgstr "Bruk distinguished name (DN)"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "Using email address"
msgstr "Bruker e-postadresse"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Download limit:"
msgstr "Grense for ne_dlasting:"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
msgid "_Find Possible Search Bases"
msgstr "_Finn mulige søkebaser"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Login method:"
msgstr "Metode for på_logging:"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Search scope:"
msgstr "_Søkeområde:"
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Timeout:"
msgstr "_Tidsavbrudd:"
@@ -15274,7 +15251,7 @@ msgstr[0] "%d notat"
msgstr[1] "%d notater"
#: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
+#: ../modules/calendar/e-task-shell-view-private.c:583
#, c-format
msgid "%d selected"
msgstr "%d valgt"
@@ -15442,18 +15419,18 @@ msgstr "Slett oppgave"
msgid "Expunging"
msgstr "Tømmer"
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:579
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d oppgave"
msgstr[1] "%d oppgaver"
-#: ../modules/mail/em-account-prefs.c:258
+#: ../modules/mail/em-account-prefs.c:263
msgid "Evolution Account Assistant"
msgstr "Evolution kontoassistent"
-#: ../modules/mail/em-account-prefs.c:307
+#: ../modules/mail/em-account-prefs.c:312
msgid "Account Editor"
msgstr "Kontoredigering"
@@ -15463,21 +15440,21 @@ msgstr "Kontoredigering"
msgid "%d attached messages"
msgstr "%d vedlagte meldinger"
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:192
msgctxt "New"
msgid "_Mail Message"
msgstr "E-post_melding"
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:194
msgid "Compose a new mail message"
msgstr "Skriv en ny e-postmelding"
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:202
msgctxt "New"
msgid "Mail _Folder"
msgstr "E-post_mappe"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:204
msgid "Create a new mail folder"
msgstr "Opprett en ny e-postmappe"
@@ -15497,296 +15474,296 @@ msgstr "Brukervalg for redigering"
msgid "Network Preferences"
msgstr "Brukervalg for nettverk"
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
#: ../modules/mail/e-mail-shell-view.c:960
msgid "_Disable Account"
msgstr "_Deaktiver konto"
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1111
msgid "Disable this account"
msgstr "Deaktiver denne kontoen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1118
msgid "Permanently remove all the deleted messages from all folders"
msgstr "Fjern alle slettede meldinger fra alle mapper permanent"
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
msgid "_Download Messages for Offline Usage"
msgstr "Last ne_d meldinger for frakoblet bruk"
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1125
msgid "Download messages of accounts and folders marked for offline usage"
msgstr ""
"Last ned meldinger fra kontoer og mapper som er merket for frakoblet bruk"
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
msgid "Fl_ush Outbox"
msgstr "T_øm utboks"
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
msgid "_Copy Folder To..."
msgstr "_Kopier mappe til …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
msgid "Copy the selected folder into another folder"
msgstr "Kopier valgt mappe til en annen mappe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
msgid "Permanently remove this folder"
msgstr "Fjern denne mappen permanent"
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1151
msgid "E_xpunge"
msgstr "T_øm"
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
msgid "Permanently remove all deleted messages from this folder"
msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
msgid "Mar_k All Messages as Read"
msgstr "Mer_k alle meldinger som lest"
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
msgid "Mark all messages in the folder as read"
msgstr "Merk alle meldinger i en mappe som lest"
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1165
msgid "_Move Folder To..."
msgstr "Flytt _mappe til …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1163
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
msgid "Move the selected folder into another folder"
msgstr "Flytt valgt mappe til en annen mappe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1172
msgid "_New..."
msgstr "_Ny …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
msgid "Create a new folder for storing mail"
msgstr "Lag en ny mappe for lagring av meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
msgid "Change the properties of this folder"
msgstr "Endre egenskaper for denne mappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
msgid "Refresh the folder"
msgstr "Oppdater mappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
msgid "Change the name of this folder"
msgstr "Endre navn på denne mappen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
msgid "Select Message _Thread"
msgstr "Velg meldings_tråd"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1202
msgid "Select all messages in the same thread as the selected message"
msgstr "Velg alle meldinger i samme tråd som den valgte meldingen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
msgid "Select Message S_ubthread"
msgstr "Velg _undertråd for melding"
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
msgid "Select all replies to the currently selected message"
msgstr "Velg alle svar til den valgt melding"
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
msgid "Empty _Trash"
msgstr "Tøm _papirkurven"
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "Fjern alle slettede meldinger fra alle kontoer permanent"
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
msgid "_New Label"
msgstr "_Ny etikett"
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
msgid "N_one"
msgstr "_Ingen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
msgid "_Manage Subscriptions"
msgstr "_Håndter abonnement"
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Abonner eller fjern abonnement på mapper på eksterne tjenere"
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
msgid "Send / _Receive"
msgstr "Send / _motta"
-#: ../modules/mail/e-mail-shell-view-actions.c:1256
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
msgid "Send queued items and retrieve new items"
msgstr "Send kølagte oppføringer og hent nye oppføringer"
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
msgid "R_eceive All"
msgstr "Motta all_e"
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
msgid "Receive new items from all accounts"
msgstr "Motta nye oppføringer fra alle kontoer"
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
msgid "_Send All"
msgstr "_Send alle"
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
msgid "Send queued items in all accounts"
msgstr "Send kølagte oppføringer i alle kontoer"
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
#: ../widgets/misc/e-activity-proxy.c:310
msgid "Cancel"
msgstr "Avbryt"
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
msgid "Cancel the current mail operation"
msgstr "Avbryt aktiv e-postoperasjon"
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
msgid "Collapse All _Threads"
msgstr "Slå sammen alle _tråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
msgid "Collapse all message threads"
msgstr "Slå sammen alle meldingstråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
msgid "E_xpand All Threads"
msgstr "Ut_vid alle tråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
msgid "Expand all message threads"
msgstr "Utvid alle meldingstråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
msgid "_Message Filters"
msgstr "_Meldingsfiltre"
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
msgid "Create or edit rules for filtering new mail"
msgstr "Opprett eller rediger regler for filtrering av ny e-post"
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
msgid "_Subscriptions..."
msgstr "_Abonnement …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
msgid "F_older"
msgstr "M_appe"
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
msgid "_Label"
msgstr "_Etikett"
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
msgid "C_reate Search Folder From Search..."
msgstr "Opp_rett søkemappe fra søk …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1368
msgid "Search F_olders"
msgstr "Søk i _mapper"
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
msgid "Create or edit search folder definitions"
msgstr "Opprett eller rediger søkemappedefinisjoner"
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
msgid "_New Folder..."
msgstr "_Ny mappe …"
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
msgid "Show Message _Preview"
msgstr "Vis _forhåndsvisning av melding"
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1431
msgid "Show message preview pane"
msgstr "Vis område for forhåndsvisning av melding"
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
msgid "Show _Deleted Messages"
msgstr "Vis slette_de meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
msgid "Show deleted messages with a line through them"
msgstr "Vis slettede meldinger som gjennomstreket i meldingslisten."
-#: ../modules/mail/e-mail-shell-view-actions.c:1441
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
msgid "_Group By Threads"
msgstr "_Grupper etter tråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1447
msgid "Threaded message list"
msgstr "Meldingsliste med tråder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-shell-view-actions.c:1468
msgid "Show message preview below the message list"
msgstr "Vis meldingen under meldingslisten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1471
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
msgid "Show message preview alongside the message list"
msgstr "Vis meldingen ved siden av meldingslisten"
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
msgid "All Messages"
msgstr "Alle meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
msgid "Important Messages"
msgstr "Viktige meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1497
msgid "Last 5 Days' Messages"
msgstr "Meldinger fra de siste 5 dagene"
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1504
msgid "Messages Not Junk"
msgstr "Meldinger som ikke er uønsket e-post"
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
msgid "Messages with Attachments"
msgstr "Meldinger med vedlegg"
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1518
msgid "No Label"
msgstr "Ingen etikett"
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1525
msgid "Read Messages"
msgstr "Leste meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1532
msgid "Recent Messages"
msgstr "Nye meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
msgid "Unread Messages"
msgstr "Uleste meldinger"
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
msgid "Subject or Addresses contain"
msgstr "Emne eller adresser inneholder"
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
msgid "All Accounts"
msgstr "Alle konti"
-#: ../modules/mail/e-mail-shell-view-actions.c:1604
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
msgid "Current Account"
msgstr "Denne kontoen"
-#: ../modules/mail/e-mail-shell-view-actions.c:1611
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
msgid "Current Folder"
msgstr "Denne mappen"
@@ -15870,7 +15847,7 @@ msgstr "Send / motta"
#: ../modules/mail/em-composer-prefs.c:498
#: ../modules/plugin-manager/evolution-plugin-manager.c:360
#: ../plugins/publish-calendar/publish-calendar.c:849
-#: ../widgets/misc/e-account-tree-view.c:385
+#: ../widgets/misc/e-account-tree-view.c:388
msgid "Enabled"
msgstr "Aktivert"
@@ -15945,7 +15922,7 @@ msgstr ""
"Evolution vil gå tilbake i tilkoblet modus når en nettverkstilkobling er "
"tilgjengelig."
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+#: ../modules/online-accounts/camel-sasl-xoauth.c:388
msgid ""
"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
"from which to obtain an authentication token."
@@ -15953,11 +15930,11 @@ msgstr ""
"Kan ikke finne en passende konto å hente autentiseringsinformasjon for fra "
"org.gnome.OnlineAccounts-tjenesten."
-#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#: ../modules/online-accounts/camel-sasl-xoauth.c:475
msgid "OAuth"
msgstr "OAuth"
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+#: ../modules/online-accounts/camel-sasl-xoauth.c:477
msgid ""
"This option will connect to the server by way of the GNOME Online Accounts "
"service"
@@ -16098,17 +16075,10 @@ msgstr "Velkommen"
#: ../modules/startup-wizard/evolution-startup-wizard.c:508
msgid ""
"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution "
-"til å koble til dine e-post kontoer, og importere filer fra andre "
-"programmer. \n"
-"\n"
-"Vennligst klikk «Fremover» for å fortsette. "
+"to your email accounts, and to import files from other applications."
+msgstr "Velkommen til Evolution. De neste skjermene lar deg konfigurere Evolution til å koble til dine e-post kontoer, og importere filer fra andre programmer."
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
msgid "Loading accounts..."
msgstr "Laster kontoer …"
@@ -17025,12 +16995,12 @@ msgstr "Bilde i e-postmeldingen"
msgid "View image attachments directly in mail messages."
msgstr "Vis bildevedlegg direkte i e-postmeldinger."
-#: ../plugins/imap-features/imap-headers.c:337
+#: ../plugins/imap-features/imap-headers.c:335
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "Egendefinerte meldingshoder"
-#: ../plugins/imap-features/imap-headers.c:349
+#: ../plugins/imap-features/imap-headers.c:347
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "IMAP-meldingshoder"
@@ -17112,114 +17082,114 @@ msgstr "Kan ikke finne denne oppgaven i noen oppgaveliste"
msgid "Unable to find this memo in any memo list"
msgstr "Kan ikke finne dette notatet i noen notatliste"
-#: ../plugins/itip-formatter/itip-formatter.c:1082
+#: ../plugins/itip-formatter/itip-formatter.c:1083
msgid "Opening the calendar. Please wait..."
msgstr "Åpner kalender. Vennligst vent …"
-#: ../plugins/itip-formatter/itip-formatter.c:1085
+#: ../plugins/itip-formatter/itip-formatter.c:1086
msgid "Searching for an existing version of this appointment"
msgstr "Søker etter en eksisterende versjon av denne avtalen"
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1363
msgid "Unable to parse item"
msgstr "Kunne ikke lese oppføring"
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1452
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Kunne ikke sende oppføring til kalender «%s». %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1464
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Sendt til kalender «%s» som godtatt"
-#: ../plugins/itip-formatter/itip-formatter.c:1467
+#: ../plugins/itip-formatter/itip-formatter.c:1468
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Sendt til kalender «%s» som tentativ"
-#: ../plugins/itip-formatter/itip-formatter.c:1472
+#: ../plugins/itip-formatter/itip-formatter.c:1473
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Sendt til kalender «%s» som avslått"
-#: ../plugins/itip-formatter/itip-formatter.c:1477
+#: ../plugins/itip-formatter/itip-formatter.c:1478
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "Sendt til kalender «%s» som avlyst"
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1580
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Organisator har fjernet delegat %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1587
msgid "Sent a cancelation notice to the delegate"
msgstr "Avlysningsvarsel sendt til delegat"
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1589
msgid "Could not send the cancelation notice to the delegate"
msgstr "Kunne ikke sende avlysningsmelding til delegaten"
-#: ../plugins/itip-formatter/itip-formatter.c:1700
+#: ../plugins/itip-formatter/itip-formatter.c:1701
msgid "Attendee status could not be updated because the status is invalid"
msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status"
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1730
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Kan ikke oppdatere deltaker. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1733
+#: ../plugins/itip-formatter/itip-formatter.c:1734
msgid "Attendee status updated"
msgstr "Deltakerstatus oppdatert"
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1738
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:1760
msgid "Meeting information sent"
msgstr "Informasjon om møte sendt"
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1763
msgid "Task information sent"
msgstr "Informasjon om oppgave sendt"
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/itip-formatter/itip-formatter.c:1766
msgid "Memo information sent"
msgstr "Informasjon om notat sendt"
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1775
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "Kan ikke sende møteinformasjon. Møtet eksisterer ikke"
-#: ../plugins/itip-formatter/itip-formatter.c:1777
+#: ../plugins/itip-formatter/itip-formatter.c:1778
msgid "Unable to send task information, the task does not exist"
msgstr "Kan ikke sende informasjon om oppgave. Oppgaven eksisterer ikke"
-#: ../plugins/itip-formatter/itip-formatter.c:1780
+#: ../plugins/itip-formatter/itip-formatter.c:1781
msgid "Unable to send memo information, the memo does not exist"
msgstr "Kan ikke sende informasjon om notat. Notatet eksisterer ikke"
#. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1846
+#: ../plugins/itip-formatter/itip-formatter.c:1847
msgid "calendar.ics"
msgstr "kalender.ics"
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1852
msgid "Save Calendar"
msgstr "Lagre kalender"
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
msgid "The calendar attached is not valid"
msgstr "Vedlagt kalender er ugyldig"
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1927
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
@@ -17227,15 +17197,15 @@ msgstr ""
"Meldingen påstår at den inneholder en kalender, men kalenderen er ikke en "
"gyldig iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
-msgid "The item in the calendar is not valid"
-msgstr "Oppføringen i kalenderen er ikke gyldig"
-
#: ../plugins/itip-formatter/itip-formatter.c:1967
#: ../plugins/itip-formatter/itip-formatter.c:1995
#: ../plugins/itip-formatter/itip-formatter.c:2104
+msgid "The item in the calendar is not valid"
+msgstr "Oppføringen i kalenderen er ikke gyldig"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../plugins/itip-formatter/itip-formatter.c:2105
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -17243,11 +17213,11 @@ msgstr ""
"Meldingen inneholder en kalender, men kalenderen inneholder ingen hendelser, "
"oppgaver eller ledig/opptatt-informasjon"
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../plugins/itip-formatter/itip-formatter.c:2009
msgid "The calendar attached contains multiple items"
msgstr "Vedlagt kalender inneholder flere oppføringer"
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/itip-formatter/itip-formatter.c:2010
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -17255,44 +17225,44 @@ msgstr ""
"Du må lagre filen og importere kalenderen for å prosessere alle disse "
"oppføringene"
-#: ../plugins/itip-formatter/itip-formatter.c:2665
+#: ../plugins/itip-formatter/itip-formatter.c:2666
msgctxt "cal-itip"
msgid "None"
msgstr "Ingen"
-#: ../plugins/itip-formatter/itip-formatter.c:2681
+#: ../plugins/itip-formatter/itip-formatter.c:2682
msgid "Tentatively Accepted"
msgstr "Akseptert tentativt"
-#: ../plugins/itip-formatter/itip-formatter.c:2799
+#: ../plugins/itip-formatter/itip-formatter.c:2800
msgid "This meeting recurs"
msgstr "Dettee møtet gjeninntreffer"
-#: ../plugins/itip-formatter/itip-formatter.c:2802
+#: ../plugins/itip-formatter/itip-formatter.c:2803
msgid "This task recurs"
msgstr "Denne oppgaven gjeninntreffer"
-#: ../plugins/itip-formatter/itip-formatter.c:2805
+#: ../plugins/itip-formatter/itip-formatter.c:2806
msgid "This memo recurs"
msgstr "Dette notatet gjeninntreffer"
-#: ../plugins/itip-formatter/itip-formatter.c:3029
+#: ../plugins/itip-formatter/itip-formatter.c:3030
msgid "Meeting Invitations"
msgstr "Møteinvitasjoner"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3054
+#: ../plugins/itip-formatter/itip-formatter.c:3055
msgid "_Delete message after acting"
msgstr "_Slett melding etter utført handling"
-#: ../plugins/itip-formatter/itip-formatter.c:3064
-#: ../plugins/itip-formatter/itip-formatter.c:3097
+#: ../plugins/itip-formatter/itip-formatter.c:3065
+#: ../plugins/itip-formatter/itip-formatter.c:3098
msgid "Conflict Search"
msgstr "Søk etter konflikter"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3079
+#: ../plugins/itip-formatter/itip-formatter.c:3080
msgid "Select the calendars to search for meeting conflicts"
msgstr "Velg kalendere som skal gjennomsøkes for å finne møtekonflikter"
@@ -18322,27 +18292,27 @@ msgstr "Outlook personlige mapper (.pst)"
msgid "_Mail"
msgstr "_E-post"
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:556
msgid "Destination folder:"
msgstr "Målmappe:"
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../plugins/pst-import/pst-importer.c:564
msgid "_Address Book"
msgstr "_Adressebok"
-#: ../plugins/pst-import/pst-importer.c:567
+#: ../plugins/pst-import/pst-importer.c:569
msgid "A_ppointments"
msgstr "A_vtaler"
-#: ../plugins/pst-import/pst-importer.c:572 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:574 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Oppgaver"
-#: ../plugins/pst-import/pst-importer.c:577
+#: ../plugins/pst-import/pst-importer.c:579
msgid "_Journal entries"
msgstr "_Journaloppføringer"
-#: ../plugins/pst-import/pst-importer.c:688
+#: ../plugins/pst-import/pst-importer.c:690
msgid "Importing Outlook data"
msgstr "Importerer data fra Outlook"
@@ -18869,7 +18839,7 @@ msgstr "Sidelinjen er synlig"
msgid "Skip development warning dialog"
msgstr "Hopp over varseldialogen om utviklingsversjonen"
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:311
msgid "Start in offline mode"
msgstr "Start i frakoblet modus"
@@ -19364,7 +19334,7 @@ msgid "Preparing to quit..."
msgstr "Forbereder avslutting …"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:193
+#: ../shell/main.c:194
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -19399,7 +19369,7 @@ msgstr ""
"Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
"spenning på at du tilbyr din hjelp!\n"
-#: ../shell/main.c:217
+#: ../shell/main.c:218
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -19407,13 +19377,13 @@ msgstr ""
"Takk\n"
"Evolution utviklerene\n"
-#: ../shell/main.c:224
+#: ../shell/main.c:225
msgid "Do not tell me again"
msgstr "Ikke gi beskjed igjen"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../shell/main.c:304
+#: ../shell/main.c:305
msgid ""
"Start Evolution showing the specified component. Available options are "
"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19421,51 +19391,51 @@ msgstr ""
"Start Evolution med oppgitt komponent. Tilgjengelige valg er «mail», "
"«calendar», «contacts», «tasks» og «memos»"
-#: ../shell/main.c:308
+#: ../shell/main.c:309
msgid "Apply the given geometry to the main window"
msgstr "Bruk oppgitt geometri på hovedvinduet"
-#: ../shell/main.c:312
+#: ../shell/main.c:313
msgid "Start in online mode"
msgstr "Start i tilkoblet modus"
-#: ../shell/main.c:314
+#: ../shell/main.c:315
msgid "Ignore network availability"
msgstr "Ignorer nettverkstilgjengelighet"
-#: ../shell/main.c:316
+#: ../shell/main.c:317
msgid "Start in \"express\" mode"
msgstr "Start i «ekspress»-modus"
-#: ../shell/main.c:319
+#: ../shell/main.c:320
msgid "Forcibly shut down Evolution"
msgstr "Tvungen nedstenging av Evolution"
-#: ../shell/main.c:322
+#: ../shell/main.c:323
msgid "Send the debugging output of all components to a file."
msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
-#: ../shell/main.c:324
+#: ../shell/main.c:325
msgid "Disable loading of any plugins."
msgstr "Slå av lasting av tillegg."
-#: ../shell/main.c:326
+#: ../shell/main.c:327
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "Deaktiver forhåndsvisningsområdet for e-post, kontakter og oppgaver."
-#: ../shell/main.c:330
+#: ../shell/main.c:331
msgid "Import URIs or file names given as rest of arguments."
msgstr "Importer URIer eller filnavn gitt som argumenter."
-#: ../shell/main.c:332
+#: ../shell/main.c:333
msgid "Request a running Evolution process to quit"
msgstr "Be en kjørende Evolution-prosess om å stenge ned"
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:507 ../shell/main.c:515
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution personlig informasjonshåndterer og e-postklient"
-#: ../shell/main.c:579
+#: ../shell/main.c:580
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -19474,7 +19444,7 @@ msgstr ""
"%s: --online og --offline kan ikke brukes samtidig.\n"
" Bruk «%s --help» for mer informasjon.\n"
-#: ../shell/main.c:585
+#: ../shell/main.c:586
#, c-format
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
@@ -19902,7 +19872,8 @@ msgstr "Stol på denne sertifikatautoriteten for å identifisere _e-postbrukere.
#: ../smime/gui/smime-ui.ui.h:36
msgid "Trust this CA to identify _software developers."
-msgstr "Stol på denne sertifikatautoriteten for å identifisere _programvareutviklere."
+msgstr ""
+"Stol på denne sertifikatautoriteten for å identifisere _programvareutviklere."
#: ../smime/gui/smime-ui.ui.h:37
msgid "Trust this CA to identify _websites."
@@ -20219,19 +20190,19 @@ msgstr "Med _status"
msgid "UTC"
msgstr "UTC"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
msgid "Select a Time Zone"
msgstr "Velg en tidssone"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
msgid "Time Zones"
msgstr "Tidssoner"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
msgid "Timezone drop-down combination box"
msgstr "Kombinasjonsboks med nedtrekksvalg for tidssone"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -20241,7 +20212,7 @@ msgstr ""
"tidssone.\n"
"Bru høyre musknapp til å zoome ut."
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
msgid "_Selection"
msgstr "_Utvalg"
@@ -20301,11 +20272,11 @@ msgstr "Bruk forvalgt _søkerekkefølge for kontoer i Evolution"
msgid "De_fault"
msgstr "_Forvalgt"
-#: ../widgets/misc/e-account-tree-view.c:404
+#: ../widgets/misc/e-account-tree-view.c:407
msgid "Account Name"
msgstr "Kontonavn"
-#: ../widgets/misc/e-account-tree-view.c:435
+#: ../widgets/misc/e-account-tree-view.c:438
msgid "Protocol"
msgstr "Protokoll"
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 370aa90403..a2fc00e3b5 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -73,6 +73,9 @@ struct _EShellViewPrivate {
guint update_actions_blocked;
gboolean update_actions_called;
+
+ GtkWidget *preferences_window;
+ gulong preferences_hide_id;
};
enum {
@@ -547,6 +550,15 @@ shell_view_dispose (GObject *object)
priv->search_rule = NULL;
}
+ if (priv->preferences_window != NULL) {
+ g_signal_handler_disconnect (
+ priv->preferences_window,
+ priv->preferences_hide_id);
+ g_object_unref (priv->preferences_window);
+ priv->preferences_window = NULL;
+ priv->preferences_hide_id = 0;
+ }
+
/* Chain up to parent's dispose() method. */
G_OBJECT_CLASS (parent_class)->dispose (object);
}
@@ -570,13 +582,18 @@ shell_view_finalize (GObject *object)
static void
shell_view_constructed (GObject *object)
{
- EShellViewClass *shell_view_class;
+ EShell *shell;
EShellView *shell_view;
+ EShellBackend *shell_backend;
+ EShellViewClass *shell_view_class;
GtkWidget *widget;
shell_view = E_SHELL_VIEW (object);
shell_view_class = E_SHELL_VIEW_GET_CLASS (shell_view);
+ shell_backend = e_shell_view_get_shell_backend (shell_view);
+ shell = e_shell_backend_get_shell (shell_backend);
+
shell_view_load_state (shell_view);
/* Invoke factory methods. */
@@ -604,6 +621,13 @@ shell_view_constructed (GObject *object)
g_object_unref (shell_view->priv->size_group);
shell_view->priv->size_group = NULL;
+ /* Update actions whenever the Preferences window is closed. */
+ widget = e_shell_get_preferences_window (shell);
+ shell_view->priv->preferences_window = g_object_ref (widget);
+ shell_view->priv->preferences_hide_id = g_signal_connect_swapped (
+ shell_view->priv->preferences_window, "hide",
+ G_CALLBACK (e_shell_view_update_actions), shell_view);
+
e_extensible_load_extensions (E_EXTENSIBLE (object));
/* Chain up to parent's constructed() method. */