Updated Canadian English translation.
authorAdam Weinberger <adamw@gnome.org>
Sat, 28 May 2005 18:38:15 +0000 (18:38 +0000)
committerAdam Weinberger <adamw@src.gnome.org>
Sat, 28 May 2005 18:38:15 +0000 (18:38 +0000)
2005-05-28  Adam Weinberger  <adamw@gnome.org>

* en_CA.po: Updated Canadian English translation.

po/ChangeLog
po/en_CA.po

index c2e80ec..881453c 100644 (file)
@@ -1,3 +1,7 @@
+2005-05-28  Adam Weinberger  <adamw@gnome.org>
+
+       * en_CA.po: Updated Canadian English translation.
+
 2005-05-26  Clytie Siddall <clytie@riverland.net.au>
 
         * vi.po: Updated Vietnamese translation.
index 6b37b78..b20db81 100644 (file)
@@ -8,57 +8,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-08 15:44-0400\n"
-"PO-Revision-Date: 2005-04-08 13:04-0400\n"
+"POT-Creation-Date: 2005-05-28 14:36-0400\n"
+"PO-Revision-Date: 2005-05-28 13:04-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backends/file/e-book-backend-file.c:519
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2045
-#: addressbook/backends/vcf/e-book-backend-vcf.c:452
+#: ../addressbook/backends/file/e-book-backend-file.c:528
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2046
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:473
 msgid "Loading..."
 msgstr "Loading..."
 
-#: addressbook/backends/file/e-book-backend-file.c:521
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2029
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2043
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3401
-#: addressbook/backends/vcf/e-book-backend-vcf.c:454
+#: ../addressbook/backends/file/e-book-backend-file.c:530
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2044
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3401
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Searching..."
 msgstr "Searching..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:647
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:647
 msgid "Using Distinguished Name (DN)"
 msgstr "Using Distinguished Name (DN)"
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:650
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:650
 msgid "Using Email Address"
 msgstr "Using Email Address"
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:820
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:820
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnecting to LDAP server..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1368
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1368
 msgid "Adding contact to LDAP server..."
 msgstr "Adding contact to LDAP server..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1493
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1493
 msgid "Removing contact from LDAP server..."
 msgstr "Removing contact from LDAP server..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1750
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1750
 msgid "Modifying contact from LDAP server..."
 msgstr "Modifying contact from LDAP server..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3290
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3290
 msgid "Receiving LDAP search results..."
 msgstr "Receiving LDAP search results..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3421
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3421
 msgid "Error performing search"
 msgstr "Error performing search"
 
@@ -66,100 +66,100 @@ msgstr "Error performing search"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: addressbook/libebook/e-book.c:240 addressbook/libebook/e-book.c:244
-#: addressbook/libebook/e-book.c:446 addressbook/libebook/e-book.c:450
-#: addressbook/libebook/e-book.c:579 addressbook/libebook/e-book.c:583
-#: addressbook/libebook/e-book.c:672 addressbook/libebook/e-book.c:676
-#: addressbook/libebook/e-book.c:952 addressbook/libebook/e-book.c:957
-#: addressbook/libebook/e-book.c:1132 addressbook/libebook/e-book.c:1136
-#: addressbook/libebook/e-book.c:1277 addressbook/libebook/e-book.c:1281
-#: addressbook/libebook/e-book.c:1479 addressbook/libebook/e-book.c:1483
-#: addressbook/libebook/e-book.c:1684 addressbook/libebook/e-book.c:1688
-#: addressbook/libebook/e-book.c:1910 addressbook/libebook/e-book.c:1914
-#: addressbook/libebook/e-book.c:2117 addressbook/libebook/e-book.c:2121
-#: addressbook/libebook/e-book.c:3200
+#: ../addressbook/libebook/e-book.c:240 ../addressbook/libebook/e-book.c:244
+#: ../addressbook/libebook/e-book.c:456 ../addressbook/libebook/e-book.c:460
+#: ../addressbook/libebook/e-book.c:601 ../addressbook/libebook/e-book.c:605
+#: ../addressbook/libebook/e-book.c:694 ../addressbook/libebook/e-book.c:698
+#: ../addressbook/libebook/e-book.c:1012 ../addressbook/libebook/e-book.c:1017
+#: ../addressbook/libebook/e-book.c:1204 ../addressbook/libebook/e-book.c:1208
+#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
+#: ../addressbook/libebook/e-book.c:1578 ../addressbook/libebook/e-book.c:1582
+#: ../addressbook/libebook/e-book.c:1819 ../addressbook/libebook/e-book.c:1823
+#: ../addressbook/libebook/e-book.c:2059 ../addressbook/libebook/e-book.c:2063
+#: ../addressbook/libebook/e-book.c:2275 ../addressbook/libebook/e-book.c:2279
+#: ../addressbook/libebook/e-book.c:3375
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" on book before \"%s\""
 
-#: addressbook/libebook/e-book.c:253 addressbook/libebook/e-book.c:459
-#: addressbook/libebook/e-book.c:592 addressbook/libebook/e-book.c:685
-#: addressbook/libebook/e-book.c:967 addressbook/libebook/e-book.c:1146
-#: addressbook/libebook/e-book.c:1291 addressbook/libebook/e-book.c:1492
-#: addressbook/libebook/e-book.c:1697 addressbook/libebook/e-book.c:1924
-#: addressbook/libebook/e-book.c:2130 addressbook/libebook/e-book.c:2468
-#: addressbook/libebook/e-book.c:2664
+#: ../addressbook/libebook/e-book.c:253 ../addressbook/libebook/e-book.c:469
+#: ../addressbook/libebook/e-book.c:614 ../addressbook/libebook/e-book.c:707
+#: ../addressbook/libebook/e-book.c:1027 ../addressbook/libebook/e-book.c:1218
+#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1591
+#: ../addressbook/libebook/e-book.c:1832 ../addressbook/libebook/e-book.c:2073
+#: ../addressbook/libebook/e-book.c:2288 ../addressbook/libebook/e-book.c:2624
+#: ../addressbook/libebook/e-book.c:2830
 msgid "book busy"
 msgstr "book busy"
 
-#: addressbook/libebook/e-book.c:286 addressbook/libebook/e-book.c:290
-#: addressbook/libebook/e-book.c:492 addressbook/libebook/e-book.c:496
-#: addressbook/libebook/e-book.c:621 addressbook/libebook/e-book.c:625
-#: addressbook/libebook/e-book.c:714 addressbook/libebook/e-book.c:718
-#: addressbook/libebook/e-book.c:996 addressbook/libebook/e-book.c:999
-#: addressbook/libebook/e-book.c:1178 addressbook/libebook/e-book.c:1181
-#: addressbook/libebook/e-book.c:1320 addressbook/libebook/e-book.c:1324
-#: addressbook/libebook/e-book.c:1528 addressbook/libebook/e-book.c:1532
-#: addressbook/libebook/e-book.c:1744 addressbook/libebook/e-book.c:1748
-#: addressbook/libebook/e-book.c:1956 addressbook/libebook/e-book.c:1960
-#: addressbook/libebook/e-book.c:2158 addressbook/libebook/e-book.c:2162
-#: addressbook/libebook/e-book.c:2409 addressbook/libebook/e-book.c:2496
-#: addressbook/libebook/e-book.c:2500 addressbook/libebook/e-book.c:2692
-#: addressbook/libebook/e-book.c:2696 addressbook/libebook/e-book.c:3209
+#: ../addressbook/libebook/e-book.c:286 ../addressbook/libebook/e-book.c:290
+#: ../addressbook/libebook/e-book.c:502 ../addressbook/libebook/e-book.c:506
+#: ../addressbook/libebook/e-book.c:643 ../addressbook/libebook/e-book.c:647
+#: ../addressbook/libebook/e-book.c:736 ../addressbook/libebook/e-book.c:740
+#: ../addressbook/libebook/e-book.c:1056 ../addressbook/libebook/e-book.c:1059
+#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
+#: ../addressbook/libebook/e-book.c:1408 ../addressbook/libebook/e-book.c:1412
+#: ../addressbook/libebook/e-book.c:1627 ../addressbook/libebook/e-book.c:1631
+#: ../addressbook/libebook/e-book.c:1879 ../addressbook/libebook/e-book.c:1883
+#: ../addressbook/libebook/e-book.c:2105 ../addressbook/libebook/e-book.c:2109
+#: ../addressbook/libebook/e-book.c:2316 ../addressbook/libebook/e-book.c:2320
+#: ../addressbook/libebook/e-book.c:2565 ../addressbook/libebook/e-book.c:2652
+#: ../addressbook/libebook/e-book.c:2656 ../addressbook/libebook/e-book.c:2858
+#: ../addressbook/libebook/e-book.c:2862 ../addressbook/libebook/e-book.c:3384
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA exception making \"%s\" call"
 
-#: addressbook/libebook/e-book.c:2390
+#: ../addressbook/libebook/e-book.c:2546
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: there is no current operation"
 
-#: addressbook/libebook/e-book.c:2425
+#: ../addressbook/libebook/e-book.c:2581
 #, c-format
 msgid "%s: couldn't cancel"
 msgstr "%s: could not cancel"
 
-#: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
+#: ../addressbook/libebook/e-book.c:2610 ../addressbook/libebook/e-book.c:2614
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" on book after \"%s\""
 
-#: addressbook/libebook/e-book.c:2524
+#: ../addressbook/libebook/e-book.c:2680
 #, c-format
 msgid "%s: cancelled"
 msgstr "%s: cancelled"
 
-#: addressbook/libebook/e-book.c:3066
+#: ../addressbook/libebook/e-book.c:3241
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: Invalid source."
 
-#: addressbook/libebook/e-book.c:3074 addressbook/libebook/e-book.c:3138
+#: ../addressbook/libebook/e-book.c:3249 ../addressbook/libebook/e-book.c:3313
 #, c-format
 msgid "%s: no factories available for uri `%s'"
 msgstr "%s: no factories available for URI `%s'"
 
-#: addressbook/libebook/e-book.c:3086
+#: ../addressbook/libebook/e-book.c:3261
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: Could not create EBookListener"
 
-#: addressbook/libebook/e-book.c:3332
+#: ../addressbook/libebook/e-book.c:3524
 #, c-format
 msgid "%s: there was no self contact uid stored in gconf"
 msgstr "%s: there was no self contact UID stored in gconf"
 
-#: addressbook/libebook/e-book.c:3443
+#: ../addressbook/libebook/e-book.c:3654
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: there was no source for UID `%s' stored in gconf."
 
-#: addressbook/libebook/e-contact.c:102
+#: ../addressbook/libebook/e-contact.c:102
 msgid "Unique ID"
 msgstr "Unique ID"
 
-#: addressbook/libebook/e-contact.c:103
+#: ../addressbook/libebook/e-contact.c:103
 msgid "File Under"
 msgstr "File Under"
 
@@ -167,1013 +167,1018 @@ msgstr "File Under"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: addressbook/libebook/e-contact.c:109
+#: ../addressbook/libebook/e-contact.c:109
 msgid "Full Name"
 msgstr "Full Name"
 
-#: addressbook/libebook/e-contact.c:110
+#: ../addressbook/libebook/e-contact.c:110
 msgid "Name"
 msgstr "Name"
 
-#: addressbook/libebook/e-contact.c:111
+#: ../addressbook/libebook/e-contact.c:111
 msgid "Given Name"
 msgstr "Given Name"
 
-#: addressbook/libebook/e-contact.c:112
+#: ../addressbook/libebook/e-contact.c:112
 msgid "Family Name"
 msgstr "Family Name"
 
-#: addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:113
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:114
 msgid "Name or Org"
 msgstr "Name or Org"
 
 #. Address fields
-#: addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook/e-contact.c:117
 msgid "Address List"
 msgstr "Address List"
 
-#: addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Home Address"
 msgstr "Home Address"
 
-#: addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:119
 msgid "Work Address"
 msgstr "Work Address"
 
-#: addressbook/libebook/e-contact.c:120
+#: ../addressbook/libebook/e-contact.c:120
 msgid "Other Address"
 msgstr "Other Address"
 
-#: addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Home Address Label"
 msgstr "Home Address Label"
 
-#: addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:123
 msgid "Work Address Label"
 msgstr "Work Address Label"
 
-#: addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Other Address Label"
 msgstr "Other Address Label"
 
-#: addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Assistant Phone"
 msgstr "Assistant Phone"
 
-#: addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Business Phone"
 msgstr "Business Phone"
 
-#: addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Business Phone 2"
 msgstr "Business Phone 2"
 
-#: addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Business Fax"
 msgstr "Business Fax"
 
-#: addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Callback Phone"
 msgstr "Callback Phone"
 
-#: addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Car Phone"
 msgstr "Car Phone"
 
-#: addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Home Phone"
 msgstr "Home Phone"
 
-#: addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Home Phone 2"
 msgstr "Home Phone 2"
 
-#: addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:136
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Other Phone"
 msgstr "Other Phone"
 
-#: addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Other Fax"
 msgstr "Other Fax"
 
-#: addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Primary Phone"
 msgstr "Primary Phone"
 
-#: addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:144
 msgid "TTY"
 msgstr "TTY"
 
 #. Email fields
-#: addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Email List"
 msgstr "Email List"
 
-#: addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Email 1"
 msgstr "Email 1"
 
-#: addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Email 3"
 msgstr "Email 3"
 
-#: addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Email 4"
 msgstr "Email 4"
 
-#: addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Mailer"
 msgstr "Mailer"
 
-#: addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Wants HTML Mail"
 msgstr "Wants HTML Mail"
 
 #. Instant messaging fields
-#: addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:156
 msgid "AIM Screen Name List"
 msgstr "AIM Screen Name List"
 
-#: addressbook/libebook/e-contact.c:157
-msgid "Groupwise Id List"
-msgstr "Groupwise Id List"
+#: ../addressbook/libebook/e-contact.c:157
+msgid "GroupWise Id List"
+msgstr "GroupWise ID List"
 
-#: addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Jabber Id List"
-msgstr "Jabber Id List"
+msgstr "Jabber ID List"
 
-#: addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! Screen Name List"
 
-#: addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:160
 msgid "MSN Screen Name List"
 msgstr "MSN Screen Name List"
 
-#: addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:161
 msgid "ICQ Id List"
-msgstr "ICQ Id List"
+msgstr "ICQ ID List"
 
-#: addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:163
 msgid "AIM Home Screen Name 1"
 msgstr "AIM Home Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:164
 msgid "AIM Home Screen Name 2"
 msgstr "AIM Home Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:165
 msgid "AIM Home Screen Name 3"
 msgstr "AIM Home Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:166
 msgid "AIM Work Screen Name 1"
 msgstr "AIM Work Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:167
 msgid "AIM Work Screen Name 2"
 msgstr "AIM Work Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:168
 msgid "AIM Work Screen Name 3"
 msgstr "AIM Work Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:169
-msgid "Groupwise Home Screen Name 1"
-msgstr "Groupwise Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:169
+msgid "GroupWise Home Screen Name 1"
+msgstr "GroupWise Home Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:170
-msgid "Groupwise Home Screen Name 2"
-msgstr "Groupwise Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:170
+msgid "GroupWise Home Screen Name 2"
+msgstr "GroupWise Home Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:171
-msgid "Groupwise Home Screen Name 3"
-msgstr "Groupwise Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:171
+msgid "GroupWise Home Screen Name 3"
+msgstr "GroupWise Home Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:172
-msgid "Groupwise Work Screen Name 1"
-msgstr "Groupwise Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:172
+msgid "GroupWise Work Screen Name 1"
+msgstr "GroupWise Work Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:173
-msgid "Groupwise Work Screen Name 2"
-msgstr "Groupwise Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:173
+msgid "GroupWise Work Screen Name 2"
+msgstr "GroupWise Work Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:174
-msgid "Groupwise Work Screen Name 3"
-msgstr "Groupwise Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:174
+msgid "GroupWise Work Screen Name 3"
+msgstr "GroupWise Work Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Jabber Home Id 1"
-msgstr "Jabber Home Id 1"
+msgstr "Jabber Home ID 1"
 
-#: addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:176
 msgid "Jabber Home Id 2"
-msgstr "Jabber Home Id 2"
+msgstr "Jabber Home ID 2"
 
-#: addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Jabber Home Id 3"
-msgstr "Jabber Home Id 3"
+msgstr "Jabber Home ID 3"
 
-#: addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Jabber Work Id 1"
-msgstr "Jabber Work Id 1"
+msgstr "Jabber Work ID 1"
 
-#: addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Jabber Work Id 2"
-msgstr "Jabber Work Id 2"
+msgstr "Jabber Work ID 2"
 
-#: addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:180
 msgid "Jabber Work Id 3"
-msgstr "Jabber Work Id 3"
+msgstr "Jabber Work ID 3"
 
-#: addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! Home Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! Home Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:183
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! Home Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! Work Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! Work Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! Work Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:187
 msgid "MSN Home Screen Name 1"
 msgstr "MSN Home Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:188
 msgid "MSN Home Screen Name 2"
 msgstr "MSN Home Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:189
 msgid "MSN Home Screen Name 3"
 msgstr "MSN Home Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:190
 msgid "MSN Work Screen Name 1"
 msgstr "MSN Work Screen Name 1"
 
-#: addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:191
 msgid "MSN Work Screen Name 2"
 msgstr "MSN Work Screen Name 2"
 
-#: addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:192
 msgid "MSN Work Screen Name 3"
 msgstr "MSN Work Screen Name 3"
 
-#: addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:193
 msgid "ICQ Home Id 1"
-msgstr "ICQ Home Id 1"
+msgstr "ICQ Home ID 1"
 
-#: addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:194
 msgid "ICQ Home Id 2"
-msgstr "ICQ Home Id 2"
+msgstr "ICQ Home ID 2"
 
-#: addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:195
 msgid "ICQ Home Id 3"
-msgstr "ICQ Home Id 3"
+msgstr "ICQ Home ID 3"
 
-#: addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:196
 msgid "ICQ Work Id 1"
-msgstr "ICQ Work Id 1"
+msgstr "ICQ Work ID 1"
 
-#: addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:197
 msgid "ICQ Work Id 2"
-msgstr "ICQ Work Id 2"
+msgstr "ICQ Work ID 2"
 
-#: addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:198
 msgid "ICQ Work Id 3"
-msgstr "ICQ Work Id 3"
+msgstr "ICQ Work ID 3"
 
 #. Organizational fields
-#: addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:201
 msgid "Organization"
 msgstr "Organization"
 
-#: addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:202
 msgid "Organizational Unit"
 msgstr "Organizational Unit"
 
-#: addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Office"
 msgstr "Office"
 
-#: addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Title"
 msgstr "Title"
 
-#: addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Role"
 msgstr "Role"
 
-#: addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Assistant"
 msgstr "Assistant"
 
 #. Web fields
-#: addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Homepage URL"
 msgstr "Homepage URL"
 
-#: addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Weblog URL"
 msgstr "Weblog URL"
 
-#: addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Video Conferencing URL"
 msgstr "Video Conferencing URL"
 
 #. Photo/Logo
-#: addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Photo"
 msgstr "Photo"
 
-#: addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Logo"
 msgstr "Logo"
 
 #. Security fields
-#: addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:220
 msgid "X.509 Certificate"
 msgstr "X.509 Certificate"
 
 #. Contact categories
-#: addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:223
 msgid "Category List"
 msgstr "Category List"
 
-#: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:408
+#: ../addressbook/libebook/e-contact.c:224
+#: ../libedataserverui/e-categories-dialog.c:408
 msgid "Categories"
 msgstr "Categories"
 
 #. Collaboration fields
-#: addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:227
 msgid "Calendar URI"
 msgstr "Calendar URI"
 
-#: addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:228
 msgid "Free/Busy URL"
 msgstr "Free/Busy URL"
 
-#: addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICS Calendar"
 msgstr "ICS Calendar"
 
 #. Misc fields
-#: addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Spouse's Name"
 msgstr "Spouse's Name"
 
-#: addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Birth Date"
 msgstr "Birth Date"
 
-#: addressbook/libebook/e-contact.c:236
+#. Make sure we have all categories
+#: ../addressbook/libebook/e-contact.c:236
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:453
+#: ../libedataserver/e-categories.c:235
 msgid "Anniversary"
 msgstr "Anniversary"
 
-#: addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:238
 msgid "List"
 msgstr "List"
 
-#: addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:239
 msgid "List Show Addresses"
 msgstr "List Show Addresses"
 
-#: addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:241
 msgid "Last Revision"
 msgstr "Last Revision"
 
-#: addressbook/libebook/e-contact.c:1210
-#: addressbook/libebook/e-destination.c:617
+#: ../addressbook/libebook/e-contact.c:1222
+#: ../addressbook/libebook/e-destination.c:751
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#. Set category and visibility
-#: calendar/backends/contacts/e-cal-backend-contacts.c:446
-#: libedataserver/e-categories.c:226
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:455
+#: ../libedataserver/e-categories.c:236
 msgid "Birthday"
 msgstr "Birthday"
 
-#: calendar/backends/contacts/e-cal-backend-contacts.c:470
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:481
 #, c-format
 msgid "Birthday: %s"
 msgstr "Birthday: %s"
 
-#: calendar/backends/contacts/e-cal-backend-contacts.c:491
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:505
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Anniversary: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:193
+#: ../calendar/backends/file/e-cal-backend-file.c:193
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Can't save calendar data: Malformed URI."
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:754
-#: camel/providers/groupwise/camel-groupwise-folder.c:293
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:754
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:237
 msgid "Reply Requested: by "
 msgstr "Reply Requested: by "
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:759
-#: camel/providers/groupwise/camel-groupwise-folder.c:298
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:759
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:242
 msgid "Reply Requested: When convenient"
 msgstr "Reply Requested: When convenient"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:529
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:566
 msgid "Invalid server URI"
 msgstr "Invalid server URI"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:560
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:597
 msgid "Could not create thread for getting deltas"
 msgstr "Could not create thread for getting deltas"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:582
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:585
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:619
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:622
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:592
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:829
-#: calendar/backends/http/e-cal-backend-http.c:495
-#: calendar/backends/weather/e-cal-backend-weather.c:444
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:629
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:866
+#: ../calendar/backends/http/e-cal-backend-http.c:495
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Could not create cache file"
 msgstr "Could not create cache file"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:602
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:639
 msgid "Could not create thread for populating cache"
 msgstr "Could not create thread for populating cache"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:608
-#: calendar/libecal/e-cal.c:4564
-#: camel/providers/groupwise/camel-groupwise-folder.c:667
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
-#: camel/providers/groupwise/camel-groupwise-folder.c:712
-#: camel/providers/groupwise/camel-groupwise-folder.c:739
-#: camel/providers/groupwise/camel-groupwise-store.c:528
-#: camel/providers/groupwise/camel-groupwise-store.c:628
-#: camel/providers/groupwise/camel-groupwise-store.c:790
-#: camel/providers/groupwise/camel-groupwise-store.c:988
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:645
+#: ../calendar/libecal/e-cal.c:4850
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:742
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:762
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:789
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:816
+#: ../camel/providers/groupwise/camel-groupwise-store.c:521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
+#: ../camel/providers/groupwise/camel-groupwise-store.c:585
+#: ../camel/providers/groupwise/camel-groupwise-store.c:746
+#: ../camel/providers/groupwise/camel-groupwise-store.c:944
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:176
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: calendar/backends/http/e-cal-backend-http.c:240
+#: ../calendar/backends/http/e-cal-backend-http.c:240
 msgid "Redirected to Invalid URI"
 msgstr "Redirected to Invalid URI"
 
-#: calendar/backends/http/e-cal-backend-http.c:264
+#: ../calendar/backends/http/e-cal-backend-http.c:264
 msgid "Bad file format."
 msgstr "Bad file format."
 
-#: calendar/backends/http/e-cal-backend-http.c:270
+#: ../calendar/backends/http/e-cal-backend-http.c:270
 msgid "Not a calendar."
 msgstr "Not a calendar."
 
-#: calendar/backends/weather/e-cal-backend-weather.c:140
+#: ../calendar/backends/weather/e-cal-backend-weather.c:140
 msgid "Could not retrieve weather data"
 msgstr "Could not retrieve weather data"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:194
+#: ../calendar/backends/weather/e-cal-backend-weather.c:194
 msgid "Fair"
 msgstr "Fair"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:195
+#: ../calendar/backends/weather/e-cal-backend-weather.c:195
 msgid "Snow showers"
 msgstr "Snow showers"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:196
+#: ../calendar/backends/weather/e-cal-backend-weather.c:196
 msgid "Snow"
 msgstr "Snow"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:197
+#: ../calendar/backends/weather/e-cal-backend-weather.c:197
 msgid "Partly cloudy"
 msgstr "Partly cloudy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:198
+#: ../calendar/backends/weather/e-cal-backend-weather.c:198
 msgid "Smoke"
 msgstr "Smoke"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:199
+#: ../calendar/backends/weather/e-cal-backend-weather.c:199
 msgid "Thunderstorms"
 msgstr "Thunderstorms"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:200
+#: ../calendar/backends/weather/e-cal-backend-weather.c:200
 msgid "Cloudy"
 msgstr "Cloudy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:201
+#: ../calendar/backends/weather/e-cal-backend-weather.c:201
 msgid "Drizzle"
 msgstr "Drizzle"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:202
+#: ../calendar/backends/weather/e-cal-backend-weather.c:202
 msgid "Sunny"
 msgstr "Sunny"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:203
+#: ../calendar/backends/weather/e-cal-backend-weather.c:203
 msgid "Dust"
 msgstr "Dust"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:204
+#: ../calendar/backends/weather/e-cal-backend-weather.c:204
 msgid "Clear"
 msgstr "Clear"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:205
+#: ../calendar/backends/weather/e-cal-backend-weather.c:205
 msgid "Mostly cloudy"
 msgstr "Mostly cloudy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:206
+#: ../calendar/backends/weather/e-cal-backend-weather.c:206
 msgid "Windy"
 msgstr "Windy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:207
+#: ../calendar/backends/weather/e-cal-backend-weather.c:207
 msgid "Rain showers"
 msgstr "Rain showers"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:208
+#: ../calendar/backends/weather/e-cal-backend-weather.c:208
 msgid "Foggy"
 msgstr "Foggy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:209
+#: ../calendar/backends/weather/e-cal-backend-weather.c:209
 msgid "Rain/snow mixed"
 msgstr "Rain/snow mixed"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:210
+#: ../calendar/backends/weather/e-cal-backend-weather.c:210
 msgid "Sleet"
 msgstr "Sleet"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:211
+#: ../calendar/backends/weather/e-cal-backend-weather.c:211
 msgid "Very hot/humid"
 msgstr "Very hot/humid"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:212
+#: ../calendar/backends/weather/e-cal-backend-weather.c:212
 msgid "Blizzard"
 msgstr "Blizzard"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:213
+#: ../calendar/backends/weather/e-cal-backend-weather.c:213
 msgid "Freezing rain"
 msgstr "Freezing rain"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:214
+#: ../calendar/backends/weather/e-cal-backend-weather.c:214
 msgid "Haze"
 msgstr "Haze"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:215
+#: ../calendar/backends/weather/e-cal-backend-weather.c:215
 msgid "Blowing snow"
 msgstr "Blowing snow"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:216
+#: ../calendar/backends/weather/e-cal-backend-weather.c:216
 msgid "Freezing drizzle"
 msgstr "Freezing drizzle"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:217
+#: ../calendar/backends/weather/e-cal-backend-weather.c:217
 msgid "Very cold/wind chill"
 msgstr "Very cold/wind chill"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:218
+#: ../calendar/backends/weather/e-cal-backend-weather.c:218
 msgid "Rain"
 msgstr "Rain"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:228
-#: calendar/backends/weather/e-cal-backend-weather.c:236
-#: calendar/backends/weather/e-cal-backend-weather.c:238
-#: calendar/backends/weather/e-cal-backend-weather.c:245
+#: ../calendar/backends/weather/e-cal-backend-weather.c:228
+#: ../calendar/backends/weather/e-cal-backend-weather.c:236
+#: ../calendar/backends/weather/e-cal-backend-weather.c:238
+#: ../calendar/backends/weather/e-cal-backend-weather.c:245
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:229
-#: calendar/backends/weather/e-cal-backend-weather.c:230
-#: calendar/backends/weather/e-cal-backend-weather.c:246
-#: calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:229
+#: ../calendar/backends/weather/e-cal-backend-weather.c:230
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:231
+#: ../calendar/backends/weather/e-cal-backend-weather.c:231
 msgid "Weather: Partly Cloudy"
 msgstr "Weather: Partly Cloudy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:232
-#: calendar/backends/weather/e-cal-backend-weather.c:237
-#: calendar/backends/weather/e-cal-backend-weather.c:242
-#: calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:232
+#: ../calendar/backends/weather/e-cal-backend-weather.c:237
+#: ../calendar/backends/weather/e-cal-backend-weather.c:242
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
 msgid "Weather: Fog"
 msgstr "Weather: Foggy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:233
+#: ../calendar/backends/weather/e-cal-backend-weather.c:233
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:234
-#: calendar/backends/weather/e-cal-backend-weather.c:239
+#: ../calendar/backends/weather/e-cal-backend-weather.c:234
+#: ../calendar/backends/weather/e-cal-backend-weather.c:239
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:235
-#: calendar/backends/weather/e-cal-backend-weather.c:241
-#: calendar/backends/weather/e-cal-backend-weather.c:243
-#: calendar/backends/weather/e-cal-backend-weather.c:244
-#: calendar/backends/weather/e-cal-backend-weather.c:247
-#: calendar/backends/weather/e-cal-backend-weather.c:250
-#: calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:235
+#: ../calendar/backends/weather/e-cal-backend-weather.c:241
+#: ../calendar/backends/weather/e-cal-backend-weather.c:243
+#: ../calendar/backends/weather/e-cal-backend-weather.c:244
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Rain"
 msgstr "Weather: Rain"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:327
+#: ../calendar/backends/weather/e-cal-backend-weather.c:327
 #, c-format
 msgid "%.1f°C - %s"
 msgstr "%.1f°C - %s"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:329
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
 #, c-format
 msgid "%.1f°F - %s"
 msgstr "%.1f°F - %s"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:332
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
 #, c-format
 msgid "%.1f/%.1f°C - %s"
 msgstr "%.1f/%.1f°C - %s"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:334
+#: ../calendar/backends/weather/e-cal-backend-weather.c:334
 #, c-format
 msgid "%.1f/%.1f°F - %s"
 msgstr "%.1f/%.1f°F - %s"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:340
+#: ../calendar/backends/weather/e-cal-backend-weather.c:340
 #, c-format
 msgid "%d%% chance of precipitation\n"
 msgstr "%d%% chance of precipitation\n"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:347
+#: ../calendar/backends/weather/e-cal-backend-weather.c:347
 #, c-format
 msgid "%.1fcm snow\n"
 msgstr "%.1fcm snow\n"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:349
+#: ../calendar/backends/weather/e-cal-backend-weather.c:349
 #, c-format
 msgid "%.1fin snow\n"
 msgstr "%.1fin snow\n"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:352
+#: ../calendar/backends/weather/e-cal-backend-weather.c:352
 #, c-format
 msgid "%.1f-%.1fcm snow\n"
 msgstr "%.1f-%.1fcm snow\n"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:354
+#: ../calendar/backends/weather/e-cal-backend-weather.c:354
 #, c-format
 msgid "%.1f-%.1fin snow\n"
 msgstr "%.1f-%.1fin snow\n"
 
-#: calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal-component.c:1314
 msgid "Untitled appointment"
 msgstr "Untitled appointment"
 
-#: calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "1st"
 msgstr "1st"
 
-#: calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "2nd"
 msgstr "2nd"
 
-#: calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "3rd"
 msgstr "3rd"
 
-#: calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4017
 msgid "4th"
 msgstr "4th"
 
-#: calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4018
 msgid "5th"
 msgstr "5th"
 
-#: calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4019
 msgid "6th"
 msgstr "6th"
 
-#: calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4020
 msgid "7th"
 msgstr "7th"
 
-#: calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4021
 msgid "8th"
 msgstr "8th"
 
-#: calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4022
 msgid "9th"
 msgstr "9th"
 
-#: calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4023
 msgid "10th"
 msgstr "10th"
 
-#: calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4024
 msgid "11th"
 msgstr "11th"
 
-#: calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4025
 msgid "12th"
 msgstr "12th"
 
-#: calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4026
 msgid "13th"
 msgstr "13th"
 
-#: calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4027
 msgid "14th"
 msgstr "14th"
 
-#: calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4028
 msgid "15th"
 msgstr "15th"
 
-#: calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4029
 msgid "16th"
 msgstr "16th"
 
-#: calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4030
 msgid "17th"
 msgstr "17th"
 
-#: calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4031
 msgid "18th"
 msgstr "18th"
 
-#: calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4032
 msgid "19th"
 msgstr "19th"
 
-#: calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4033
 msgid "20th"
 msgstr "20th"
 
-#: calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4034
 msgid "21st"
 msgstr "21st"
 
-#: calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4035
 msgid "22nd"
 msgstr "22nd"
 
-#: calendar/libecal/e-cal-recur.c:4018
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "23rd"
 msgstr "23rd"
 
-#: calendar/libecal/e-cal-recur.c:4019
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "24th"
 msgstr "24th"
 
-#: calendar/libecal/e-cal-recur.c:4020
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "25th"
 msgstr "25th"
 
-#: calendar/libecal/e-cal-recur.c:4021
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "26th"
 msgstr "26th"
 
-#: calendar/libecal/e-cal-recur.c:4022
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "27th"
 msgstr "27th"
 
-#: calendar/libecal/e-cal-recur.c:4023
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "28th"
 msgstr "28th"
 
-#: calendar/libecal/e-cal-recur.c:4024
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "29th"
 msgstr "29th"
 
-#: calendar/libecal/e-cal-recur.c:4025
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "30th"
 msgstr "30th"
 
-#: calendar/libecal/e-cal-recur.c:4026
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "31st"
 msgstr "31st"
 
-#: calendar/libecal/e-cal-util.c:635 calendar/libecal/e-cal-util.c:657
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:708
 msgid "High"
 msgstr "High"
 
-#: calendar/libecal/e-cal-util.c:637 calendar/libecal/e-cal-util.c:659
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/libecal/e-cal-util.c:639 calendar/libecal/e-cal-util.c:661
+#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
 msgid "Low"
 msgstr "Low"
 
 #. An empty string is the same as 'None'.
-#: calendar/libecal/e-cal-util.c:655
+#: ../calendar/libecal/e-cal-util.c:706
 msgid "Undefined"
 msgstr "Undefined"
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1552 libedataserverui/e-book-auth-util.c:192
+#: ../calendar/libecal/e-cal.c:1590 ../libedataserverui/e-book-auth-util.c:192
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
 
-#: calendar/libecal/e-cal.c:4536
+#: ../calendar/libecal/e-cal.c:4822
 msgid "Invalid argument"
 msgstr "Invalid argument"
 
-#: calendar/libecal/e-cal.c:4538
+#: ../calendar/libecal/e-cal.c:4824
 msgid "Backend is busy"
 msgstr "Backend is busy"
 
-#: calendar/libecal/e-cal.c:4540
+#: ../calendar/libecal/e-cal.c:4826
 msgid "Repository is offline"
 msgstr "Repository is offline"
 
-#: calendar/libecal/e-cal.c:4542
+#: ../calendar/libecal/e-cal.c:4828
 msgid "No such calendar"
 msgstr "No such calendar"
 
-#: calendar/libecal/e-cal.c:4544 servers/groupwise/e-gw-connection.c:165
+#: ../calendar/libecal/e-cal.c:4830 ../servers/groupwise/e-gw-connection.c:165
 msgid "Object not found"
 msgstr "Object not found"
 
-#: calendar/libecal/e-cal.c:4546 servers/groupwise/e-gw-connection.c:159
+#: ../calendar/libecal/e-cal.c:4832 ../servers/groupwise/e-gw-connection.c:159
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: calendar/libecal/e-cal.c:4548
+#: ../calendar/libecal/e-cal.c:4834
 msgid "URI not loaded"
 msgstr "URI not loaded"
 
-#: calendar/libecal/e-cal.c:4550
+#: ../calendar/libecal/e-cal.c:4836
 msgid "URI already loaded"
 msgstr "URI already loaded"
 
-#: calendar/libecal/e-cal.c:4552
+#: ../calendar/libecal/e-cal.c:4838
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: calendar/libecal/e-cal.c:4554 servers/groupwise/e-gw-connection.c:167
+#: ../calendar/libecal/e-cal.c:4840 ../servers/groupwise/e-gw-connection.c:167
 msgid "Unknown User"
 msgstr "Unknown User"
 
-#: calendar/libecal/e-cal.c:4556
+#: ../calendar/libecal/e-cal.c:4842
 msgid "Object ID already exists"
 msgstr "Object ID already exists"
 
-#: calendar/libecal/e-cal.c:4558
+#: ../calendar/libecal/e-cal.c:4844
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: calendar/libecal/e-cal.c:4560
+#: ../calendar/libecal/e-cal.c:4846
 msgid "Operation has been cancelled"
 msgstr "Operation has been canceled"
 
-#: calendar/libecal/e-cal.c:4562
+#: ../calendar/libecal/e-cal.c:4848
 msgid "Could not cancel operation"
 msgstr "Could not cancel operation"
 
-#: calendar/libecal/e-cal.c:4566
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: ../calendar/libecal/e-cal.c:4852
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: calendar/libecal/e-cal.c:4568
+#: ../calendar/libecal/e-cal.c:4854
 msgid "A CORBA exception has occurred"
 msgstr "A CORBA exception has occurred"
 
-#: calendar/libecal/e-cal.c:4570 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:404
-#: camel/providers/imap4/camel-imap4-store.c:376
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
-#: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:173
+#: ../calendar/libecal/e-cal.c:4856
+#: ../camel/providers/imap/camel-imap-command.c:304
+#: ../camel/providers/imap/camel-imap-command.c:404
+#: ../camel/providers/imap4/camel-imap4-store.c:376
+#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../servers/groupwise/e-gw-connection.c:173
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: calendar/libecal/e-cal.c:4572
+#: ../calendar/libecal/e-cal.c:4858
 msgid "No error"
 msgstr "No error"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:54
-#: calendar/libedata-cal/e-cal-backend-sexp.c:533
-#: calendar/libedata-cal/e-cal-backend-sexp.c:726
-#: calendar/libedata-cal/e-cal-backend-sexp.c:753
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:65
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:769
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:796
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" expects no arguments"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:79
-#: calendar/libedata-cal/e-cal-backend-sexp.c:173
-#: calendar/libedata-cal/e-cal-backend-sexp.c:207
-#: calendar/libedata-cal/e-cal-backend-sexp.c:243
-#: calendar/libedata-cal/e-cal-backend-sexp.c:791
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:98
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:208
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:250
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:286
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:834
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" expects one argument"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: calendar/libedata-cal/e-cal-backend-sexp.c:92
-#: calendar/libedata-cal/e-cal-backend-sexp.c:249
-#: calendar/libedata-cal/e-cal-backend-sexp.c:477
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:104
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:111
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:520
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" expects the first argument to be a string"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:131
-#: calendar/libedata-cal/e-cal-backend-sexp.c:316
-#: calendar/libedata-cal/e-cal-backend-sexp.c:471
-#: calendar/libedata-cal/e-cal-backend-sexp.c:565
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:158
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:359
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:608
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" expects two arguments"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:137
-#: calendar/libedata-cal/e-cal-backend-sexp.c:179
-#: calendar/libedata-cal/e-cal-backend-sexp.c:213
-#: calendar/libedata-cal/e-cal-backend-sexp.c:322
-#: calendar/libedata-cal/e-cal-backend-sexp.c:571
-#: calendar/libedata-cal/e-cal-backend-sexp.c:797
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:164
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:214
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:614
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:840
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" expects the first argument to be a time_t"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:145
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:172
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" expects the second argument to be an integer"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:330
-#: calendar/libedata-cal/e-cal-backend-sexp.c:579
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:373
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:622
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" expects the second argument to be a time_t"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:485
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:528
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" expects the second argument to be a string"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:505
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:548
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1182,12 +1187,12 @@ msgstr ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:628
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:671
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" expects at least one argument"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:642
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:685
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1196,56 +1201,56 @@ msgstr ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 
-#: camel/camel-cipher-context.c:103
+#: ../camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "Signing is not supported by this cipher"
 
-#: camel/camel-cipher-context.c:129
+#: ../camel/camel-cipher-context.c:129
 msgid "Signing message"
 msgstr "Signing message"
 
-#: camel/camel-cipher-context.c:146
+#: ../camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifying is not supported by this cipher"
 
-#: camel/camel-cipher-context.c:172
+#: ../camel/camel-cipher-context.c:172
 msgid "Verifying message"
 msgstr "Verifying message"
 
-#: camel/camel-cipher-context.c:190
+#: ../camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "Encryption is not supported by this cipher"
 
-#: camel/camel-cipher-context.c:216
+#: ../camel/camel-cipher-context.c:216
 msgid "Encrypting message"
 msgstr "Encrypting message"
 
-#: camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "Decryption is not supported by this cipher"
 
-#: camel/camel-cipher-context.c:255
+#: ../camel/camel-cipher-context.c:255
 msgid "Decrypting message"
 msgstr "Decrypting message"
 
-#: camel/camel-cipher-context.c:272
+#: ../camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "You may not import keys with this cipher"
 
-#: camel/camel-cipher-context.c:302
+#: ../camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "You may not export keys with this cipher"
 
-#: camel/camel-data-cache.c:134
+#: ../camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr "Unable to create cache path"
 
-#: camel/camel-data-cache.c:376
+#: ../camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Could not remove cache entry: %s: %s"
 
-#: camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1256,7 +1261,7 @@ msgstr ""
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 
-#: camel/camel-disco-diary.c:258
+#: ../camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -1267,120 +1272,120 @@ msgstr ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 
-#: camel/camel-disco-diary.c:294
+#: ../camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "Resynchronizing with server"
 
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:51
+#: ../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "Copy folder content locally for offline operation"
 
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:110
+#: ../camel/camel-disco-folder.c:104 ../camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
-#: camel/camel-disco-folder.c:467
+#: ../camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparing folder '%s' for offline"
 
-#: camel/camel-disco-store.c:405
+#: ../camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "You must be working online to complete this operation"
 
-#: camel/camel-filter-driver.c:701 camel/camel-filter-search.c:523
+#: ../camel/camel-filter-driver.c:701 ../camel/camel-filter-search.c:523
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Failed to create pipe to '%s': %s"
 
-#: camel/camel-filter-driver.c:745
+#: ../camel/camel-filter-driver.c:745
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Failed to create child process '%s': %s"
 
-#: camel/camel-filter-driver.c:788
+#: ../camel/camel-filter-driver.c:788
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Invalid message stream received from %s: %s"
 
-#: camel/camel-filter-driver.c:977 camel/camel-filter-driver.c:986
+#: ../camel/camel-filter-driver.c:977 ../camel/camel-filter-driver.c:986
 msgid "Syncing folders"
 msgstr "Syncing folders"
 
-#: camel/camel-filter-driver.c:1075 camel/camel-filter-driver.c:1453
+#: ../camel/camel-filter-driver.c:1075 ../camel/camel-filter-driver.c:1453
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error parsing filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1084 camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1084 ../camel/camel-filter-driver.c:1462
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error executing filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1151
+#: ../camel/camel-filter-driver.c:1151
 msgid "Unable to open spool folder"
 msgstr "Unable to open spool folder"
 
-#: camel/camel-filter-driver.c:1160
+#: ../camel/camel-filter-driver.c:1160
 msgid "Unable to process spool folder"
 msgstr "Unable to process spool folder"
 
-#: camel/camel-filter-driver.c:1175
+#: ../camel/camel-filter-driver.c:1175
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Getting message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1179
+#: ../camel/camel-filter-driver.c:1179
 msgid "Cannot open message"
 msgstr "Cannot open message"
 
-#: camel/camel-filter-driver.c:1180 camel/camel-filter-driver.c:1192
+#: ../camel/camel-filter-driver.c:1180 ../camel/camel-filter-driver.c:1192
 #, c-format
 msgid "Failed on message %d"
 msgstr "Failed on message %d"
 
-#: camel/camel-filter-driver.c:1206 camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1206 ../camel/camel-filter-driver.c:1297
 msgid "Syncing folder"
 msgstr "Syncing folder"
 
-#: camel/camel-filter-driver.c:1210 camel/camel-filter-driver.c:1302
+#: ../camel/camel-filter-driver.c:1210 ../camel/camel-filter-driver.c:1302
 msgid "Complete"
 msgstr "Complete"
 
-#: camel/camel-filter-driver.c:1267
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Getting message %d of %d"
 
-#: camel/camel-filter-driver.c:1282
+#: ../camel/camel-filter-driver.c:1282
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Failed at message %d of %d"
 
-#: camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Failed to retrieve message"
 
-#: camel/camel-filter-search.c:396
+#: ../camel/camel-filter-search.c:396
 msgid "Invalid arguments to (system-flag)"
 msgstr "Invalid arguments to (system-flag)"
 
-#: camel/camel-filter-search.c:411
+#: ../camel/camel-filter-search.c:411
 msgid "Invalid arguments to (user-tag)"
 msgstr "Invalid arguments to (user-tag)"
 
-#: camel/camel-filter-search.c:559
+#: ../camel/camel-filter-search.c:559
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Failed to create create child process '%s': %s"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:682 camel/camel-filter-search.c:690
+#: ../camel/camel-filter-search.c:682 ../camel/camel-filter-search.c:690
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:478
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1389,7 +1394,7 @@ msgstr ""
 "Cannot parse search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:367 camel/camel-folder-search.c:488
+#: ../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:488
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1398,67 +1403,67 @@ msgstr ""
 "Error executing search expression: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:674 camel/camel-folder-search.c:707
+#: ../camel/camel-folder-search.c:674 ../camel/camel-folder-search.c:707
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) requires a single bool result"
 
-#: camel/camel-folder-search.c:757
+#: ../camel/camel-folder-search.c:757
 msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) not allowed inside match-all"
 
-#: camel/camel-folder-search.c:760 camel/camel-folder-search.c:764
+#: ../camel/camel-folder-search.c:760 ../camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requires a match type string"
 
-#: camel/camel-folder-search.c:786
+#: ../camel/camel-folder-search.c:786
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) expects an array result"
 
-#: camel/camel-folder-search.c:792
+#: ../camel/camel-folder-search.c:792
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) requires the folder set"
 
-#: camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:881
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
 
-#: camel/camel-folder.c:610
+#: ../camel/camel-folder.c:620
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Unsupported operation: append message: for %s"
 
-#: camel/camel-folder.c:1200
+#: ../camel/camel-folder.c:1242
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Unsupported operation: search by expression: for %s"
 
-#: camel/camel-folder.c:1240
+#: ../camel/camel-folder.c:1283
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Unsupported operation: search by uids: for %s"
 
-#: camel/camel-folder.c:1352
+#: ../camel/camel-folder.c:1399
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: camel/camel-folder.c:1352
+#: ../camel/camel-folder.c:1399
 msgid "Copying messages"
 msgstr "Copying messages"
 
-#: camel/camel-folder.c:1601
+#: ../camel/camel-folder.c:1653
 msgid "Learning junk"
 msgstr "Learning junk"
 
-#: camel/camel-folder.c:1618
+#: ../camel/camel-folder.c:1670
 msgid "Learning non-junk"
 msgstr "Learning non-junk"
 
-#: camel/camel-folder.c:1637
+#: ../camel/camel-folder.c:1689
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
-#: camel/camel-gpg-context.c:734
+#: ../camel/camel-gpg-context.c:734
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1469,15 +1474,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:748
+#: ../camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:772
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: camel/camel-gpg-context.c:786
+#: ../camel/camel-gpg-context.c:786
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1486,278 +1491,279 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:803 camel/camel-gpg-context.c:1000
-#: camel/providers/nntp/camel-nntp-store.c:1275
+#: ../camel/camel-gpg-context.c:803 ../camel/camel-gpg-context.c:1000
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: camel/camel-gpg-context.c:821
+#: ../camel/camel-gpg-context.c:821
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:879
+#: ../camel/camel-gpg-context.c:879
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
 #. always called on an i/o error
-#: camel/camel-gpg-context.c:1138 camel/camel-gpg-context.c:1262
-#: camel/camel-gpg-context.c:1687 camel/camel-gpg-context.c:1732
+#: ../camel/camel-gpg-context.c:1138 ../camel/camel-gpg-context.c:1262
+#: ../camel/camel-gpg-context.c:1687 ../camel/camel-gpg-context.c:1732
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1230 camel/camel-smime-context.c:389
+#: ../camel/camel-gpg-context.c:1230 ../camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1519 camel/camel-gpg-context.c:1534
-#: camel/camel-gpg-context.c:1623 camel/camel-gpg-context.c:1638
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1748
+#: ../camel/camel-gpg-context.c:1277 ../camel/camel-gpg-context.c:1437
+#: ../camel/camel-gpg-context.c:1519 ../camel/camel-gpg-context.c:1534
+#: ../camel/camel-gpg-context.c:1623 ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1703 ../camel/camel-gpg-context.c:1748
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1296
+#: ../camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1377 camel/camel-gpg-context.c:1383
-#: camel/camel-gpg-context.c:1389 camel/camel-smime-context.c:692
-#: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
+#: ../camel/camel-gpg-context.c:1377 ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-gpg-context.c:1389 ../camel/camel-smime-context.c:692
+#: ../camel/camel-smime-context.c:703 ../camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1423
+#: ../camel/camel-gpg-context.c:1423
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1502
+#: ../camel/camel-gpg-context.c:1502
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1552
+#: ../camel/camel-gpg-context.c:1552
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1603
+#: ../camel/camel-gpg-context.c:1603
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Failed to decrypt MIME part: protocol error"
 
-#: camel/camel-gpg-context.c:1645 camel/camel-smime-context.c:966
+#: ../camel/camel-gpg-context.c:1645 ../camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1664
+#: ../camel/camel-gpg-context.c:1664
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-gpg-context.c:1688 camel/camel-gpg-context.c:1733
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1550
-#: camel/providers/imap4/camel-imap4-engine.c:1589
-#: camel/providers/imap4/camel-imap4-engine.c:1634
-#: camel/providers/imap4/camel-imap4-engine.c:1690
-#: camel/providers/imap4/camel-imap4-store.c:1434
-#: camel/providers/imap4/camel-imap4-utils.c:575
-#: camel/providers/smtp/camel-smtp-transport.c:163
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/camel-gpg-context.c:1688 ../camel/camel-gpg-context.c:1733
+#: ../camel/camel-tcp-stream-openssl.c:631
+#: ../camel/providers/imap4/camel-imap4-engine.c:1550
+#: ../camel/providers/imap4/camel-imap4-engine.c:1589
+#: ../camel/providers/imap4/camel-imap4-engine.c:1634
+#: ../camel/providers/imap4/camel-imap4-engine.c:1690
+#: ../camel/providers/imap4/camel-imap4-store.c:1434
+#: ../camel/providers/imap4/camel-imap4-utils.c:575
+#: ../camel/providers/smtp/camel-smtp-transport.c:163
+#: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Unknown"
 
-#: camel/camel-lock-client.c:100
+#: ../camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Cannot build locking helper pipe: %s"
 
-#: camel/camel-lock-client.c:113
+#: ../camel/camel-lock-client.c:113
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Cannot fork locking helper: %s"
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: ../camel/camel-lock-client.c:191 ../camel/camel-lock-client.c:214
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "Could not lock '%s': protocol error with lock-helper"
 
-#: camel/camel-lock-client.c:204
+#: ../camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: ../camel/camel-lock.c:92 ../camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Could not create lock file for %s: %s"
 
-#: camel/camel-lock.c:154
+#: ../camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Timed out trying to get lock file on %s. Try again later."
 
-#: camel/camel-lock.c:209
+#: ../camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Failed to get lock using fcntl(2): %s"
 
-#: camel/camel-lock.c:272
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Failed to get lock using flock(2): %s"
 
-#: camel/camel-movemail.c:104
+#: ../camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Could not check mail file %s: %s"
 
-#: camel/camel-movemail.c:117
+#: ../camel/camel-movemail.c:117
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Could not open mail file %s: %s"
 
-#: camel/camel-movemail.c:125
+#: ../camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Could not open temporary mail file %s: %s"
 
-#: camel/camel-movemail.c:154
+#: ../camel/camel-movemail.c:154
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Failed to store mail in temp file %s: %s"
 
-#: camel/camel-movemail.c:184
+#: ../camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Could not create pipe: %s"
 
-#: camel/camel-movemail.c:196
+#: ../camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Could not fork: %s"
 
-#: camel/camel-movemail.c:234
+#: ../camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail program failed: %s"
 
-#: camel/camel-movemail.c:235
+#: ../camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(Unknown error)"
 
-#: camel/camel-movemail.c:258
+#: ../camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error reading mail file: %s"
 
-#: camel/camel-movemail.c:269
+#: ../camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error writing mail temp file: %s"
 
-#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
+#: ../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Error copying mail temp file: %s"
 
-#: camel/camel-multipart-signed.c:587
+#: ../camel/camel-multipart-signed.c:598
 msgid "parse error"
 msgstr "parse error"
 
-#: camel/camel-net-utils.c:446 camel/camel-net-utils.c:608
-#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:448
-#: camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/camel-net-utils.c:446 ../camel/camel-net-utils.c:608
+#: ../camel/camel-net-utils.c:739
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:529
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: camel/camel-net-utils.c:465
+#: ../camel/camel-net-utils.c:465
 msgid "cannot create thread"
 msgstr "cannot create thread"
 
-#: camel/camel-net-utils.c:612
+#: ../camel/camel-net-utils.c:612
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: camel/camel-net-utils.c:634
+#: ../camel/camel-net-utils.c:634
 msgid "Host lookup failed"
 msgstr "Host lookup failed"
 
-#: camel/camel-net-utils.c:636
+#: ../camel/camel-net-utils.c:636
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Host lookup failed: %s: %s"
 
-#: camel/camel-net-utils.c:743
+#: ../camel/camel-net-utils.c:743
 msgid "Resolving address"
 msgstr "Resolving address"
 
-#: camel/camel-net-utils.c:763
+#: ../camel/camel-net-utils.c:763
 msgid "Name lookup failed"
 msgstr "Name lookup failed"
 
-#: camel/camel-net-utils.c:766
+#: ../camel/camel-net-utils.c:766
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Name lookup failed: %s"
 
-#: camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Syncing messages in folder '%s' to disk"
 
-#: camel/camel-offline-journal.c:141 camel/camel-offline-journal.c:164
+#: ../camel/camel-offline-journal.c:165 ../camel/camel-offline-journal.c:188
 #, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
 msgstr "Cannot write offline journal for folder `%s': %s"
 
-#: camel/camel-provider.c:59
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "Virtual folder email provider"
 
-#: camel/camel-provider.c:61
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "For reading mail as a query of another set of folders"
 
-#: camel/camel-provider.c:185
+#: ../camel/camel-provider.c:185
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Could not load %s: Module loading not supported on this system."
 
-#: camel/camel-provider.c:194
+#: ../camel/camel-provider.c:194
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Could not load %s: %s"
 
-#: camel/camel-provider.c:202
+#: ../camel/camel-provider.c:202
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Could not load %s: No initialization code in module."
 
-#: camel/camel-provider.c:374 camel/camel-session.c:161
+#: ../camel/camel-provider.c:374 ../camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No provider available for protocol `%s'"
 
-#: camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "This option will connect to the server using an anonymous login."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
+#: ../camel/camel-sasl-anonymous.c:122 ../camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: camel/camel-sasl-anonymous.c:121
+#: ../camel/camel-sasl-anonymous.c:131
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1766,7 +1772,7 @@ msgstr ""
 "Invalid email address trace information:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:143
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1775,7 +1781,7 @@ msgstr ""
 "Invalid opaque trace information:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:155
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1784,11 +1790,11 @@ msgstr ""
 "Invalid trace information:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:36
+#: ../camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:38
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1796,11 +1802,11 @@ msgstr ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 
-#: camel/camel-sasl-digest-md5.c:49
+#: ../camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:51
+#: ../camel/camel-sasl-digest-md5.c:51
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1808,40 +1814,40 @@ msgstr ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 
-#: camel/camel-sasl-digest-md5.c:819
+#: ../camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Server challenge too long (>2048 octets)"
 
-#: camel/camel-sasl-digest-md5.c:828
+#: ../camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge invalid\n"
 msgstr "Server challenge invalid\n"
 
-#: camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:834
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Server challenge contained invalid \"Quality of Protection\" token"
 
-#: camel/camel-sasl-digest-md5.c:864
+#: ../camel/camel-sasl-digest-md5.c:864
 msgid "Server response did not contain authorization data"
 msgstr "Server response did not contain authorization data"
 
-#: camel/camel-sasl-digest-md5.c:882
+#: ../camel/camel-sasl-digest-md5.c:882
 msgid "Server response contained incomplete authorization data"
 msgstr "Server response contained incomplete authorization data"
 
-#: camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:892
 msgid "Server response does not match"
 msgstr "Server response does not match"
 
-#: camel/camel-sasl-gssapi.c:57
+#: ../camel/camel-sasl-gssapi.c:57
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:59
+#: ../camel/camel-sasl-gssapi.c:59
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "This option will connect to the server using Kerberos 5 authentication."
 
-#: camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:157
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1849,11 +1855,11 @@ msgstr ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 
-#: camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The provided target_name parameter was ill-formed."
 msgstr "The provided target_name parameter was ill-formed."
 
-#: camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:165
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1861,7 +1867,7 @@ msgstr ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 
-#: camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:169
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1869,7 +1875,7 @@ msgstr ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 
-#: camel/camel-sasl-gssapi.c:174
+#: ../camel/camel-sasl-gssapi.c:174
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -1877,7 +1883,7 @@ msgstr ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 
-#: camel/camel-sasl-gssapi.c:178
+#: ../camel/camel-sasl-gssapi.c:178
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1885,43 +1891,43 @@ msgstr ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 
-#: camel/camel-sasl-gssapi.c:183
+#: ../camel/camel-sasl-gssapi.c:183
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "The supplied context handle did not refer to a valid context."
 
-#: camel/camel-sasl-gssapi.c:186
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The consistency checks performed on the input_token failed."
 msgstr "The consistency checks performed on the input_token failed."
 
-#: camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:189
 msgid "The consistency checks performed on the credential failed."
 msgstr "The consistency checks performed on the credential failed."
 
-#: camel/camel-sasl-gssapi.c:192
+#: ../camel/camel-sasl-gssapi.c:192
 msgid "The referenced credentials have expired."
 msgstr "The referenced credentials have expired."
 
-#: camel/camel-sasl-gssapi.c:198 camel/camel-sasl-gssapi.c:246
-#: camel/camel-sasl-gssapi.c:282 camel/camel-sasl-gssapi.c:297
-#: camel/camel-sasl-kerberos4.c:226
-#: camel/providers/imap/camel-imap-store.c:1245
+#: ../camel/camel-sasl-gssapi.c:198 ../camel/camel-sasl-gssapi.c:246
+#: ../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
+#: ../camel/camel-sasl-kerberos4.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1245
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
-#: camel/camel-sasl-gssapi.c:307
+#: ../camel/camel-sasl-gssapi.c:307
 msgid "Unsupported security layer."
 msgstr "Unsupported security layer."
 
-#: camel/camel-sasl-kerberos4.c:42
+#: ../camel/camel-sasl-kerberos4.c:42
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:44
+#: ../camel/camel-sasl-kerberos4.c:44
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "This option will connect to the server using Kerberos 4 authentication."
 
-#: camel/camel-sasl-kerberos4.c:169
+#: ../camel/camel-sasl-kerberos4.c:169
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -1930,23 +1936,23 @@ msgstr ""
 "Could not get Kerberos ticket:\n"
 "%s"
 
-#: camel/camel-sasl-login.c:33
+#: ../camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "Login"
 
-#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
+#: ../camel/camel-sasl-login.c:35 ../camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr "This option will connect to the server using a simple password."
 
-#: camel/camel-sasl-login.c:128
+#: ../camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "Unknown authentication state."
 
-#: camel/camel-sasl-ntlm.c:32
+#: ../camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:34
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -1954,51 +1960,51 @@ msgstr ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 
-#: camel/camel-sasl-plain.c:33
+#: ../camel/camel-sasl-plain.c:33
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:37
+#: ../camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "This option will authorise a POP connection before attempting SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:104
+#: ../camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "POP Source URI"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: ../camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP Before SMTP auth using an unknown transport"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: ../camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Before SMTP auth using a non-pop source"
 
-#: camel/camel-search-private.c:151
+#: ../camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: camel/camel-service.c:272
+#: ../camel/camel-service.c:272
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: camel/camel-service.c:276
+#: ../camel/camel-service.c:276
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: camel/camel-service.c:280
+#: ../camel/camel-service.c:280
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: camel/camel-session.c:283
+#: ../camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2007,369 +2013,369 @@ msgstr ""
 "Could not create directory %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:231
+#: ../camel/camel-smime-context.c:231
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Cannot find certificate for '%s'"
 
-#: camel/camel-smime-context.c:237
+#: ../camel/camel-smime-context.c:237
 msgid "Cannot create CMS message"
 msgstr "Cannot create CMS message"
 
-#: camel/camel-smime-context.c:242
+#: ../camel/camel-smime-context.c:242
 msgid "Cannot create CMS signed data"
 msgstr "Cannot create CMS signed data"
 
-#: camel/camel-smime-context.c:248
+#: ../camel/camel-smime-context.c:248
 msgid "Cannot attach CMS signed data"
 msgstr "Cannot attach CMS signed data"
 
-#: camel/camel-smime-context.c:255
+#: ../camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr "Cannot attach CMS data"
 
-#: camel/camel-smime-context.c:261
+#: ../camel/camel-smime-context.c:261
 msgid "Cannot create CMS Signer information"
 msgstr "Cannot create CMS Signer information"
 
-#: camel/camel-smime-context.c:267
+#: ../camel/camel-smime-context.c:267
 msgid "Cannot find certificate chain"
 msgstr "Cannot find certificate chain"
 
-#: camel/camel-smime-context.c:273
+#: ../camel/camel-smime-context.c:273
 msgid "Cannot add CMS Signing time"
 msgstr "Cannot add CMS Signing time"
 
-#: camel/camel-smime-context.c:295 camel/camel-smime-context.c:307
+#: ../camel/camel-smime-context.c:295 ../camel/camel-smime-context.c:307
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Encryption certificate for '%s' does not exist"
 
-#: camel/camel-smime-context.c:314
+#: ../camel/camel-smime-context.c:314
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add SMIMEEncKeyPrefs attribute"
 
-#: camel/camel-smime-context.c:319
+#: ../camel/camel-smime-context.c:319
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
-#: camel/camel-smime-context.c:324
+#: ../camel/camel-smime-context.c:324
 msgid "Cannot add encryption certificate"
 msgstr "Cannot add encryption certificate"
 
-#: camel/camel-smime-context.c:330
+#: ../camel/camel-smime-context.c:330
 msgid "Cannot add CMS Signer information"
 msgstr "Cannot add CMS Signer information"
 
-#: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:400 ../camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
-#: camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:406
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:411 camel/camel-smime-context.c:865
+#: ../camel/camel-smime-context.c:411 ../camel/camel-smime-context.c:865
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
-#: camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:484
 msgid "Unverified"
 msgstr "Unverified"
 
-#: camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:486
 msgid "Good signature"
 msgstr "Good signature"
 
-#: camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:488
 msgid "Bad signature"
 msgstr "Bad signature"
 
-#: camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:490
 msgid "Content tampered with or altered in transit"
 msgstr "Content tampered with or altered in transit"
 
-#: camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:492
 msgid "Signing certificate not found"
 msgstr "Signing certificate not found"
 
-#: camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:494
 msgid "Signing certificate not trusted"
 msgstr "Signing certificate not trusted"
 
-#: camel/camel-smime-context.c:496
+#: ../camel/camel-smime-context.c:496
 msgid "Signature algorithm unknown"
 msgstr "Signature algorithm unknown"
 
-#: camel/camel-smime-context.c:498
+#: ../camel/camel-smime-context.c:498
 msgid "Signature algorithm unsupported"
 msgstr "Siganture algorithm unsupported"
 
-#: camel/camel-smime-context.c:500
+#: ../camel/camel-smime-context.c:500
 msgid "Malformed signature"
 msgstr "Malformed signature"
 
-#: camel/camel-smime-context.c:502
+#: ../camel/camel-smime-context.c:502
 msgid "Processing error"
 msgstr "Processing error"
 
-#: camel/camel-smime-context.c:539
+#: ../camel/camel-smime-context.c:539
 msgid "No signed data in signature"
 msgstr "No signed data in signature"
 
-#: camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:546
 msgid "Digests missing from enveloped data"
 msgstr "Digests missing from enveloped data"
 
-#: camel/camel-smime-context.c:559 camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:559 ../camel/camel-smime-context.c:569
 msgid "Cannot calculate digests"
 msgstr "Cannot calculate digests"
 
-#: camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:574
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:584 camel/camel-smime-context.c:589
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:589
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: camel/camel-smime-context.c:599
+#: ../camel/camel-smime-context.c:599
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Certificate is the only message; cannot verify certificates"
 
-#: camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:602
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Certificate is the only message; certificates imported and verified"
 
-#: camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot find signature digests"
 msgstr "Cannot find signature digests"
 
-#: camel/camel-smime-context.c:622
+#: ../camel/camel-smime-context.c:622
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:723
+#: ../camel/camel-smime-context.c:723
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: camel/camel-smime-context.c:775
+#: ../camel/camel-smime-context.c:775
 #, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "Cannot find certificate for `%s'"
 
-#: camel/camel-smime-context.c:782
+#: ../camel/camel-smime-context.c:782
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Cannot find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:791
+#: ../camel/camel-smime-context.c:791
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Cannot allocate slot for encryption bulk key"
 
-#: camel/camel-smime-context.c:802
+#: ../camel/camel-smime-context.c:802
 msgid "Cannot create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: camel/camel-smime-context.c:808
+#: ../camel/camel-smime-context.c:808
 msgid "Cannot create CMS Enveloped data"
 msgstr "Cannot create CMS Enveloped data"
 
-#: camel/camel-smime-context.c:814
+#: ../camel/camel-smime-context.c:814
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Cannot attach CMS Enveloped data"
 
-#: camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:820
 msgid "Cannot attach CMS data object"
 msgstr "Cannot attach CMS data object"
 
-#: camel/camel-smime-context.c:829
+#: ../camel/camel-smime-context.c:829
 msgid "Cannot create CMS Recipient information"
 msgstr "Cannot create CMS Recipient information"
 
-#: camel/camel-smime-context.c:834
+#: ../camel/camel-smime-context.c:834
 msgid "Cannot add CMS Recipient information"
 msgstr "Cannot add CMS Recipient information"
 
-#: camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:859
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: camel/camel-smime-context.c:946
+#: ../camel/camel-smime-context.c:946
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder failed, error %d"
 
-#: camel/camel-smime-context.c:953
+#: ../camel/camel-smime-context.c:953
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: camel/camel-smime-context.c:980
+#: ../camel/camel-smime-context.c:980
 msgid "import keys: unimplemented"
 msgstr "import keys: unimplemented"
 
-#: camel/camel-smime-context.c:988
+#: ../camel/camel-smime-context.c:988
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
-#: camel/camel-store.c:214
+#: ../camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Cannot get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:244
+#: ../camel/camel-store.c:246
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Cannot create folder `%s': folder exists"
 
-#: camel/camel-store.c:298
+#: ../camel/camel-store.c:300
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:326
+#: ../camel/camel-store.c:328
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:390 camel/camel-vee-store.c:367
-#: camel/providers/local/camel-maildir-store.c:217
+#: ../camel/camel-store.c:392 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:217
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:440 camel/camel-vee-store.c:404
-#: camel/providers/local/camel-maildir-store.c:289
+#: ../camel/camel-store.c:442 ../camel/camel-vee-store.c:404
+#: ../camel/providers/local/camel-maildir-store.c:289
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
 
 #. the name of the Trash folder, used for deleted messages
-#: camel/camel-store.c:779 camel/camel-vtrash-folder.c:47
+#: ../camel/camel-store.c:781 ../camel/camel-vtrash-folder.c:47
 msgid "Trash"
 msgstr "Trash"
 
 #. the name of the Junk folder, used for spam messages
-#: camel/camel-store.c:782 camel/camel-vtrash-folder.c:49
+#: ../camel/camel-store.c:784 ../camel/camel-vtrash-folder.c:49
 msgid "Junk"
 msgstr "Junk"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: ../camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Unable to get issuer's certificate"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: ../camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr "Unable to get Certificate Revocation List"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr "Unable to decrypt certificate signature"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "Unable to decrypt Certificate Revocation List signature"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr "Unable to decode issuer's public key"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Certificate Revocation List signature failure"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Certificate not yet valid"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "CRL not yet valid"
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: ../camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Error in CRL"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: ../camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Zero-depth self-signed certificate"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Self-signed certificate in chain"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr "Unable to get issuer's certificate locally"
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Unable to verify leaf signature"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Certificate Revoked"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Invalid Certificate Authority (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Path length exceeded"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Invalid purpose"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Certificate untrusted"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: ../camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Subject/Issuer mismatch"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: ../camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID mismatch"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Issuer serial mismatch"
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr "Key usage does not support certificate signing"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: ../camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
+#: ../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2382,15 +2388,15 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
+#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
 msgid "BAD"
 msgstr "BAD"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: ../camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2410,7 +2416,7 @@ msgstr ""
 "Do you wish to accept anyway?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:837
+#: ../camel/camel-tcp-stream-ssl.c:843
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2425,7 +2431,7 @@ msgstr ""
 "\n"
 "Do you wish to accept?"
 
-#: camel/camel-tcp-stream-ssl.c:881
+#: ../camel/camel-tcp-stream-ssl.c:887
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2434,7 +2440,7 @@ msgstr ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:933
+#: ../camel/camel-tcp-stream-ssl.c:939
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2443,7 +2449,7 @@ msgstr ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:951
+#: ../camel/camel-tcp-stream-ssl.c:957
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2452,7 +2458,7 @@ msgstr ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:968
+#: ../camel/camel-tcp-stream-ssl.c:974
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2461,49 +2467,49 @@ msgstr ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-url.c:293
+#: ../camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Could not parse URL `%s'"
 
-#: camel/camel-vee-folder.c:476
+#: ../camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error storing `%s': %s"
 
-#: camel/camel-vee-folder.c:518
+#: ../camel/camel-vee-folder.c:518
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:643 camel/camel-vee-folder.c:649
+#: ../camel/camel-vee-folder.c:643 ../camel/camel-vee-folder.c:649
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#: camel/camel-vee-store.c:100 camel/camel-vee-store.c:343
+#: ../camel/camel-vee-store.c:100 ../camel/camel-vee-store.c:343
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: camel/camel-vee-store.c:390
+#: ../camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
 
-#: camel/camel-vtrash-folder.c:48
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Cannot copy messages to the Trash folder"
 
-#: camel/camel-vtrash-folder.c:50
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:112
-#: camel/providers/imap/camel-imap-folder.c:1980
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:113
+#: ../camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2512,242 +2518,239 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:112
-#: camel/providers/imap/camel-imap-folder.c:1980
-#: camel/providers/local/camel-maildir-folder.c:245
-#: camel/providers/local/camel-mbox-folder.c:340
-#: camel/providers/local/camel-mh-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:113
+#: ../camel/providers/imap/camel-imap-folder.c:1980
+#: ../camel/providers/local/camel-maildir-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:340
+#: ../camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:127
-#: camel/providers/imap4/camel-imap4-folder.c:787
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:233
-#: camel/providers/nntp/camel-nntp-folder.c:372
-#: camel/providers/pop3/camel-pop3-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:431
-#: camel/providers/pop3/camel-pop3-folder.c:492
-#: camel/providers/pop3/camel-pop3-folder.c:510
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
+#: ../camel/providers/imap4/camel-imap4-folder.c:787
+#: ../camel/providers/nntp/camel-nntp-folder.c:157
+#: ../camel/providers/nntp/camel-nntp-folder.c:233
+#: ../camel/providers/nntp/camel-nntp-folder.c:372
+#: ../camel/providers/pop3/camel-pop3-folder.c:263
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:492
+#: ../camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "User cancelled"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:132
-#: camel/providers/imap4/camel-imap4-folder.c:792
-#: camel/providers/nntp/camel-nntp-folder.c:148
-#: camel/providers/nntp/camel-nntp-folder.c:150
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/nntp/camel-nntp-folder.c:235
-#: camel/providers/pop3/camel-pop3-folder.c:434
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:513
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:134
+#: ../camel/providers/imap4/camel-imap4-folder.c:792
+#: ../camel/providers/nntp/camel-nntp-folder.c:148
+#: ../camel/providers/nntp/camel-nntp-folder.c:150
+#: ../camel/providers/nntp/camel-nntp-folder.c:159
+#: ../camel/providers/nntp/camel-nntp-folder.c:235
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:495
+#: ../camel/providers/pop3/camel-pop3-folder.c:502
+#: ../camel/providers/pop3/camel-pop3-folder.c:513
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:151
-#: camel/providers/imap4/camel-imap4-folder.c:810
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:151
+#: ../camel/providers/imap4/camel-imap4-folder.c:810
 msgid "This message is not available in offline mode."
 msgstr "This message is not available in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:179
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:175
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:198
 msgid "Could not get message"
 msgstr "Could not get message"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:600
-#: camel/providers/imap/camel-imap-folder.c:245
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:670
+#: ../camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:957
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1052
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Cannot create message: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:969
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1064
 #, c-format
 msgid "Cannot append message to folder `%s': %s"
 msgstr "Cannot append message to folder `%s': %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:283
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:283
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Cannot get folder container %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:347
-#: camel/providers/imap4/camel-imap4-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:347
+#: ../camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Cannot append message in offline mode: cache unavailable"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:363
-#: camel/providers/imap4/camel-imap4-journal.c:336
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:363
+#: ../camel/providers/imap4/camel-imap4-journal.c:336
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Cannot append message in offline mode: %s"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:51
-#: camel/providers/imap4/camel-imap4-provider.c:36
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 msgid "Check for new messages in all folders"
 msgstr "Check for new messages in all folders"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:56
-#: camel/providers/imap/camel-imap-provider.c:64
-#: camel/providers/imap4/camel-imap4-provider.c:56
-#: camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:79
-#: camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "Options"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:58
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Apply filters to new messages in Inbox on this server"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
 msgid "Check new messages for Junk contents"
 msgstr "Check new messages for Junk contents"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Only check for Junk messages in the INBOX folder"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
 msgid "Automatically synchronize account locally"
 msgstr "Automatically synchronize account locally"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "SOAP Settings"
 msgstr "SOAP Settings"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Post Office Agent SOAP Port:"
 msgstr "Post Office Agent SOAP Port:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
-#: camel/providers/imap/camel-imap-provider.c:96
-#: camel/providers/imap4/camel-imap4-provider.c:88
-#: camel/providers/imapp/camel-imapp-provider.c:66
-#: camel/providers/nntp/camel-nntp-provider.c:72
-#: camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:102
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imap4/camel-imap4-provider.c:88
+#: ../camel/providers/imapp/camel-imapp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "Password"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "This option will connect to the GroupWise server using a plaintext password."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:270
-msgid "Host or user not availbale in url"
-msgstr "Host or user in URL not available"
+#: ../camel/providers/groupwise/camel-groupwise-store.c:270
+msgid "Host or user not available in url"
+msgstr "Host or user not available in URL"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:361
+#: ../camel/providers/groupwise/camel-groupwise-store.c:365
 #, c-format
-msgid "%sPlease enter the Groupwise password for %s@%s"
-msgstr "%sPlease enter the Groupwise password for %s@%s"
+msgid "%sPlease enter the GroupWise password for %s@%s"
+msgstr "%sPlease enter the GroupWise password for %s@%s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:375
-#: camel/providers/imap/camel-imap-store.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:379
+#: ../camel/providers/imap/camel-imap-store.c:1324
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:389
+#: ../camel/providers/groupwise/camel-groupwise-store.c:393
 msgid "Unable to authenticate to GroupWise server."
 msgstr "Unable to authenticate to GroupWise server."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:430
+#: ../camel/providers/groupwise/camel-groupwise-store.c:434
 msgid "Some features may not work correctly with your current server version"
 msgstr "Some features may not work correctly with your current server version"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/imap/camel-imap-store.c:1875
-#: camel/providers/imap/camel-imap-store.c:2065
+#: ../camel/providers/groupwise/camel-groupwise-store.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1875
+#: ../camel/providers/imap/camel-imap-store.c:2065
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:618
-#: camel/providers/imap/camel-imap-folder.c:2288
-#: camel/providers/imap/camel-imap-folder.c:2358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:575
+#: ../camel/providers/imap/camel-imap-folder.c:2288
+#: ../camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/groupwise/camel-groupwise-store.c:712
 msgid "Cannot get folder info in offline mode."
 msgstr "Cannot get folder info in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:969
+#: ../camel/providers/groupwise/camel-groupwise-store.c:925
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Cannot create GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1020
+#: ../camel/providers/groupwise/camel-groupwise-store.c:976
 msgid "Cannot delete GroupWise folders in offline mode."
 msgstr "Cannot delete GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1066
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1022
 msgid "Cannot rename GroupWise folders in offline mode."
 msgstr "Cannot rename GroupWise folders in offline mode."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1084
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1041
 #, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
 msgstr "Cannot rename Groupwise folder `%s' to `%s'"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1077
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise server %s"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1122
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1079
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise service for %s on %s"
 
-#: camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
 #, c-format
-msgid "Groupwise server %s"
-msgstr "Groupwise server %s"
+msgid "GroupWise mail delivery via %s"
+msgstr "GroupWise mail delivery via %s"
 
-#: camel/providers/groupwise/camel-groupwise-transport.c:123
-#, c-format
-msgid "Groupwise mail delivery via %s"
-msgstr "Groupwise mail delivery via %s"
-
-#: camel/providers/groupwise/camel-groupwise-transport.c:159
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
 msgid "Sending Message"
 msgstr "Sending Message"
 
-#: camel/providers/imap/camel-imap-command.c:219
-#: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:465
-#: camel/providers/imap/camel-imap-store.c:3240
+#: ../camel/providers/imap/camel-imap-command.c:219
+#: ../camel/providers/imap/camel-imap-command.c:258
+#: ../camel/providers/imap/camel-imap-command.c:465
+#: ../camel/providers/imap/camel-imap-store.c:3240
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-store.c:3243
+#: ../camel/providers/imap/camel-imap-command.c:303
+#: ../camel/providers/imap/camel-imap-store.c:3243
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
 #. for imap ALERT codes, account user@host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: camel/providers/imap/camel-imap-command.c:324
+#: ../camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -2756,286 +2759,286 @@ msgstr ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:393
+#: ../camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Unexpected response from IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:403
+#: ../camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP command failed: %s"
 
-#: camel/providers/imap/camel-imap-command.c:479
+#: ../camel/providers/imap/camel-imap-command.c:479
 msgid "Server response ended too soon."
 msgstr "Server response ended too soon."
 
-#: camel/providers/imap/camel-imap-command.c:686
+#: ../camel/providers/imap/camel-imap-command.c:686
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP server response did not contain %s information"
 
-#: camel/providers/imap/camel-imap-command.c:722
+#: ../camel/providers/imap/camel-imap-command.c:722
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unexpected OK response from IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:226
+#: ../camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Could not create directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:330
+#: ../camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1472
+#: ../camel/providers/imap/camel-imap-folder.c:573
+#: ../camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: ../camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2022
-#: camel/providers/imap/camel-imap-folder.c:2624
-#: camel/providers/nntp/camel-nntp-folder.c:221
+#: ../camel/providers/imap/camel-imap-folder.c:2022
+#: ../camel/providers/imap/camel-imap-folder.c:2624
+#: ../camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2465
+#: ../camel/providers/imap/camel-imap-folder.c:2465
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Incomplete server response: no information provided for message %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2473
+#: ../camel/providers/imap/camel-imap-folder.c:2473
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Incomplete server response: no UID provided for message %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2486
+#: ../camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 
-#: camel/providers/imap/camel-imap-folder.c:2662
+#: ../camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
-#: camel/providers/imap/camel-imap-message-cache.c:156
+#: ../camel/providers/imap/camel-imap-message-cache.c:156
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Could not open cache directory: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:253
-#: camel/providers/imap/camel-imap-message-cache.c:310
-#: camel/providers/imap/camel-imap-message-cache.c:341
-#: camel/providers/imap/camel-imap-message-cache.c:373
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#: ../camel/providers/imap/camel-imap-message-cache.c:310
+#: ../camel/providers/imap/camel-imap-message-cache.c:341
+#: ../camel/providers/imap/camel-imap-message-cache.c:373
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Failed to cache message %s: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Failed to cache %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Checking for New Mail"
 
-#: camel/providers/imap/camel-imap-provider.c:46
-#: camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/imap/camel-imap-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "C_heck for new messages in all folders"
 msgstr "C_heck for new messages in all folders"
 
-#: camel/providers/imap/camel-imap-provider.c:49
-#: camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap/camel-imap-provider.c:49
+#: ../camel/providers/imap4/camel-imap4-provider.c:41
 msgid "Connection to Server"
 msgstr "Connection to Server"
 
-#: camel/providers/imap/camel-imap-provider.c:51
-#: camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imap/camel-imap-provider.c:51
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
 msgid "_Use custom command to connect to server"
 msgstr "_Use custom command to connect to server"
 
-#: camel/providers/imap/camel-imap-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:53
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "Command:"
 msgstr "Command:"
 
-#: camel/providers/imap/camel-imap-provider.c:56
-#: camel/providers/imap4/camel-imap4-provider.c:48
-#: camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "Folders"
 
-#: camel/providers/imap/camel-imap-provider.c:58
-#: camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:50
 msgid "_Show only subscribed folders"
 msgstr "_Show only subscribed folders"
 
-#: camel/providers/imap/camel-imap-provider.c:60
-#: camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:52
 msgid "O_verride server-supplied folder namespace"
 msgstr "O_verride server-supplied folder namespace"
 
-#: camel/providers/imap/camel-imap-provider.c:62
-#: camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#: ../camel/providers/imap4/camel-imap4-provider.c:54
 msgid "Namespace"
 msgstr "Namespace"
 
-#: camel/providers/imap/camel-imap-provider.c:66
-#: camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imap4/camel-imap4-provider.c:58
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "_Apply filters to new messages in INBOX on this server"
 
-#: camel/providers/imap/camel-imap-provider.c:68
-#: camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imap4/camel-imap4-provider.c:60
 msgid "Check new messages for _Junk contents"
 msgstr "Check new messages for _Junk contents"
 
-#: camel/providers/imap/camel-imap-provider.c:70
-#: camel/providers/imap4/camel-imap4-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imap4/camel-imap4-provider.c:62
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr "Only check for Junk messa_ges in the INBOX folder"
 
-#: camel/providers/imap/camel-imap-provider.c:72
-#: camel/providers/imap4/camel-imap4-provider.c:64
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap4/camel-imap4-provider.c:64
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Automatically synchroni_ze remote mail locally"
 
-#: camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imap/camel-imap-provider.c:81
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-provider.c:98
-#: camel/providers/imapp/camel-imapp-provider.c:68
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "This option will connect to the IMAP server using a plaintext password."
 
-#: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:215
+#: ../camel/providers/imap/camel-imap-store.c:421
+#: ../camel/providers/imap4/camel-imap4-store.c:215
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:217
+#: ../camel/providers/imap/camel-imap-store.c:423
+#: ../camel/providers/imap4/camel-imap4-store.c:217
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap4/camel-imap4-store.c:322
-#: camel/providers/imap4/camel-imap4-store.c:337
-#: camel/providers/nntp/camel-nntp-store.c:200
-#: camel/providers/nntp/camel-nntp-store.c:215
-#: camel/providers/pop3/camel-pop3-store.c:169
-#: camel/providers/pop3/camel-pop3-store.c:184
-#: camel/providers/smtp/camel-smtp-transport.c:257
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/imap/camel-imap-store.c:553
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap4/camel-imap4-store.c:322
+#: ../camel/providers/imap4/camel-imap4-store.c:337
+#: ../camel/providers/nntp/camel-nntp-store.c:200
+#: ../camel/providers/nntp/camel-nntp-store.c:215
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:257
+#: ../camel/providers/smtp/camel-smtp-transport.c:272
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Could not connect to %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:554
-#: camel/providers/imap4/camel-imap4-store.c:323
-#: camel/providers/nntp/camel-nntp-store.c:201
-#: camel/providers/pop3/camel-pop3-store.c:170
-#: camel/providers/smtp/camel-smtp-transport.c:258
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imap4/camel-imap4-store.c:323
+#: ../camel/providers/nntp/camel-nntp-store.c:201
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
 msgid "SSL unavailable"
 msgstr "SSL unavailable"
 
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imap/camel-imap-store.c:835
-#: camel/providers/imap4/camel-imap4-store.c:270
-#: camel/providers/imap4/camel-imap4-store.c:334
-#: camel/providers/imapp/camel-imapp-store.c:248
-#: camel/providers/nntp/camel-nntp-store.c:212
-#: camel/providers/nntp/camel-nntp-store.c:231
-#: camel/providers/pop3/camel-pop3-store.c:181
-#: camel/providers/smtp/camel-smtp-transport.c:269
+#: ../camel/providers/imap/camel-imap-store.c:565
+#: ../camel/providers/imap/camel-imap-store.c:835
+#: ../camel/providers/imap4/camel-imap4-store.c:270
+#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapp/camel-imapp-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:212
+#: ../camel/providers/nntp/camel-nntp-store.c:231
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:269
 msgid "Connection cancelled"
 msgstr "Connection cancelled"
 
-#: camel/providers/imap/camel-imap-store.c:673
-#: camel/providers/imap/camel-imap-store.c:695
-#: camel/providers/imap/camel-imap-store.c:701
-#: camel/providers/imap4/camel-imap4-store.c:362
-#: camel/providers/imap4/camel-imap4-store.c:375
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: ../camel/providers/imap/camel-imap-store.c:673
+#: ../camel/providers/imap/camel-imap-store.c:695
+#: ../camel/providers/imap/camel-imap-store.c:701
+#: ../camel/providers/imap4/camel-imap4-store.c:362
+#: ../camel/providers/imap4/camel-imap4-store.c:375
+#: ../camel/providers/imap4/camel-imap4-store.c:391
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 
-#: camel/providers/imap/camel-imap-store.c:674
-#: camel/providers/smtp/camel-smtp-transport.c:326
+#: ../camel/providers/imap/camel-imap-store.c:674
+#: ../camel/providers/smtp/camel-smtp-transport.c:326
 msgid "STARTTLS not supported"
 msgstr "STARTTLS not supported"
 
-#: camel/providers/imap/camel-imap-store.c:696
-#: camel/providers/imap4/camel-imap4-store.c:363
-#: camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/imap/camel-imap-store.c:696
+#: ../camel/providers/imap4/camel-imap4-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:702
-#: camel/providers/imap4/camel-imap4-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:252
-#: camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/imap/camel-imap-store.c:702
+#: ../camel/providers/imap4/camel-imap4-store.c:392
+#: ../camel/providers/pop3/camel-pop3-store.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:365
 msgid "SSL is not available in this build"
 msgstr "SSL is not available in this build"
 
-#: camel/providers/imap/camel-imap-store.c:838
-#: camel/providers/imap4/camel-imap4-store.c:273
+#: ../camel/providers/imap/camel-imap-store.c:838
+#: ../camel/providers/imap4/camel-imap4-store.c:273
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: camel/providers/imap/camel-imap-store.c:1021
-#: camel/providers/imap/camel-imap-store.c:2429
-#: camel/providers/imap4/camel-imap4-store-summary.c:368
-#: camel/providers/imap4/camel-imap4-store.c:1267
-#: camel/providers/local/camel-maildir-folder.c:75
-#: camel/providers/local/camel-maildir-store.c:217
-#: camel/providers/local/camel-maildir-store.c:289
-#: camel/providers/local/camel-maildir-store.c:511
-#: camel/providers/local/camel-maildir-store.c:524
-#: camel/providers/local/camel-spool-store.c:460
+#: ../camel/providers/imap/camel-imap-store.c:1021
+#: ../camel/providers/imap/camel-imap-store.c:2429
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
+#: ../camel/providers/imap4/camel-imap4-store.c:1267
+#: ../camel/providers/local/camel-maildir-folder.c:75
+#: ../camel/providers/local/camel-maildir-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:289
+#: ../camel/providers/local/camel-maildir-store.c:511
+#: ../camel/providers/local/camel-maildir-store.c:524
+#: ../camel/providers/local/camel-spool-store.c:460
 msgid "Inbox"
 msgstr "Inbox"
 
-#: camel/providers/imap/camel-imap-store.c:1277
+#: ../camel/providers/imap/camel-imap-store.c:1277
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1287
-#: camel/providers/smtp/camel-smtp-transport.c:501
+#: ../camel/providers/imap/camel-imap-store.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:501
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1310
-#: camel/providers/imapp/camel-imapp-store.c:364
+#: ../camel/providers/imap/camel-imap-store.c:1310
+#: ../camel/providers/imapp/camel-imapp-store.c:364
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1353
+#: ../camel/providers/imap/camel-imap-store.c:1353
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3046,297 +3049,297 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1893
-#: camel/providers/imap/camel-imap-store.c:2271
-#: camel/providers/imap4/camel-imap4-store.c:856
+#: ../camel/providers/imap/camel-imap-store.c:1893
+#: ../camel/providers/imap/camel-imap-store.c:2271
+#: ../camel/providers/imap4/camel-imap4-store.c:856
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1951
-#: camel/providers/imap/camel-imap-store.c:2333
+#: ../camel/providers/imap/camel-imap-store.c:1951
+#: ../camel/providers/imap/camel-imap-store.c:2333
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:2006
-#: camel/providers/local/camel-maildir-store.c:190
-#: camel/providers/local/camel-mbox-store.c:199
-#: camel/providers/local/camel-mh-store.c:237
+#: ../camel/providers/imap/camel-imap-store.c:2006
+#: ../camel/providers/local/camel-maildir-store.c:190
+#: ../camel/providers/local/camel-mbox-store.c:199
+#: ../camel/providers/local/camel-mh-store.c:237
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2282
+#: ../camel/providers/imap/camel-imap-store.c:2282
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
+#: ../camel/providers/imap4/camel-imap4-command.c:550
+#: ../camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "Failed sending command to IMAP server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:660
+#: ../camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "Unexpected response from IMAP4 server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-engine.c:222
+#: ../camel/providers/imap4/camel-imap4-engine.c:222
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "Unexpected greeting from IMAP server %s."
 
-#: camel/providers/imap4/camel-imap4-engine.c:432
+#: ../camel/providers/imap4/camel-imap4-engine.c:432
 #, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr "Cannot select folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-engine.c:438
+#: ../camel/providers/imap4/camel-imap4-engine.c:438
 #, c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Cannot select folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1588
-#: camel/providers/imap4/camel-imap4-engine.c:1633
-#: camel/providers/imap4/camel-imap4-engine.c:1689
+#: ../camel/providers/imap4/camel-imap4-engine.c:1549
+#: ../camel/providers/imap4/camel-imap4-engine.c:1588
+#: ../camel/providers/imap4/camel-imap4-engine.c:1633
+#: ../camel/providers/imap4/camel-imap4-engine.c:1689
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 server %s unexpectedly disconnected: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:85
+#: ../camel/providers/imap4/camel-imap4-folder.c:85
 msgid ""
 "Enable Mailing-List detection required for some filter and vFolder rules"
 msgstr ""
 "Enable Mailing-List detection, required for some filter and vFolder rules"
 
-#: camel/providers/imap4/camel-imap4-folder.c:398
+#: ../camel/providers/imap4/camel-imap4-folder.c:398
 #, c-format
 msgid "Cannot access folder `%s': %s"
 msgstr "Cannot access folder `%s': %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:457
+#: ../camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Cannot sync flags to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:463
+#: ../camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Cannot sync flags to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:603
+#: ../camel/providers/imap4/camel-imap4-folder.c:603
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "Cannot expunge folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:608
+#: ../camel/providers/imap4/camel-imap4-folder.c:608
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Cannot expunge folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:864
+#: ../camel/providers/imap4/camel-imap4-folder.c:864
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr "Cannot get message %s from folder `%s': No such message"
 
-#: camel/providers/imap4/camel-imap4-folder.c:869
+#: ../camel/providers/imap4/camel-imap4-folder.c:869
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr "Cannot get message %s from folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:913
+#: ../camel/providers/imap4/camel-imap4-folder.c:913
 #, c-format
 msgid "Cannot append message to folder `%s': Folder is read-only"
 msgstr "Cannot append message to folder `%s': Folder is read-only"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1009
+#: ../camel/providers/imap4/camel-imap4-folder.c:1006
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr "Cannot append message to folder `%s': Unknown error"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1038
+#: ../camel/providers/imap4/camel-imap4-folder.c:1035
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr "Cannot append message to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1150
+#: ../camel/providers/imap4/camel-imap4-folder.c:1155
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1154
+#: ../camel/providers/imap4/camel-imap4-folder.c:1159
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1162
+#: ../camel/providers/imap4/camel-imap4-folder.c:1167
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-folder.c:1166
+#: ../camel/providers/imap4/camel-imap4-folder.c:1171
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-provider.c:71
+#: ../camel/providers/imap4/camel-imap4-provider.c:71
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: camel/providers/imap4/camel-imap4-provider.c:73
+#: ../camel/providers/imap4/camel-imap4-provider.c:73
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "For reading and storing mail on IMAPv4rev1 servers."
 
-#: camel/providers/imap4/camel-imap4-provider.c:90
+#: ../camel/providers/imap4/camel-imap4-provider.c:90
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
-#: camel/providers/imap4/camel-imap4-store.c:477
+#: ../camel/providers/imap4/camel-imap4-store.c:477
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 
-#: camel/providers/imap4/camel-imap4-store.c:522
+#: ../camel/providers/imap4/camel-imap4-store.c:522
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sPlease enter the IMAP password for %s on host %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:592
+#: ../camel/providers/imap4/camel-imap4-store.c:592
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Cannot authenticate to IMAP server %s using %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:754
-#: camel/providers/imap4/camel-imap4-store.c:866
+#: ../camel/providers/imap4/camel-imap4-store.c:754
+#: ../camel/providers/imap4/camel-imap4-store.c:866
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "Cannot create IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:793
+#: ../camel/providers/imap4/camel-imap4-store.c:793
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
 
-#: camel/providers/imap4/camel-imap4-store.c:914
+#: ../camel/providers/imap4/camel-imap4-store.c:914
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Cannot create folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:920
+#: ../camel/providers/imap4/camel-imap4-store.c:920
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Cannot create folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:951
+#: ../camel/providers/imap4/camel-imap4-store.c:951
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Cannot delete folder `%s': Special folder"
 
-#: camel/providers/imap4/camel-imap4-store.c:958
+#: ../camel/providers/imap4/camel-imap4-store.c:958
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Cannot delete IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1017
+#: ../camel/providers/imap4/camel-imap4-store.c:1017
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Cannot delete folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1022
+#: ../camel/providers/imap4/camel-imap4-store.c:1022
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Cannot delete folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1042
+#: ../camel/providers/imap4/camel-imap4-store.c:1042
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "Cannot rename folder `%s' to `%s': Special folder"
 
-#: camel/providers/imap4/camel-imap4-store.c:1049
+#: ../camel/providers/imap4/camel-imap4-store.c:1049
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "Cannot rename IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1080
+#: ../camel/providers/imap4/camel-imap4-store.c:1080
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1085
+#: ../camel/providers/imap4/camel-imap4-store.c:1085
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "Cannot rename folder `%s' to `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1432
+#: ../camel/providers/imap4/camel-imap4-store.c:1432
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1434
+#: ../camel/providers/imap4/camel-imap4-store.c:1434
 msgid "Bad command"
 msgstr "Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1472
+#: ../camel/providers/imap4/camel-imap4-store.c:1472
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "Cannot subscribe to IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1517
+#: ../camel/providers/imap4/camel-imap4-store.c:1517
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1522
+#: ../camel/providers/imap4/camel-imap4-store.c:1522
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Cannot subscribe to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1544
+#: ../camel/providers/imap4/camel-imap4-store.c:1544
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "Cannot unsubscribe from IMAP folders in offline mode."
 
-#: camel/providers/imap4/camel-imap4-store.c:1589
+#: ../camel/providers/imap4/camel-imap4-store.c:1589
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1594
+#: ../camel/providers/imap4/camel-imap4-store.c:1594
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Cannot unsubscribe from folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-summary.c:1497
+#: ../camel/providers/imap4/camel-imap4-summary.c:1497
 msgid "Fetching envelopes for new messages"
 msgstr "Fetching envelopes for new messages"
 
-#: camel/providers/imap4/camel-imap4-utils.c:368
+#: ../camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "Unexpected token in response from IMAP server %s: "
 
-#: camel/providers/imap4/camel-imap4-utils.c:391
+#: ../camel/providers/imap4/camel-imap4-utils.c:391
 msgid "No data"
 msgstr "No data"
 
-#: camel/providers/imap4/camel-imap4-utils.c:574
+#: ../camel/providers/imap4/camel-imap4-utils.c:574
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP server %s unexpectedly disconnected: %s"
 
-#: camel/providers/imapp/camel-imapp-provider.c:40
-#: camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/imapp/camel-imapp-provider.c:40
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Message storage"
 
-#: camel/providers/imapp/camel-imapp-provider.c:48
+#: ../camel/providers/imapp/camel-imapp-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:50
+#: ../camel/providers/imapp/camel-imapp-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -3348,56 +3351,56 @@ msgstr ""
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:251
+#: ../camel/providers/imapp/camel-imapp-store.c:251
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Could not connect to %s (port %s): %s"
 
-#: camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Could not connect to POP server on %s"
 
-#: camel/providers/local/camel-local-folder.c:173
+#: ../camel/providers/local/camel-local-folder.c:173
 msgid "Index message body data"
 msgstr "Index message body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:378
+#: ../camel/providers/local/camel-local-folder.c:378
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:382
-#: camel/providers/local/camel-local-folder.c:385
+#: ../camel/providers/local/camel-local-folder.c:382
+#: ../camel/providers/local/camel-local-folder.c:385
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:389
+#: ../camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:45
+#: ../camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "Use the `.folders' folder summary file (exmh)"
 
-#: camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "MH-format mail directories"
 
-#: camel/providers/local/camel-local-provider.c:53
+#: ../camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr "For storing local mail in MH-like mail directories."
 
-#: camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Local delivery"
 
-#: camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
@@ -3405,28 +3408,28 @@ msgstr ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 
-#: camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:100
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "Apply filters to new messages in INBOX"
 
-#: camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format mail directories"
 
-#: camel/providers/local/camel-local-provider.c:89
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "For storing local mail in maildir directories."
 
-#: camel/providers/local/camel-local-provider.c:101
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Store status headers in Elm/Pine/Mutt format"
 
-#: camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "Standard Unix mbox spool or directory"
 msgstr "Standard Unix mbox spool or directory"
 
-#: camel/providers/local/camel-local-provider.c:109
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3434,91 +3437,91 @@ msgstr ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 
-#: camel/providers/local/camel-local-store.c:150
-#: camel/providers/local/camel-local-store.c:261
-#: camel/providers/local/camel-mbox-store.c:342
-#: camel/providers/local/camel-spool-store.c:125
+#: ../camel/providers/local/camel-local-store.c:150
+#: ../camel/providers/local/camel-local-store.c:261
+#: ../camel/providers/local/camel-mbox-store.c:342
+#: ../camel/providers/local/camel-spool-store.c:125
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: camel/providers/local/camel-local-store.c:157
+#: ../camel/providers/local/camel-local-store.c:157
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:174
-#: camel/providers/local/camel-local-store.c:272
+#: ../camel/providers/local/camel-local-store.c:166
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:272
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Cannot get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: ../camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: camel/providers/local/camel-local-store.c:232
+#: ../camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: camel/providers/local/camel-local-store.c:341
+#: ../camel/providers/local/camel-local-store.c:341
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: camel/providers/local/camel-local-store.c:406
+#: ../camel/providers/local/camel-local-store.c:406
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not rename '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:431
-#: camel/providers/local/camel-mbox-store.c:271
+#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-mbox-store.c:271
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Could not delete folder summary file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:441
-#: camel/providers/local/camel-mbox-store.c:283
+#: ../camel/providers/local/camel-local-store.c:441
+#: ../camel/providers/local/camel-mbox-store.c:283
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Could not delete folder index file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:464
-#: camel/providers/local/camel-mbox-store.c:307
+#: ../camel/providers/local/camel-local-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:307
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Could not delete folder meta file `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:406
+#: ../camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Could not save summary: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:464
+#: ../camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Unable to add message to summary: unknown reason"
 
-#: camel/providers/local/camel-maildir-folder.c:215
+#: ../camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr "Maildir append message cancelled"
 
-#: camel/providers/local/camel-maildir-folder.c:218
+#: ../camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Cannot append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-maildir-folder.c:258
-#: camel/providers/local/camel-maildir-folder.c:267
-#: camel/providers/local/camel-mbox-folder.c:339
-#: camel/providers/local/camel-mbox-folder.c:358
-#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-mbox-folder.c:397
-#: camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/local/camel-mh-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:258
+#: ../camel/providers/local/camel-maildir-folder.c:267
+#: ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-mbox-folder.c:358
+#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-mbox-folder.c:397
+#: ../camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/local/camel-mh-folder.c:213
+#: ../camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3527,119 +3530,119 @@ msgstr ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "Invalid message contents"
 
-#: camel/providers/local/camel-maildir-store.c:146
-#: camel/providers/local/camel-maildir-store.c:171
-#: camel/providers/local/camel-mbox-store.c:171
-#: camel/providers/local/camel-mbox-store.c:183
+#: ../camel/providers/local/camel-maildir-store.c:146
+#: ../camel/providers/local/camel-maildir-store.c:171
+#: ../camel/providers/local/camel-mbox-store.c:171
+#: ../camel/providers/local/camel-mbox-store.c:183
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Cannot create folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:159
-#: camel/providers/local/camel-mbox-store.c:141
-#: camel/providers/local/camel-mh-store.c:205
+#: ../camel/providers/local/camel-maildir-store.c:159
+#: ../camel/providers/local/camel-mbox-store.c:141
+#: ../camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Cannot get folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:163
-#: camel/providers/local/camel-mbox-store.c:149
-#: camel/providers/local/camel-mh-store.c:212
+#: ../camel/providers/local/camel-maildir-store.c:163
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Cannot get folder `%s': folder does not exist."
 
-#: camel/providers/local/camel-maildir-store.c:187
+#: ../camel/providers/local/camel-maildir-store.c:187
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Cannot get folder `%s': not a maildir directory."
 
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:270
-#: camel/providers/local/camel-mh-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:232
+#: ../camel/providers/local/camel-maildir-store.c:270
+#: ../camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Could not delete folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:234
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:436
-#: camel/providers/local/camel-spool-store.c:327
-#: camel/providers/local/camel-spool-store.c:341
+#: ../camel/providers/local/camel-maildir-store.c:436
+#: ../camel/providers/local/camel-spool-store.c:327
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Could not scan folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:425
-#: camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:425
+#: ../camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Cannot open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "Checking folder consistency"
 
-#: camel/providers/local/camel-maildir-summary.c:652
+#: ../camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "Checking for new messages"
 
-#: camel/providers/local/camel-maildir-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:416
-#: camel/providers/local/camel-mbox-summary.c:589
-#: camel/providers/local/camel-mbox-summary.c:680
-#: camel/providers/local/camel-spool-summary.c:140
+#: ../camel/providers/local/camel-maildir-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:416
+#: ../camel/providers/local/camel-mbox-summary.c:589
+#: ../camel/providers/local/camel-mbox-summary.c:680
+#: ../camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
 msgstr "Storing folder"
 
-#: camel/providers/local/camel-mbox-folder.c:147
-#: camel/providers/local/camel-spool-folder.c:148
+#: ../camel/providers/local/camel-mbox-folder.c:147
+#: ../camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Cannot create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:206
+#: ../camel/providers/local/camel-mbox-folder.c:206
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Cannot open mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:266
+#: ../camel/providers/local/camel-mbox-folder.c:266
 msgid "Mail append cancelled"
 msgstr "Mail append cancelled"
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: ../camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Cannot append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mbox-folder.c:390
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "The folder appears to be irrecoverably corrupted."
 
-#: camel/providers/local/camel-mbox-folder.c:398
-#: camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
 msgstr "Message construction failed."
 
-#: camel/providers/local/camel-mbox-store.c:163
-#: camel/providers/local/camel-mbox-store.c:348
+#: ../camel/providers/local/camel-mbox-store.c:163
+#: ../camel/providers/local/camel-mbox-store.c:348
 msgid "Cannot create a folder by this name."
 msgstr "Cannot create a folder by this name."
 
-#: camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mbox-store.c:193
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "Cannot get folder `%s': not a regular file."
 
-#: camel/providers/local/camel-mbox-store.c:223
-#: camel/providers/local/camel-mbox-store.c:234
-#: camel/providers/local/camel-mbox-store.c:257
+#: ../camel/providers/local/camel-mbox-store.c:223
+#: ../camel/providers/local/camel-mbox-store.c:234
+#: ../camel/providers/local/camel-mbox-store.c:257
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3648,158 +3651,158 @@ msgstr ""
 "Could not delete folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:242
+#: ../camel/providers/local/camel-mbox-store.c:242
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' is not a regular file."
 
-#: camel/providers/local/camel-mbox-store.c:249
+#: ../camel/providers/local/camel-mbox-store.c:249
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' is not empty. Not deleted."
 
-#: camel/providers/local/camel-mbox-store.c:361
+#: ../camel/providers/local/camel-mbox-store.c:361
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Cannot create directory `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:375
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:377
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: camel/providers/local/camel-mbox-store.c:459
+#: ../camel/providers/local/camel-mbox-store.c:459
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: ../camel/providers/local/camel-mbox-store.c:472
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not rename `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:547
+#: ../camel/providers/local/camel-mbox-store.c:547
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not rename '%s' to %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:422
+#: ../camel/providers/local/camel-mbox-summary.c:422
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Could not open folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:470
+#: ../camel/providers/local/camel-mbox-summary.c:470
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal mail parser error near position %ld in folder %s"
 
-#: camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:526
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Cannot check folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:594
-#: camel/providers/local/camel-mbox-summary.c:685
-#: camel/providers/local/camel-spool-summary.c:145
+#: ../camel/providers/local/camel-mbox-summary.c:594
+#: ../camel/providers/local/camel-mbox-summary.c:685
+#: ../camel/providers/local/camel-spool-summary.c:145
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Could not open file: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-spool-summary.c:165
+#: ../camel/providers/local/camel-mbox-summary.c:606
+#: ../camel/providers/local/camel-spool-summary.c:165
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Cannot open temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:619
-#: camel/providers/local/camel-mbox-summary.c:793
+#: ../camel/providers/local/camel-mbox-summary.c:619
+#: ../camel/providers/local/camel-mbox-summary.c:793
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Could not close source folder %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:628
+#: ../camel/providers/local/camel-mbox-summary.c:628
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temp folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:639
+#: ../camel/providers/local/camel-mbox-summary.c:639
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:696
-#: camel/providers/local/camel-mbox-summary.c:904
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:904
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not store folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:935
-#: camel/providers/local/camel-mbox-summary.c:943
+#: ../camel/providers/local/camel-mbox-summary.c:733
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:935
+#: ../camel/providers/local/camel-mbox-summary.c:943
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Summary and folder mismatch, even after a sync"
 
-#: camel/providers/local/camel-mbox-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unknown error: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:998
-#: camel/providers/local/camel-mbox-summary.c:1024
+#: ../camel/providers/local/camel-mbox-summary.c:998
+#: ../camel/providers/local/camel-mbox-summary.c:1024
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temp mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1015
+#: ../camel/providers/local/camel-mbox-summary.c:1015
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to tmp mailbox failed: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: ../camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH append message cancelled"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Cannot append message to mh folder: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:220
+#: ../camel/providers/local/camel-mh-store.c:220
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "Could not create folder `%s': %s"
 
-#: camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Cannot get folder `%s': not a directory."
 
-#: camel/providers/local/camel-mh-summary.c:247
+#: ../camel/providers/local/camel-mh-summary.c:247
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Cannot open MH directory path: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:131
+#: ../camel/providers/local/camel-spool-store.c:131
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool `%s' cannot be opened: %s"
 
-#: camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:143
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool `%s' is not a regular file or directory"
 
-#: camel/providers/local/camel-spool-store.c:162
+#: ../camel/providers/local/camel-spool-store.c:162
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder `%s/%s' does not exist."
 
-#: camel/providers/local/camel-spool-store.c:172
+#: ../camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3808,12 +3811,12 @@ msgstr ""
 "Could not open folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder `%s' does not exist."
 
-#: camel/providers/local/camel-spool-store.c:181
+#: ../camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3822,48 +3825,48 @@ msgstr ""
 "Could not create folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:189
+#: ../camel/providers/local/camel-spool-store.c:189
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' is not a mailbox file."
 
-#: camel/providers/local/camel-spool-store.c:206
+#: ../camel/providers/local/camel-spool-store.c:206
 msgid "Store does not support an INBOX"
 msgstr "Store does not support an INBOX"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: ../camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool mail file %s"
 
-#: camel/providers/local/camel-spool-store.c:218
+#: ../camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Spool folder tree %s"
 
-#: camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be renamed"
 msgstr "Spool folders cannot be renamed"
 
-#: camel/providers/local/camel-spool-store.c:234
+#: ../camel/providers/local/camel-spool-store.c:234
 msgid "Spool folders cannot be deleted"
 msgstr "Spool folders cannot be deleted"
 
-#: camel/providers/local/camel-spool-summary.c:178
-#: camel/providers/local/camel-spool-summary.c:188
-#: camel/providers/local/camel-spool-summary.c:198
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:188
+#: ../camel/providers/local/camel-spool-summary.c:198
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Could not sync temporary folder %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: ../camel/providers/local/camel-spool-summary.c:214
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Could not sync spool folder %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:245
-#: camel/providers/local/camel-spool-summary.c:264
-#: camel/providers/local/camel-spool-summary.c:277
+#: ../camel/providers/local/camel-spool-summary.c:245
+#: ../camel/providers/local/camel-spool-summary.c:264
+#: ../camel/providers/local/camel-spool-summary.c:277
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -3872,47 +3875,47 @@ msgstr ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
 
-#: camel/providers/nntp/camel-nntp-folder.c:177
-#: camel/providers/nntp/camel-nntp-folder.c:209
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:329
-#: camel/providers/nntp/camel-nntp-folder.c:332
-#: camel/providers/nntp/camel-nntp-folder.c:374
-#: camel/providers/nntp/camel-nntp-folder.c:376
+#: ../camel/providers/nntp/camel-nntp-folder.c:329
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/nntp/camel-nntp-folder.c:374
+#: ../camel/providers/nntp/camel-nntp-folder.c:376
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Posting failed: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:394
+#: ../camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "You cannot post NNTP messages while working offline!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:405
+#: ../camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
-#: camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 
-#: camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr "In the subscription dialogue, show relative folder names"
 
-#: camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:55
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "This is a provider for reading from and posting toUSENET newsgroups."
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
+msgid "This is a provider for reading from and posting to USENET newsgroups."
+msgstr "This is a provider for reading from and posting to USENET newsgroups."
 
-#: camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -3920,22 +3923,22 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/nntp/camel-nntp-store.c:234
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not read greeting from %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:246
+#: ../camel/providers/nntp/camel-nntp-store.c:246
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:423
+#: ../camel/providers/nntp/camel-nntp-store.c:423
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:812
+#: ../camel/providers/nntp/camel-nntp-store.c:813
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3946,7 +3949,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:906
+#: ../camel/providers/nntp/camel-nntp-store.c:907
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -3956,7 +3959,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: camel/providers/nntp/camel-nntp-store.c:938
+#: ../camel/providers/nntp/camel-nntp-store.c:939
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -3966,122 +3969,122 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: camel/providers/nntp/camel-nntp-store.c:963
+#: ../camel/providers/nntp/camel-nntp-store.c:964
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "You cannot create a folder in a News store: subscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:971
+#: ../camel/providers/nntp/camel-nntp-store.c:972
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: camel/providers/nntp/camel-nntp-store.c:979
+#: ../camel/providers/nntp/camel-nntp-store.c:980
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:1149
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 msgid "Authentication requested but no username provided"
 msgstr "Authentication requested but no username provided"
 
-#: camel/providers/nntp/camel-nntp-store.c:1157
+#: ../camel/providers/nntp/camel-nntp-store.c:1158
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Please enter the NNTP password for %s@%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1161
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Cannot authenticate to server: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1277
+#: ../camel/providers/nntp/camel-nntp-store.c:1278
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP Command failed: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1333
+#: ../camel/providers/nntp/camel-nntp-store.c:1334
 msgid "Not connected."
 msgstr "Not connected."
 
-#: camel/providers/nntp/camel-nntp-store.c:1386
+#: ../camel/providers/nntp/camel-nntp-store.c:1387
 #, c-format
 msgid "No such folder: %s"
 msgstr "No such folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:221
-#: camel/providers/nntp/camel-nntp-summary.c:317
+#: ../camel/providers/nntp/camel-nntp-summary.c:221
+#: ../camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: camel/providers/nntp/camel-nntp-summary.c:228
+#: ../camel/providers/nntp/camel-nntp-summary.c:228
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Unexpected server response from xover: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:331
+#: ../camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Unexpected server response from head: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:371
+#: ../camel/providers/nntp/camel-nntp-summary.c:371
 msgid "Use cancel"
 msgstr "Use cancel"
 
-#: camel/providers/nntp/camel-nntp-summary.c:373
+#: ../camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Retrieving POP summary"
 
-#: camel/providers/pop3/camel-pop3-folder.c:266
+#: ../camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Cannot get POP summary: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:309
+#: ../camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "Expunging deleted messages"
 
-#: camel/providers/pop3/camel-pop3-folder.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
 msgstr "No message with uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:412
+#: ../camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
+#: ../camel/providers/pop3/camel-pop3-folder.c:502
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "Leave messages on server"
 
-#: camel/providers/pop3/camel-pop3-provider.c:44
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Delete after %s day(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "Disable support for all POP3 extensions"
 
-#: camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "For connecting to and downloading mail from POP servers."
 
-#: camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4089,7 +4092,7 @@ msgstr ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 
-#: camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4099,30 +4102,30 @@ msgstr ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 
-#: camel/providers/pop3/camel-pop3-store.c:204
+#: ../camel/providers/pop3/camel-pop3-store.c:204
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Failed to read a valid greeting from POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:218
-#: camel/providers/pop3/camel-pop3-store.c:235
-#: camel/providers/pop3/camel-pop3-store.c:245
-#: camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:245
+#: ../camel/providers/pop3/camel-pop3-store.c:251
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 msgid "STLS not supported"
 msgstr "STLS not supported"
 
-#: camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not connect to POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:404
-#: camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4131,28 +4134,28 @@ msgstr ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login failed for POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:451
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Failed to authenticate on POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:477
+#: ../camel/providers/pop3/camel-pop3-store.c:477
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPlease enter the POP password for %s on host %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:532
-#: camel/providers/pop3/camel-pop3-store.c:545
+#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/providers/pop3/camel-pop3-store.c:545
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4161,7 +4164,7 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:539
+#: ../camel/providers/pop3/camel-pop3-store.c:539
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4170,16 +4173,16 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:645
+#: ../camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4187,183 +4190,183 @@ msgstr ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:114
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
 msgstr "Could not parse recipient list"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:145
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Could not create pipe to sendmail: %s: mail not sent"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:166
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Could not fork sendmail: %s: mail not sent"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Could not send message: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail exited with signal %s: mail not sent."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Could not execute %s: mail not sent."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail exited with status %d: mail not sent."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:260
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:262
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail delivery via the sendmail program"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38
+#: ../camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr "Syntax error, command unrecognized"
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr "Syntax error in parameters or arguments"
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr "Command not implemented"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr "Command parameter not implemented"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr "System status, or system help reply"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Help message"
 msgstr "Help message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
 msgstr "Service ready"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr "Service closing transmission channel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr "Service not available, closing transmission channel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr "Requested mail action okay, completed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr "User not local; will forward to <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Requested mail action not taken: mailbox unavailable"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Requested action not taken: mailbox unavailable"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr "Requested action aborted: error in processing"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr "User not local; please try <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Requested action not taken: insufficient system storage"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Requested mail action aborted: exceeded storage allocation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Requested action not taken: mailbox name not allowed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Start mail input; end with <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr "Transaction failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
 msgstr "A password transition is needed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr "Authentication mechanism is too weak"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Encryption required for requested authentication mechanism"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Temporary authentication failure"
 msgstr "Temporary authentication failure"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 msgid "Welcome response error"
 msgstr "Welcome response error"
 
-#: camel/providers/smtp/camel-smtp-transport.c:325
-#: camel/providers/smtp/camel-smtp-transport.c:358
-#: camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:325
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Failed to connect to SMTP server %s in secure mode: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: ../camel/providers/smtp/camel-smtp-transport.c:334
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:349
+#: ../camel/providers/smtp/camel-smtp-transport.c:349
 msgid "STARTTLS command failed"
 msgstr "STARTTLS command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:491
+#: ../camel/providers/smtp/camel-smtp-transport.c:491
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s does not support requested authentication type %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: ../camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sPlease enter the SMTP password for %s on host %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:548
+#: ../camel/providers/smtp/camel-smtp-transport.c:548
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4374,93 +4377,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:674
+#: ../camel/providers/smtp/camel-smtp-transport.c:674
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "Sending message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:923
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: ../camel/providers/smtp/camel-smtp-transport.c:940
 msgid "HELO command failed"
 msgstr "HELO command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1029
-#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: ../camel/providers/smtp/camel-smtp-transport.c:1029
+#: ../camel/providers/smtp/camel-smtp-transport.c:1040
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1046
+#: ../camel/providers/smtp/camel-smtp-transport.c:1046
 msgid "AUTH command failed"
 msgstr "AUTH command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Bad authentication response from server.\n"
 msgstr "Bad authentication response from server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: ../camel/providers/smtp/camel-smtp-transport.c:1174
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1193
+#: ../camel/providers/smtp/camel-smtp-transport.c:1193
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1232
-#: camel/providers/smtp/camel-smtp-transport.c:1290
-#: camel/providers/smtp/camel-smtp-transport.c:1309
+#: ../camel/providers/smtp/camel-smtp-transport.c:1232
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1309
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA command failed: %s: mail not sent"
@@ -4468,106 +4471,106 @@ msgstr "DATA command failed: %s: mail not sent"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1249
-#: camel/providers/smtp/camel-smtp-transport.c:1325
+#: ../camel/providers/smtp/camel-smtp-transport.c:1249
+#: ../camel/providers/smtp/camel-smtp-transport.c:1325
 msgid "DATA command failed"
 msgstr "DATA command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1364
+#: ../camel/providers/smtp/camel-smtp-transport.c:1364
 msgid "RSET command failed"
 msgstr "RSET command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1387
+#: ../camel/providers/smtp/camel-smtp-transport.c:1387
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1401
+#: ../camel/providers/smtp/camel-smtp-transport.c:1401
 msgid "QUIT command failed"
 msgstr "QUIT command failed"
 
-#: libedataserver/e-categories.c:227
+#: ../libedataserver/e-categories.c:237
 msgid "Business"
 msgstr "Business"
 
-#: libedataserver/e-categories.c:228
+#: ../libedataserver/e-categories.c:238
 msgid "Competition"
 msgstr "Competition"
 
-#: libedataserver/e-categories.c:229
+#: ../libedataserver/e-categories.c:239
 msgid "Favorites"
 msgstr "Favourites"
 
-#: libedataserver/e-categories.c:230
+#: ../libedataserver/e-categories.c:240
 msgid "Gifts"
 msgstr "Gifts"
 
-#: libedataserver/e-categories.c:231
+#: ../libedataserver/e-categories.c:241
 msgid "Goals/Objectives"
 msgstr "Goals/Objectives"
 
-#: libedataserver/e-categories.c:232
+#: ../libedataserver/e-categories.c:242
 msgid "Holiday"
 msgstr "Holiday"
 
-#: libedataserver/e-categories.c:233
+#: ../libedataserver/e-categories.c:243
 msgid "Holiday Cards"
 msgstr "Holiday Cards"
 
-#: libedataserver/e-categories.c:234
+#: ../libedataserver/e-categories.c:244
 msgid "Hot Contacts"
 msgstr "Hot Contacts"
 
-#: libedataserver/e-categories.c:235
+#: ../libedataserver/e-categories.c:245
 msgid "Ideas"
 msgstr "Ideas"
 
-#: libedataserver/e-categories.c:236
+#: ../libedataserver/e-categories.c:246
 msgid "International"
 msgstr "International"
 
-#: libedataserver/e-categories.c:237
+#: ../libedataserver/e-categories.c:247
 msgid "Key Customer"
 msgstr "Key Customer"
 
-#: libedataserver/e-categories.c:238
+#: ../libedataserver/e-categories.c:248
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: libedataserver/e-categories.c:239
+#: ../libedataserver/e-categories.c:249
 msgid "Personal"
 msgstr "Personal"
 
-#: libedataserver/e-categories.c:240
+#: ../libedataserver/e-categories.c:250
 msgid "Phone Calls"
 msgstr "Phone Calls"
 
-#: libedataserver/e-categories.c:241
+#: ../libedataserver/e-categories.c:251
 msgid "Status"
 msgstr "Status"
 
-#: libedataserver/e-categories.c:242
+#: ../libedataserver/e-categories.c:252
 msgid "Strategies"
 msgstr "Strategies"
 
-#: libedataserver/e-categories.c:243
+#: ../libedataserver/e-categories.c:253
 msgid "Suppliers"
 msgstr "Suppliers"
 
-#: libedataserver/e-categories.c:244
+#: ../libedataserver/e-categories.c:254
 msgid "Time & Expenses"
 msgstr "Time & Expenses"
 
-#: libedataserver/e-categories.c:245
+#: ../libedataserver/e-categories.c:255
 msgid "VIP"
 msgstr "VIP"
 
-#: libedataserver/e-categories.c:246
+#: ../libedataserver/e-categories.c:256
 msgid "Waiting"
 msgstr "Waiting"
 
@@ -4575,7 +4578,7 @@ msgstr "Waiting"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: libedataserver/e-time-utils.c:179 libedataserver/e-time-utils.c:422
+#: ../libedataserver/e-time-utils.c:179 ../libedataserver/e-time-utils.c:422
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4583,7 +4586,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: libedataserver/e-time-utils.c:184 libedataserver/e-time-utils.c:413
+#: ../libedataserver/e-time-utils.c:184 ../libedataserver/e-time-utils.c:413
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4591,7 +4594,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: libedataserver/e-time-utils.c:189 libedataserver/e-time-utils.c:418
+#: ../libedataserver/e-time-utils.c:189 ../libedataserver/e-time-utils.c:418
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4599,78 +4602,78 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: libedataserver/e-time-utils.c:194 libedataserver/e-time-utils.c:409
+#: ../libedataserver/e-time-utils.c:194 ../libedataserver/e-time-utils.c:409
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: libedataserver/e-time-utils.c:199
+#: ../libedataserver/e-time-utils.c:199
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: libedataserver/e-time-utils.c:204
+#: ../libedataserver/e-time-utils.c:204
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: libedataserver/e-time-utils.c:207 libedataserver/e-time-utils.c:300
-#: libedataserver/e-time-utils.c:404
+#: ../libedataserver/e-time-utils.c:207 ../libedataserver/e-time-utils.c:300
+#: ../libedataserver/e-time-utils.c:404
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: libedataserver/e-time-utils.c:215
+#: ../libedataserver/e-time-utils.c:215
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: libedataserver/e-time-utils.c:219
+#: ../libedataserver/e-time-utils.c:219
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: libedataserver/e-time-utils.c:224
+#: ../libedataserver/e-time-utils.c:224
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: libedataserver/e-time-utils.c:229
+#: ../libedataserver/e-time-utils.c:229
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: libedataserver/e-time-utils.c:234
+#: ../libedataserver/e-time-utils.c:234
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: libedataserver/e-time-utils.c:239
+#: ../libedataserver/e-time-utils.c:239
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: libedataserver/e-time-utils.c:242 libedataserver/e-time-utils.c:303
+#: ../libedataserver/e-time-utils.c:242 ../libedataserver/e-time-utils.c:303
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: libedataserver/e-time-utils.c:348 libedataserver/e-time-utils.c:467
+#: ../libedataserver/e-time-utils.c:348 ../libedataserver/e-time-utils.c:467
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: libedataserver/e-time-utils.c:352 libedataserver/e-time-utils.c:459
+#: ../libedataserver/e-time-utils.c:352 ../libedataserver/e-time-utils.c:459
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4678,35 +4681,35 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: libedataserver/e-time-utils.c:357 libedataserver/e-time-utils.c:464
+#: ../libedataserver/e-time-utils.c:357 ../libedataserver/e-time-utils.c:464
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: libedataserver/e-time-utils.c:361 libedataserver/e-time-utils.c:456
+#: ../libedataserver/e-time-utils.c:361 ../libedataserver/e-time-utils.c:456
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: libedataserver/e-time-utils.c:365
+#: ../libedataserver/e-time-utils.c:365
 msgid "%I %p"
 msgstr "%I %p"
 
-#: libedataserverui/e-book-auth-util.c:89
+#: ../libedataserverui/e-book-auth-util.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
-#: libedataserverui/e-book-auth-util.c:185
+#: ../libedataserverui/e-book-auth-util.c:185
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
-#: libedataserverui/e-categories-dialog.c:91
+#: ../libedataserverui/e-categories-dialog.c:91
 msgid "Category Icon"
 msgstr "Category Icon"
 
-#: libedataserverui/e-categories-dialog.c:266
+#: ../libedataserverui/e-categories-dialog.c:266
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -4715,125 +4718,125 @@ msgstr ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 
-#: libedataserverui/e-categories-dialog.c:433
+#: ../libedataserverui/e-categories-dialog.c:433
 msgid "Category"
 msgstr "Category"
 
-#: libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.glade.h:1
 msgid "Category Properties"
 msgstr "Category Properties"
 
-#: libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.glade.h:2
 msgid "Category _Color"
 msgstr "Category _Colour"
 
-#: libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.glade.h:3
 msgid "Category _Icon"
 msgstr "Category _Icon"
 
-#: libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.glade.h:4
 msgid "Category _Name"
 msgstr "Category _Name"
 
-#: libedataserverui/e-categories-dialog.glade.h:5
+#: ../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Item(s) belong to these _categories:"
 msgstr "Item(s) belong to these _categories:"
 
-#: libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.glade.h:6
 msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
-#: libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
 msgstr "_Edit"
 
-#: libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.glade.h:8
 msgid "categories"
 msgstr "categories"
 
-#: libedataserverui/e-name-selector-dialog.c:200
+#: ../libedataserverui/e-name-selector-dialog.c:200
 msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.glade.h:1
 msgid "\t\t\t\t\t\t"
 msgstr "\t\t\t\t\t\t"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.glade.h:2
 msgid "*"
 msgstr "*"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Show Contacts</b>"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.glade.h:4
 msgid "<b>_Contacts</b>"
 msgstr "<b>_Contacts</b>"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.glade.h:5
 msgid "Address Book"
 msgstr "Address Book"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "Address _Book:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.glade.h:7
 msgid "Contacts"
 msgstr "Contacts"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:8
+#: ../libedataserverui/e-name-selector-dialog.glade.h:8
 msgid "Search"
 msgstr "Search"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "_Search:"
 
-#: libedataserverui/e-passwords.c:471
+#: ../libedataserverui/e-passwords.c:471
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: libedataserverui/e-passwords.c:472
+#: ../libedataserverui/e-passwords.c:472
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
 #. prepare the dialog
-#: libedataserverui/e-source-selector-dialog.c:101
+#: ../libedataserverui/e-source-selector-dialog.c:101
 msgid "Select destination"
 msgstr "Select destination"
 
-#: libedataserverui/e-source-selector-dialog.c:154
+#: ../libedataserverui/e-source-selector-dialog.c:154
 msgid "_Destination"
 msgstr "_Destination"
 
-#: servers/groupwise/e-gw-connection.c:157
+#: ../servers/groupwise/e-gw-connection.c:157
 msgid "Invalid connection"
 msgstr "Invalid connection"
 
-#: servers/groupwise/e-gw-connection.c:161
+#: ../servers/groupwise/e-gw-connection.c:161
 msgid "Invalid response from server"
 msgstr "Invalid response from server"
 
-#: servers/groupwise/e-gw-connection.c:163
+#: ../servers/groupwise/e-gw-connection.c:163
 msgid "No response from the server"
 msgstr "No response from the server"
 
-#: servers/groupwise/e-gw-connection.c:169
+#: ../servers/groupwise/e-gw-connection.c:169
 msgid "Bad parameter"
 msgstr "Bad parameter"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:1
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
 msgid "Evolution Addressbook file backend"
 msgstr "Evolution Addressbook file backend"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:2
+#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
 msgid "Evolution Calendar file and webcal backend"
 msgstr "Evolution Calendar file and webcal backend"
 
 #. dialog display isn't working out
-#: src/server.c:101
+#: ../src/server.c:101
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
 msgstr "Multiple segmentation faults occurred; cannot display error dialogue\n"