aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog114
-rw-r--r--po/ja.po4266
2 files changed, 2549 insertions, 1831 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 185d6bf85f..63d3d92d32 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-19 Akira TAGOH <tagoh@gnome.gr.jp>
+
+ * ja.po: Updated Japanese translation.
+
2001-05-16 JP Rosevear <jpr@ximian.com>
* POTFILES.in: Remove importers/evolution-gnomecard-importer.c
@@ -52,7 +56,7 @@
* lt.po: Updated Lithuanian translation.
-2001-05-05 Hctor Garca lvarez <hector@scouts-es.org>
+2001-05-05 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -98,7 +102,7 @@
* sv.po: Updated Swedish translation.
-2001-04-24 Hctor Garca lvarez <hector@scouts-es.org>
+2001-04-24 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -109,7 +113,7 @@
2001-04-24 Fatih Demir <kabalak@gtranslator.org>
* tr.po: Committed updated Turkish translation
- by Grkem Cetin.
+ by Gkem Cetin.
2001-04-23 Jeffrey Stedfast <fejj@ximian.com>
@@ -156,7 +160,7 @@
* nl.po: Updated Dutch translation.
-2001-04-18 Hctor Garca lvarez <hector@scouts-es.org>
+2001-04-18 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -181,7 +185,7 @@
* POTFILES.in: Removed openpgp-utils.c and added the camel-pgp-*.c
files. Added camel-cipher-context.c also.
-2001-04-12 Hctor Garca lvarez <hector@scouts-es.org>
+2001-04-12 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -191,7 +195,7 @@
2001-04-12 Christian Rose <menthos@menthos.com>
- * sv.po: Fixed Swedish translation. Thanks to Gran Uddeborg
+ * sv.po: Fixed Swedish translation. Thanks to Gan Uddeborg
<goeran@uddeborg.pp.se>.
2001-04-12 Mikael Hallendal <micke@codefactory.se>
@@ -224,12 +228,12 @@
2001-04-04 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2001-04-04 Fatih Demir <kabalak@gtranslator.org>
* tr.po: Committed updated Turkish translation
- by Grkem.
+ by Gkem.
2001-04-01 Jarkko Ranta <jjranta@cc.joensuu.fi>
@@ -239,7 +243,7 @@
* fi.po: Updated Finnish translation.
-2001-03-29 Hctor Garca lvarez <hector@scouts-es.org>
+2001-03-29 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -250,7 +254,7 @@
2001-03-25 Fatih Demir <kabalak@gtranslator.org>
* tr.po: Committed updated Turkish translation
- by Grkem.
+ by Gkem.
2001-03-22 Dan Winship <danw@ximian.com>
@@ -262,7 +266,7 @@
* ja.po: Updated Japanese translation.
-2001-03-21 Hctor Garca lvarez <hector@scouts-es.org>
+2001-03-21 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -272,7 +276,7 @@
2001-03-20 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2001-03-19 Jarkko Ranta <jjranta@cc.joensuu.fi>
@@ -280,7 +284,7 @@
2001-03-18 Fatih Demir <kabalak@gtranslator.org>
- * tr.po: Small update by Grkem Cetin.
+ * tr.po: Small update by Gkem Cetin.
2001-03-16 Jeffrey Stedfast <fejj@ximian.com>
@@ -288,7 +292,7 @@
2001-03-16 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2001-03-15 Matthias Warkus <mawarkus@gnome.org>
@@ -300,7 +304,7 @@
2001-03-15 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2001-03-15 Pablo Saratxaga <pablo@mandrakesoft.com>
@@ -318,14 +322,14 @@
2001-03-13 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
* POTFILES.in: Updated with a bunch of missing files.
2001-03-12 Jarkko Ranta <jjranta@cc.joensuu.fi>
* fi.po: Updated Finnish translation.
-2001-03-11 Hctor Garca lvarez <hector@scouts-es.org>
+2001-03-11 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -333,7 +337,7 @@
* ru.po: updated russian translation.
-2001-03-10 Hctor Garca lvarez <hector@scouts-es.org>
+2001-03-10 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -343,11 +347,11 @@
2001-03-08 Fatih Demir <kabalak@gtranslator.org>
- * tr.po: Committed updated Turkish translation by Grkem Cetin.
+ * tr.po: Committed updated Turkish translation by Gkem Cetin.
2001-03-05 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
* POTFILES.in: Updated with a bunch of missing files.
2001-03-05 JP Rosevear <jpr@ximian.com>
@@ -475,7 +479,7 @@
* sk.po: Updated Slovak translation.
-2001-02-09 Hctor Garca lvarez <hector@scouts-es.org>
+2001-02-09 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -486,14 +490,14 @@
2001-02-07 Fatih Demir <kabalak@kabalak.net>
* tr.po: Committed updated Turkish translation by
- Grkem Cetin.
+ Gkem Cetin.
2001-02-07 Christopher R. Gabriel <cgabriel@bug.rulez.org>
* it.po: Updated italian translation from Clara Tattoni
<clara.tattoni@libero.it>
-2001-02-06 Hctor Garca lvarez <hector@scouts-es.org>
+2001-02-06 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -505,7 +509,7 @@
* hu.po: Terminology fixes by Andras Timar <timar@gnome.hu>
-2001-01-30 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-30 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -521,7 +525,7 @@
* ru.po: updated russian translation.
-2001-01-27 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-27 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -534,7 +538,7 @@
* pt_BR.po: Updated brazilian portuguese translation
-2001-01-26 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-26 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -542,7 +546,7 @@
* ru.po: updated russian translation.
-2001-01-24 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-24 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -551,7 +555,7 @@
* hu.po: Tons of fixes by Andras and Emese (spelling,
terminology, headers)
-2001-01-23 Martin Norbck <d95mback@dtek.chalmers.se>
+2001-01-23 Martin Norbk <d95mback@dtek.chalmers.se>
* sv.po: Updated Swedish translation.
@@ -573,7 +577,7 @@
2001-01-18 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
* update.sh: Removed old script.
2001-01-17 Dave Camp <dave@ximian.com>
@@ -587,7 +591,7 @@
* ru.po: updated russian translation.
-2001-01-16 Martin Norbck <d95mback@dtek.chalmers.se>
+2001-01-16 Martin Norbk <d95mback@dtek.chalmers.se>
* sv.po: Updated Swedish translation, using xml-i18n-update.
@@ -595,7 +599,7 @@
* POTFILES.(in|skip): Updated after consulting Michael.
-2001-01-16 Martin Norbck <d95mback@dtek.chalmers.se>
+2001-01-16 Martin Norbk <d95mback@dtek.chalmers.se>
* sv.po: Updated Swedish translation, using xml-i18n-update.
@@ -604,7 +608,7 @@
* it.po: Updated italian translation from Clara Tattoni
<clara.tattoni@libero.it>
-2001-01-15 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-15 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -617,7 +621,7 @@
* sv.po: Updated Swedish translation.
-2001-01-11 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-11 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -639,7 +643,7 @@
* POTFILES.in: Removed .oaf.in files until the whole of Evolution
uses the xml-i18n-tools framework.
-2001-01-09 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-09 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -649,7 +653,7 @@
2001-01-09 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2001-01-07 Benedikt Roth <Benedikt.Roth@gmx.net>
@@ -675,7 +679,7 @@
* sv.po: Updated Swedish translation.
-2001-01-03 Hctor Garca lvarez <hector@scouts-es.org>
+2001-01-03 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -696,7 +700,7 @@
* no.po: Updated Norwegian translation.
-2000-12-23 Hctor Garca lvarez <hector@scouts-es.org>
+2000-12-23 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -720,7 +724,7 @@
* no.po: Updated Norwegian translation.
-2000-12-18 Hctor Garca lvarez <hector@scouts-es.org>
+2000-12-18 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -792,13 +796,13 @@
2000-12-05 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2000-12-04 Valek Filippov <frob@df.ru>
* ru.po: updated russian translation.
-2000-12-03 Hctor Garca lvarez <hector@scouts-es.org>
+2000-12-03 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -820,13 +824,13 @@
2000-11-30 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2000-11-30 Valek Filippov <frob@df.ru>
* ru.po: updated russian translation.
-2000-11-29 Hctor Garca lvarez <hector@scouts-es.org>
+2000-11-29 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -856,7 +860,7 @@
* POTFILES.in: Removed mail/message-thread.c and added
camel/camel-folder-thread.c
-2000-11-20 Hctor Garca lvarez <hector@scouts-es.org>
+2000-11-20 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -868,7 +872,7 @@
* sv.po: Updated Swedish translation.
-2000-11-17 Hctor Garca lvarez <hector@scouts-es.org>
+2000-11-17 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -910,7 +914,7 @@
* ru.po: updated russian translation.
-2000-11-08 Hctor Garca lvarez <hector@scouts-es.org>
+2000-11-08 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -922,7 +926,7 @@
* sv.po: Updated Swedish translation.
-2000-11-06 Hctor Garca lvarez <hector@scouts-es.org>
+2000-11-06 Htor Garc lvarez <hector@scouts-es.org>
* es.po: Updated Spanish translation.
@@ -1020,7 +1024,7 @@
2000-10-30 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2000-10-30 Valek Filippov <frob@df.ru>
@@ -1061,7 +1065,7 @@
2000-10-26 Kjartan Maraas <kmaraas@gnome.org>
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2000-10-26 Matthias Warkus <mawa@iname.com>
@@ -1121,7 +1125,7 @@
2000-10-14 Kjartan Maraas <kmaraas@gnome.org>
* nn.po: Added Norwegian (nynorsk) translation.
- * no.po: Updated Norwegian (bokml) translation.
+ * no.po: Updated Norwegian (bokm) translation.
2000-10-14 Almer S. Tigelaar <almer1@dds.nl>
@@ -1155,7 +1159,7 @@
* sv.po: Updated Swedish translation.
-2000-10-08 Hctor Garca Alvarez <hector@scouts-es.org>
+2000-10-08 Htor Garc Alvarez <hector@scouts-es.org>
* es.po: updated Spanish translation.
@@ -1179,11 +1183,11 @@
* sv.po: Updated Swedish translation.
-2000-10-05 Hctor Garca Alvarez <hector@scouts-es.org>
+2000-10-05 Htor Garc Alvarez <hector@scouts-es.org>
* es.po: updated Spanish translation.
-2000-10-04 Hctor Garca Alvarez <hector@scouts-es.org>
+2000-10-04 Htor Garc Alvarez <hector@scouts-es.org>
* es.po: updated Spanish translation.
@@ -1195,7 +1199,7 @@
* no.po: Updated Norwegian translation.
-2000-10-03 Hctor Garca lvarez <hector@scouts-es.org>
+2000-10-03 Htor Garc lvarez <hector@scouts-es.org>
* es.po: updated Spanish translation.
@@ -1642,7 +1646,7 @@
* README.tools: Added readme file, which explains the
use of the newly checked in po tools.
- hmm, looking forward to tomorrow...viva los compleaos!
+ hmm, looking forward to tomorrow...viva los compleas!
:)
2000-06-05 Fatih Demir <kabalak@gmx.net>
@@ -1760,7 +1764,7 @@
* sv.po: Updated Swedish translation.
-2000-05-08 Hctor Garca lvarez <hector@scouts-es.org>
+2000-05-08 Htor Garc lvarez <hector@scouts-es.org>
* es.po: added translation to spanish.
diff --git a/po/ja.po b/po/ja.po
index 46e1865c02..2041c8f4f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,20 +4,20 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: evolution CVS-20010408\n"
-"POT-Creation-Date: 2001-04-20 01:02+0900\n"
-"PO-Revision-Date: 2001-04-20 02:56+0900\n"
+"Project-Id-Version: evolution CVS-20010519\n"
+"POT-Creation-Date: 2001-05-19 17:16+0900\n"
+"PO-Revision-Date: 2001-05-19 19:04+0900\n"
"Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
"Language-Team: Japanese <translation@gnome.gr.jp>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/e-card.c:3314
msgid "Card: "
msgstr "̾: "
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3316
msgid ""
"\n"
"Name: "
@@ -25,7 +25,7 @@ msgstr ""
"\n"
"̾: "
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3317
msgid ""
"\n"
" Prefix: "
@@ -33,7 +33,7 @@ msgstr ""
"\n"
" ɾ(Ĥ): "
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3318
msgid ""
"\n"
" Given: "
@@ -41,13 +41,13 @@ msgstr ""
"\n"
" : "
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3319
msgid ""
"\n"
" Additional: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3320
msgid ""
"\n"
" Family: "
@@ -55,7 +55,7 @@ msgstr ""
"\n"
" եߥ꡼̾: "
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3321
msgid ""
"\n"
" Suffix: "
@@ -63,7 +63,7 @@ msgstr ""
"\n"
" ɾ(Ĥ): "
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3335
msgid ""
"\n"
"Birth Date: "
@@ -71,7 +71,7 @@ msgstr ""
"\n"
": "
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3346
msgid ""
"\n"
"Address:"
@@ -79,7 +79,7 @@ msgstr ""
"\n"
":"
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3348
msgid ""
"\n"
" Postal Box: "
@@ -87,7 +87,7 @@ msgstr ""
"\n"
"͹ֹ: "
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3349
msgid ""
"\n"
" Ext: "
@@ -95,25 +95,25 @@ msgstr ""
"\n"
" "
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3350
msgid ""
"\n"
" Street: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3351
msgid ""
"\n"
" City: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3352
msgid ""
"\n"
" Region: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3353
msgid ""
"\n"
" Postal Code: "
@@ -121,7 +121,7 @@ msgstr ""
"\n"
" ͹ֹ: "
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3354
msgid ""
"\n"
" Country: "
@@ -129,13 +129,13 @@ msgstr ""
"\n"
" : "
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3367
msgid ""
"\n"
"Delivery Label: "
msgstr ""
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3379
msgid ""
"\n"
"Telephones:\n"
@@ -143,7 +143,7 @@ msgstr ""
"\n"
"ֹ:\n"
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3382
msgid ""
"\n"
"Telephone:"
@@ -151,7 +151,7 @@ msgstr ""
"\n"
"ֹ:"
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3406
msgid ""
"\n"
"E-mail:\n"
@@ -159,7 +159,7 @@ msgstr ""
"\n"
"᡼:\n"
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3409
msgid ""
"\n"
"E-mail:"
@@ -167,7 +167,7 @@ msgstr ""
"\n"
"᡼:"
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3428
msgid ""
"\n"
"Mailer: "
@@ -175,7 +175,7 @@ msgstr ""
"\n"
"᡼: "
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3434
msgid ""
"\n"
"Time Zone: "
@@ -183,7 +183,7 @@ msgstr ""
"\n"
"ॾ: "
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3442
msgid ""
"\n"
"Geo Location: "
@@ -191,7 +191,7 @@ msgstr ""
"\n"
"а: "
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3446
msgid ""
"\n"
"Business Role: "
@@ -199,7 +199,7 @@ msgstr ""
"\n"
"Żο̳: "
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3458
msgid ""
"\n"
"Org: "
@@ -207,7 +207,7 @@ msgstr ""
"\n"
"ȿ: "
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3459
msgid ""
"\n"
" Name: "
@@ -215,7 +215,7 @@ msgstr ""
"\n"
" ̾: "
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3460
msgid ""
"\n"
" Unit: "
@@ -223,7 +223,7 @@ msgstr ""
"\n"
" : "
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3461
msgid ""
"\n"
" Unit2: "
@@ -231,7 +231,7 @@ msgstr ""
"\n"
" 2: "
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3462
msgid ""
"\n"
" Unit3: "
@@ -239,7 +239,7 @@ msgstr ""
"\n"
" 3: "
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3463
msgid ""
"\n"
" Unit4: "
@@ -247,7 +247,7 @@ msgstr ""
"\n"
" 4: "
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3467
msgid ""
"\n"
"Categories: "
@@ -255,7 +255,7 @@ msgstr ""
"\n"
"̳ʬ: "
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3468
msgid ""
"\n"
"Comment: "
@@ -273,7 +273,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3481
msgid ""
"\n"
"Unique String: "
@@ -281,7 +281,7 @@ msgstr ""
"\n"
"Ǥդʸ: "
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3484
msgid ""
"\n"
"Public Key: "
@@ -289,23 +289,36 @@ msgstr ""
"\n"
": "
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr "Evolution GnomeCard ե򥤥ݡȤեȥ"
+#: addressbook/backend/ebook/e-card.c:3745
+msgid "Multiple VCards"
+msgstr "ʣ VCard"
+
+#: addressbook/backend/ebook/e-card.c:3753
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VCard"
+
+#: addressbook/backend/ebook/e-destination.c:244
+msgid "???"
+msgstr "???"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+msgid "Factory to import VCard files into Evolution."
+msgstr "Evolution VCard ե򥤥ݡȤեȥ"
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr "Evolution GnomeCard ե򥤥ݡ"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr "Evolution VCard ե򥤥ݡ"
#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
+#: addressbook/gui/component/addressbook-factory.c:42
#: calendar/conduits/calendar/calendar-conduit.c:1151
#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
msgid "Could not initialize Bonobo"
msgstr "Bonobo νޤǤ"
@@ -409,7 +422,7 @@ msgid "Web page address:"
msgstr "֥ڡ URL:"
#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:84
msgid "_Add"
msgstr "ɲ(_A)"
@@ -434,8 +447,9 @@ msgid "_Company:"
msgstr "(_C):"
#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:715 mail/mail-config.glade.h:85
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:103
+#: ui/evolution-task-editor-dialog.xml.h:69 ui/evolution.xml.h:46
msgid "_Delete"
msgstr "(_D)"
@@ -483,16 +497,12 @@ msgstr "۶(_S):"
msgid "_This is the mailing address"
msgstr "͹ʪνǤ"
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "󥿥Ȥޤ?"
-
#: addressbook/contact-editor/e-contact-editor.c:603
msgid "This contact belongs to these categories:"
msgstr "Υ󥿥ȤϤΥƥ˽°Ƥޤ:"
#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:733
msgid "Assistant"
msgstr ""
@@ -506,7 +516,7 @@ msgid "Business 2"
msgstr "Ż 2"
#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/widgets/e-addressbook-view.c:713
msgid "Business Fax"
msgstr "Ż FAX"
@@ -532,12 +542,12 @@ msgid "Home 2"
msgstr " 2"
#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/widgets/e-addressbook-view.c:714
msgid "Home Fax"
msgstr "Ȥ FAX"
#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/widgets/e-addressbook-view.c:717
msgid "ISDN"
msgstr "ISDN"
@@ -547,17 +557,16 @@ msgstr "Х"
#: addressbook/contact-editor/e-contact-editor.c:1254
#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
msgid "Other"
msgstr "¾"
#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/widgets/e-addressbook-view.c:719
msgid "Other Fax"
msgstr "¾ FAX"
#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/widgets/e-addressbook-view.c:720
msgid "Pager"
msgstr "ݥ٥"
@@ -566,12 +575,12 @@ msgid "Primary"
msgstr "ץ饤ޥ"
#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/widgets/e-addressbook-view.c:721
msgid "Radio"
msgstr "饸"
#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/widgets/e-addressbook-view.c:722
msgid "Telex"
msgstr "ƥå"
@@ -580,29 +589,33 @@ msgid "TTY/TDD"
msgstr "TTY/TDD"
#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
+#: addressbook/gui/widgets/e-addressbook-view.c:725
msgid "Email 2"
msgstr "᡼2"
#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
+#: addressbook/gui/widgets/e-addressbook-view.c:726
msgid "Email 3"
msgstr "᡼3"
-#: addressbook/contact-editor/e-contact-quick-add.c:223
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "󥿥Ȥޤ?"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:233
msgid "Contact Quick-Add"
msgstr "󥿥Ȥδʰɲ"
-#: addressbook/contact-editor/e-contact-quick-add.c:225
+#: addressbook/contact-editor/e-contact-quick-add.c:235
msgid "Edit Full"
msgstr "٤Խ"
-#: addressbook/contact-editor/e-contact-quick-add.c:262
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/contact-editor/e-contact-quick-add.c:276
+#: addressbook/gui/widgets/e-addressbook-view.c:700
msgid "Full Name"
msgstr "ե͡"
-#: addressbook/contact-editor/e-contact-quick-add.c:268
+#: addressbook/contact-editor/e-contact-quick-add.c:282
msgid "E-mail"
msgstr "᡼"
@@ -718,73 +731,70 @@ msgstr "ɾ(Ĥ)(_S):"
msgid "_Title:"
msgstr "ɾ(Ĥ)(_T):"
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:244
msgid "As _Minicards"
msgstr "ߥ˥"
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:250
#: ui/evolution-addressbook.xml.h:1
msgid "As _Table"
msgstr "ơ֥(_T)"
-#: addressbook/gui/component/addressbook.c:399
+#: addressbook/gui/component/addressbook.c:410
#, c-format
msgid "Enter password for %s"
msgstr "%s ΥѥɤϤƤ"
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:438
msgid "Unable to open addressbook"
msgstr "ɥ쥹Ģ򳫤Ȥޤ"
-#: addressbook/gui/component/addressbook.c:432
+#: addressbook/gui/component/addressbook.c:445
msgid ""
"We were unable to open this addressbook. This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in. If you've entered a URI, check the URI for\n"
-"correctness and reenter. If not, you probably have\n"
-"attempted to access an LDAP server. If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-"Υɥ쥹Ģ򳫤Ȥޤ. Ϥʤ\n"
-"ְä URI Ϥ, LDAP ݡȤ̵ˤ\n"
-"ѥ뤷, LDAPФإ褦ȤƤ뤳\n"
-"Ȥ̣ޤ⤷ URI Ϥʤ, Τ URI \n"
-"åƺϤƤ. Ǥʤ, \n"
-"֤ LDAP Ф˥ߤǤ礦. ʤ\n"
-" LDAP ȤȤ뤳Ȥ˾ʤ, OpenLDAP \n"
-"ɡƥ󥹥ȡ뤷, ѥľ\n"
-" Evolution 򥤥󥹥ȡ뤹ɬפǤ礦.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "٤ɽ"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+"Υɥ쥹Ģ򳫤Ȥޤ. ϸäURI\n"
+"Ϥ, 뤤 LDAP ФƤ뤫Τɤ餫\n"
+"̣ޤ"
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "ܺ..."
+#: addressbook/gui/component/addressbook.c:450
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it. If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+" Evolution ΥС LDAP ݡȤ򤻤˥ѥ\n"
+"Ƥޤ. Evolution LDAP Ȥʤ, \n"
+" OpenLDAP CVS ץ\n"
+"ѥ뤷ʤФʤޤ\n"
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:458
+msgid ""
+"We were unable to open this addressbook. Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Υɥ쥹Ģ򳫤ȤޤǤ. ѥ¸ߤ, \n"
+"äƤ뤫ɤåƤ"
+
+#: addressbook/gui/component/addressbook.c:618 calendar/gui/gnome-cal.c:233
msgid "Any field contains"
msgstr "եɤΤΤޤ"
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:619
msgid "Name contains"
msgstr "̾ΤΤޤ"
-#: addressbook/gui/component/addressbook.c:589
+#: addressbook/gui/component/addressbook.c:620
msgid "Email contains"
msgstr "᡼뤬ΤΤޤ"
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:763
msgid "The URI that the Folder Browser will display"
msgstr "ե֥饦ɽ URI"
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "¾Υ󥿥"
-
#: addressbook/gui/component/addressbook-config.c:148
msgid "LDAP Server"
msgstr "LDAP "
@@ -804,56 +814,60 @@ msgstr "ʤ (ƿ̾⡼)"
#: addressbook/gui/component/addressbook-config.c:165
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:52
msgid "Password"
msgstr "ѥ"
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
+#: addressbook/gui/component/addressbook-config.c:168
msgid "Unknown auth type"
msgstr "̤Τǧڼ"
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/component/addressbook-config.c:177
msgid "Base"
msgstr "١ȥ"
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:179
msgid "One"
msgstr "֥ȥ"
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/component/addressbook-config.c:181
msgid "Subtree"
msgstr "٤ƤΥȥ"
-#: addressbook/gui/component/addressbook-config.c:186
+#: addressbook/gui/component/addressbook-config.c:184
msgid "Unknown scope type"
msgstr "̤ΤΥ׼"
-#: addressbook/gui/component/addressbook-config.c:353
+#: addressbook/gui/component/addressbook-config.c:349
msgid "Bind DN:"
msgstr "ХDN:"
-#: addressbook/gui/component/addressbook-config.c:354
+#: addressbook/gui/component/addressbook-config.c:350
msgid "FIXME Bind DN Help text here"
msgstr "FIXME Х DN ΥإץƥȤǤ"
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:60
msgid "Remember this password"
msgstr "Υѥɤ򵭲"
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:33
msgid "Host:"
msgstr "ۥ:"
-#: addressbook/gui/component/addressbook-config.c:407
+#: addressbook/gui/component/addressbook-config.c:402
msgid "FIXME Host help text here."
msgstr "FIXME ۥȥإץƥȤǤ"
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "Root DN:"
+msgstr "롼 DN:"
+
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Root DN help text here."
+msgstr "FIXME 롼 DN إץƥȤǤ"
+
#: addressbook/gui/component/addressbook-config.c:409
msgid "Port:"
msgstr "ݡ:"
@@ -862,66 +876,62 @@ msgstr "ݡ:"
msgid "FIXME Port help text here."
msgstr "FIXME ݡȥإץƥȤǤ"
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr "롼 DN:"
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr "FIXME 롼 DN إץƥȤǤ"
-
-#: addressbook/gui/component/addressbook-config.c:435
+#: addressbook/gui/component/addressbook-config.c:430
msgid "Search Scope:"
msgstr "ϰ:"
-#: addressbook/gui/component/addressbook-config.c:489
+#: addressbook/gui/component/addressbook-config.c:477
msgid "Authentication:"
msgstr "ǧ:"
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
+#: addressbook/gui/component/addressbook-config.c:499
+msgid "Advanced LDAP Options"
+msgstr " LDAP ץ"
+
+#: addressbook/gui/component/addressbook-config.c:520
+#: mail/mail-config.glade.h:53
msgid "Path:"
msgstr "ѥ:"
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:521
msgid "FIXME Path Help text here"
msgstr "FIXME ѥإץƥȤǤ"
-#: addressbook/gui/component/addressbook-config.c:513
+#: addressbook/gui/component/addressbook-config.c:526
msgid "Create path if it doesn't exist."
msgstr "¸ߤʤѥ"
-#: addressbook/gui/component/addressbook-config.c:647
+#: addressbook/gui/component/addressbook-config.c:660
msgid "Edit Addressbook"
msgstr "ɥ쥹ĢԽ"
-#: addressbook/gui/component/addressbook-config.c:649
+#: addressbook/gui/component/addressbook-config.c:662
msgid "Add Addressbook"
msgstr "ɥ쥹Ģɲ"
-#: addressbook/gui/component/addressbook-config.c:665
+#: addressbook/gui/component/addressbook-config.c:680
msgid ""
"Select the kind of addressbook you have, and enter the relevant information "
"about it."
msgstr ""
"ʤλĥɥ쥹Ģ, ˤĤƤδϢϤƤ"
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
+#: addressbook/gui/component/addressbook-config.c:686
+#: mail/mail-config.glade.h:43
msgid "Name:"
msgstr "̾:"
-#: addressbook/gui/component/addressbook-config.c:672
+#: addressbook/gui/component/addressbook-config.c:687
msgid "FIXME Name help text here"
msgstr "FIXME ̾إץƥȤǤ"
-#: addressbook/gui/component/addressbook-config.c:674
+#: addressbook/gui/component/addressbook-config.c:689
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3
msgid "Description:"
msgstr ":"
-#: addressbook/gui/component/addressbook-config.c:675
+#: addressbook/gui/component/addressbook-config.c:690
msgid "FIXME Description help text here"
msgstr "FIXME إץƥȤǤ"
@@ -930,20 +940,20 @@ msgid "Addressbook Sources"
msgstr "ɥ쥹ĢΥ"
#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:616
#: calendar/gui/e-meeting-dialog.glade.h:8
#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:597
-#: mail/mail-config.glade.h:19 mail/mail-view.c:156
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:23
+#: mail/message-browser.c:202 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:22
+#: ui/evolution-task-editor-dialog.xml.h:18
msgid "Delete"
msgstr ""
#: addressbook/gui/component/addressbook-config.glade.h:4
#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:28
msgid "Edit"
msgstr "Խ"
@@ -955,6 +965,10 @@ msgstr "̾"
msgid "URI"
msgstr "URI"
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "¾Υ󥿥"
+
#: addressbook/gui/component/e-address-widget.c:365
msgid "Disable Queries"
msgstr "̵"
@@ -964,12 +978,12 @@ msgid "Enable Queries (Dangerous!)"
msgstr "ͭ (Ǥ!)"
#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+#: addressbook/gui/component/select-names/e-select-names-popup.c:281
msgid "Edit Contact Info"
msgstr "󥿥ȾԽ"
#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
+#: addressbook/gui/component/select-names/e-select-names-popup.c:347
msgid "Add to Contacts"
msgstr "󥿥Ȥɲ"
@@ -1017,25 +1031,29 @@ msgstr "Evolution ɥ쥹ĢݡͥȤΤΥեȥ"
msgid "Factory for the sample Addressbook control"
msgstr "ץ륢ɥ쥹ĢȥΤΥեȥ"
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "Evolution Υɥ쥹Ģ̾򥤥󥿡ե"
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr "ɥ쥹Ģ̾򥤥󥿡եΤΥեȥ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: addressbook/gui/component/select-names/e-select-names-popup.c:161
#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:550 filter/filter.glade.h:9
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
msgid "Remove"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
+#: addressbook/gui/component/select-names/e-select-names-popup.c:176
msgid "Remove All"
msgstr "٤ƺ"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Send HTML Mail?"
+msgstr "HTML ᡼ޤ?"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Evolution Υɥ쥹Ģ̾򥤥󥿡ե"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr "ɥ쥹Ģ̾򥤥󥿡եΤΥեȥ"
+
#: addressbook/gui/component/select-names/select-names.glade.h:1
msgid "Find..."
msgstr "..."
@@ -1053,6 +1071,7 @@ msgid "Select name from:"
msgstr "̾:"
#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:242
msgid "Search"
msgstr ""
@@ -1164,149 +1183,148 @@ msgstr "y"
msgid "z"
msgstr "z"
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:551
+#: addressbook/gui/widgets/e-addressbook-view.c:611
msgid "Save as VCard"
msgstr "VCard ¸"
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:612
msgid "Send contact to other"
msgstr "¾إ󥿥Ȥ"
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:613
msgid "Send message to contact"
msgstr "󥿥إå"
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
-#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:614 mail/message-browser.c:199
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:65 ui/evolution-tasks.xml.h:4
msgid "Print"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:615
msgid "Print Envelope"
msgstr "ɽ"
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-view.c:698
msgid "* Click here to add a contact *"
msgstr "* 󥿥Ȥɲä뤿ˤ򥯥å *"
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:699
msgid "File As"
msgstr "̾"
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:701
msgid "Email"
msgstr "᡼"
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:702
msgid "Primary Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:703
msgid "Assistant Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:704
msgid "Business Phone"
msgstr "Ż"
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:705
msgid "Callback Phone"
msgstr "Ƥᤷ"
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:706
msgid "Company Phone"
msgstr "Ҥ"
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:707
msgid "Home Phone"
msgstr "Ȥ"
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:708
msgid "Organization"
msgstr "ȿ"
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:709
msgid "Business Address"
msgstr "Żν"
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:710
msgid "Home Address"
msgstr "Ȥν"
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:711
msgid "Mobile Phone"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:712
msgid "Car Phone"
msgstr "ֺ"
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:715
msgid "Business Phone 2"
msgstr "Ż 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:716
msgid "Home Phone 2"
msgstr "Ȥ 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:718
msgid "Other Phone"
msgstr "¾"
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:723
msgid "TTY"
msgstr "TTY"
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:724
msgid "Other Address"
msgstr "¾ν"
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:727
msgid "Web Site"
msgstr "֥"
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:728
msgid "Department"
msgstr "ô"
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:729
msgid "Office"
msgstr "̳"
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:730
msgid "Title"
msgstr "ɾ(Ĥ)"
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:731
msgid "Profession"
msgstr "翦"
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:732
msgid "Manager"
msgstr "ޥ͡"
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:734
msgid "Nickname"
msgstr "˥å͡"
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:735
msgid "Spouse"
msgstr "۶"
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:736
msgid "Note"
msgstr "Ρ"
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:737
msgid "Free-busy URL"
msgstr ""
@@ -1314,7 +1332,7 @@ msgstr ""
msgid "Save in addressbook"
msgstr "ɥ쥹Ģ¸"
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:216
msgid ""
"\n"
"\n"
@@ -1514,6 +1532,46 @@ msgid "Could not read pilot's ToDo application block"
msgstr ""
"ѥåȤ ToDo ץꥱ֥åɤ߹ळȤޤǤ"
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "«κ¥"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "顼"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr "顼Υӥ"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr "顼ΥӥΤΥեȥ"
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s. The Unix time is %ld right now. We just thought you may like to "
+"know."
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "GNOME νޤǤ"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+msgid "Could not create the alarm notify service factory"
+msgstr "顼ΥӥեȥޤǤ"
+
#: calendar/gui/calendar-commands.c:266
msgid "File not found"
msgstr "ե뤬Ĥޤ"
@@ -1532,24 +1590,24 @@ msgid ""
msgstr ""
"ӥ塼ޤǤ. ORBitOAFåƤ"
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
+#: calendar/gui/e-calendar-table.c:323
msgid "Public"
msgstr ""
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
+#: calendar/gui/e-calendar-table.c:324
msgid "Private"
msgstr "Ū"
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
+#: calendar/gui/e-calendar-table.c:325
msgid "Confidential"
msgstr ""
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
msgid "Unknown"
msgstr "̤"
@@ -1569,71 +1627,71 @@ msgstr ""
msgid "W"
msgstr ""
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:662
+#: calendar/gui/e-calendar-table.c:345 mail/message-list.c:689
msgid "High"
msgstr "⤤"
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1574
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:661
+#: calendar/gui/e-calendar-table.c:346 mail/message-list.c:688
msgid "Normal"
msgstr ""
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:660
+#: calendar/gui/e-calendar-table.c:347 mail/message-list.c:687
msgid "Low"
msgstr "㤤"
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
+#: calendar/gui/e-calendar-table.c:399
msgid "Transparent"
msgstr "Ʃ"
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
+#: calendar/gui/e-calendar-table.c:398
msgid "Opaque"
msgstr "Ʃ"
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:419
msgid "Not Started"
msgstr "ϤƤʤ"
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:420
msgid "In Progress"
msgstr ""
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:421
msgid "Completed"
msgstr "λޤ"
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/e-calendar-table.c:422 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr "󥻥뤷ޤ"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y/%m/%d (%a) %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:802
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1644,24 +1702,24 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
msgid ""
"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
msgstr ""
"ʬ '', 'Ū', '' 뤤 'ʤ' 򤷤ʤФʤޤ"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:397 mail/mail-account-gui.c:976
#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: mail/mail-config.glade.h:46 shell/e-shell-view.c:1198
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
msgid "None"
msgstr "Ρ"
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1671,71 +1729,84 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "ѡͤ 0 100 δ֤ǴޤǤʤФʤޤ"
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1051
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
"ͥ٤ '⤤', '', '㤤' 뤤 '̤' 򤷤ʤФʤޤ"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
+#: calendar/gui/calendar-model.c:1064
#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/e-calendar-table.c:348
msgid "Undefined"
msgstr "̤"
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
msgstr "Ʃ٤ 'Ʃ', 'Ʃ', 뤤 'ʤ' ǤʤФʤޤ"
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1576
msgid "Recurring"
msgstr "ȯ"
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1578
msgid "Assigned"
msgstr "ƺѤ"
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
msgid "Yes"
msgstr "Ϥ"
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
msgid "No"
msgstr ""
-#: calendar/gui/calendar-summary.c:196
+#: calendar/gui/calendar-summary.c:198
msgid "%A, %e %B %Y"
msgstr "%Y/%B/%e %A"
-#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
+#: calendar/gui/calendar-summary.c:207
+msgid "Appointments"
+msgstr "«"
+
+#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
msgid "%I:%M%p"
msgstr "%p %I:%M"
-#: calendar/gui/calendar-summary.c:437
+#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:443
msgid "<b>Error loading calendar</b>"
msgstr "<b>˥顼</b>"
-#: calendar/gui/calendar-summary.c:449
+#: calendar/gui/calendar-summary.c:455
msgid "<b>Error loading calendar:<br>Method not supported"
msgstr "<b>˥顼:<br>᥽åɤϥݡȤƤޤ"
-#: calendar/gui/calendar-summary.c:616
+#: calendar/gui/calendar-summary.c:622 mail/mail-config.glade.h:24
msgid "Display"
msgstr "ɽ"
-#: calendar/gui/calendar-summary.c:621
+#: calendar/gui/calendar-summary.c:627
msgid "Show appointments"
msgstr "«ɽ"
-#: calendar/gui/calendar-summary.c:629
+#: calendar/gui/calendar-summary.c:635
msgid "Show tasks"
msgstr "ɽ"
-#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
+#: calendar/gui/calendar-summary.c:690
+msgid "Things to do"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
msgid "Loading Calendar"
msgstr ""
@@ -1743,46 +1814,6 @@ msgstr ""
msgid "The URI that the calendar will display"
msgstr "ɽ URI"
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "«κ¥"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "顼"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr "顼Υӥ"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
-msgstr "顼ΥӥΤΥեȥ"
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s. The Unix time is %ld right now. We just thought you may like to "
-"know."
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "GNOME νޤǤ"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-msgid "Could not create the alarm notify service factory"
-msgstr "顼ΥӥեȥޤǤ"
-
#: calendar/gui/dialogs/alarm-notify-dialog.c:189
msgid "Alarm on %A %b %d %Y %H:%M"
msgstr "%Y/%b/%d %A %H:%M ˥顼"
@@ -1798,7 +1829,7 @@ msgstr "ѤǤ륵ޥ꡼Ϥޤ"
#: calendar/gui/dialogs/alarm-notify.glade.h:1
#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:5
msgid "Close"
msgstr "Ĥ"
@@ -1880,7 +1911,7 @@ msgid "Display options"
msgstr "ɽץ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:155
msgid "Due Date"
msgstr ""
@@ -1901,7 +1932,7 @@ msgid "Fri"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/event-editor.c:479
msgid "Friday"
msgstr ""
@@ -1930,7 +1961,7 @@ msgid "Mon"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:475
msgid "Monday"
msgstr ""
@@ -1943,12 +1974,12 @@ msgid "Overdue Items:"
msgstr "¤᤮ƥ:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:54
msgid "Pick a color"
msgstr "顼"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:158
msgid "Priority"
msgstr "ͥ"
@@ -1966,7 +1997,7 @@ msgid "Sat"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/event-editor.c:480
msgid "Saturday"
msgstr ""
@@ -1991,7 +2022,7 @@ msgid "Sun"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/event-editor.c:481
msgid "Sunday"
msgstr ""
@@ -2004,7 +2035,7 @@ msgid "Thu"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:478
msgid "Thursday"
msgstr ""
@@ -2025,7 +2056,7 @@ msgid "Tue"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:476
msgid "Tuesday"
msgstr ""
@@ -2038,7 +2069,7 @@ msgid "Wed"
msgstr ""
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:477
msgid "Wednesday"
msgstr ""
@@ -2051,48 +2082,86 @@ msgid "minutes before they occur."
msgstr "ʬ"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:88
msgid "seconds."
msgstr " "
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/delete-comp.c:84
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "« `%s' Ǥ?"
+msgstr "« `%s' ƤǤ?"
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "̵ȥ«Ǥ?"
+msgstr "˥ȥʤ«ƤǤ?"
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
-msgstr "˥ `%s' Ǥ?"
+msgstr "˥ `%s' ƤǤ?"
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
msgid "Are you sure you want to delete this untitled task?"
-msgstr "̵ȥΥǤ?"
+msgstr "˥ȥʤΥƤǤ?"
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "˻ `%s' Ǥ?"
+msgstr "˻ `%s' ƤǤ?"
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "̵ȥλǤ?"
+msgstr "˥ȥʤλƤǤ?"
+
+#: calendar/gui/dialogs/delete-comp.c:120
+#, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr " %d Ĥ«ƤǤ?"
+
+#: calendar/gui/dialogs/delete-comp.c:125
+#, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr " %d ĤΥƤǤ?"
+
+#: calendar/gui/dialogs/delete-comp.c:130
+#, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr " %d ĤλƤǤ?"
#: calendar/gui/dialogs/save-comp.c:51
msgid "Do you want to save changes?"
msgstr "ѹ¸Ǥ?"
+#: calendar/gui/dialogs/task-editor.c:709
+msgid "Edit Task"
+msgstr "Խ"
+
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#, c-format
+msgid "Appointment - %s"
+msgstr "« - %s"
+
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#, c-format
+msgid "Task - %s"
+msgstr " - %s"
+
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Journal entry - %s"
+msgstr " - %s"
+
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "ޥ꡼ʤ"
+
#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
#, no-c-format
msgid "% Comp_lete:"
msgstr "% λ(_l):"
#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:151
#: calendar/gui/event-editor-dialog.glade.h:6
msgid "Classification"
msgstr "ʬ"
@@ -2159,157 +2228,137 @@ msgstr "ͥ(_P):"
msgid "_Status:"
msgstr "ơ(_S):"
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Խ"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "ޥ꡼ʤ"
-
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "« - %s"
-
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr " - %s"
-
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr " - %s"
-
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:150
msgid "Categories"
msgstr "ƥ"
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:152
msgid "Completion Date"
msgstr "λ"
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:153
msgid "End Date"
msgstr "λ"
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:154
msgid "Start Date"
msgstr ""
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:156
msgid "Geographical Position"
msgstr "ٷ"
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:157
msgid "Percent complete"
msgstr "ѡȴλ"
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:159
msgid "Summary"
msgstr "ޥ꡼"
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:160
msgid "Transparency"
msgstr "Ʃ"
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:161
msgid "URL"
msgstr "URL"
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:162
msgid "Alarms"
msgstr "顼"
-#: calendar/gui/e-calendar-table.c:170
+#: calendar/gui/e-calendar-table.c:163
msgid "Click here to add a task"
msgstr "ɲä뤿ˤ򥯥å"
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:367
#, c-format
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:368
#, c-format
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:369
#, c-format
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:370
#, c-format
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:371
#, c-format
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:372
#, c-format
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:373
#, c-format
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:374
#, c-format
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:375
#, c-format
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:376
#, c-format
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:377
#, c-format
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "λޡ"
+#: calendar/gui/e-calendar-table.c:705
+msgid "Edit this task"
+msgstr "ΥԽޤ"
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "λޡޤ"
+#: calendar/gui/e-calendar-table.c:707
+msgid "Mark as complete"
+msgstr "λޡޤ"
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "ΥԽ..."
-
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Խޤ"
-
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:708
#: ui/evolution-task-editor-dialog.xml.h:19
msgid "Delete this task"
msgstr "Υޤ"
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
-msgstr "ޤ"
+#: calendar/gui/e-calendar-table.c:713
+msgid "Mark tasks as complete"
+msgstr "λޡޤ"
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i ʬʬ"
+#: calendar/gui/e-calendar-table.c:714
+msgid "Delete selected tasks"
+msgstr "򤷤ޤ"
+
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
@@ -2332,54 +2381,41 @@ msgstr "%b/%d (%a)"
msgid "%d %b"
msgstr "%b/%d"
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr ""
-
#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
msgid "New Appointment"
msgstr "«"
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3279
msgid "New All Day Event"
msgstr "Υ٥"
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3284
msgid "Go to Today"
msgstr "ذư"
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3286
msgid "Go to Date..."
msgstr "ذư..."
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3292
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:11
msgid "Open"
msgstr ""
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3294
msgid "Delete this Appointment"
msgstr "«"
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3296
#: ui/evolution-event-editor.xml.h:45
msgid "Schedule Meeting"
msgstr "ǹ礻Υ塼"
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3309
msgid "Make this Occurrence Movable"
msgstr "νưˤ"
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3311
msgid "Delete this Occurrence"
msgstr "ν"
@@ -2387,6 +2423,11 @@ msgstr "ν"
msgid "Delete all Occurrences"
msgstr "٤Ƥν"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i ʬʬ"
+
#: calendar/gui/e-itip-control.c:161
msgid "I couldn't update your calendar file!\n"
msgstr "ե򹹿ޤǤ!\n"
@@ -2468,7 +2509,7 @@ msgstr ""
msgid "Calendar Message"
msgstr "å"
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
msgid "Date:"
msgstr ":"
@@ -2536,7 +2577,7 @@ msgstr "Ǥջü"
msgid "Organizer: "
msgstr "ż:"
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
msgid ""
"Publish\n"
"Event"
@@ -2544,11 +2585,11 @@ msgstr ""
"ȯɽ\n"
"٥"
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
msgid "RSVP"
msgstr "RSVP"
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
msgid ""
"Request\n"
"Meeting"
@@ -2556,15 +2597,15 @@ msgstr ""
"׵\n"
"ǹ礻"
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
msgid "Required Participant"
msgstr "üԤɬ"
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
msgid "Role"
msgstr ""
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
msgid ""
"Schedule\n"
"Time"
@@ -2572,8 +2613,8 @@ msgstr ""
"塼\n"
""
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1054
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1081
msgid "Status"
msgstr "ơ"
@@ -2596,20 +2637,119 @@ msgstr "'%s' Υɤ߹ळȤޤǤ"
msgid "The method required to load `%s' is not supported"
msgstr "'%s' ɤ߹ळȤ׵ᤵ᥽åɤϥݡȤƤޤ"
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%B %d"
+#: calendar/gui/event-editor.c:377
+msgid "Edit Appointment"
+msgstr "«Խ"
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "«..."
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr ""
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "٤Ƥν"
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr ""
+
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "« Evolution ԽʤȯޤǤޤ"
+
+#: calendar/gui/event-editor.c:1543
+#, c-format
+msgid " %d days"
+msgstr "%d "
+
+#: calendar/gui/event-editor.c:1545
+msgid " 1 day"
+msgstr "1 "
+
+#: calendar/gui/event-editor.c:1548
+#, c-format
+msgid " %d weeks"
+msgstr "%d "
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 week"
+msgstr "1 "
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d hours"
+msgstr "%d "
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 hour"
+msgstr "1 "
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d minutes"
+msgstr "%d ʬ"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 minute"
+msgstr "1 ʬ"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d seconds"
+msgstr "%d "
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 second"
+msgstr "1 "
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1588
+msgid "Play a sound"
+msgstr "λ˲ڤ:"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1591
+msgid "Show a dialog"
+msgstr "λ˥ɽ:"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1594
+msgid "Send an email"
+msgstr "λ˥᡼:"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1597
+msgid "Run a program"
+msgstr "λ˥ץ¹Ԥ:"
+
+#: calendar/gui/event-editor.c:1612
+msgid " before start of appointment"
+msgstr "ǽ«"
+
+#: calendar/gui/event-editor.c:1614
+msgid " after start of appointment"
+msgstr "ǽ«θ"
+
+#: calendar/gui/event-editor.c:1622
+msgid " before end of appointment"
+msgstr "Ǹ«"
+
+#: calendar/gui/event-editor.c:1624
+msgid " after end of appointment"
+msgstr "Ǹ«θ"
+
+#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
#: calendar/gui/event-editor-dialog.glade.h:1
msgid "A_ll day event"
@@ -2628,9 +2768,8 @@ msgid "Custom recurrence"
msgstr "ȯΥޥ"
#: calendar/gui/event-editor-dialog.glade.h:10
-#, fuzzy
msgid "Every"
-msgstr ""
+msgstr ""
#: calendar/gui/event-editor-dialog.glade.h:11
msgid "Exceptions"
@@ -2644,11 +2783,6 @@ msgstr ""
msgid "No recurrence"
msgstr "ȯʤ"
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "λ˲ڤ:"
-
#: calendar/gui/event-editor-dialog.glade.h:15
msgid "Preview"
msgstr "ץӥ塼"
@@ -2665,25 +2799,10 @@ msgstr "ȯ롼"
msgid "Reminder"
msgstr "¥"
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "λ˥ץ¹Ԥ:"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "λ˥᡼:"
-
#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
msgid "Settings..."
msgstr "..."
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "λ˥ɽ:"
-
#: calendar/gui/event-editor-dialog.glade.h:26
msgid "Simple recurrence"
msgstr "ץʺȯ"
@@ -2718,20 +2837,18 @@ msgid "end of appointment"
msgstr "«κǸ夬в"
#: calendar/gui/event-editor-dialog.glade.h:37
-#, fuzzy
msgid "for"
-msgstr ""
+msgstr ""
#: calendar/gui/event-editor-dialog.glade.h:38
-#, fuzzy
msgid "forever"
-msgstr "˱ʱ˷֤"
+msgstr ""
#: calendar/gui/event-editor-dialog.glade.h:39
msgid "hour(s)"
msgstr ""
-#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:87
msgid "minute(s)"
msgstr "ʬ"
@@ -2759,101 +2876,46 @@ msgstr ""
msgid "year(s)"
msgstr "ǯ"
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "«Խ"
-
-#: calendar/gui/event-editor.c:454
-#, fuzzy
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr ""
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:759
-#, fuzzy
-msgid "occurrences"
-msgstr "ȯ"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "« Evolution ԽʤȯޤǤޤ"
+#: calendar/gui/e-week-view.c:3277 calendar/gui/e-week-view.c:3300
+msgid "New Appointment..."
+msgstr "«..."
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d "
+#: calendar/gui/e-week-view.c:3313
+msgid "Delete All Occurrences"
+msgstr "٤Ƥν"
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr "1 "
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%B %d"
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr "%d "
+#: calendar/gui/gnome-cal.c:234
+msgid "Summary contains"
+msgstr "ޥ꤬ΤΤޤ"
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr "1 "
+#: calendar/gui/gnome-cal.c:235
+msgid "Description contains"
+msgstr "ΤΤޤ"
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr "%d "
+#: calendar/gui/gnome-cal.c:236
+msgid "Comment contains"
+msgstr "ȤΤΤޤ"
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr "1 "
+#: calendar/gui/gnome-cal.c:237
+msgid "Has category"
+msgstr "Υƥ"
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/gnome-cal.c:840
#, c-format
-msgid " %d minutes"
-msgstr "%d ʬ"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr "1 ʬ"
+msgid "Could not open the folder in `%s'"
+msgstr "`%s' Υե򳫤ȤޤǤ"
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/gnome-cal.c:851
#, c-format
-msgid " %d seconds"
-msgstr "%d "
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr "1 "
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr "ǽ«"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr "ǽ«θ"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr "Ǹ«"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr "Ǹ«θ"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
+msgid "The method required to open `%s' is not supported"
+msgstr "'%s' 򳫤Ȥ׵ᤵ᥽åɤϥݡȤƤޤ"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
msgid "A sample Bonobo control which displays an calendar."
@@ -2887,36 +2949,6 @@ msgstr " iTip ӥ塼ȥΤΥեȥ"
msgid "Factory for the sample Calendar control"
msgstr "ץ륫ȥΥեȥ"
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "٤ɽ"
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "ޥ꤬ΤΤޤ"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "ΤΤޤ"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "ȤΤΤޤ"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "Υƥ"
-
-#: calendar/gui/gnome-cal.c:843
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' Υե򳫤ȤޤǤ"
-
-#: calendar/gui/gnome-cal.c:854
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "'%s' 򳫤Ȥ׵ᤵ᥽åɤϥݡȤƤޤ"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "4 "
@@ -3125,10 +3157,6 @@ msgstr ""
msgid "Sa"
msgstr ""
-#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr ""
-
#. Day
#: calendar/gui/print.c:1078
msgid "Current day (%a %b %d %Y)"
@@ -3161,9 +3189,8 @@ msgstr "ǯ (%Y)"
msgid "Print Calendar"
msgstr "ΰ"
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1465
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1447
#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
msgid "Print Preview"
msgstr "ץӥ塼"
@@ -3213,26 +3240,120 @@ msgstr ""
msgid "SMTWTFS"
msgstr "SMTWTFS"
-#: camel/camel-cipher-context.c:169
+#: calendar/pcs/query.c:218
+msgid "time-now expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:242
+msgid "make-time expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:247
+msgid "make-time expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:255
+msgid "make-time argument 1 must be an ISO 8601 date/time string"
+msgstr ""
+
+#: calendar/pcs/query.c:281
+msgid "time-add-day expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:286
+msgid "time-add-day expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:293
+msgid "time-add-day expects argument 2 to be an integer"
+msgstr ""
+
+#: calendar/pcs/query.c:318
+msgid "time-day-begin expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:323
+msgid "time-day-begin expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:348
+msgid "time-day-end expects 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:353
+msgid "time-day-end expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:389
+msgid "get-vtype expects 0 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:472
+msgid "occur-in-time-range? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:477
+msgid "occur-in-time-range? expects argument 1 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:484
+msgid "occur-in-time-range? expects argument 2 to be a time_t"
+msgstr ""
+
+#: calendar/pcs/query.c:611
+msgid "contains? expects 2 arguments"
+msgstr ""
+
+#: calendar/pcs/query.c:616
+msgid "contains? expects argument 1 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:623
+msgid "contains? expects argument 2 to be a string"
+msgstr ""
+
+#: calendar/pcs/query.c:640
+msgid ""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
+msgstr ""
+
+#: calendar/pcs/query.c:678
+msgid "has-categories? expects at least 1 argument"
+msgstr ""
+
+#: calendar/pcs/query.c:684
+msgid "has-categories? expects all arguments to be strings"
+msgstr ""
+
+#: calendar/pcs/query.c:932
+msgid "Evaluation of the search expression did not yield a boolean value"
+msgstr ""
+
+#: camel/camel-cipher-context.c:171
msgid "Signing is not supported by this cipher"
msgstr "ϤΰŹ򥵥ݡȤƤޤ"
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
msgid "Clearsigning is not supported by this cipher"
msgstr "ꥢϤΰŹ򥵥ݡȤƤޤ"
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
msgid "Verifying is not supported by this cipher"
msgstr "٥եϤΰŹ򥵥ݡȤƤޤ"
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
msgid "Encryption is not supported by this cipher"
msgstr "沽ϤΰŹ򥵥ݡȤƤޤ"
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
msgid "Decryption is not supported by this cipher"
msgstr "沽ϤΰŹ򥵥ݡȤƤޤ"
+#: camel/camel-disco-store.c:271
+msgid "You must be working online to complete this operation"
+msgstr "ưλ뤿˥饤ǺȤʤФʤޤ"
+
#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
msgid "Syncing folders"
msgstr "եƱ"
@@ -3414,44 +3535,44 @@ msgstr "ʤ %s ѥե졼 ( %s ) ϤƤ"
msgid "Please enter your %s passphrase"
msgstr "ʤ %s ѥե졼ϤƤ"
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:511
msgid "No plaintext to sign."
msgstr "󤹤뤿Υץ쥤ƥȤޤ"
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1061 camel/camel-pgp-context.c:1273
+#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
+#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
msgid "No password provided."
msgstr "󶡤줿ѥɤϤޤ"
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1068
-#: camel/camel-pgp-context.c:1280
+#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
+#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
+#: camel/camel-pgp-context.c:1276
#, c-format
msgid "Couldn't create pipe to GPG/PGP: %s"
msgstr "GPG/PGP ؤΥѥפǤޤǤ: %s"
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:683
msgid "No plaintext to clearsign."
msgstr "ꥢ󤹤뤿Υץ쥤ƥȤޤ"
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:873
msgid "No plaintext to verify."
msgstr "٥ե뤿Υץ쥤ƥȤޤ"
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:890
#, c-format
msgid "Couldn't create temp file: %s"
msgstr "ȥե뤳ȤޤǤ: %s"
-#: camel/camel-pgp-context.c:1051
+#: camel/camel-pgp-context.c:1047
msgid "No plaintext to encrypt."
msgstr "沽뤿Υץ쥤ƥȤޤ"
-#: camel/camel-pgp-context.c:1077
+#: camel/camel-pgp-context.c:1073
msgid "No recipients specified"
msgstr "ԤꤵƤޤ"
-#: camel/camel-pgp-context.c:1265
+#: camel/camel-pgp-context.c:1261
msgid "No ciphertext to decrypt."
msgstr "沽뤿ΰŹƥȤޤ"
@@ -3472,37 +3593,37 @@ msgstr "%s ɽޤǤ: %s"
msgid "Could not load %s: No initialization code in module."
msgstr "%s ɽޤǤ: ⥸塼ΥɤƤޤ"
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
#, c-format
msgid "%s server %s"
msgstr "%s %s"
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
#, c-format
msgid "%s service for %s on %s"
msgstr "%s ӥ (桼: %s ۥ %s)"
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
msgid "Connection cancelled"
msgstr "³ϥ󥻥뤷ޤ"
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "%s (ݡ %d) ³ޤǤ: %s"
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
msgid "(unknown host)"
msgstr "(̤ΤΥۥ)"
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
+#: camel/camel-remote-store.c:470
+#: camel/providers/imap/camel-imap-command.c:287
msgid "Operation cancelled"
msgstr "ϥ󥻥뤷ޤ"
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
msgid "Server unexpectedly disconnected"
msgstr "ФǤޤ"
@@ -3612,68 +3733,76 @@ msgstr ""
"%s"
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:433
msgid "Bad authentication response from server."
msgstr "Фְäǧڱޤ"
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr "NT "
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
msgid "This option will connect to the server using a simple password."
msgstr "ΥץϴñʥѥɤȤäƥФ³ޤ"
-#: camel/camel-search-private.c:110
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr ""
+
+#: camel/camel-search-private.c:111
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "ɽԽ˼: %s: %s"
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL '%s' ϥ桼̾ݡͥȤɬפǤ"
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL '%s' ϥۥȥݡͥȤɬפǤ"
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL '%s' ϥѥݡͥȤɬפǤ"
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
#, c-format
msgid "Resolving: %s"
msgstr ": %s"
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
#, c-format
msgid "Failure in name lookup: %s"
msgstr "̾θ˼Ԥޤ: %s"
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "ۥȤθ˼Ԥޤ: %s: ۥȤϸĤޤ"
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "ۥȤθ˼Ԥޤ: %s: ̤ΤͳǤ"
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
msgid "Virtual folder email provider"
msgstr "ۥե᡼ץХ"
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
msgid "For reading mail as a query of another set of folders"
msgstr ""
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "ץȥ `%s' ѤǤץХϤޤ"
-#: camel/camel-session.c:462
+#: camel/camel-session.c:479
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -3682,12 +3811,111 @@ msgstr ""
"ǥ쥯ȥ %s ޤ:\n"
"%s"
+#: camel/camel-smime-context.c:194
+#, c-format
+msgid "Please enter your password for %s"
+msgstr "%s ΤΤʤΥѥɤϤƤ"
+
+#: camel/camel-smime-context.c:210
+msgid "Error hashing password."
+msgstr "ѥɤΥϥåǥ顼ȯޤ"
+
+#: camel/camel-smime-context.c:219
+msgid "Invalid password."
+msgstr "̵ʥѥɤǤ"
+
+#: camel/camel-smime-context.c:327
+#, c-format
+msgid "Could not sign: certificate not found for \"%s\"."
+msgstr "̾ޤǤ: \"%s\" Τξ񤬸Ĥޤ"
+
+#: camel/camel-smime-context.c:343
+msgid "Could not sign: failed to create content info."
+msgstr "̾ޤǤ: ƥȾκ˼Ԥޤ"
+
+#: camel/camel-smime-context.c:350
+msgid "Could not sign: failed to create signing context."
+msgstr "̾ޤǤ: ƥȤν̾κ˼Ԥޤ"
+
+#: camel/camel-smime-context.c:356
+msgid "Could not sign: failed to create signature."
+msgstr "̾ޤǤ: ̾κ˼Ԥޤ"
+
+#: camel/camel-smime-context.c:383
+msgid "'clearsign' is not supported by S/MIME."
+msgstr "'ꥢ' S/MIME 򥵥ݡȤƤޤ"
+
+#: camel/camel-smime-context.c:528
+msgid "Could not encrypt: failed to create enveloped data."
+msgstr "Ź沽ޤǤ: ٥ץǡκ˼Ԥޤ"
+
+#: camel/camel-smime-context.c:535
+msgid "Could not encrypt: failed to create encryption context."
+msgstr "Ź沽ޤǤ: Ź楳ƥȤκ˼Ԥޤ"
+
+#: camel/camel-smime-context.c:570
+#, c-format
+msgid "Could not encrypt data: invalid user key: \"%s\"."
+msgstr "ǡŹ沽ޤǤ: ̵ʥ桼Ǥ: \"%s\""
+
+#: camel/camel-smime-context.c:576
+msgid "Could not encrypt: encoding failed."
+msgstr "Ź沽ޤǤ: 沽˼Ԥޤ"
+
+#: camel/camel-smime-context.c:626
+msgid "Failed to decrypt: Unknown"
+msgstr "沽˼Ԥޤ: ̤ΤΥ顼Ǥ"
+
#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
-#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
+#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
msgid "Trash"
msgstr "Ȣ"
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"᡼: %s\n"
+"̾: %s\n"
+"ȿ˥å: %s\n"
+"ȿ: %s\n"
+": %s\n"
+": %s\n"
+": %s"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-openssl.c:428 camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%s 鵶ξǤ:\n"
+"\n"
+"%s\n"
+"\n"
+"˾ߤޤ?"
+
+#: camel/camel-tcp-stream-openssl.c:423
+#, c-format
+msgid ""
+"Issuer: %s\n"
+"Subject: %s"
+msgstr ""
+"ȯ: %s\n"
+"о: %s"
+
#: camel/camel-url.c:289
#, c-format
msgid "Could not parse URL `%s'"
@@ -3698,59 +3926,73 @@ msgstr "URL `%s' Ϥ뤳ȤޤǤ"
msgid "No such message %s in %s"
msgstr "%s %s Τ褦ʥåϤޤ"
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
#, c-format
msgid "No such message: %s"
msgstr "Τ褦ʥåϤޤ: %s"
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "ΥȢեå򥳥ԡ뤳Ȥޤ"
+
+#: camel/providers/imap/camel-imap-message-cache.c:150
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "åǥ쥯ȥ򳫤ȤޤǤ: %s"
+
+#: camel/providers/imap/camel-imap-command.c:232
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "IMAP Фͽʤޤ: %s"
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:240
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP ޥɤϼԤޤ: %s"
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
msgid "Unknown error"
msgstr "̤ΤΥ顼"
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:295
msgid "Server response ended too soon."
msgstr "Х쥹ݥ󥹤Ϥäʤޤ"
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:487
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP Фα %s ޤǤޤ"
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:524
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "IMAP Фͽʤ OK ޤ: %s"
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:172
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "ǥ쥯ȥ %s ޤǤ: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:191
#, c-format
msgid "Could not load summary for %s"
msgstr "%s Υޥ꡼ɽޤǤ"
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:364
msgid "Scanning IMAP folder"
msgstr "IMAP ե"
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1047
+#: camel/providers/imap/camel-imap-folder.c:1281
msgid "This message is not currently available"
msgstr "Υåϸѽޤ"
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1075
+#: camel/providers/imap/camel-imap-folder.c:1314
msgid "Could not find message body in FETCH response."
msgstr "FETCH ˥åΤդ뤳ȤޤǤ"
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:13
msgid "Checking for new mail"
msgstr "᡼Υå"
@@ -3758,7 +4000,7 @@ msgstr "᡼Υå"
msgid "Check for new messages in all folders"
msgstr "٤ƤΥեο᡼åޤ"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:552
msgid "Folders"
msgstr "ե"
@@ -3791,28 +4033,28 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"Υץϥץ쥤ƥȥѥɤȤä IMAP Ф³ޤ"
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:456
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP %s ׵ᤷǧڥ %s 򥵥ݡȤƤޤ"
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:366
#, c-format
msgid "No support for authentication type %s"
msgstr "ǧڥ %s 򥵥ݡȤƤޤ"
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:490
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s %s@%s IMAP ѥɤϤƤ"
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:505
+#: camel/providers/smtp/camel-smtp-transport.c:410
msgid "You didn't enter a password."
msgstr "ѥɤϤƤޤ"
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:531
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3823,19 +4065,10 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:868
+#: camel/providers/imap/camel-imap-store.c:803 mail/mail-local.c:334
#, c-format
-msgid "%s is not a selectable folder"
-msgstr "%s ǽʥեǤϤޤ"
-
-#: camel/providers/imap/camel-imap-store.c:882
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "ǥ쥯ȥ %s ޤǤ: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "ưλ뤿˥饤ǺȤʤФʤޤ"
+msgid "No such folder %s"
+msgstr "Τ褦ʥե %s Ϥޤ"
#: camel/providers/local/camel-local-provider.c:39
msgid "MH-format mail directories"
@@ -3861,47 +4094,51 @@ msgstr "Qmail maildirΥ᡼ե"
msgid "For storing local mail in qmail maildir directories"
msgstr "qmail maildirǥ쥯ȥ˥᡼¸ޤ"
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:127
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "¸줿롼 %s ХѥǤϤޤ"
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "¸줿롼 %s ̾Υǥ쥯ȥǤϤޤ"
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "եޤ: %s: %s"
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
msgid "Local stores do not have an inbox"
msgstr "ؤ¸ inbox Ƥޤ"
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Local mail file %s"
msgstr "᡼ե %s"
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "ե %s %s ̾ѹ뤳ȤޤǤ: %s"
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "ե饵ޥ꡼ե `%s' 뤳ȤޤǤ: %s"
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr ""
"ե饤ǥåե `%s' 뤳ȤޤǤ: %s"
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "ޥإåɲä뤳Ȥޤ: ̤ΤͳǤ"
+
#: camel/providers/local/camel-maildir-folder.c:150
#: camel/providers/local/camel-maildir-folder.c:158
#: camel/providers/local/camel-maildir-folder.c:169
@@ -3978,6 +4215,12 @@ msgstr "ե `%s' 뤳ȤޤǤ: %s"
msgid "not a maildir directory"
msgstr "maildir Υǥ쥯ȥǤϤޤ"
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "maildir ǥ쥯ȥѥ򳫤Ȥޤ: %s: %s"
+
#: camel/providers/local/camel-mbox-folder.c:152
#, c-format
msgid "Cannot create folder lock on %s: %s"
@@ -4053,75 +4296,75 @@ msgstr "ե `%s' ϶ǤϤޤ. ޤ"
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
msgid "Summarising folder"
msgstr "ե򥵥ޥ饤"
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
#, c-format
msgid "Could not open folder: %s: summarising from position %ld: %s"
msgstr "ե򳫤ޤǤ: %s: ݥ %ld 饵ޥ饤: %s"
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "ݥ %ld ն ե %s ̿Ūʥ᡼빽ʸϥ顼Ǥ"
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
#, c-format
msgid "Cannot summarise folder: %s: %s"
msgstr "ե򥵥ޥ饤뤳Ȥޤ: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
msgid "Synchronising folder"
msgstr "եƱ"
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
#, c-format
msgid "Could not open folder to summarise: %s: %s"
msgstr "ե򥵥ޥ饤뤳ȤޤǤ: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "ƥݥ mailbox 򳫤Ȥޤ: %s"
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
msgid "Summary and folder mismatch, even after a sync"
msgstr "Ʊޤ, ޥ꡼ȥե԰פǤ"
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr " mailbox ؽ񤭽Ф˥顼: %s"
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr " mailbox ؽ񤭽Ф˥顼: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Υե %s Ĥ뤳ȤޤǤ: %s"
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
#, c-format
msgid "Could not close temp folder: %s"
msgstr "ȥեĤ뤳ȤޤǤ: %s"
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
#, c-format
msgid "Could not rename folder: %s"
msgstr "ե͡ޤǤ: %s"
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
#, c-format
msgid "Unknown error: %s"
msgstr "̤ΤΥ顼: %s"
@@ -4137,6 +4380,11 @@ msgstr "mh եإåɲýޤ: %s: %s"
msgid "`%s' is not a directory."
msgstr "`%s' ϥǥ쥯ȥǤϤޤ"
+#: camel/providers/local/camel-mh-summary.c:218
+#, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "MH ǥ쥯ȥѥ򳫤Ȥޤ: %s: %s"
+
#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
@@ -4251,7 +4499,7 @@ msgstr "Ф˥åĤ"
msgid "Delete after %s day(s)"
msgstr "%s ˺"
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:51
msgid "POP"
msgstr "POP"
@@ -4287,27 +4535,27 @@ msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr " POP Ф³, Kerberos 4 ǧڤȤޤ."
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "KPOP ФǧڽޤǤ: %s"
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
#, c-format
msgid "Could not connect to server: %s"
msgstr "Ф³뤳ȤޤǤ: %s"
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
#, c-format
msgid "Could not connect to POP server on %s."
msgstr "%s POP Ф³ޤǤ"
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr "%s %s@%s POP3 ѥɤϤƤ"
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4316,12 +4564,12 @@ msgstr ""
"POP Ф³ޤ\n"
"桼̾˥顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
msgid "(Unknown)"
msgstr "(̤)"
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -4329,7 +4577,7 @@ msgstr ""
"POP Ф³ޤ\n"
"׵ᤷǧڼʤϥݡȤƤޤ"
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4338,13 +4586,13 @@ msgstr ""
"POP Ф³Ǥޤ\n"
"ѥɤ˥顼: %s"
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid "No such folder `%s'."
msgstr "Τ褦ʥե `%s' Ϥޤ"
#: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:67
msgid "Sendmail"
msgstr "Sendmail"
@@ -4398,7 +4646,7 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "sendmail ͳǥ᡼ۿ"
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:62
msgid "SMTP"
msgstr "SMTP"
@@ -4406,122 +4654,122 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr "SMTPȤäƥ⡼ȥ᡼ϥ֤³뤳Ȥǥ᡼ۿޤ\n"
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
msgid "Syntax error, command unrecognized"
msgstr "ʸϥ顼, ޥɤǤϤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
msgid "Syntax error in parameters or arguments"
msgstr "ѥ᡼뤤ϰ˹ʸϥ顼"
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
msgid "Command not implemented"
msgstr "ޥɤϼƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "Command parameter not implemented"
msgstr "ޥɥѥ᡼ϼƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
msgid "System status, or system help reply"
msgstr "ƥॹơ뤤ϥƥإױ"
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
msgid "Help message"
msgstr "إץå"
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
msgid "Service ready"
msgstr "ӥѤǤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
msgid "Service closing transmission channel"
msgstr "ӥͥĤƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
msgid "Service not available, closing transmission channel"
msgstr "ӥѤǤޤ, ͥĤƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
msgid "Requested mail action okay, completed"
msgstr "׵ᤵ줿᡼ưOK, λޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
msgid "User not local; will forward to <forward-path>"
msgstr "桼ϥǤϤޤ; <forward-path> žޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "׵ᤵ줿᡼ưϴλޤ: ᡼ܥåѤǤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
msgid "Requested action not taken: mailbox unavailable"
msgstr "׵ᤵ줿ưϴλޤ: ᡼ܥåѤǤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "Requested action aborted: error in processing"
msgstr "׵ᤵ줿ưǤޤ: ˥顼"
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "User not local; please try <forward-path>"
msgstr "桼ϥǤϤޤ; <forward-path> Ƥ"
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
msgid "Requested action not taken: insufficient system storage"
msgstr "׵ᤵ줿ưϴλޤ: ƥ¸ΰ褬­ޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "׵ᤵ줿᡼ưǤޤ: ΰƤۤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
msgid "Requested action not taken: mailbox name not allowed"
msgstr "׵ᤵ줿ưϴλޤ: ᡼ܥå̾ǧޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "᡼Ϥ򳫻Ϥޤ; <CRLF>.<CRLF> ǽλޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
msgid "Transaction failed"
msgstr "ϼԤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
msgid "A password transition is needed"
msgstr "ѥɤѹɬפǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
msgid "Authentication mechanism is too weak"
msgstr "ǧڥᥫ˥Խʬ᤮ޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
msgid "Encryption required for requested authentication mechanism"
msgstr "׵ᤷǧڥᥫ˥Τ˰Ź沽ɬפǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
msgid "Temporary authentication failure"
msgstr "Ūǧڤ˼Ԥޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
msgid "Authentication required"
msgstr "ǧڤɬפȤƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr "顼: %s: ֤̿ŪǤϤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
#, c-format
msgid "SMTP server %s does not support requested authentication type %s"
msgstr "SMTP %s ׵ᤷǧڥ %s 򥵥ݡȤƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:395
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s %s@%s SMTP ѥɤϤƤ"
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:418
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4532,111 +4780,115 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:534
#, c-format
msgid "SMTP server %s"
msgstr "SMTP %s"
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:536
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "%s ͳ SMTP ᡼ۿޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:561
msgid "Cannot send message: sender address not defined."
msgstr "åޤ: ԤΥɥ쥹Ƥޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:568
msgid "Cannot send message: sender address not valid."
msgstr "åޤ: ԤΥɥ쥹ޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:582
msgid "Cannot send message: no recipients defined."
msgstr "åޤ: ԤƤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:676
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "HELO ׵Υॢ: %s: ̿ŪǤϤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:695
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "HELO 쥹ݥ󥹥顼: %s: ̿ŪǤϤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:728
msgid "Error creating SASL authentication object."
msgstr "SASL ǧڥ֥Ȥ˥顼ȯޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:736
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
#, c-format
msgid "AUTH request timed out: %s"
msgstr "AUTH ׵Υॢ: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:764
+msgid "AUTH request failed."
+msgstr "AUTH ׵˼Ԥޤ"
+
+#: camel/providers/smtp/camel-smtp-transport.c:809
msgid "Bad authentication response from server.\n"
msgstr "Фְäǧڱޤ\n"
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:835
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "MAIL FROM ׵Υॢ: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:854
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr "MAIL FROM 쥹ݥ󥹥顼: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:879
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "RCPT TO ׵Υॢ: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:898
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr "RCPT TO 쥹ݥ󥹥顼: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:929
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "DATA ׵Υॢ: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:948
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr "DATA 쥹ݥ󥹥顼: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:963
+#: camel/providers/smtp/camel-smtp-transport.c:981
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"DATA Υॢ: åνλ: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1000
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr ""
"DATA 쥹ݥ󥹥顼: åνλ: %s: ᡼ޤǤ"
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1024
#, c-format
msgid "RSET request timed out: %s"
msgstr "RSET ׵Υॢ: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1043
#, c-format
msgid "RSET response error: %s"
msgstr "RSET 쥹ݥ󥹥顼: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1066
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "QUIT ׵Υॢ: %s: ̿ŪǤϤޤ"
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1085
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "QUIT 쥹ݥ󥹥顼: %s: ̿ŪǤϤޤ"
@@ -4666,7 +4918,7 @@ msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:122
msgid "attachment"
msgstr "ź"
@@ -4687,7 +4939,8 @@ msgstr "źդɲ..."
msgid "Attach a file to the message"
msgstr "åإեźդޤ"
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1054
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:9
+#: mail/message-list.c:1081
msgid "Attachment"
msgstr "ź"
@@ -4711,60 +4964,26 @@ msgstr "MIME :"
msgid "Send as:"
msgstr ":"
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr "ɥ쥹ĢΤˤǥå"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:719
-msgid "From:"
-msgstr "п:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:721
-msgid "Reply-To:"
-msgstr "ֿ:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
-msgid "Subject:"
-msgstr "̾:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:723
-msgid "To:"
-msgstr ":"
+#: composer/e-msg-composer.c:546
+#, c-format
+msgid ""
+"This version of Evolution was not built with support for S/MIME.\n"
+"You may wish to instead use PGP to %s your document."
+msgstr ""
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr "åμͤϤޤ"
+#: composer/e-msg-composer.c:548
+msgid "sign and encrypt"
+msgstr "̾ȰŹ沽"
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:725
-msgid "Cc:"
-msgstr "Cc:"
+#: composer/e-msg-composer.c:549
+msgid "sign"
+msgstr "̾"
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "åΥܥ󥳥ԡ륢ɥ쥹Ϥޤ"
+#: composer/e-msg-composer.c:549
+msgid "encrypt"
+msgstr "Ź沽"
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"åμͥꥹȤ˸ʤ, "
-"åΥܥ󥳥ԡ륢ɥ쥹Ϥޤ"
-
-#: composer/e-msg-composer.c:528
+#: composer/e-msg-composer.c:601
#, c-format
msgid ""
"Could not open signature file %s:\n"
@@ -4773,21 +4992,21 @@ msgstr ""
"̾ե %s 򳫤ȤޤǤ:\n"
"%s"
-#: composer/e-msg-composer.c:716
+#: composer/e-msg-composer.c:774
msgid "Save as..."
msgstr "̾¸..."
-#: composer/e-msg-composer.c:727
+#: composer/e-msg-composer.c:785
#, c-format
msgid "Error saving file: %s"
msgstr "ե¸˥顼: %s"
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:805
#, c-format
msgid "Error loading file: %s"
msgstr "եΥ˥顼: %s"
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:877
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -4795,12 +5014,12 @@ msgstr ""
"ΥȤƥե򳫤Ȥޤ\n"
"ǥեȤƥեȤäƤǤ?"
-#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
+#: composer/e-msg-composer.c:935 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:224
msgid "Evolution"
msgstr "Evolution"
-#: composer/e-msg-composer.c:883
+#: composer/e-msg-composer.c:941
msgid ""
"This message has not been sent.\n"
"\n"
@@ -4810,27 +5029,27 @@ msgstr ""
"\n"
"ѹ¸ޤ?"
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:966
msgid "Open file"
msgstr "ե򳫤"
-#: composer/e-msg-composer.c:1034
+#: composer/e-msg-composer.c:1092
msgid "That file does not exist."
msgstr "Υե¸ߤޤ"
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1102
msgid "That is not a regular file."
msgstr "̾ΥեǤϤޤ"
-#: composer/e-msg-composer.c:1054
+#: composer/e-msg-composer.c:1112
msgid "That file exists but is not readable."
msgstr "Υե¸ߤޤɤ߼ǽǤϤޤ"
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1122
msgid "That file appeared accesible but open(2) failed."
msgstr "ΥեϥǽΤ褦˸ޤopen(2) ϼԤޤ"
-#: composer/e-msg-composer.c:1086
+#: composer/e-msg-composer.c:1144
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -4838,18 +5057,71 @@ msgstr ""
"եϤȤƤ礭 (100K ʾ) Ǥ\n"
"ˤ뤳Ȥ˾ߤޤ?"
-#: composer/e-msg-composer.c:1107
+#: composer/e-msg-composer.c:1165
msgid "An error occurred while reading the file."
msgstr "եɹδ֤˥顼ȯޤ"
-#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
+#: composer/e-msg-composer.c:1526 composer/e-msg-composer.c:1871
msgid "Compose a message"
msgstr "åޤ"
-#: composer/e-msg-composer.c:1829
+#: composer/e-msg-composer.c:1962
msgid "Could not create composer window."
msgstr "᡼ɥޤǤ"
+#: composer/e-msg-composer-hdrs.c:324
+msgid "Click here for the address book"
+msgstr "ɥ쥹ĢΤˤǥå"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:355
+msgid "From:"
+msgstr "п:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:361
+msgid "Reply-To:"
+msgstr "ֿ:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:372
+msgid "Subject:"
+msgstr "̾:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "To:"
+msgstr ":"
+
+#: composer/e-msg-composer-hdrs.c:387
+msgid "Enter the recipients of the message"
+msgstr "åμԤϤޤ"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:391
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "åΥܥ󥳥ԡ륢ɥ쥹Ϥޤ"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:395
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"åμԥꥹȤ˸ʤ, "
+"åΥܥ󥳥ԡ륢ɥ쥹Ϥޤ"
+
#: composer/evolution-composer.c:355
msgid ""
"Could not create composer window, because you have not yet\n"
@@ -4877,7 +5149,7 @@ msgstr ""
#. strptime format for a date.
#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
msgid "%m/%d/%Y"
msgstr "%Y/%m/%d"
@@ -4906,7 +5178,7 @@ msgstr "%H:%M%n"
#. strftime format of a weekday and a date.
#: e-util/e-time-utils.c:269
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
msgid "%a %m/%d/%Y"
msgstr "%Y/%m/%d (%a)"
@@ -4924,8 +5196,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M"
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
msgid "%H:%M"
msgstr "%H:%M"
@@ -4936,8 +5208,8 @@ msgstr "%H:%M:%S"
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
msgid "%I:%M %p"
msgstr "%p %I:%M"
@@ -4946,18 +5218,36 @@ msgstr "%p %I:%M"
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "¹ԥޥΤ Evolution ݡͥ"
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Evolution ¹ԥޥꥳݡͥȤΤΥեȥ"
-
#: executive-summary/component/component-factory.c:152
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr "Evolution ¹ԥޥ꡼ݡͥȤνޤ"
+#: executive-summary/component/e-summary.c:926
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"HTML ե򳫤Ȥޤ:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:940
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"ǡӤ߹˥顼:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:958
+msgid "File does not have a place for the services.\n"
+msgstr "եϥӥξäƤޤ\n"
+
+#: executive-summary/component/e-summary-callbacks.c:126
+msgid "Select a service"
+msgstr "ӥ"
+
#: executive-summary/component/e-summary-callbacks.c:290
msgid ""
"You can select a different HTML page for the background of the Executive "
@@ -5026,28 +5316,6 @@ msgstr " %s ư"
msgid "Configure %s"
msgstr "%s "
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"HTML ե򳫤Ȥޤ:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"ǡӤ߹˥顼:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr "եϥӥξäƤޤ\n"
-
#: executive-summary/component/executive-summary-config.glade.h:1
msgid "Appearance"
msgstr ""
@@ -5066,6 +5334,14 @@ msgstr ""
"⤷ RootPOA ˤĤƤηٹåʤ顤֤ OAF \n"
"GOAD Ȥäƥѥ뤷Ȥ̣ޤ"
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "¹ԥޥΤ Evolution ݡͥ"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "Evolution ¹ԥޥꥳݡͥȤΤΥեȥ"
+
#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
msgid "Factory for the RDF summary."
msgstr "RDF ޥΤΥեȥ"
@@ -5097,19 +5373,19 @@ msgstr "ƥȥӥ"
msgid "Error"
msgstr "顼"
-#: executive-summary/test-service/rdf-summary.c:768
+#: executive-summary/test-service/rdf-summary.c:775
msgid "Update automatically"
msgstr "ưŪ˹"
-#: executive-summary/test-service/rdf-summary.c:778
+#: executive-summary/test-service/rdf-summary.c:785
msgid "Update now"
msgstr ""
-#: executive-summary/test-service/rdf-summary.c:788
+#: executive-summary/test-service/rdf-summary.c:795
msgid "Update every "
msgstr "٤ƹ "
-#: executive-summary/test-service/rdf-summary.c:796
+#: executive-summary/test-service/rdf-summary.c:806
#: filter/filter-datespec.c:83
msgid "minutes"
msgstr "ʬ"
@@ -5258,47 +5534,6 @@ msgstr "ե URI "
msgid "<click here to select a folder>"
msgstr "<ե򤹤뤿ˤ򥯥åƤ>"
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"ɽ '%s' ǥ顼Ǥ:\n"
-"%s"
-
-#: filter/filter-part.c:474
-msgid "Test"
-msgstr "ƥ"
-
-#: filter/filter-rule.c:627
-msgid "Rule name: "
-msgstr "롼̾: "
-
-#: filter/filter-rule.c:631
-msgid "Untitled"
-msgstr "ȥʤ"
-
-#: filter/filter-rule.c:647
-msgid "If"
-msgstr "⤷"
-
-#: filter/filter-rule.c:665
-msgid "Execute actions"
-msgstr "ξư¹:"
-
-#: filter/filter-rule.c:669
-msgid "if all criteria are met"
-msgstr "٤Ƥδबä"
-
-#: filter/filter-rule.c:674
-msgid "if any criteria are met"
-msgstr "Ĥδबä"
-
-#: filter/filter-rule.c:685
-msgid "Add criterion"
-msgstr "ɲ"
-
#: filter/filter.glade.h:4
msgid "Edit Filters"
msgstr "ե륿Խ"
@@ -5339,6 +5574,55 @@ msgstr "٤ƤΥͭʥ⡼ȥե"
msgid "with all local folders"
msgstr "٤ƤΥե"
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"ɽ '%s' ǥ顼Ǥ:\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "ƥ"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "롼̾: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr "ȥʤ"
+
+#: filter/filter-rule.c:646
+msgid "If"
+msgstr "⤷"
+
+#: filter/filter-rule.c:664
+msgid "Execute actions"
+msgstr "ξư¹:"
+
+#: filter/filter-rule.c:668
+msgid "if all criteria are met"
+msgstr "٤Ƥδबä"
+
+#: filter/filter-rule.c:673
+msgid "if any criteria are met"
+msgstr "Ĥδबä"
+
+#: filter/filter-rule.c:684
+msgid "Add criterion"
+msgstr "ɲ"
+
+#: filter/filter-rule.c:770
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:770
+msgid "outgoing"
+msgstr ""
+
#: filter/libfilter-i18n.h:3
msgid "Assign Colour"
msgstr ""
@@ -5488,7 +5772,7 @@ msgid "Replied to"
msgstr ""
#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1054
+#: mail/message-list.c:1081
msgid "Score"
msgstr "Ͽ"
@@ -5520,7 +5804,7 @@ msgstr "ΤΤdzϤ"
msgid "Stop Processing"
msgstr ""
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1055
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:767 mail/message-list.c:1082
msgid "Subject"
msgstr "̾"
@@ -5532,130 +5816,224 @@ msgstr "ΤΤ"
msgid "was before"
msgstr "ΤΤ"
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "롼"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "롼ɲ"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "롼Խ"
+
#: filter/score-editor.c:130
msgid "Score Rules"
msgstr "롼"
-#: mail/component-factory.c:329
+#: importers/elm-importer.c:512 importers/netscape-importer.c:780
+#: importers/pine-importer.c:646 shell/e-shell-importer.c:655
+#: shell/importer/import.glade.h:4
+msgid "Import"
+msgstr "ݡ"
+
+#: importers/elm-importer.c:517 importers/netscape-importer.c:785
+#: importers/pine-importer.c:651
+msgid "Mail"
+msgstr "᡼"
+
+#: importers/elm-importer.c:521
+msgid "Elm Aliases"
+msgstr "Elm ꥢ"
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:807
+#: importers/pine-importer.c:668
+msgid "Don't ask me again"
+msgstr "Υå٤ɽʤ"
+
+#: importers/elm-importer.c:561
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Elm ᡼եȯޤ\n"
+"Evolution إݡȤƤǤ?"
+
+#: importers/elm-importer.c:579
+msgid "Elm mail"
+msgstr "Elm ᡼"
+
+#: importers/netscape-importer.c:790 importers/pine-importer.c:656
+msgid "Settings"
+msgstr ""
+
+#: importers/netscape-importer.c:795 mail/mail-callbacks.c:1359
+msgid "Filters"
+msgstr "ե륿"
+
+#: importers/netscape-importer.c:800
+msgid "Addressbooks"
+msgstr "ɥ쥹Ģ"
+
+#: importers/netscape-importer.c:847
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution Netscape ᡼եȯޤ\n"
+"Evolution إݡȤƤǤ?"
+
+#: importers/pine-importer.c:661
+msgid "Addressbook"
+msgstr "ɥ쥹Ģ"
+
+#: importers/pine-importer.c:705
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution Pine ᡼եȯޤ\n"
+"Evolution إݡȤƤǤ?"
+
+#: importers/pine-importer.c:723
+msgid "Pine mail"
+msgstr "Pine ᡼"
+
+#: mail/component-factory.c:337
msgid "Cannot initialize Evolution's mail component."
msgstr "Evolution ᡼륳ݡͥȤνޤ"
-#: mail/component-factory.c:402
+#: mail/component-factory.c:410
msgid "Cannot register storage with shell"
msgstr "ǥȥ졼Ͽޤ"
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "\"%s\" Υץѥƥ"
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "ץѥƥ"
-
-#: mail/folder-browser.c:225
+#: mail/folder-browser.c:329
msgid "Store search as vFolder"
msgstr ""
-#: mail/folder-browser.c:533
-msgid "VFolder on Subject"
-msgstr "̾βۥե"
+#: mail/folder-browser.c:653
+msgid "VFolder on _Subject"
+msgstr "̾βۥե(_S)"
-#: mail/folder-browser.c:536
-msgid "VFolder on Sender"
-msgstr "Ԥβۥե"
+#: mail/folder-browser.c:656
+msgid "VFolder on Se_nder"
+msgstr "Ԥβۥե(_n)"
-#: mail/folder-browser.c:539
-msgid "VFolder on Recipients"
-msgstr "Ԥβۥե"
+#: mail/folder-browser.c:659
+msgid "VFolder on _Recipients"
+msgstr "Ԥβۥե(_R)"
-#: mail/folder-browser.c:542 mail/folder-browser.c:733
-msgid "VFolder on Mailing List"
-msgstr "᡼󥰥ꥹȤβۥե"
+#: mail/folder-browser.c:662
+msgid "VFolder on Mailing _List"
+msgstr "᡼󥰥ꥹȤβۥե(_L)"
-#: mail/folder-browser.c:548
-msgid "Filter on Subject"
-msgstr "̾Υե륿"
+#: mail/folder-browser.c:668
+msgid "Filter on Sub_ject"
+msgstr "̾Υե륿(_j)"
-#: mail/folder-browser.c:551
-msgid "Filter on Sender"
-msgstr "ԤΥե륿"
+#: mail/folder-browser.c:671
+msgid "Filter on Sen_der"
+msgstr "ԤΥե륿(_d)"
-#: mail/folder-browser.c:554
-msgid "Filter on Recipients"
-msgstr "ԤΥե륿"
+#: mail/folder-browser.c:674
+msgid "Filter on Re_cipients"
+msgstr "ԤΥե륿(_c)"
-#: mail/folder-browser.c:557 mail/folder-browser.c:732
-msgid "Filter on Mailing List"
-msgstr "᡼󥰥ꥹȤΥե륿"
+#: mail/folder-browser.c:677
+msgid "Filter on _Mailing List"
+msgstr "᡼󥰥ꥹȤΥե륿(_M)"
+
+#: mail/folder-browser.c:686
+msgid "_Open"
+msgstr "(_O)"
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:688
msgid "Resend"
msgstr ""
-#: mail/folder-browser.c:570
-msgid "Save As..."
-msgstr "̾¸..."
+#: mail/folder-browser.c:690 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:118 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
+msgstr "̾¸(_S)..."
-#: mail/folder-browser.c:577
-msgid "Reply to Sender"
-msgstr "Ԥֿ"
+#: mail/folder-browser.c:692 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "(_P)"
-#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
-msgid "Reply to All"
-msgstr "ֿ"
+#: mail/folder-browser.c:697 ui/evolution-mail.xml.h:117
+msgid "_Reply to Sender"
+msgstr "Ԥֿ(_R)"
-#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "ž"
+#: mail/folder-browser.c:699 ui/evolution-mail.xml.h:72
+msgid "Reply to _All"
+msgstr "ֿ(_A)"
-#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
-msgstr "饤ž"
+#: mail/folder-browser.c:701
+msgid "_Forward"
+msgstr "ž(_F)"
-#: mail/folder-browser.c:586
-msgid "Mark as Read"
-msgstr "ɤȤƥޡ"
+#: mail/folder-browser.c:704
+msgid "Mar_k as Read"
+msgstr "ɤȤƥޡ(_k)"
-#: mail/folder-browser.c:588
-msgid "Mark as Unread"
-msgstr "̤ɤȤƥޡ"
+#: mail/folder-browser.c:706
+msgid "Mark as U_nread"
+msgstr "̤ɤȤƥޡ(_n)"
-#: mail/folder-browser.c:593
-msgid "Move to Folder..."
-msgstr "եذư..."
+#: mail/folder-browser.c:711
+msgid "_Move to Folder..."
+msgstr "եذư(_M)..."
-#: mail/folder-browser.c:595
-msgid "Copy to Folder..."
-msgstr "եإԡ..."
+#: mail/folder-browser.c:713
+msgid "_Copy to Folder..."
+msgstr "եإԡ(_C)..."
-#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
-msgid "Undelete"
-msgstr ""
+#: mail/folder-browser.c:717 ui/evolution-mail.xml.h:121
+msgid "_Undelete"
+msgstr "(_U)"
#. { _("Add Sender to Address Book"), NULL,
#. GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
#. { "", NULL,
#. GTK_SIGNAL_FUNC (NULL), NULL, 0 },
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:727
msgid "Apply Filters"
msgstr "ե륿Ŭ"
-#: mail/folder-browser.c:613
-msgid "Create Rule From Message"
-msgstr "å롼"
+#: mail/folder-browser.c:731
+msgid "Create Ru_le From Message"
+msgstr "å롼(_l)"
-#: mail/folder-browser.c:735
+#: mail/folder-browser.c:870
+msgid "Filter on Mailing List"
+msgstr "᡼󥰥ꥹȤΥե륿"
+
+#: mail/folder-browser.c:871
+msgid "VFolder on Mailing List"
+msgstr "᡼󥰥ꥹȤβۥե"
+
+#: mail/folder-browser.c:873
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "᡼󥰥ꥹȤΥե륿 (%s)"
-#: mail/folder-browser.c:736
+#: mail/folder-browser.c:874
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "᡼󥰥ꥹȤβۥե (%s)"
+#: mail/folder-browser-factory.c:196
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" Υץѥƥ"
+
+#: mail/folder-browser-factory.c:198 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "ץѥƥ"
+
#: mail/GNOME_Evolution_Mail.oaf.in.h:1
msgid "Evolution component for handling mail."
msgstr "᡼򰷤 Evolution ݡͥ"
@@ -5688,6 +6066,26 @@ msgstr "Evolution ᡼륳ݡͥȤΤΥեȥ"
msgid "Factory for the Mail Summary component."
msgstr "᡼륵ޥꥳݡͥȤΤΥեȥ"
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Mail configuration interface"
+msgstr "᡼Υ󥿡ե"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "Evolution mbox 򥤥ݡȤեȥ"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "Evolution mbox ե򥤥ݡ"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "Evolution Outlook Express 4 ᡼򥤥ݡȤեȥ"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Evolution Outlook Express 4 ե򥤥ݡ"
+
#: mail/local-config.glade.h:1
msgid "Current store format:"
msgstr "ߤ¸:"
@@ -5722,6 +6120,15 @@ msgstr "mbox"
msgid "mh"
msgstr "mh"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "ɬפʾΤ٤ƤƤޤ"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "Evolution ȥǥ"
+
#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
msgid " (default)"
msgstr " (ǥե)"
@@ -5730,7 +6137,7 @@ msgstr " (ǥե)"
msgid "Disable"
msgstr "̵"
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:30
msgid "Enable"
msgstr "ͭ"
@@ -5743,19 +6150,10 @@ msgid "Are you sure you want to delete this news account?"
msgstr " news ȤƤǤ?"
#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#: mail/mail-accounts.c:568
msgid "Evolution Account Manager"
msgstr "Evolution ȥޥ͡"
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr "ɬפʾΤ٤ƤƤޤ"
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "Evolution ȥǥ"
-
#: mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
@@ -5776,11 +6174,11 @@ msgstr "%s ᡼"
msgid "%s mailing list"
msgstr "%s ᡼󥰥ꥹ"
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
msgid "Add Filter Rule"
msgstr "ե륿롼ɲ"
-#: mail/mail-callbacks.c:94
+#: mail/mail-callbacks.c:93
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -5792,7 +6190,7 @@ msgstr ""
"ɬפޤ\n"
"ꤷޤ?"
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:146
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -5800,7 +6198,7 @@ msgstr ""
"ʤϥ᡼˿ȸ\n"
"򤹤ɬפޤ"
-#: mail/mail-callbacks.c:159
+#: mail/mail-callbacks.c:158
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -5808,11 +6206,11 @@ msgstr ""
"ʤϥ᡼˥᡼\n"
"򤹤ɬפޤ"
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:202
msgid "You have not set a mail transport method"
msgstr "᡼ž᥽åɤ꤬ޤ"
-#: mail/mail-callbacks.c:236
+#: mail/mail-callbacks.c:235
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -5820,32 +6218,37 @@ msgstr ""
"ΥåϷ̾ޤ\n"
"ޤ?"
-#: mail/mail-callbacks.c:309
+#: mail/mail-callbacks.c:308
msgid "You must specify recipients in order to send this message."
msgstr "ΥåŬڤʼԤꤷʤФʤޤ"
-#: mail/mail-callbacks.c:352
+#: mail/mail-callbacks.c:351
msgid "You must configure an account before you can send this email."
msgstr "Υ᡼˥ȤꤷʤФʤޤ"
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:594
#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "On %s, %s wrote:\n"
+msgid "On %s, %s wrote:"
+msgstr "On %s, %s wrote:"
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:756
msgid "Forwarded message:\n"
msgstr "åž:\n"
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:850
msgid "Move message(s) to"
msgstr "åưޤ: "
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:852
msgid "Copy message(s) to"
msgstr "å򥳥ԡޤ: "
-#: mail/mail-callbacks.c:1147
+#: mail/mail-callbacks.c:1017
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr " %d åԽƤǤ?"
+
+#: mail/mail-callbacks.c:1039
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -5853,7 +6256,7 @@ msgstr ""
"ɥեȥե¸줿\n"
"åԽ뤳Ȥޤ"
-#: mail/mail-callbacks.c:1179
+#: mail/mail-callbacks.c:1073
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -5861,11 +6264,20 @@ msgstr ""
"եΥå\n"
"뤳Ȥޤ"
-#: mail/mail-callbacks.c:1212 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1085
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr " %d åƤǤ?"
+
+#: mail/mail-callbacks.c:1106
+msgid "No Message Selected"
+msgstr "򤵤줿åϤޤ"
+
+#: mail/mail-callbacks.c:1140 mail/mail-display.c:92
msgid "Overwrite file?"
msgstr "ե񤭤ޤ?"
-#: mail/mail-callbacks.c:1216 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1144 mail/mail-display.c:96
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -5873,15 +6285,15 @@ msgstr ""
"̾ΥեϤǤ¸ߤޤ\n"
"񤭤ޤ?"
-#: mail/mail-callbacks.c:1260
+#: mail/mail-callbacks.c:1188
msgid "Save Message As..."
msgstr "å̾¸..."
-#: mail/mail-callbacks.c:1262
+#: mail/mail-callbacks.c:1190
msgid "Save Messages As..."
msgstr "å̾¸..."
-#: mail/mail-callbacks.c:1376
+#: mail/mail-callbacks.c:1349
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -5890,18 +6302,58 @@ msgstr ""
"ե륿Υ˥顼:\n"
"%s"
-#: mail/mail-callbacks.c:1425 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1407
msgid "Print Message"
msgstr "å"
-#: mail/mail-callbacks.c:1472
+#: mail/mail-callbacks.c:1454
msgid "Printing of message failed"
msgstr "åΰ˼Ԥޤ"
-#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#: mail/mail-callbacks.c:1549
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr " %d ḁ̊ɥdzƤǤ?"
+
+#: mail/mail-config.c:1213 mail/mail-config.c:1216
msgid "Connecting to server..."
msgstr "Ф³..."
+#: mail/mail-config-druid.c:99
+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 email you send."
+msgstr ""
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "Evolution ȥ"
+
#: mail/mail-config.glade.h:1
msgid " Check for supported types "
msgstr "ݡȤ줿̤å"
@@ -5927,18 +6379,26 @@ msgid "Accounts"
msgstr ""
#: mail/mail-config.glade.h:8
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
msgid "Authentication"
msgstr "ǧ"
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "Authentication Type: "
msgstr "ǧڼ: "
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "Automatically check for new mail every"
msgstr "᡼ưŪ˥å"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
+msgid "Composer"
+msgstr "᡼"
+
+#: mail/mail-config.glade.h:15
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -5954,163 +6414,191 @@ msgstr ""
"\n"
"\"λ\" 򥯥å¸Ƥ"
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:21
msgid "De_fault"
msgstr "ǥե(_f)"
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
+msgid "Default \"Forward\" style is: "
+msgstr "ǥեȤ \"ž\" ˡ: "
+
+#: mail/mail-config.glade.h:25
msgid "Done"
msgstr "λ"
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:26
msgid "Drafts"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:27
msgid "Drafts folder:"
msgstr "ƥե:"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:29
msgid "Email Address:"
msgstr "᡼륢ɥ쥹:"
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:31
msgid "Full Name:"
msgstr "ե͡:"
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:32
+msgid "Highlight citations with"
msgstr "ѤĴ"
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:34
msgid "IMAPv4 "
msgstr "IMAPv4 "
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:35
msgid "Identity"
msgstr "ȸ"
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:36
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:37
+msgid "Inline"
+msgstr "饤"
+
+#: mail/mail-config.glade.h:38
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:39
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
msgid "Mail Configuration"
msgstr "᡼"
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:41
msgid "Make this my default account"
msgstr "ǥեȥȤ"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:42
msgid "Mark messages as \"Read\" after:"
+msgstr "ָ˥å \"\" Ȥƥޡ:"
+
+#: mail/mail-config.glade.h:44
+msgid "Never load images off the net"
msgstr ""
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:45
msgid "News"
msgstr "˥塼"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:47
msgid "Optional Information"
msgstr "ղþ"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:48
msgid "Organization:"
msgstr "ȿ:"
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:49
+msgid "PGP"
+msgstr "PGP"
+
+#: mail/mail-config.glade.h:50
msgid "PGP binary path:"
msgstr "PGP ץΥѥ:"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:55
msgid "Qmail maildir "
msgstr "Qmail maildir "
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:56
+msgid "Quoted"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
msgid "Receiving Email"
msgstr "᡼μ"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:58
msgid "Receiving Mail"
msgstr "᡼μ"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:59
msgid "Receiving Options"
msgstr "ץ"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:61
msgid "Required Information"
msgstr "ɬܾ"
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:63
msgid "Select PGP binary"
msgstr "PGP ץ"
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:64
msgid "Send mail in HTML format by default."
msgstr "ǥեȤ HTML Υ᡼"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:65
msgid "Sending Email"
msgstr "᡼"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:66
msgid "Sending Mail"
msgstr "᡼"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:68
msgid "Sent"
msgstr ""
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:69
msgid "Sent and Draft Messages"
msgstr "Ѥƥå"
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:70
msgid "Sent messages folder:"
msgstr "ѥåե:"
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:71
msgid "Server Configuration"
msgstr "Ф"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:72
msgid "Server Type: "
msgstr "м:"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:73
msgid "Server requires authentication"
msgstr "Фǧڤɬ"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:74
msgid "Signature file:"
msgstr "̾ե:"
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:75
msgid "Sources"
msgstr ""
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:76
msgid "Special Folders"
msgstr "̤ʥե"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:77
msgid "Standard Unix mbox"
msgstr "ɸŪ UNIX mbox ե"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:78
msgid "Type"
msgstr ""
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:79
msgid "Use secure connection (SSL)"
msgstr "奢³ (SSL) Ȥ"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:80
msgid "Username:"
msgstr "桼̾:"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:81
msgid ""
"Welcome to the Evolution Mail Configuration Druid.\n"
"\n"
@@ -6120,197 +6608,209 @@ msgstr ""
"\n"
"\"\" 򥯥åƻϤƤ"
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
+#: mail/mail-config.glade.h:86 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:45 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:48
msgid "_Edit"
msgstr "Խ(_E)"
-#: mail/mail-config-druid.c:99
-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 email you send."
-msgstr ""
+#: mail/mail-crypto.c:59
+msgid "Could not create a PGP signature context."
+msgstr "PGP ̾ƥȤޤǤ"
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:84
+msgid "Could not create a PGP verification context."
+msgstr "PGP ڥƥȤޤǤ"
+
+#: mail/mail-crypto.c:113
+msgid "Could not create a PGP encryption context."
+msgstr "PGP Ź楳ƥȤޤǤ"
+
+#: mail/mail-crypto.c:138
+msgid "Could not create a PGP decryption context."
+msgstr "PGP 楳ƥȤޤǤ"
+
+#: mail/mail-crypto.c:169
+msgid "Could not create a S/MIME signature context."
msgstr ""
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
+#: mail/mail-crypto.c:195
+msgid "Could not create a S/MIME verification context."
msgstr ""
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
+#: mail/mail-crypto.c:225
+msgid "Could not create a S/MIME encryption context."
msgstr ""
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "Evolution ȥ"
+#: mail/mail-crypto.c:251
+msgid "Could not create a S/MIME decryption context."
+msgstr ""
-#: mail/mail-display.c:194
+#: mail/mail-display.c:196
msgid "Save Attachment"
msgstr "źդ¸"
-#: mail/mail-display.c:234
+#: mail/mail-display.c:236
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "ȥǥ쥯ȥޤǤ: %s"
-#: mail/mail-display.c:295
+#: mail/mail-display.c:297
msgid "Save to Disk..."
msgstr "ǥ¸..."
-#: mail/mail-display.c:297
+#: mail/mail-display.c:299
#, c-format
msgid "Open in %s..."
msgstr "%s ˳..."
-#: mail/mail-display.c:299
+#: mail/mail-display.c:301
msgid "View Inline"
msgstr "饤ɽ"
-#: mail/mail-display.c:334
+#: mail/mail-display.c:336
msgid "External Viewer"
msgstr "ӥ塼"
-#: mail/mail-display.c:357
+#: mail/mail-display.c:359
#, c-format
msgid "View Inline (via %s)"
msgstr "饤ɽ (%sͳ)"
-#: mail/mail-display.c:361
+#: mail/mail-display.c:363
msgid "Hide"
msgstr ""
-#: mail/mail-display.c:1102
+#: mail/mail-display.c:962
+msgid "Loading message content"
+msgstr "åƤɤ߹"
+
+#: mail/mail-display.c:1256
msgid "Open link in browser"
msgstr "֥饦ǥ󥯤򳫤"
-#: mail/mail-display.c:1104
+#: mail/mail-display.c:1258
msgid "Save as (FIXME)"
msgstr "̾¸ (FIXME)"
-#: mail/mail-display.c:1106
+#: mail/mail-display.c:1260
msgid "Copy location (FIXME)"
msgstr "򥳥ԡ (FIXME)"
-#: mail/mail-format.c:522
+#: mail/mail-format.c:527
#, c-format
msgid "%s attachment"
msgstr "%s ź"
-#: mail/mail-format.c:564
+#: mail/mail-format.c:573
msgid "Could not parse MIME message. Displaying as source."
msgstr "MIME åϽޤǤ, ɽޤ"
-#: mail/mail-format.c:746
-msgid "Loading message content"
-msgstr "åƤɤ߹"
+#: mail/mail-format.c:640 mail/message-list.c:1082
+msgid "Date"
+msgstr ""
-#: mail/mail-format.c:1040
+#: mail/mail-format.c:756 mail/message-list.c:1082
+msgid "From"
+msgstr "п"
+
+#: mail/mail-format.c:759
+msgid "Reply-To"
+msgstr "ֿ"
+
+#: mail/mail-format.c:762 mail/message-list.c:1083
+msgid "To"
+msgstr ""
+
+#: mail/mail-format.c:765
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:1075
msgid "No GPG/PGP program configured."
msgstr "GPG/PGP ץ꤬ޤ"
-#: mail/mail-format.c:1055
+#: mail/mail-format.c:1090
msgid "Encrypted message not displayed"
msgstr "Ź沽줿åɽޤ"
-#: mail/mail-format.c:1061
+#: mail/mail-format.c:1096
msgid "Encrypted message"
msgstr "Ź沽줿å"
-#: mail/mail-format.c:1062
+#: mail/mail-format.c:1097
msgid "Click icon to decrypt."
msgstr "򥯥å沽Ƥ"
-#: mail/mail-format.c:1152 mail/mail-format.c:1540
+#: mail/mail-format.c:1153
msgid "This message is digitally signed and has been found to be authentic."
msgstr "Υåϥǥ̾쿮ǤΤǤ"
-#: mail/mail-format.c:1160 mail/mail-format.c:1548
+#: mail/mail-format.c:1161
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr "Υåϥǥ̾줿ΤǤ, ޤ"
-#: mail/mail-format.c:1761
+#: mail/mail-format.c:1787
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "FTP (%s) ؤƤޤ"
-#: mail/mail-format.c:1773
+#: mail/mail-format.c:1799
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1777
+#: mail/mail-format.c:1803
#, c-format
msgid "Pointer to local file (%s)"
msgstr "ե (%s) ؤƤޤ"
-#: mail/mail-format.c:1811
+#: mail/mail-format.c:1837
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "̤Τγǡ (\"%s\" ) ؤƤޤ"
-#: mail/mail-format.c:1816
+#: mail/mail-format.c:1842
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "Τ褦ʥե %s Ϥޤ"
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:505
#, c-format
msgid "Opening '%s'"
msgstr "'%s' 򥪡ץ"
-#: mail/mail-local.c:787
+#: mail/mail-local.c:785
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "ե \"%s\" \"%s\" ѹƤޤ"
-#: mail/mail-local.c:791
+#: mail/mail-local.c:789
#, c-format
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "ե \"%s\" \"%s\" ѹޤ"
-#: mail/mail-local.c:814
+#: mail/mail-local.c:812
msgid "Reconfiguring folder"
msgstr "եκƹ"
#. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:841
msgid "Closing current folder"
msgstr "ߤΥե򥯥"
-#: mail/mail-local.c:875
+#: mail/mail-local.c:873
msgid "Renaming old folder and opening"
msgstr "Ťե͡षƥץ"
-#: mail/mail-local.c:893
+#: mail/mail-local.c:891
msgid "Creating new folder"
msgstr "ե"
-#: mail/mail-local.c:907
+#: mail/mail-local.c:905
msgid "Copying messages"
msgstr "å򥳥ԡ"
-#: mail/mail-local.c:924
+#: mail/mail-local.c:922
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6319,7 +6819,7 @@ msgstr ""
"եΥ᥿¸ޤ; Ϥ䤳Υե򳫤\n"
"ȤʤȤ֤󵤤ŤΤǤ礦: %s"
-#: mail/mail-local.c:963
+#: mail/mail-local.c:961
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
@@ -6345,105 +6845,101 @@ msgstr ""
"νƤ֤˥顼ȯޤ:\n"
"%s"
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
msgid "Working"
msgstr ""
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "ǧޤ?"
-
-#: mail/mail-mt.c:874
+#: mail/mail-mt.c:862
msgid "Evolution progress"
msgstr "Evolution ʹ"
-#: mail/mail-ops.c:587
+#: mail/mail-ops.c:599
#, c-format
msgid "Sending \"%s\""
msgstr "\"%s\" "
-#: mail/mail-ops.c:589
+#: mail/mail-ops.c:603
msgid "Sending message"
msgstr "å"
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:718
#, c-format
msgid "Sending message %d of %d"
msgstr "å %d / %d "
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:737
#, c-format
msgid "Failed on message %d of %d"
msgstr "å %d / %d ϼԤޤ"
-#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
msgid "Complete."
msgstr "λޤ"
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:825
msgid "Saving message to folder"
msgstr "եإå¸"
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
#, c-format
msgid "Moving messages to %s"
msgstr "%s إåư"
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:898
#, c-format
msgid "Copying messages to %s"
msgstr "%s إå򥳥ԡ"
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:914
msgid "Moving"
msgstr "ư"
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:917
msgid "Copying"
msgstr "ԡ"
-#: mail/mail-ops.c:978
+#: mail/mail-ops.c:992
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "\"%s\" Υե"
-#: mail/mail-ops.c:1139
+#: mail/mail-ops.c:1154
msgid "Forwarded messages"
msgstr "åž"
-#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
+#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
#, c-format
msgid "Opening folder %s"
msgstr "\"%s\" Υե򥪡ץ"
-#: mail/mail-ops.c:1247
+#: mail/mail-ops.c:1262
#, c-format
msgid "Opening store %s"
msgstr "¸줿 %s 򥪡ץ"
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1449
msgid "Expunging folder"
msgstr "ե"
-#: mail/mail-ops.c:1483
+#: mail/mail-ops.c:1498
#, c-format
msgid "Retrieving message %s"
msgstr "å %s "
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1565
msgid "Retrieving messages"
msgstr "å"
-#: mail/mail-ops.c:1560
+#: mail/mail-ops.c:1575
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "åֹ %d / %d (uid \"%s\") "
-#: mail/mail-ops.c:1634
+#: mail/mail-ops.c:1649
msgid "Saving messages"
msgstr "å¸"
-#: mail/mail-ops.c:1713
+#: mail/mail-ops.c:1728
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6452,12 +6948,12 @@ msgstr ""
"ϥեޤ: %s\n"
" %s"
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1741
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "å %d / %d (uid \"%s\") ¸"
-#: mail/mail-ops.c:1740
+#: mail/mail-ops.c:1755
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6466,11 +6962,11 @@ msgstr ""
"ե¸˥顼: %s:\n"
" %s"
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1829
msgid "Saving attachment"
msgstr "źդ¸"
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1844
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -6479,18 +6975,47 @@ msgstr ""
"ϥեޤ: %s:\n"
" %s"
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1872
#, c-format
msgid "Could not write data: %s"
msgstr "ǡ񤭽ФȤޤǤ: %s"
+#: mail/mail-ops.c:1939
+#, c-format
+msgid "Disconnecting from %s"
+msgstr "%s Ȥ³ڤäƤޤ"
+
+#: mail/mail-search.c:138
+msgid "(Untitled Message)"
+msgstr "(ȥʤå)"
+
+#: mail/mail-search.c:268
+msgid "Find in Message"
+msgstr "å򸡺"
+
+#: mail/mail-search.c:298
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:299
+msgid "Search Forward"
+msgstr ""
+
+#: mail/mail-search.c:316
+msgid "Find:"
+msgstr ":"
+
+#: mail/mail-search.c:319
+msgid "Matches:"
+msgstr ""
+
#: mail/mail-search-dialogue.c:113
msgid "_Search"
msgstr "(_S)"
#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
-msgstr "󥻥 ..."
+msgid "Cancelling..."
+msgstr "󥻥..."
#: mail/mail-send-recv.c:233
msgid "Send & Receive mail"
@@ -6501,12 +7026,12 @@ msgid "Receiving"
msgstr ""
#: mail/mail-send-recv.c:285
-msgid "Updating ..."
-msgstr " ..."
+msgid "Updating..."
+msgstr "..."
#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
-msgstr "Ե ..."
+msgid "Waiting..."
+msgstr "Ե..."
#: mail/mail-send-recv.c:306
msgid "Sending"
@@ -6516,34 +7041,38 @@ msgstr ""
msgid "Cancelled."
msgstr "󥻥뤷ޤ"
-#: mail/mail-summary.c:109
+#: mail/mail-summary.c:110
msgid "Incomplete message written on pipe!"
msgstr "ѥ׾Դʥå񤫤ޤ!"
-#: mail/mail-tools.c:141
+#: mail/mail-summary.c:468
+msgid "Mail Summary"
+msgstr "᡼륵ޥ"
+
+#: mail/mail-tools.c:145
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "ƥݥ mbox '%s' ǤޤǤ: %s"
-#: mail/mail-tools.c:188
+#: mail/mail-tools.c:192
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (åž)"
-#: mail/mail-tools.c:198
+#: mail/mail-tools.c:202
msgid "Fwd: (no subject)"
msgstr "Fwd: (̾ʤ)"
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:219
#, c-format
msgid "Forwarded message - %s"
msgstr "åžޤ - %s"
-#: mail/mail-tools.c:217
+#: mail/mail-tools.c:221
msgid "Forwarded message (no subject)"
msgstr "åžޤ (̾ʤ)"
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:428
#, c-format
msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6556,121 +7085,140 @@ msgstr ""
msgid "VFolders"
msgstr "ۥե"
-#: mail/mail-vfolder.c:427
+#: mail/mail-vfolder.c:438
msgid "New VFolder"
msgstr "ۥե"
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:188 ui/evolution-mail.xml.h:70
msgid "Reply"
msgstr "ֿ"
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:188
msgid "Reply to the sender of this message"
-msgstr "åκпֿͤޤ"
+msgstr "åԤֿޤ"
-#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:191 ui/evolution-mail.xml.h:71
+msgid "Reply to All"
+msgstr "ֿ"
+
+#: mail/message-browser.c:191
msgid "Reply to all recipients of this message"
-msgstr "Υåμֿޤ"
+msgstr "Υåμֿޤ"
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:194 ui/evolution-mail.xml.h:33
+msgid "Forward"
+msgstr "ž"
+
+#: mail/message-browser.c:194
msgid "Forward this message"
msgstr "Υåžޤ"
-#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:199
msgid "Print the selected message"
msgstr "򤵤줿åޤ"
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:202
msgid "Delete this message"
msgstr "Υåޤ"
-#: mail/message-list.c:650
+#: mail/message-browser.c:207 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:64 ui/evolution-task-editor-dialog.xml.h:36
+msgid "Previous"
+msgstr ""
+
+#: mail/message-browser.c:207
+msgid "Previous message"
+msgstr "Υåذưޤ"
+
+#: mail/message-browser.c:210 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:57
+#: ui/evolution-task-editor-dialog.xml.h:32
+msgid "Next"
+msgstr ""
+
+#: mail/message-browser.c:210
+msgid "Next message"
+msgstr "Υåذưޤ"
+
+#: mail/message-list.c:677
msgid "Unseen"
msgstr "̤"
-#: mail/message-list.c:651
+#: mail/message-list.c:678
msgid "Seen"
msgstr ""
-#: mail/message-list.c:652
+#: mail/message-list.c:679
msgid "Answered"
msgstr "Ѥ"
-#: mail/message-list.c:653
+#: mail/message-list.c:680
msgid "Multiple Unseen Messages"
msgstr "ʣ̤ɥå"
-#: mail/message-list.c:654
+#: mail/message-list.c:681
msgid "Multiple Messages"
msgstr "ʣΥå"
-#: mail/message-list.c:658
+#: mail/message-list.c:685
msgid "Lowest"
msgstr "Ǥ㤤"
-#: mail/message-list.c:659
+#: mail/message-list.c:686
msgid "Lower"
msgstr "㤤"
-#: mail/message-list.c:663
+#: mail/message-list.c:690
msgid "Higher"
msgstr "⤤"
-#: mail/message-list.c:664
+#: mail/message-list.c:691
msgid "Highest"
msgstr "Ǥ⤤"
-#: mail/message-list.c:914
+#: mail/message-list.c:941
msgid "?"
msgstr "?"
-#: mail/message-list.c:921
+#: mail/message-list.c:948
msgid "Today %l:%M %p"
msgstr " %p %l:%M"
-#: mail/message-list.c:930
+#: mail/message-list.c:957
msgid "Yesterday %l:%M %p"
msgstr " %p %l:%M"
-#: mail/message-list.c:942
+#: mail/message-list.c:969
msgid "%a %l:%M %p"
msgstr "%p %l:%M (%a)"
-#: mail/message-list.c:950
+#: mail/message-list.c:977
msgid "%b %d %l:%M %p"
msgstr "%m %d %p %l:%M"
-#: mail/message-list.c:952
+#: mail/message-list.c:979
msgid "%b %d %Y"
msgstr "%Yǯ %m %d"
-#: mail/message-list.c:1054
+#: mail/message-list.c:1081
msgid "Flagged"
msgstr "ե饰"
-#: mail/message-list.c:1055
-msgid "From"
-msgstr "п"
-
-#: mail/message-list.c:1055
-msgid "Date"
-msgstr ""
-
-#: mail/message-list.c:1055
+#: mail/message-list.c:1082
msgid "Received"
msgstr ""
-#: mail/message-list.c:1056
-msgid "To"
-msgstr ""
-
-#: mail/message-list.c:1056
+#: mail/message-list.c:1083
msgid "Size"
msgstr ""
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr ""
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:48
msgid "Folder"
msgstr "ե"
@@ -6702,134 +7250,6 @@ msgstr "ե \"%s\" ιɲ"
msgid "Manage Subscriptions"
msgstr "ɴ"
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "ե̾:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "ե:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "եꤷƤ:"
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"%s 򥤥ݡ\n"
-"ݡνƤޤ\n"
-"5ԤäƺٻƤ"
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"%s 򥤥ݡ\n"
-"ƥ %d 򥤥ݡ"
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Ȥ륤ݡȤޤ\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "ݡ"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"%s 򥤥ݡ\n"
-"%s 򳫻Ϥޤ"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "%s γ˥顼ȯޤ"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "%s Υ˥顼ȯޤ"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"%s 򥤥ݡ\n"
-"ƥ 1 򥤥ݡ"
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "Ư"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "ե̾:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "ե"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "ե:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "ݡ"
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"\"ݡ\" 򥯥å Evolution "
-"إեΥݡȤ򳫻ϤƤ"
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "Evolution ݡȥ桼ƥƥ"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "Evolution ݡȥ桼ƥƥ"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"褦, Evolution ݡȥ桼ƥƥ\n"
-"ΥɤǤ Evolution ˳ե򥤥ݡ\n"
-"̤ư⤷ޤ"
-
#: shell/e-setup.c:118 shell/e-setup.c:191
msgid "Evolution installation"
msgstr "Evolution Υ󥹥ȡ"
@@ -6905,6 +7325,20 @@ msgstr ""
"ǥ쥯ȥǤϤޤEvolution 桼\n"
"եΥ󥹥ȡƤ뤿˰ưƲ"
+#: shell/e-shell.c:388
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "֤Υåȥåפޤ -- %s"
+
+#: shell/e-shell.c:1268
+#, c-format
+msgid ""
+"Ooops! The view for `%s' have died unexpectedly. :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"`%s' ӥ塼˴ޤ :-(\n"
+"Ϥ֤ %s ݡͥȤå夷Ȥ̣ޤ"
+
#: shell/e-shell-folder-creation-dialog.c:99
#, c-format
msgid ""
@@ -6938,19 +7372,129 @@ msgstr "..."
msgid "(Untitled)"
msgstr "(ȥʤ)"
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"%s 򥤥ݡ\n"
+"ݡνƤޤ\n"
+"5ԤäƺٻƤ"
+
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"%s 򥤥ݡ\n"
+"ƥ %d 򥤥ݡ"
+
+#: shell/e-shell-importer.c:353
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Ȥ륤ݡȤޤ\n"
+"%s"
+
+#: shell/e-shell-importer.c:363
+msgid "Importing"
+msgstr "ݡ"
+
+#: shell/e-shell-importer.c:371
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"%s 򥤥ݡ\n"
+"%s 򳫻Ϥޤ"
+
+#: shell/e-shell-importer.c:384
+#, c-format
+msgid "Error starting %s"
+msgstr "%s γ˥顼ȯޤ"
+
+#: shell/e-shell-importer.c:404
+#, c-format
+msgid "Error loading %s"
+msgstr "%s Υ˥顼ȯޤ"
+
+#: shell/e-shell-importer.c:419
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"%s 򥤥ݡ\n"
+"ƥ 1 򥤥ݡ"
+
+#: shell/e-shell-importer.c:490
+msgid "Automatic"
+msgstr "Ư"
+
+#: shell/e-shell-importer.c:540
+msgid "Filename:"
+msgstr "ե̾:"
+
+#: shell/e-shell-importer.c:545 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "ե"
+
+#: shell/e-shell-importer.c:555
+msgid "File type:"
+msgstr "ե:"
+
+#: shell/e-shell-importer.c:601
+msgid "Select folder"
+msgstr "ե"
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr "³ĤƤޤ..."
+
+#: shell/e-shell-view.c:149
+msgid "(No folder displayed)"
+msgstr "(ɽեϤޤ)"
+
+#: shell/e-shell-view.c:1203
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution - %s"
+
+#: shell/e-shell-view.c:1205
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view-menu.c:175
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug buddy Ϥʤ $PATH ˤϸĤޤ"
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:181
msgid "Bug buddy could not be run."
msgstr "Bug buddy ϼ¹ԤǤޤǤ"
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:226
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:228
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -6962,37 +7506,21 @@ msgstr ""
"롼ץץꥱ\n"
"ѥåեȤǤ"
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:392
msgid "Go to folder..."
msgstr "եذư..."
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(ɽեϤޤ)"
+#: shell/e-shell-view-menu.c:576
+msgid "Work online"
+msgstr "饤"
-#: shell/e-shell-view.c:1184
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution - %s"
-
-#: shell/e-shell-view.c:1186
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "֤Υåȥåפޤ -- %s"
+#: shell/e-shell-view-menu.c:588 shell/e-shell-view-menu.c:600
+msgid "Work offline"
+msgstr "ե饤"
-#: shell/e-shell.c:1248
-#, c-format
-msgid ""
-"Ooops! The view for `%s' have died unexpectedly. :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"`%s' ӥ塼˴ޤ :-(\n"
-"Ϥ֤ %s ݡͥȤå夷Ȥ̣ޤ"
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "硼ȥåȤ¸˥顼ȯޤ"
#: shell/e-shortcuts-view.c:134
msgid "Create new shortcut group"
@@ -7067,20 +7595,6 @@ msgstr "Υ硼ȥåȤ򥢥ƥ֤ˤޤ"
msgid "Remove this shortcut from the shortcut bar"
msgstr "硼ȥåȥС餳Υ硼ȥåȤޤ"
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "硼ȥåȤ¸˥顼ȯޤ"
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "ɽ(_V)"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "򤵤줿եɽޤ"
-
#: shell/e-storage.c:178
msgid "(No name)"
msgstr "(̾ʤ)"
@@ -7129,11 +7643,51 @@ msgstr "ϥݡȤƤޤ"
msgid "The specified type is not supported in this storage"
msgstr "ꤵ줿̤Ϥε֤ǤϥݡȤƤޤ"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "ե̾:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "ե:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "եꤷƤ:"
+
#: shell/GNOME_Evolution_Shell.oaf.in.h:1
msgid "The Evolution shell."
msgstr "Evolution "
-#: shell/main.c:83
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"\"ݡ\" 򥯥å Evolution "
+"إեΥݡȤ򳫻ϤƤ"
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Evolution ݡȥ桼ƥƥ"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Evolution ݡȥ桼ƥƥ"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"褦, Evolution ݡȥ桼ƥƥ\n"
+"ΥɤǤ Evolution ˳ե򥤥ݡ\n"
+"̤ư⤷ޤ"
+
+#: shell/importer/intelligent.c:186
+msgid "Importers"
+msgstr "ݡ"
+
+#: shell/main.c:82
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7169,7 +7723,7 @@ msgstr ""
"桹Ϥʤ桹̤ڤळȤ˾ǤޤƲ桹\n"
"Ǯˤʤι׸ԤƤޤ!\n"
-#: shell/main.c:108
+#: shell/main.c:107
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -7177,19 +7731,19 @@ msgstr ""
"꤬Ȥ\n"
"Evolution \n"
-#: shell/main.c:139
+#: shell/main.c:138
msgid "Cannot initialize the Evolution shell."
msgstr "Evolution νޤ"
-#: shell/main.c:185
+#: shell/main.c:184
msgid "Disable splash screen"
msgstr "ץå̵̤ˤ"
-#: shell/main.c:186
+#: shell/main.c:185
msgid "Send the debugging output of all components to a file."
msgstr "٤ƤΥݡͥȤΥǥХåϤե"
-#: shell/main.c:219
+#: shell/main.c:217
msgid "Cannot initialize the Bonobo component system."
msgstr "Bonobo ݡͥȥƥޤ"
@@ -7213,7 +7767,7 @@ msgstr "󥿥Ȥ򸡺ޤ"
msgid "New contact"
msgstr "󥿥"
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:63
msgid "Previews the message to be printed"
msgstr "åΥץӥ塼ɽޤ"
@@ -7221,7 +7775,7 @@ msgstr "åΥץӥ塼ɽޤ"
msgid "Print contacts"
msgstr "󥿥Ȥޤ"
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:12
msgid "Stop"
msgstr ""
@@ -7255,8 +7809,8 @@ msgid "_Search for contacts"
msgstr "󥿥Ȥθ(_S)"
#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution.xml.h:64
msgid "_Tools"
msgstr "ġ(_T)"
@@ -7320,11 +7874,6 @@ msgstr ""
msgid "New _Event"
msgstr "٥(_E)"
-#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr ""
-
#: ui/evolution-calendar.xml.h:20
msgid "Open Calendar"
msgstr "򳫤"
@@ -7345,7 +7894,7 @@ msgstr "ΰ"
msgid "Print this Calendar"
msgstr "Υΰޤ"
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:18
msgid "Save As"
msgstr "̾¸"
@@ -7369,8 +7918,8 @@ msgstr "1 ֤ɽޤ"
msgid "Show the working week"
msgstr "ϫƯ֤ɽޤ"
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
msgid "Today"
msgstr ""
@@ -7395,7 +7944,7 @@ msgid "_Month"
msgstr "(_M)"
#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:58
msgid "_New"
msgstr "(_N)"
@@ -7403,11 +7952,6 @@ msgstr "(_N)"
msgid "_Open Calendar"
msgstr "򳫤(_O)"
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "̾¸(_S)..."
-
#: ui/evolution-calendar.xml.h:45
msgid "_Week"
msgstr "(_W)"
@@ -7434,12 +7978,12 @@ msgid "Print this item"
msgstr "Υƥ"
#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:41
msgid "Print..."
msgstr "..."
#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:19
#: ui/evolution-task-editor-dialog.xml.h:51
msgid "Save _As..."
msgstr "̾¸(_A)..."
@@ -7466,13 +8010,13 @@ msgid "Send _message to contact..."
msgstr "󥿥Ȥإå(_m)..."
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-message-composer.xml.h:46 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:49
msgid "_File"
msgstr "ե(_F)"
#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:53
#: ui/evolution-task-editor-dialog.xml.h:85
msgid "_Save"
msgstr "¸(_S)"
@@ -7521,7 +8065,7 @@ msgstr "«Ĥޤ"
msgid "Cop_y to Folder... (FIXME)"
msgstr "եإԡ(_y)... (FIXME)"
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:8
#: ui/evolution-task-editor-dialog.xml.h:14
msgid "Copy"
msgstr "ԡ"
@@ -7594,10 +8138,6 @@ msgstr "åץܡɤŽդޤ"
msgid "Pre_vious"
msgstr "(_v)"
-#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr ""
-
#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
msgid "Print Pre_view"
msgstr "ץӥ塼(_v)"
@@ -7610,8 +8150,8 @@ msgstr "ץ󥿤(_e)..."
msgid "Print Setup"
msgstr "ץ󥿤"
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:17
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
msgid "Save"
msgstr "¸"
@@ -7619,7 +8159,7 @@ msgstr "¸"
msgid "Save the appointment and close the dialog box"
msgstr "«¸ƥܥåĤޤ"
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:23
#: ui/evolution-task-editor-dialog.xml.h:53
msgid "Save the current file"
msgstr "ߤΥե¸ޤ"
@@ -7632,8 +8172,7 @@ msgstr "ǹ礻Υ塼(_M)"
msgid "Schedule some sort of a meeting"
msgstr ""
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
msgid "Select All"
msgstr "٤"
@@ -7649,18 +8188,17 @@ msgstr "ߤΥץ󥿤ΥڡԤޤ"
msgid "Task _Request (FIXME)"
msgstr "׵(_R) (FIXME)"
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-task-editor-dialog.xml.h:63
msgid "_About..."
msgstr "(_A)..."
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:43
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:43
msgid "_Close"
msgstr "Ĥ(_C)"
#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:44
msgid "_Contact (FIXME)"
msgstr "󥿥(_C) (FIXME)"
@@ -7668,13 +8206,13 @@ msgstr "󥿥(_C) (FIXME)"
msgid "_Copy"
msgstr "ԡ(_C)"
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:44
#: ui/evolution-task-editor-dialog.xml.h:68
msgid "_Debug"
msgstr "ǥХå(_D)"
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:53
msgid "_Help"
msgstr "إ(_H)"
@@ -7706,13 +8244,8 @@ msgstr "Ρ(_N) (FIXME)"
msgid "_Paste"
msgstr "Žդ(_P)"
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "(_P)"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:115
+#: ui/evolution-task-editor-dialog.xml.h:83 ui/evolution.xml.h:60
msgid "_Properties..."
msgstr "ץѥƥ(_P)..."
@@ -7721,7 +8254,7 @@ msgid "_Select All"
msgstr "٤(_A)"
#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:63
msgid "_Task (FIXME)"
msgstr "(_T) (FIXME)"
@@ -7729,6 +8262,11 @@ msgstr "(_T) (FIXME)"
msgid "_Unread Item (FIXME)"
msgstr "̤ɥƥ(_U) (FIXME)"
+#: ui/evolution-event-editor.xml.h:76 ui/evolution-message-composer.xml.h:55
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:65
+msgid "_View"
+msgstr "ɽ(_V)"
+
#: ui/evolution-executive-summary.xml.h:1
msgid "Add Service"
msgstr "ӥɲ"
@@ -7749,29 +8287,33 @@ msgstr "¹ԥޥ꡼..."
msgid "New Mail"
msgstr "᡼"
+#: ui/evolution-mail.xml.h:1
+msgid "Apply filter rules to the selected messages"
+msgstr "򤵤줿åإե륿롼ŬѤޤ"
+
#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
-msgstr "ΥܥåΥ᡼˿ե륿ŬѤ"
+msgid "Cancel"
+msgstr "󥻥뤷ޤ"
#: ui/evolution-mail.xml.h:3
+msgid "Cancel the current mail operation"
+msgstr "ߤΥ᡼򥭥󥻥뤷ޤ"
+
+#: ui/evolution-mail.xml.h:4
msgid "Change the properties of this folder"
msgstr "Υեѹ"
-#: ui/evolution-mail.xml.h:4
+#: ui/evolution-mail.xml.h:5
msgid "Compose"
msgstr ""
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "åޤ"
-
#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "ե..."
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "򤵤줿åμؤֿޤ"
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "å򿷵եإԡޤ"
+#: ui/evolution-mail.xml.h:7
+msgid "Compose a reply to the sender of the selected message"
+msgstr "򤵤줿åԤؤֿޤ"
#: ui/evolution-mail.xml.h:9
msgid "Copy selected messages to another folder"
@@ -7781,329 +8323,397 @@ msgstr "̤Υե򤵤줿å򥳥ԡޤ"
msgid "Create _Virtual Folder From Message"
msgstr "å鲾ۥե(_V)"
+#: ui/evolution-mail.xml.h:11
+msgid "Create a rule to filter messages from this sender"
+msgstr "ԤΥåե륿롼ޤ"
+
#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
-msgstr "򤵤줿åޤ"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "μԤؤΥåե륿롼ޤ"
+
+#: ui/evolution-mail.xml.h:13
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Υ᡼󥰥ꥹȤؤΥåե륿롼ޤ"
#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
-msgstr "٤ƤΥåإåɽޤ"
+msgid "Create a rule to filter messages with this subject"
+msgstr "η̾Υåե륿롼ޤ"
#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "åԽ"
+msgid "Create a virtual folder for these recipients"
+msgstr "μԤΤβۥեޤ"
#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "ߤΥåԽ"
+msgid "Create a virtual folder for this mailing list"
+msgstr "Υ᡼󥰥ꥹȤΤβۥեޤ"
#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Ȣˤ(_T)"
+msgid "Create a virtual folder for this sender"
+msgstr "ԤΤβۥեޤ"
#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr ""
+msgid "Create a virtual folder for this subject"
+msgstr "η̾Τβۥեޤ"
#: ui/evolution-mail.xml.h:19
+msgid "Create or edit mail accounts and other preferences"
+msgstr "᡼륢Ȥ¾/Խޤ"
+
+#: ui/evolution-mail.xml.h:20
+msgid "Create or edit rules for filtering new mail"
+msgstr "᡼ե륿롼κ/Խ򤷤ޤ"
+
+#: ui/evolution-mail.xml.h:21
+msgid "Create or edit virtual folder definitions"
+msgstr "ۥե/Խޤ"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Display the next message"
+msgstr "Υåɽޤ"
+
+#: ui/evolution-mail.xml.h:24
+msgid "Display the previous message"
+msgstr "Υåɽޤ"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Empty _Trash"
+msgstr "Ȣˤ(_T)"
+
+#: ui/evolution-mail.xml.h:26
msgid "Filter on Mailing _List"
msgstr "᡼󥰥ꥹȤΥե륿(_L)"
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:27
msgid "Filter on Se_nder"
msgstr "ԤΥե륿(_n)"
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:28
msgid "Filter on _Recipients"
msgstr "ԤΥե륿(_R)"
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:29
msgid "Filter on _Subject"
msgstr "̾Υե륿(_S)"
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr ""
+#: ui/evolution-mail.xml.h:30
+msgid "Force images in HTML mail to be loaded"
+msgstr "Ū HTML ᡼βɤ߹"
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:31
msgid "Forget _Passwords"
msgstr "ѥɤʶ(_P)"
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:32
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:34
msgid "Forward As"
msgstr "ž"
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr "򤵤줿᡼žޤ"
+#: ui/evolution-mail.xml.h:35
+msgid "Forward _Attached"
+msgstr "źդž(_A)"
-#: ui/evolution-mail.xml.h:30
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr ""
+#: ui/evolution-mail.xml.h:36
+msgid "Forward _Inline"
+msgstr "饤ž(_I)"
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "٤ƤΥإå(_H)"
+#: ui/evolution-mail.xml.h:37
+msgid "Forward _Quoted"
+msgstr "Ѥž(_Q)"
-#: ui/evolution-mail.xml.h:32
-msgid "Hide Deleted Messages"
-msgstr "줿å򱣤"
+#: ui/evolution-mail.xml.h:38
+msgid "Forward the selected message in the body of a new message"
+msgstr "åʸ򤵤줿åžޤ"
+
+#: ui/evolution-mail.xml.h:39
+msgid "Forward the selected message quoted like a reply"
+msgstr "Ѥ򤵤줿åžޤ"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Forward the selected message to someone"
+msgstr "ï򤵤줿åžޤ"
+
+#: ui/evolution-mail.xml.h:41
+msgid "Forward the selected message to someone as an attachment"
+msgstr "źդȤï򤵤줿åžޤ"
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:42
msgid "Hide S_elected Messages"
msgstr "򤵤줿å򱣤(_e)"
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:43
msgid "Hide _Deleted Messages"
msgstr "줿å򱣤(_D)"
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:44
msgid "Hide _Read messages"
msgstr "ɥå򱣤(_R)"
-#: ui/evolution-mail.xml.h:36
-msgid "Invert Selection"
-msgstr "ȿž"
+#: ui/evolution-mail.xml.h:45
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:46
+msgid "Load _Images"
+msgstr "ɤ߹(_I)"
+
+#: ui/evolution-mail.xml.h:47
msgid "Manage _Subscriptions..."
msgstr "ɴ(_S)..."
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
+#: ui/evolution-mail.xml.h:48
+msgid "Mar_k As Read"
msgstr "ɤȤƥޡ(_k)"
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:49
msgid "Mark All as R_ead"
msgstr "ɤȤƤ٤ƥޡ(_e)"
-#: ui/evolution-mail.xml.h:40
-msgid "Mark As Read"
-msgstr "ɤȤƥޡ"
-
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:50
msgid "Mark As U_nread"
msgstr "̤ɤȤƥޡ(_n)"
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "̤ɤȤƥޡ(_n)"
+#: ui/evolution-mail.xml.h:51
+msgid "Mark all visible messages as read"
+msgstr "ɤȤƤ٤ƤΥåޡޤ"
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:52
msgid "Mark the selected messages as having been read"
msgstr "ɤȤ򤵤줿åޡޤ"
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:53
msgid "Mark the selected messages as not having been read"
msgstr "̤ɤȤ򤵤줿åޡޤ"
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:54
+msgid "Mark the selected messages for deletion"
+msgstr "򤵤줿å˺ޡ򤷤ޤ"
+
+#: ui/evolution-mail.xml.h:55
msgid "Move"
msgstr "ư"
-#: ui/evolution-mail.xml.h:46
-msgid "Move message to a new folder"
-msgstr "å򿷵եذưޤ"
-
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:56
msgid "Move selected messages to another folder"
msgstr "̤Υե򤵤줿åưޤ"
-#: ui/evolution-mail.xml.h:48
-msgid "Open in New Window"
-msgstr "ɥdz"
-
-#: ui/evolution-mail.xml.h:49
-msgid "Open the current message in a new window"
-msgstr "ɥǸߤΥå򳫤ޤ"
-
-#: ui/evolution-mail.xml.h:54
-msgid "Print Preview of message..."
-msgstr "åΰץӥ塼..."
+#: ui/evolution-mail.xml.h:58
+msgid "Open a window for composing a mail message"
+msgstr ""
-#: ui/evolution-mail.xml.h:55
-msgid "Print message to the printer"
-msgstr "åץ󥿤ذޤ"
+#: ui/evolution-mail.xml.h:59
+msgid "Open the selected message in a new window"
+msgstr "ɥ򤵤줿å򳫤ޤ"
-#: ui/evolution-mail.xml.h:56
-msgid "Print message..."
-msgstr "å..."
+#: ui/evolution-mail.xml.h:60
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "ɤȤ򤵤줿åޡޤ"
-#: ui/evolution-mail.xml.h:59
-msgid "Redirect (FIXME: implement me)"
-msgstr "̾񤭴 (FIXME: Ƥ)"
+#: ui/evolution-mail.xml.h:61
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "٤ƤΥեޡ줿åʵŪ˺ޤ"
#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "ֿ(_A)"
-
-#: ui/evolution-mail.xml.h:63
-msgid "Reply to all"
-msgstr "ֿ"
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "ĤΥեޡ줿åʵŪ˺ޤ"
-#: ui/evolution-mail.xml.h:65
-msgid "Reply to sender"
-msgstr "Ԥֿ"
+#: ui/evolution-mail.xml.h:66
+msgid "Print Message..."
+msgstr "å..."
#: ui/evolution-mail.xml.h:67
-msgid "S_ource"
-msgstr "(_o)"
+msgid "Print Preview..."
+msgstr "ץӥ塼..."
#: ui/evolution-mail.xml.h:68
-msgid "Save the message into a new file"
-msgstr "եإå¸ޤ"
-
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "٤(_A)"
-
-#: ui/evolution-mail.xml.h:71
-msgid "Select _Thread"
-msgstr "åɤ(_T)"
+msgid "Print message to the printer"
+msgstr "åץ󥿤ذޤ"
-#: ui/evolution-mail.xml.h:72
-msgid "Send / Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:69
+msgid "Redirect (FIXME: implement me)"
+msgstr "̾񤭴 (FIXME: Ƥ)"
#: ui/evolution-mail.xml.h:73
-msgid "Send a reply to the person who sent you this mail"
-msgstr "Υ᡼äֿͤޤ"
+msgid "S_earch Message"
+msgstr "å򸡺(_e)"
#: ui/evolution-mail.xml.h:74
-msgid "Send a single mail in reply to all the selected mail"
-msgstr "򤵤줿᡼Τ٤ƤοͤؤҤȤĤΥ᡼ֿޤ"
+msgid "Save the message as a text file"
+msgstr "ƥȥեإå¸ޤ"
#: ui/evolution-mail.xml.h:75
-msgid ""
-"Send queued mail\n"
-" and retrieve new mail"
+msgid "Search for text in the body of the displayed message"
msgstr ""
-"塼ˤ᡼\n"
-" ᡼ޤ"
+
+#: ui/evolution-mail.xml.h:76 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "٤(_A)"
#: ui/evolution-mail.xml.h:77
-msgid "Send queued mail and retrieve new mail"
-msgstr "塼ˤ᡼ƿ᡼ޤ"
+msgid "Select _Thread"
+msgstr "åɤ(_T)"
#: ui/evolution-mail.xml.h:78
-msgid "Show _All"
-msgstr "٤ɽ(_A)"
+msgid "Select all and only the messages that are not currently selected"
+msgstr "򤵤Ƥʤå򤹤٤򤷤ޤ"
+
+#: ui/evolution-mail.xml.h:79
+msgid "Select all messages in the same thread as the selected message"
+msgstr "򤵤줿åƱåɤΥå򤹤٤򤷤ޤ"
#: ui/evolution-mail.xml.h:80
-msgid "Threaded Message list"
-msgstr "åꥹȤ򥹥åɲޤ"
+msgid "Select all visible messages"
+msgstr "٤ƤΥå򤷤ޤ"
#: ui/evolution-mail.xml.h:81
-msgid "Un-delete the selected messages"
-msgstr "򤵤줿åäޤ"
+msgid "Send / Receive"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:82
+msgid "Send queued mail and retrieve new mail"
+msgstr "塼ˤ᡼ƿ᡼ޤ"
#: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr "᡼󥰥ꥹȤβۥե(_L)"
+msgid "Show Email _Source"
+msgstr "᡼Υɽ(_S)"
#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr "Ԥβۥե(_n)"
+msgid "Show Full _Headers"
+msgstr "٤ƤΥإåɽ(_H)"
#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr "Ԥβۥե(_R)"
+msgid "Show _All"
+msgstr "٤ɽ(_A)"
#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr "̾βۥե(_S)"
+msgid "Show message in the normal style"
+msgstr "̾Υåɽޤ"
#: ui/evolution-mail.xml.h:87
-msgid "View Raw Message Source"
-msgstr "̤ùåΥɽޤ"
+msgid "Show message with all email headers"
+msgstr "٤ƤΥ᡼إåޤƥåɽޤ"
#: ui/evolution-mail.xml.h:88
-msgid "Virtual Folder _Editor..."
-msgstr "ۥեǥ(_E)..."
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
#: ui/evolution-mail.xml.h:89
-msgid "_Apply Filters"
-msgstr "ե륿Ŭ(_A)"
+msgid "Show the raw email source of the message"
+msgstr ""
#: ui/evolution-mail.xml.h:90
-msgid "_Attachment"
-msgstr "ź(_A)"
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "եإԡ(_C)..."
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "ɤȤ򤵤줿åޡޤ"
#: ui/evolution-mail.xml.h:92
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "򤵤줿åޤ"
+
+#: ui/evolution-mail.xml.h:93
+msgid "Threaded Message list"
+msgstr "åꥹȤ򥹥åɲޤ"
+
+#: ui/evolution-mail.xml.h:94
+msgid "Un-delete the selected messages"
+msgstr "򤵤줿åäޤ"
+
+#: ui/evolution-mail.xml.h:95
+msgid "VFolder on Mailing _List..."
+msgstr "᡼󥰥ꥹȤβۥե(_L)..."
+
+#: ui/evolution-mail.xml.h:96
+msgid "VFolder on Se_nder..."
+msgstr "Ԥβۥե(_n)..."
+
+#: ui/evolution-mail.xml.h:97
+msgid "VFolder on _Recipients..."
+msgstr "Ԥβۥե(_R)..."
+
+#: ui/evolution-mail.xml.h:98
+msgid "VFolder on _Subject..."
+msgstr "̾βۥե(_S)..."
+
+#: ui/evolution-mail.xml.h:99
+msgid "Virtual Folder _Editor..."
+msgstr "ۥեǥ(_E)..."
+
+#: ui/evolution-mail.xml.h:100
+msgid "_Apply Filters"
+msgstr "ե륿Ŭ(_A)"
+
+#: ui/evolution-mail.xml.h:101
+msgid "_Copy to Folder"
+msgstr "եإԡ(_C)"
+
+#: ui/evolution-mail.xml.h:102
msgid "_Create Filter From Message"
msgstr "åե륿(_C)"
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:104
msgid "_Expunge"
msgstr "(_E)"
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:105
msgid "_Filters..."
msgstr "ե륿(_F)..."
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
+#: ui/evolution-mail.xml.h:106 ui/evolution.xml.h:50
msgid "_Folder"
msgstr "ե(_F)"
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "ž(_F)"
-
-#: ui/evolution-mail.xml.h:98
-msgid "_Inline"
-msgstr "饤(_I)"
+#: ui/evolution-mail.xml.h:107
+msgid "_Forward Message"
+msgstr "åž(_F)"
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:108 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "ȿž(_I)"
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:109
msgid "_Mail Message"
msgstr "å᡼(_M)"
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:110
msgid "_Mail Settings..."
msgstr "᡼(_M)..."
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "եذư(_M)..."
+#: ui/evolution-mail.xml.h:111
+msgid "_Message Display"
+msgstr "åɽ(_M)"
-#: ui/evolution-mail.xml.h:103
-msgid "_Open Selected Items"
-msgstr "򤵤줿ƥ򳫤(_O)"
+#: ui/evolution-mail.xml.h:112
+msgid "_Move to Folder"
+msgstr "եذư(_M)"
-#: ui/evolution-mail.xml.h:105
-msgid "_Quoted"
-msgstr "(_Q)"
+#: ui/evolution-mail.xml.h:113
+msgid "_Normal Display"
+msgstr "̾ɽ(_N)"
-#: ui/evolution-mail.xml.h:106
-msgid "_Reply"
-msgstr "ֿ(_R)"
+#: ui/evolution-mail.xml.h:114
+msgid "_Open Message"
+msgstr "å򳫤(_O)"
-#: ui/evolution-mail.xml.h:107
-msgid "_Resend Messages"
+#: ui/evolution-mail.xml.h:116
+msgid "_Re-send Message"
msgstr "å(_R)"
-#: ui/evolution-mail.xml.h:109
-msgid "_Save Message As..."
-msgstr "å̾¸(_S)..."
-
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:119
msgid "_Send / Receive"
msgstr "(_S)"
-#: ui/evolution-mail.xml.h:111
-msgid "_Threaded"
-msgstr "å(_T)"
-
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "(_U)"
+#: ui/evolution-mail.xml.h:120
+msgid "_Threaded Message List"
+msgstr "åꥹȤ򥹥åɲ(_T)"
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
@@ -8119,142 +8729,154 @@ msgid "Encrypt this message with PGP"
msgstr "PGP ǤΥåŹ沽ޤ"
#: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:7
msgid "F_ormat"
msgstr "եޥå(_o)"
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:8
msgid "HTML"
msgstr "HTML"
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:9
msgid "Insert a file as text into the message"
msgstr "åإƥȤȤƥեޤ"
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:10
msgid "Insert text file..."
msgstr "ƥȥե..."
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:12
msgid "Open a file"
msgstr "ե򳫤"
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
msgid "PGP Encrypt"
msgstr "PGP ˤŹ沽"
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
msgid "PGP Sign"
msgstr "PGP "
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Encrypt"
+msgstr "S/MIME ˤŹ沽"
+
+#: ui/evolution-message-composer.xml.h:16
+msgid "S/MIME Sign"
+msgstr "S/MIME ̾"
+
+#: ui/evolution-message-composer.xml.h:20
msgid "Save _Draft"
msgstr "Ƥ¸(_D)"
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:21
msgid "Save in _folder... (FIXME)"
msgstr "ե¸... (FIXME)"
-#: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
msgid "Save in folder..."
msgstr "ե¸..."
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
msgid "Save the current file with a different name"
msgstr "ߤΥե̾¸ޤ"
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
msgid "Save the message in a specified folder"
msgstr "Υեإå¸ޤ"
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
msgid "Send"
msgstr ""
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
msgid "Send _Later"
msgstr "(_L)"
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
msgid "Send _later"
msgstr "(_l)"
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
msgid "Send the mail in HTML format"
msgstr "HTMLǥ᡼ޤ"
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
msgid "Send the message later"
msgstr "ǥåޤ"
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "åޤ"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:31
msgid "Send this message now"
msgstr "Υåޤ"
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:32
msgid "Show / hide attachments"
msgstr "źդɽ/ɽ"
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:33
msgid "Show _attachments"
msgstr "źդɽ(_a)"
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:34
msgid "Show attachments"
msgstr "źդɽ"
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:35
msgid "Sign this message with your PGP key"
msgstr "PGPǤΥå˥󤷤ޤ"
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:36
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "S/MIME ̾ǤΥå˥󤷤ޤ"
+
+#: ui/evolution-message-composer.xml.h:37
msgid "Toggles whether the BCC field is displayed"
msgstr "BCC եɤɽ뤫ɤؤޤ"
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:38
msgid "Toggles whether the CC field is displayed"
msgstr "CC եɤɽ뤫ɤؤޤ"
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:39
msgid "Toggles whether the From chooser is displayed"
msgstr "пͤɽ뤫ɤؤޤ"
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:40
msgid "Toggles whether the Reply-To field is displayed"
msgstr "ֿեɤɽ뤫ɤؤޤ"
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:41
msgid "_Bcc Field"
msgstr "Bcc ե(_B)"
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
msgid "_Cc Field"
msgstr "Cc ե(_C)"
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
msgid "_From Field"
msgstr "пͥե(_F)"
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:49
msgid "_Insert"
msgstr "(_I)"
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:50
msgid "_Insert text file... (FIXME)"
msgstr "ƥȥե(_I)... (FIXME)"
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:51
msgid "_Open..."
msgstr "(_O)..."
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:52
msgid "_Reply-To Field"
msgstr "ֿե(_R)"
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:54
msgid "_Security"
msgstr "ƥ(_S)"
@@ -8346,7 +8968,7 @@ msgstr "᤹"
msgid "Undo the last action"
msgstr "Ǹư򸵤ᤷޤ"
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:42
msgid "_Appointment (FIXME)"
msgstr "«(_A) (FIXME)"
@@ -8382,260 +9004,384 @@ msgstr "(_T)"
msgid "About Evolution..."
msgstr "Evolution ˤĤ..."
+#: ui/evolution.xml.h:2
+msgid "Add to _Shortcut Bar"
+msgstr "硼ȥåȥСɲ(_S)"
+
#: ui/evolution.xml.h:3
+msgid "Change the name of this folder"
+msgstr "Υե̾ѹޤ"
+
+#: ui/evolution.xml.h:4
+msgid "Change the properties for this folder"
+msgstr "Υեѹޤ"
+
+#: ui/evolution.xml.h:6
msgid "Close this window"
msgstr "ΥɥĤޤ"
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:7
+msgid "Copy this folder"
+msgstr "ե򥳥ԡޤ"
+
+#: ui/evolution.xml.h:8
+msgid "Create _New Folder..."
+msgstr "ե(_N)..."
+
+#: ui/evolution.xml.h:9
+msgid "Create a link to this folder in the shortcut bar"
+msgstr "硼ȥåȥСˤΥեΥ󥯤ޤ"
+
+#: ui/evolution.xml.h:10
+msgid "Create a new folder"
+msgstr "եޤ"
+
+#: ui/evolution.xml.h:11
msgid "Customi_ze Toolbars..."
msgstr "ġСΥޥ(_z)..."
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:12
msgid "Customize"
msgstr "ޥ"
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:13
msgid "Customize toolbars"
msgstr "ġС򥫥ޥޤ"
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:14
msgid "Display a different folder"
msgstr "̤Υեɽޤ"
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
msgid "E_xit"
msgstr "λ(_x)"
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+msgid "Evolution _FAQ"
+msgstr "Evolution FAQ(_F)"
+
+#: ui/evolution.xml.h:17
msgid "Evolution _Window"
msgstr "Evolution ɥ(_W)"
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:18
msgid "Evolution bar _shortcut"
msgstr "Evolution С硼ȥå(_s)"
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:19
msgid "Exit the program"
msgstr "ץλޤ"
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:20
msgid "Getting _Started"
msgstr "Ϥ(_S)"
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:21
msgid "Import an external file format"
msgstr "ե򥤥ݡȤޤ"
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:22
msgid "Main toolbar"
msgstr "ᥤġС"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:23
+msgid "Move this folder to another place"
+msgstr "̤ξؤΥեưޤ"
+
+#: ui/evolution.xml.h:24
+msgid "Open in New Window"
+msgstr "ɥdz"
+
+#: ui/evolution.xml.h:25
+msgid "Open in New _Window"
+msgstr "ɥdz(_W)"
+
+#: ui/evolution.xml.h:26
+msgid "Open this folder in an other window"
+msgstr "̤ΥɥǤΥե򳫤ޤ"
+
+#: ui/evolution.xml.h:27
msgid "Show information about Evolution"
msgstr "Evolution ˤĤƤξɽޤ"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:28
msgid "Submit Bug Report"
msgstr "Զ"
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:29
msgid "Submit _Bug Report"
msgstr "Զ(_B)"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:30
msgid "Submit bug report using Bug Buddy."
msgstr "Bug BuddyȤäԶФޤ"
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:31
+msgid "Toggle"
+msgstr "ؤ"
+
+#: ui/evolution.xml.h:32
msgid "Toggle whether to show the folder bar"
msgstr "եСɽ뤫ɤؤޤ"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:33
msgid "Toggle whether to show the shortcut bar"
msgstr "硼ȥåȥСɽ뤫ɤؤޤ"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:34
+msgid "Toggle whether we are working offline."
+msgstr "ե饤Ȥɤؤޤ"
+
+#: ui/evolution.xml.h:35
msgid "Using the C_ontact Manager"
msgstr "󥿥ȥޥ͡Ȥ(_o)"
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:36
msgid "Using the _Calendar"
msgstr "Ȥ(_C)"
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:37
msgid "Using the _Mailer"
msgstr "᡼Ȥ(_M)"
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:38
+msgid "View the selected folder"
+msgstr "򤵤줿եɽޤ"
+
+#: ui/evolution.xml.h:39
msgid "Work Offline"
msgstr "ե饤"
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:40
msgid "_About Evolution..."
msgstr "Evolution ˤĤ(_A)..."
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:41
msgid "_Actions"
msgstr "ư(_A)"
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
+msgid "_Copy..."
+msgstr "ԡ(_C)..."
+
+#: ui/evolution.xml.h:47
+msgid "_Delete this folder"
+msgstr "Υե(_D)"
+
+#: ui/evolution.xml.h:51
msgid "_Folder Bar"
msgstr "եС(_F)"
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:52
msgid "_Go to Folder..."
msgstr "եذư(_G)..."
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:54
msgid "_Import file..."
msgstr "ե򥤥ݡ(_I)..."
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:55
msgid "_Index"
msgstr "ǥå(_I)"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:56
msgid "_Mail message"
msgstr "å᡼(_M)"
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:57
+msgid "_Move..."
+msgstr "ư(_M)..."
+
+#: ui/evolution.xml.h:59
msgid "_New Folder"
msgstr "ե(_N)"
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:61
+msgid "_Rename..."
+msgstr "͡(_R)..."
+
+#: ui/evolution.xml.h:62
msgid "_Shortcut Bar"
msgstr "硼ȥåȥС(_S)"
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%Yǯ %m %d %A"
+#: ui/evolution.xml.h:66
+msgid "_Work Offline"
+msgstr "ե饤(_W)"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "ɥ쥹"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr ""
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "åꥹ"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr ""
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "ơ"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "̾"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "å"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "ƥ"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
msgid "Tentative"
msgstr ""
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
msgid "Busy"
msgstr "ӥ"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
msgid "Out of Office"
msgstr "եγ"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
msgid "No Information"
msgstr "ʤ"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
msgid "_Invite Others..."
msgstr "¾ξ(_I)..."
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
msgid "_Options"
msgstr "ץ(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
msgid "Show _Only Working Hours"
msgstr "Żλ֤ɽ(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
msgid "Show _Zoomed Out"
msgstr "̾ɽ(_Z)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
msgid "_Update Free/Busy"
msgstr "ե꡼/ӥ ι(_U)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
msgid "_<<"
msgstr "<<(_<)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
msgid "_Autopick"
msgstr "ưԥåå(_A)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
msgid ">_>"
msgstr ">>(_>)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
msgid "_All People and Resources"
msgstr "٤Ƥο͡ȥ꥽(_A)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
msgid "All _People and One Resource"
msgstr "٤Ƥο͡ȤҤȤĤΥ꥽(_P)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
msgid "_Required People"
msgstr "͡ɬ(_R)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
msgid "Required People and _One Resource"
msgstr "͡ȤҤȤĤΥ꥽ɬ(_O)"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
msgid "Meeting _start time:"
msgstr "ijϻ(_s):"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
msgid "Meeting _end time:"
msgstr "Ľλ(_e):"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
msgid "All Attendees"
msgstr "٤Ƥդź"
-#: widgets/menus/gal-view-menus.c:177
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%Yǯ %m %d %A"
+
+#: widgets/menus/gal-view-menus.c:176
msgid "_Current View"
msgstr "ߤɽ(_C)"
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
msgid "Define Views"
msgstr "ɽ"
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
+#: widgets/misc/e-calendar-item.c:422
msgid "MTWTFSS"
msgstr "MTWTFSS"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
msgid "%B %Y"
msgstr "%Y %B"
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
msgid "Now"
msgstr ""
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
msgid "OK"
msgstr "OK"
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
#, c-format
msgid "The time must be in the format: %s"
msgstr "֤ϥեޥåȤʤФʤޤ: %s"
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
msgid "Save Search"
msgstr "¸"
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
msgid "Advanced Search"
msgstr "鸡"
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr " ..."
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "̾¸..."
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "٤ɽ"
+
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "Խ..."
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "ܺ..."
#: widgets/misc/e-messagebox.c:152
msgid "Information"
@@ -8658,42 +9404,10 @@ msgstr "å"
msgid "Don't show this message again."
msgstr "Υå٤ɽʤ"
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
msgid "Sear_ch"
msgstr "(_c)"
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "ɥ쥹"
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr ""
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr "åꥹ"
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr ""
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "ơ"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "̾"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr "å"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "ƥ"
-
#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
msgid "The Personal Addressbook Server"
msgstr "ѡʥ륢ɥ쥹Ģ"