[evolution-data-server] Assamese translation updated

[Nilamdyuti Goswami <ngoswami src gnome org>]

commit 90915009112b7b4bd08fe30efab7c23275ece901
Author: Nilamdyuti Goswami <ngoswami redhat com>
Date:   Thu Dec 27 21:00:32 2012 +0530

    Assamese translation updated

 po/as.po |  535 +++++++++++++++++++++++++-------------------------------------
 1 files changed, 217 insertions(+), 318 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index cddcdcc..9143322 100644
--- a/po/as.po
+++ b/po/as.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2012-12-18 19:58+0000\n"
-"PO-Revision-Date: 2012-12-19 13:03+0530\n"
+"POT-Creation-Date: 2012-12-24 14:19+0000\n"
+"PO-Revision-Date: 2012-12-27 21:00+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: Assamese <kde-i18n-doc kde org>\n"
 "Language: as_IN\n"
@@ -66,10 +66,7 @@ msgstr "ààààà ààààààààà '%s' à ààà '%s' à
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
 #: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:122
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:525
-#: ../camel/providers/imap/camel-imap-store.c:469
-#: ../libedataserver/e-client.c:165
+#: ../camel/camel-imapx-command.c:594 ../libedataserver/e-client.c:165
 msgid "Unknown error"
 msgstr "âàààààà àààààà"
 
@@ -1838,7 +1835,6 @@ msgstr ""
 "àààààààà àààà àààà ààà àà'àà"
 
 #: ../camel/camel-disco-diary.c:271
-#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1866,17 +1862,13 @@ msgstr "àà-àààà àààààààà àààà '%s' ààà
 msgid "Copy folder content locally for _offline operation"
 msgstr "àà-àààà ààààà àààà àààààààà ààà ààààààààààà ààà ààà (_o)"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:429
-#: ../camel/camel-imapx-folder.c:465 ../camel/camel-imapx-folder.c:504
-#: ../camel/camel-imapx-folder.c:564 ../camel/camel-imapx-folder.c:699
-#: ../camel/camel-imapx-folder.c:880 ../camel/camel-imapx-folder.c:940
-#: ../camel/camel-imapx-folder.c:979 ../camel/camel-imapx-store.c:320
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:320
 #: ../camel/camel-imapx-store.c:1454 ../camel/camel-imapx-store.c:1543
 #: ../camel/camel-imapx-store.c:1592
-#: ../camel/providers/imap/camel-imap-store.c:1270
-#: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imap/camel-imap-store.c:3299
 #: ../camel/providers/pop3/camel-pop3-folder.c:534
 #: ../camel/providers/pop3/camel-pop3-folder.c:677
 #: ../camel/providers/pop3/camel-pop3-folder.c:906
@@ -1986,109 +1978,109 @@ msgstr "(user-tag) àà àààà àààààààà"
 msgid "Error executing filter search: %s: %s"
 msgstr "ààààààà àààààà àààààà àààààà àààààà: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:272
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' à àààà ààààà àààààà àààà àààà"
 msgstr[1] "'%s' à àààà ààààà àààààààààà àààà àààà"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:312
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' à àààà ààà àààààà àààà àààà"
 msgstr[1] "'%s' à àààà ààà àààààààààà àààà àààà"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:360
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ' à àààà àààààà ààààààà ààà àààà"
 msgstr[1] "'%s' à àààà àààààààààà ààààààà ààà àààà"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:934
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "àààààà ààààààààààà ààà àààà"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:937
 msgid "Copying messages"
 msgstr "àààààà ààà ààà àààà"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1257
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "ààààààà '%s' à àààà àààà àààà ààààààà ààà"
 
-#: ../camel/camel-folder.c:3372
+#: ../camel/camel-folder.c:3488
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "ààààààà '%s' ààààààààà ààà àà ààà"
 
-#: ../camel/camel-folder.c:3604
+#: ../camel/camel-folder.c:3720
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "'%s' à '%s' à àààà àààààà àààààà ààà àààà"
 
-#: ../camel/camel-folder.c:3755
+#: ../camel/camel-folder.c:3871
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "'%s' à àààà àààà àààà àààààà ààà àààà"
 
-#: ../camel/camel-folder.c:3987
+#: ../camel/camel-folder.c:4103
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "ààààààà '%s' à àààà ààà àààà"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"ààààààà àààà àààààààààà àààààààà àààààà àààààà: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"ààààààà àààààààààà ààààààà àààààà àààààà: %s:\n"
-"%s"
-
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:824 ../camel/camel-folder-search.c:867
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) à àààààààà ààà ààààààà ààààà àààààà"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:902
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s), %s à àààà ààààààà ààà ààààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:909 ../camel/camel-folder-search.c:917
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) à ààà ààà àààààààà àààààààà ààààààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) à ààà àààààà ààààà ààààààààà ààà"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) à ààààààà àààààà ààààààà"
 
+#: ../camel/camel-folder-search.c:1789 ../camel/camel-folder-search.c:1956
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"ààààààà àààà àààààààààà àààààààà àààààà àààààà: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1801 ../camel/camel-folder-search.c:1968
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"ààààààà àààààààààà ààààààà àààààà àààààà: %s:\n"
+"%s"
+
 #: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
 #: ../camel/camel-gpg-context.c:1359
 #, c-format
@@ -2221,86 +2213,77 @@ msgstr "MIME à ààà ààààààààà àààààà àà
 msgid "Encrypted content"
 msgstr "ààààààààà ààà ààà"
 
-#: ../camel/camel-imapx-folder.c:661
+#: ../camel/camel-imapx-folder.c:710
 #, c-format
 msgid "No quota information available for folder '%s'"
 msgstr "ààààààà '%s' à àààà àààà àààà àààà àààààà ààà"
 
-#: ../camel/camel-imapx-folder.c:760 ../camel/camel-imapx-folder.c:831
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
 msgid "No destination folder specified"
 msgstr "àààà ààààààà ààààààà ààààààà ààà àààà ààà"
 
-#: ../camel/camel-imapx-folder.c:777
-#| msgid "Unable to retrieve message: "
+#: ../camel/camel-imapx-folder.c:828
 msgid "Unable to move junk messages"
 msgstr "ààààààà àààààààààà àààààààààà àààààà ààààà"
 
-#: ../camel/camel-imapx-folder.c:848
-#| msgid "Unable to retrieve message: "
+#: ../camel/camel-imapx-folder.c:901
 msgid "Unable to move deleted messages"
 msgstr "ààà àààààà àààààààààà àààààààààà àààààà ààààà"
 
-#: ../camel/camel-imapx-folder.c:1062
-#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/camel-imapx-folder.c:1115
 #: ../camel/providers/nntp/camel-nntp-folder.c:738
 msgid "Apply message _filters to this folder"
 msgstr "àà àààààààà àààààà ààààààààààà àààààà ààà (_f)"
 
-#: ../camel/camel-imapx-folder.c:1171
+#: ../camel/camel-imapx-folder.c:1224
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%s à àààà ààààààà àààààà àààààà àààà àààààà"
 
-#: ../camel/camel-imapx-folder.c:1179
+#: ../camel/camel-imapx-folder.c:1232
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%s à àààà ààààà àààààà àààà àààààà: "
 
-#: ../camel/camel-imapx-server.c:1217
+#: ../camel/camel-imapx-server.c:1254
 msgid "Server disconnected"
 msgstr "ààààààà ààààààààààà"
 
-#: ../camel/camel-imapx-server.c:1683
+#: ../camel/camel-imapx-server.c:1727
 msgid "Error writing to cache stream"
 msgstr "ààààà ààààààààà àààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:2776
+#: ../camel/camel-imapx-server.c:2893
 #, c-format
 msgid "Not authenticated"
 msgstr "àààààààà ààà"
 
-#: ../camel/camel-imapx-server.c:2854
+#: ../camel/camel-imapx-server.c:2971
 msgid "Error performing IDLE"
 msgstr "IDLE ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:3750
-#: ../camel/providers/imap/camel-imap-store.c:414
-#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../camel/camel-imapx-server.c:3875
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "àààààààà ààààààà IMAP ààààààà %s à àààà ààààà àààààà àààààà: %s"
 
-#: ../camel/camel-imapx-server.c:3751
-#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/camel-imapx-server.c:3876
 #: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ààààààà ààà"
 
-#: ../camel/camel-imapx-server.c:3790
-#: ../camel/providers/imap/camel-imap-store.c:440
+#: ../camel/camel-imapx-server.c:3915
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "IMAP ààààààà %s àà àààààààà ààààààà ààààà àààààà àààààà: "
 
-#: ../camel/camel-imapx-server.c:3870
-#: ../camel/providers/imap/camel-imap-store.c:749
+#: ../camel/camel-imapx-server.c:3995
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP ààààààà %s à %s àààààààààà àààààà àààà"
 
-#: ../camel/camel-imapx-server.c:3881 ../camel/camel-session.c:494
-#: ../camel/providers/imap/camel-imap-store.c:1174
+#: ../camel/camel-imapx-server.c:4006 ../camel/camel-session.c:494
 #: ../camel/providers/pop3/camel-pop3-store.c:266
 #: ../camel/providers/pop3/camel-pop3-store.c:604
 #: ../camel/providers/smtp/camel-smtp-transport.c:467
@@ -2308,154 +2291,151 @@ msgstr "IMAP ààààààà %s à %s àààààààààà à
 msgid "No support for %s authentication"
 msgstr "%s àààààààààà àààà àààà àààààà ààà"
 
-#: ../camel/camel-imapx-server.c:3900
-#: ../camel/providers/imap/camel-imap-store.c:1142
+#: ../camel/camel-imapx-server.c:4025
 #: ../camel/providers/nntp/camel-nntp-store.c:314
 #: ../camel/providers/nntp/camel-nntp-store.c:512
 msgid "Cannot authenticate without a username"
 msgstr "ààà ààààààààààà àààà àààààà àààààààà àààà àààààà"
 
-#: ../camel/camel-imapx-server.c:3909
-#: ../camel/providers/imap/camel-imap-store.c:1150
+#: ../camel/camel-imapx-server.c:4034
 #: ../camel/providers/nntp/camel-nntp-store.c:521
 #: ../camel/providers/pop3/camel-pop3-store.c:529
 #: ../camel/providers/pop3/camel-pop3-store.c:549
 msgid "Authentication password not available"
 msgstr "àààààààààà àààààààà àààààà ààà"
 
-#: ../camel/camel-imapx-server.c:4112
+#: ../camel/camel-imapx-server.c:4241
 msgid "Error fetching message"
 msgstr "àààààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4197
+#: ../camel/camel-imapx-server.c:4323
 msgid "Failed to copy the tmp file"
 msgstr "tmp àààà ààà àààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4211
+#: ../camel/camel-imapx-server.c:4337
 msgid "Failed to close the tmp stream"
 msgstr "tmp ààààà àààà àààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4320
+#: ../camel/camel-imapx-server.c:4458
 msgid "Error copying messages"
 msgstr "àààààààààà ààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4466
+#: ../camel/camel-imapx-server.c:4624
 msgid "Error appending message"
 msgstr "àààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4653
+#: ../camel/camel-imapx-server.c:4823
 msgid "Error fetching message headers"
 msgstr "àààààà ààààààààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4790
+#: ../camel/camel-imapx-server.c:4970
 msgid "Error retrieving message"
 msgstr "àààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:4912 ../camel/camel-imapx-server.c:5118
+#: ../camel/camel-imapx-server.c:5094 ../camel/camel-imapx-server.c:5322
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "'%s' à àààà àààààààààààà àààààà àààà ààààààà ààà àààà"
 
-#: ../camel/camel-imapx-server.c:4967
+#: ../camel/camel-imapx-server.c:5158
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "'%s' à ààààààààà ààààààààààà àààà ààààà ààà àààà"
 
-#: ../camel/camel-imapx-server.c:5014
+#: ../camel/camel-imapx-server.c:5211
 msgid "Error fetching new messages"
 msgstr "àààà àààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5215
+#: ../camel/camel-imapx-server.c:5424
 msgid "Error while fetching messages"
 msgstr "àààààààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5222 ../camel/camel-imapx-server.c:5255
+#: ../camel/camel-imapx-server.c:5432 ../camel/camel-imapx-server.c:5465
 #, c-format
 msgid "Fetching summary information for %d message in '%s'"
 msgid_plural "Fetching summary information for %d messages in '%s'"
 msgstr[0] "àààààà àààà ààààààà ààà àààà %d àààààà '%s'"
 msgstr[1] "àààààà àààà ààààààà ààà àààà %d àààààààààà '%s'"
 
-#: ../camel/camel-imapx-server.c:5383 ../camel/camel-imapx-server.c:5413
+#: ../camel/camel-imapx-server.c:5601 ../camel/camel-imapx-server.c:5631
 msgid "Error refreshing folder"
 msgstr "ààààààà àààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5509
+#: ../camel/camel-imapx-server.c:5735
 msgid "Error expunging message"
 msgstr "àààààà ààà ààààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5613
+#: ../camel/camel-imapx-server.c:5846
 msgid "Error fetching folders"
 msgstr "ààààààààààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5695
+#: ../camel/camel-imapx-server.c:5928
 msgid "Error subscribing to folder"
 msgstr "ààààààààà àààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5760
+#: ../camel/camel-imapx-server.c:5993
 msgid "Error creating folder"
 msgstr "ààààààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5814
+#: ../camel/camel-imapx-server.c:6047
 msgid "Error deleting folder"
 msgstr "ààààààà ààà ààààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5883
+#: ../camel/camel-imapx-server.c:6121
 msgid "Error renaming folder"
 msgstr "ààààààà àààààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:5952
+#: ../camel/camel-imapx-server.c:6196
 msgid "Error retrieving quota information"
 msgstr "àààà àààà àààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:6015
+#: ../camel/camel-imapx-server.c:6261
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "àààààà àààààà àà"
+
+#: ../camel/camel-imapx-server.c:6324
 msgid "Error performing NOOP"
 msgstr "NOOP ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:6115
+#: ../camel/camel-imapx-server.c:6433
 msgid "Error syncing changes"
 msgstr "àààààààààààà ààààààà ààààà àààààà"
 
-#: ../camel/camel-imapx-server.c:6894
-#: ../camel/providers/imap/camel-imap-folder.c:3531
+#: ../camel/camel-imapx-server.c:7242
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ID àà àààààà ààààààà ààààà àààààà: %s"
 
-#: ../camel/camel-imapx-server.c:6895
-#: ../camel/providers/imap/camel-imap-folder.c:3532
+#: ../camel/camel-imapx-server.c:7243
 msgid "No such message available."
 msgstr "àà àààà àààà àààààà ààààààà àààà"
 
-#: ../camel/camel-imapx-server.c:7050 ../camel/camel-imapx-server.c:7065
+#: ../camel/camel-imapx-server.c:7401 ../camel/camel-imapx-server.c:7416
 msgid "Cannot create spool file: "
 msgstr "ààààà àààà àààààà àààà àààààà: "
 
-#: ../camel/camel-imapx-server.c:7798
+#: ../camel/camel-imapx-server.c:8158
 msgid "IMAP server does not support quotas"
 msgstr "IMAP ààààààà à àààà àààààà àààà"
 
 #: ../camel/camel-imapx-store.c:201
-#: ../camel/providers/imap/camel-imap-store.c:827
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ààààààà %s"
 
 #: ../camel/camel-imapx-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:830
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s à àààà IMAP àààà, %s à ààà"
 
 #: ../camel/camel-imapx-store.c:295
-#: ../camel/providers/imap/camel-imap-provider.c:98
 #: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "àààààààà"
 
 #: ../camel/camel-imapx-store.c:297
-#: ../camel/providers/imap/camel-imap-provider.c:100
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "àà ààààààà àààààààà ààà àààààà-ààààà àààààààà àààààà IMAP àààààààà àààà ààààà "
@@ -2463,16 +2443,12 @@ msgstr ""
 "à'àà"
 
 #: ../camel/camel-imapx-store.c:396
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imap/camel-imap-store.c:2262
 #, c-format
 msgid "No such folder %s"
 msgstr "%s à àààààà àààà ààààààà ààààààà ààà"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/camel-imapx-store.c:421 ../camel/camel-imapx-store.c:911
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/imap/camel-imap-store.c:2684
 #: ../camel/providers/local/camel-maildir-folder.c:473
 #: ../camel/providers/local/camel-maildir-store.c:307
 #: ../camel/providers/local/camel-maildir-store.c:699
@@ -2494,8 +2470,6 @@ msgid "No such folder: %s"
 msgstr "àà àààà ààààààà ààààààà ààà: %s"
 
 #: ../camel/camel-imapx-store.c:1476
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imap/camel-imap-store.c:2524
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -2503,14 +2477,11 @@ msgstr ""
 "\"%s\" àààààààà àààà àààà àààà ààà \"%c\" ààààààà àààà àààààààà à ààà ààà"
 
 #: ../camel/camel-imapx-store.c:1487
-#: ../camel/providers/imap/camel-imap-store.c:2537
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "àààààà ààààààà âàààààà: %s"
 
 #: ../camel/camel-imapx-store.c:1497
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imap/camel-imap-store.c:2589
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "àààààà àààààààààà àààà ààààààààà àààààà ààà ààààà"
@@ -2948,7 +2919,7 @@ msgstr "ààà àààààà àààààà ààààààà 
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "ààà %s ààààà àààà POP à ààà SMTP ààààààààààà àààààà ààà àààà"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "àààààà àààààààààà ààààààà àààààà àààààà: %s: %s"
@@ -3379,173 +3350,43 @@ msgstr "àààààààà ààààààà àààààà àà
 msgid "Cannot copy messages to the Junk folder"
 msgstr "àààààààà ààààààà ààààààà àààààà ààà àààààà àààààà"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "àààààà ààààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "ààààà ààààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"ààààààà %s à IMAP ààààààà %s %s ààà ààààààààààà:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"IMAP ààààààà %s %s à ààà ààààààà ààààààààààà:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:512
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP àààààààà ààà ààààààà ààààààààààà ààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:524
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP àààààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:607
-#, c-format
-msgid "Server response ended too soon."
-msgstr "àààààààà ààà ààààààà ààààààààààà ààà ààààà àààààà ààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:822
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP àààààààà àààààààààààà àààà %s àààà ààààààààà"
-
-#: ../camel/providers/imap/camel-imap-command.c:860
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP àààààààà ààà ààààààààààà OK ààààààààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:356
-msgid "Always check for _new mail in this folder"
-msgstr "àààà ààààà àààà àààà àà àààààààà àààààààà àààà (_n)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:447
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "%s ààààààààà àààààà àààààà àààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:468
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s à ààààààààà àààà à'à àààààà àààààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1137
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s à àààà ààààààààà àààààà ààààààà ààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3494
-msgid "Unable to retrieve message: "
-msgstr "àààààà àààààà àààààà ààààà: "
-
-#: ../camel/providers/imap/camel-imap-folder.c:3620
-#: ../camel/providers/imap/camel-imap-folder.c:4512
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "ààààààà àààààà àààààààà àààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4085
-#: ../camel/providers/imap/camel-imap-folder.c:4167
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s à àààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà àààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4299
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d àààà àààà ààààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4309
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d à UID ààààààà ààà"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4549
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH ààààà àààààààààààà àààà ààààààà àààààà ààà àààààààààà"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "ààààà ààààààààà ààààà àààààà: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "àààààà %s ààààà ààà ààààà: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "àààààà %s ààààà àààà àààààà: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "%s ààààà àààààà àààààà: "
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "àààà ààààà àààààààà ààààààà ààà àààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "àààà àààààààà àààà àààà ààààààà àààààààà ààààààà ààà à'à (_h)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "àààààààà ààà àààààààà àààà àààà ààààààà àààààààà ààààààà ààà à'à (_h)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ààààà ààààààààààà ààààààà ààà ààà àààààààà àààà àààààà ààà (_Q)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "ààààààà àààààààà àààààààààààà àààà (_L)"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "ààààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "ààà àààààààà ààà ààààààà ààààààààà à'à (_S)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "ààààààà àààààà àààààà ààààààà ààààààààà àààààààà ààà (_v)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:53
-msgid "Names_pace:"
-msgstr "ààààààààà (_p):"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "ààààààààà:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:77
@@ -3554,95 +3395,46 @@ msgstr "ààààààààà (_p):"
 msgid "Options"
 msgstr "àààààààààà"
 
-#: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "àààà àààààààààààà àààà ààààààààààà ààààààààààà àààààà ààà (_f)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "ààààààà àààààààà ààààààà àààà ààà àààà ààààààà àààààààà ààààààà àààààà ààà "
 "à'à (_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "ààààààà àààààààà àààà àààà àààààààààà àààààààà ààà (_J)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr ""
 "INBOX (àààààà) àààààààà ààà àààààààà àààààà (Junk) ààààààà ààà à'à (_B)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "àààààààààààà àààààààà àààààà ààààààààààà àààà ààààààà ààà à'à (_z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
-msgstr "IMAP ààààààààà ààààà"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "ààààààààà IMAP ààààà "
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "SSL à àààà IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP àààààààà àààà ààà ààà àààààààà àààààààààà"
 
-#: ../camel/providers/imap/camel-imap-store.c:2191
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "`%s' ààààààà àààààà àààààà àààààà: ààààààà àààààààà àààààààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:2994
-#, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "'%s' à àààààààààààà àààààà àààààà ààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:3344
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà"
-
-#: ../camel/providers/imap/camel-imap-store.c:3348
-msgid "Server unexpectedly disconnected: "
-msgstr "ààààààà ààààààààààààààà ààààààààà àà: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr "ààààà ààààààààààà ààààààà ààà ààà àààààààà àààà àààààà ààà (_Q)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr "ààààààà àààààààà àààààààààààà àààà (_L)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "ààààààààà:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr "ààààààààà IMAP ààààà "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "IMAP+"
-
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3856,6 +3648,13 @@ msgstr "ààààààà '%s' ààààààà ààààà àà
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "ààààààà '%s' ààààààà ààààà àààààà: maildir ààààààààà àààà"
 
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "`%s' ààààààà àààààà àààààà àààààà: ààààààà àààààààà àààààààà"
+
 #: ../camel/providers/local/camel-maildir-store.c:338
 #: ../camel/providers/local/camel-maildir-store.c:378
 #: ../camel/providers/local/camel-mh-store.c:682
@@ -4212,6 +4011,11 @@ msgstr "%s àààààà ààààààà àààààà ààà
 msgid "Cannot get message %s: "
 msgstr "àààààà %s ààààààà ààààà àààààà: "
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "ààààààà àààààà àààààààà àààààà ààà"
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:559
 #: ../camel/providers/nntp/camel-nntp-folder.c:565
 #: ../camel/providers/nntp/camel-nntp-folder.c:611
@@ -5003,12 +4807,12 @@ msgstr "àààà ààà '%s' à àààààààà ààààà
 msgid "File must have a '.source' extension"
 msgstr "ààààà ààà '.source' àààààààààà ààààà ààààà"
 
-#: ../libebackend/e-source-registry-server.c:522
+#: ../libebackend/e-source-registry-server.c:523
 #: ../libedataserver/e-source-registry.c:1594
 msgid "The user declined to authenticate"
 msgstr "àààààààààààààà àààààààààà àààààà àààààà ààà"
 
-#: ../libebackend/e-source-registry-server.c:791
+#: ../libebackend/e-source-registry-server.c:792
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID '%s' àààààààà ààààààà"
@@ -5883,6 +5687,101 @@ msgstr "ààààà ààà àààààààà ààààààà
 msgid "_Dismiss"
 msgstr "ààààà ààà (_D)"
 
+#~ msgid "No output stream"
+#~ msgstr "àààààà ààààà ààààààààà"
+
+#~ msgid "No input stream"
+#~ msgstr "ààààà ààààà ààààààààà"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà: %s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ààààààà %s à IMAP ààààààà %s %s ààà ààààààààààà:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "IMAP ààààààà %s %s à ààà ààààààà ààààààààààà:\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "IMAP àààààààà ààà ààààààà ààààààààààà ààààààààààà: %s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAP àààààà àààààà: %s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "àààààààà ààà ààààààà ààààààààààà ààà ààààà àààààà ààààà"
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP àààààààà àààààààààààà àààà %s àààà ààààààààà"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "IMAP àààààààà ààà ààààààààààà OK ààààààààààà: %s"
+
+#~ msgid "Always check for _new mail in this folder"
+#~ msgstr "àààà ààààà àààà àààà àà àààààààà àààààààà àààà (_n)"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "%s ààààààààà àààààà àààààà àààààà: %s"
+
+#~ msgid "Could not load summary for %s"
+#~ msgstr "%s à ààààààààà àààà à'à àààààà àààààà"
+
+#~ msgid "Scanning for changed messages in %s"
+#~ msgstr "%s à àààà ààààààààà àààààà ààààààà ààà àààà"
+
+#~ msgid "Unable to retrieve message: "
+#~ msgstr "àààààà àààààà àààààà ààààà: "
+
+#~ msgid "Fetching summary information for new messages in %s"
+#~ msgstr "%s à àààà ààààààà àààà ààààààà ààààààààà àààà ààààààà ààà àààà"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d àààà àààà ààààààà ààà"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr "àààààààà ààààààààààà ààààààààà: àààààà %d à UID ààààààà ààà"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "FETCH ààààà àààààààààààà àààà ààààààà àààààà ààà àààààààààà"
+
+#~ msgid "Could not open cache directory: "
+#~ msgstr "ààààà ààààààààà ààààà àààààà: "
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "àààààà %s ààààà ààà ààààà: %s"
+
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "àààààà %s ààààà àààà àààààà: "
+
+#~ msgid "Failed to cache %s: "
+#~ msgstr "%s ààààà àààààà àààààà: "
+
+#~ msgid "Names_pace:"
+#~ msgstr "ààààààààà (_p):"
+
+#~ msgid "IMAP default port"
+#~ msgstr "IMAP ààààààààà ààààà"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "'%s' à àààààààààààà àààààà àààààà ààà àààà"
+
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "àààààààà àààà ààààààààààà àààà ààààà ààààààààà ààà àààà"
+
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "ààààààà ààààààààààààààà ààààààààà àà: "
+
 #~ msgid ""
 #~ "   Issuer:       %s\n"
 #~ "   Subject:      %s\n"