[Goodies-commits] r5327 - xfce4-mailwatch-plugin/trunk/po

Brian Tarricone kelnos at xfce.org
Sat Aug 30 11:08:03 CEST 2008


Author: kelnos
Date: 2008-08-30 09:08:03 +0000 (Sat, 30 Aug 2008)
New Revision: 5327

Modified:
   xfce4-mailwatch-plugin/trunk/po/ar.po
   xfce4-mailwatch-plugin/trunk/po/ca.po
   xfce4-mailwatch-plugin/trunk/po/cs.po
   xfce4-mailwatch-plugin/trunk/po/de.po
   xfce4-mailwatch-plugin/trunk/po/el.po
   xfce4-mailwatch-plugin/trunk/po/en_GB.po
   xfce4-mailwatch-plugin/trunk/po/eu.po
   xfce4-mailwatch-plugin/trunk/po/fi.po
   xfce4-mailwatch-plugin/trunk/po/fr.po
   xfce4-mailwatch-plugin/trunk/po/gl.po
   xfce4-mailwatch-plugin/trunk/po/gu.po
   xfce4-mailwatch-plugin/trunk/po/he.po
   xfce4-mailwatch-plugin/trunk/po/hu.po
   xfce4-mailwatch-plugin/trunk/po/id.po
   xfce4-mailwatch-plugin/trunk/po/it.po
   xfce4-mailwatch-plugin/trunk/po/ja.po
   xfce4-mailwatch-plugin/trunk/po/nb_NO.po
   xfce4-mailwatch-plugin/trunk/po/pt_BR.po
   xfce4-mailwatch-plugin/trunk/po/pt_PT.po
   xfce4-mailwatch-plugin/trunk/po/ru.po
   xfce4-mailwatch-plugin/trunk/po/sq.po
   xfce4-mailwatch-plugin/trunk/po/uk.po
   xfce4-mailwatch-plugin/trunk/po/vi.po
   xfce4-mailwatch-plugin/trunk/po/xfce4-mailwatch-plugin.pot
   xfce4-mailwatch-plugin/trunk/po/zh_CN.po
   xfce4-mailwatch-plugin/trunk/po/zh_TW.po
Log:
update-po

Modified: xfce4-mailwatch-plugin/trunk/po/ar.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/ar.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/ar.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-07-15 16:20+0200\n"
 "Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
 "Language-Team: Arabeyes <doc at arabeyes.org>\n"
@@ -11,44 +11,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -56,257 +33,395 @@
 "method or location of the new messages feed."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
-msgid "STARTTLS security was requested, but this server does not support it."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
+msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
 "Advanced dialog."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, c-format
+msgid "Failed to send data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, c-format
+msgid "Failed to receive data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr ""
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr ""
 
@@ -324,220 +439,128 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr ""
-
 #: ../panel-plugin/mailwatch.desktop.in.in.h:1
 msgid "Check mail from multiple mailboxes"
 msgstr ""

Modified: xfce4-mailwatch-plugin/trunk/po/ca.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/ca.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/ca.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-21 20:25+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
@@ -18,42 +18,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"No s'ha pogut configurar el sòcol a mode no-bloquejador. Si l'intent de "
-"connexió es pengés és possible que el quadre també es pengi quan s'intenti "
-"tancar."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "No s'ha pogut connectar al servidor: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"No s'ha pogut configurar el sòcol a mode no-bloquejador. Es possible que no "
-"es consegueixin les dades correctament."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "No s'ha pogut dur a terme la connexió TLS: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -62,7 +34,7 @@
 "S'ha rebut el codi HTTP %d. El més probable és que el vostre usuario o "
 "contrassenya de GMail siguin incorrectes."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -73,38 +45,47 @@
 "problemes amb els servidors de GMail, s'han fet canvis que fa incompatible "
 "l'autentificació o s'ha canviat la localització dels missatges nous."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Nom d'_usuari:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Comprova si hi ha missatges _nous cada"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minut(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Bústia remota de GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -112,7 +93,7 @@
 "El connector GMail pot connectar-se al servei de correu de Google i "
 "recuperar de manera segura el nombre de missatges."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -120,39 +101,35 @@
 "La seguretat IMAP no està disponible i el servidor IMAP no permet connexions "
 "de text."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "S'ha demanat seguretat STARTLS però el servidor no ho permet."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"El servidor IMAP ha contestat amb una resposta inesperada. Això pot ser "
-"correcte, o que el connector s'ha de modificar per funcionar amb el vostre "
-"servidor de correu en el cas que el comptador de missatges nous sigui "
-"incorrecte."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "No s'ha obtingut la llista de carpetes"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Espereu…"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Error"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "No s'ha informat el servidor o el nom d'usuari."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -162,72 +139,72 @@
 "l'usuari i probablement la clau.  Assegureu-vos de fixar les opcions de "
 "seguretat a la finestra d'opcions avançades."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Fixa no ves carpetes de correu"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Noves carpetes de correu"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Opcions avançades d'IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Connexió"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Utilitza una connexió no segura"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Utilitza SSL/TLS en un ort alternatiu"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Utilitza SSL/TLS mitjançant STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Utilitza un _port no habitual d'IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Carpetes"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Directori del servidor IMAP: "
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Servidor de _correu;"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avançat…"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Carpetes noves de correu…"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Bústia de correu IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -235,38 +212,38 @@
 "El connector IMAP es pot connectar a un servidor de correu remot de tipus "
 "IMAP, opcionalment mitjançant SSL per protegir la connexió."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "No s'ha pogut obtenir l'estat del fitxer «%s»: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "«%s» No és un directori. És realment «%s» una carpeta de correu vàlida?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Seleccioneu una carpeta de correu"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Camí a la carpeta de correu:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Interval:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Cua local de carpetes «maildir»"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -274,29 +251,29 @@
 "El connector de carpetes de correu monitoritza el correu de les cues locals "
 "de tipus «maildir»."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Seleccioneu el fitxer Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nom del _fitxer Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Cua local Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "El connector Mbox monitoritza el correu de les cues locals de tipus «mbox». "
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Línia %s errònia, s'ignora %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -304,35 +281,35 @@
 "La configuració d'aquest connector es llegeix del\n"
 "perfil per defecte d'MH «~/.mh_profile»."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Carpeta local de correu MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "El connector MH monitoritza el correu a les carpetes locals MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Opcions avançades de POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Utilitza SSL/TLS mitjançant STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Utilitza un _port no habitual de POP3:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Servidor POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Bústia remota de POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -341,10 +318,147 @@
 "permeti l'ús del protocol POP3, opcionalment mitjançant SSL per protegir la "
 "connexió."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "No s'ha pogut connectar al servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "No s'ha compilat amb les opcions per SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "No s'ha pogut connectar al servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "No s'ha pogut connectar al servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "No s'ha pogut connectar al servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: No es pot inicialitzar el suport per GThread. Pot "
+"ser degut a problemes amb la vostra instaŀlació de GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "No es pot escriure el fitxer de configuració «%s»"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"No es poden ajustar els permisos del fitxer de configuració «%s». Si aquest "
+"fitxer te alguna clau o altra informació important podrà ser llegir per "
+"altres usuaris del sistema."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "A aquest tipus de bústia no li cal cap configuració."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Nom de la bústia:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Monitor de correu"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Cal que la bústia tingui un nom."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Introduïu un nom per la bústia."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Edita la bústia: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Seleccioneu el tipus de bústia"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Seleccioneu un tipus de bústia. La descripció del tipus es mostrarà a sota."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Afegeix una bústia nova"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Suprimeix la bústia"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Esteu segurs?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Si es suprimeixen les bústies tots els paràmetres es perdran. Aquests "
+"paràmetres no es poden recuperar."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Bústies"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "No hi han nous correus"
 
@@ -362,237 +476,172 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "%d a %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Monitor de correu d'Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "No es pot afegir el monitor de correu al quadre."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Pot ser que la vostra versió de GLib no permeti fils."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Registre del monitor de correu"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Línies del registre:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Mostra l'e_stat del registre a la icona"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Selecciona la icona"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "_Correu nou"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programes externs"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Executa _al fer clic:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Executa quan hi hagin nous _missatges:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Icones"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "_Correu nou"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Veu el registre…"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Monitor de correu"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "No s'ha pogut accedir a l'ajuda perquè no s'ha pogut executar 'xfhelp4': %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "L'ajuda no està disponible"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "No s'ha pogut executar «xfhelp4»"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Connector del monitor de correu d'Xfce4"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 "Una miniaplicació plena de funcionalitats per comprovar el correu pel plafó "
 "d'Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mantenidor, autor original"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Desenvolupador"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Actualitza ara"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "Monitor de correu d'Xfce: Connexió TLS fallida: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Comprova el correu de múltiples bústies"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "No s'ha compilat amb les opcions per SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el sòcol a mode no-bloquejador. Si l'intent de "
+#~ "connexió es pengés és possible que el quadre també es pengi quan "
+#~ "s'intenti tancar."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"Monitor de correu d'Xfce: Connexió TLS fallida: no s'ha compilat amb suport "
-"per SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el sòcol a mode no-bloquejador. Es possible que "
+#~ "no es consegueixin les dades correctament."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "S'ha soŀlicitat una connexió segura, però gnutls no està inicialitzat."
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "El servidor IMAP ha contestat amb una resposta inesperada. Això pot ser "
+#~ "correcte, o que el connector s'ha de modificar per funcionar amb el "
+#~ "vostre servidor de correu en el cas que el comptador de missatges nous "
+#~ "sigui incorrecte."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: No es pot inicialitzar el suport per GThread. Pot "
-"ser degut a problemes amb la vostra instaŀlació de GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "Monitor de correu d'Xfce: Connexió TLS fallida: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "No es pot escriure el fitxer de configuració «%s»"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "Monitor de correu d'Xfce: Connexió TLS fallida: no s'ha compilat amb "
+#~ "suport per SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"No es poden ajustar els permisos del fitxer de configuració «%s». Si aquest "
-"fitxer te alguna clau o altra informació important podrà ser llegir per "
-"altres usuaris del sistema."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "S'ha soŀlicitat una connexió segura, però gnutls no està inicialitzat."
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "A aquest tipus de bústia no li cal cap configuració."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Nom de la bústia:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Monitor de correu"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Cal que la bústia tingui un nom."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Introduïu un nom per la bústia."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Edita la bústia: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Seleccioneu el tipus de bústia"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Seleccioneu un tipus de bústia. La descripció del tipus es mostrarà a sota."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Afegeix una bústia nova"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Suprimeix la bústia"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Esteu segurs?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Si es suprimeixen les bústies tots els paràmetres es perdran. Aquests "
-"paràmetres no es poden recuperar."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Bústies"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Comprova el correu de múltiples bústies"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Quant al Monitor de correu"

Modified: xfce4-mailwatch-plugin/trunk/po/cs.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/cs.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/cs.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-09-23 10:02+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,41 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Nelze nastavit socket do neblokujícího režimu. Pokud pokus o připojení "
-"zamrzne, panel nemusí při zavírání reagovat."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Připojení k serveru se nezdařilo: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Nelze vrátit socket do blokujícího režimu. Data možná nebudou korektně "
-"přijata."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Připojení pomocí TLS selhalo: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -59,7 +32,7 @@
 "Byla přijata odpověď protokolu HTTP s kódem %d. Obvyklý důvod tohoto chování "
 "spočívá v nesprávném zadání uživatelského jména nebo heslo."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +43,47 @@
 "200. Problém může být na straně serverů GMail nebo byla změněna metoda "
 "ověření nebo umístění novým zpráv."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Uživatelské jméno:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Zjišťovat nové zprávy každých"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minut."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Vzdálená poštovní schránka GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,7 +91,7 @@
 "Zásuvný modul GMail je schopen spojení se službou elektronické pošty Google "
 "a bezpečně přijmout počet nových zpráv."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -117,38 +99,35 @@
 "Zabezpečený protokol IMAP není dostupný, server IMAP nepodporuje přihlášení "
 "nešifrovaným heslem."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Bylo vyžádáno zabezpečení STARTTLS, ale tento server jej nepodporuje."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Server IMAP vrátil neočekávanou hodnotu. Toto nemusí znamenat chybu, pokud "
-"se však zobrazuje nesprávný počet nových zpráv, zásuvný modul pravděpodobně "
-"vyžaduje úpravu pro podporu Vašeho poštovního serveru."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Získání seznamu složky se nezdařilo."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Prosím čekejte..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Chyba"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Není nastaven název serveru nebo uživatelské jméno."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -158,72 +137,72 @@
 "uživatelské jméno a heslo. Ujistěte se také, že jste nastavili veškerá "
 "nastavení bezpečnosti v dialogu Upřesnit."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Nastavit složky nové elektronické pošty"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Nastavit složky elektronické pošty"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Pokročilé nastavení protokolu IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Připojení"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Použít nezabezpečené připojení"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Použít SSL/TLS na alternativním portu"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Použít SSL/TLS přes STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Použít nestandardní _port pro protokol IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Složky"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "A_dresář serveru IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Server IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Poštovní s_erver"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Upřesnit..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "N_ové složky elektronické pošty..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Vzdálená schránka IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -231,39 +210,39 @@
 "Zásuvný modul IMAP se dokáže připojit ke vzdálenému poštovnímu serveru, "
 "který podporuje protokol IMAP, volitelně se zabezpečením SSL."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Získání informací o souboru %s se nezdařilo: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 "%s není adresář. Je %s opravdu platný adresář elektronické pošty (maildir)?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Vyberte složku adresáře elektronické pošty (maildir)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Cesta adresáře elektronické _pošty (maildir):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Interval:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Místní úložiště elektronické pošty typu Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -271,30 +250,30 @@
 "Zásuvný modul Maildir sleduje nově příchozí zprávy v místním úložišti "
 "elektronické pošty typu maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Vyberte si soubor mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Ná_zev souboru mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Místní úložiště elektronické pošty typu Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Zásuvný modul leduje nově příchozí zprávy v úložišti elektronické pošty typu "
 "mbox."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Nesprávná formulace na řádku %s v %s bude ignorována."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -303,36 +282,36 @@
 "z výchozího souboru adresáře elektronické\n"
 "pošty ~/.hm_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Místní složka elektronické pošty typu MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 "Zásuvný modul MH sleduje nové zprávy ve složce elektronické pošty typu MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Upřesnění nastavení POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Použít SSL/TLS přes STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "_Použít nestandardní port POP3_"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Server POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Vzdálená schránka POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -340,10 +319,145 @@
 "Zásuvný modul POP3 se může připojit ke vzdálenému serveru s podporou POP3, "
 "volitelně s zabezpečením SSL."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Připojení k serveru se nezdařilo: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Nezkompilováno s podporou protokolu SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Připojení k serveru se nezdařilo: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Připojení k serveru se nezdařilo: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Připojení k serveru se nezdařilo: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Nelze inicializovat podporu GThread. Toto může být "
+"způsobeno instalací balíku GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Nelze zapisovat do souboru s nastavením '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Nelze nastavit přístupová práva pro soubor s nastavením '%s'. Pokud tento "
+"soubor obsahuje hesla nebo jiné citlivé údaje, může být čitelný pro jiné "
+"uživatele Vašeho systému."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Tato schránka nevyžaduje žádná další nastavení."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Název schránky:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Sledování elektronické pošty"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Schránka vyžaduje název."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Vložte prosím název schránky."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Upravit schránku: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Vyberte typ schránky"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Vyberte typ schránky. Popis typu najdete níže."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Přidat novou schránku"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Odebrat schránku"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Jste si jisti?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Odebráním schránky zrušíte všechna nastavení, tuto operaci nelze vrátit zpět."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Poštovní schránky"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Žádné nové zprávy"
 
@@ -362,233 +476,168 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Applet mailwatch nemohl být přidán na panel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Je možné, že Vaše verze Glib nemá podporu vláken."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Záznam programu mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Řá_dky záznamu:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Zobrazit _stav záznamu jako ikonu"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Vybrat ikonu"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Běžný"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "No_vá pošta"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Externí programy"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Spustit při _kliknutí:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Spustit při nových _zprávách:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikony"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "No_vá pošta"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Zobrazit záznam..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Sledování pošty"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Nápověda není dostupná, protože program 'xfhelp4' nelze spustit: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Nápověda není dostupná"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Spuštění xfhelp4 se nezdařilo"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: Přihlášení TLS se nezdařilo: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Ověřovat poštu ve více schránkách."
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Nezkompilováno s podporou protokolu SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Nelze nastavit socket do neblokujícího režimu. Pokud pokus o připojení "
+#~ "zamrzne, panel nemusí při zavírání reagovat."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: Připojení TLS se nezdařilo: program nebyl zkompilován s "
-"podporou protokolu SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Nelze vrátit socket do blokujícího režimu. Data možná nebudou korektně "
+#~ "přijata."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Bylo požadováno zabezpečené připojení, ale gnutls nebyl inicializován"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Server IMAP vrátil neočekávanou hodnotu. Toto nemusí znamenat chybu, "
+#~ "pokud se však zobrazuje nesprávný počet nových zpráv, zásuvný modul "
+#~ "pravděpodobně vyžaduje úpravu pro podporu Vašeho poštovního serveru."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Nelze inicializovat podporu GThread. Toto může být "
-"způsobeno instalací balíku GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: Přihlášení TLS se nezdařilo: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Nelze zapisovat do souboru s nastavením '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: Připojení TLS se nezdařilo: program nebyl zkompilován s "
+#~ "podporou protokolu SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Nelze nastavit přístupová práva pro soubor s nastavením '%s'. Pokud tento "
-"soubor obsahuje hesla nebo jiné citlivé údaje, může být čitelný pro jiné "
-"uživatele Vašeho systému."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "Bylo požadováno zabezpečené připojení, ale gnutls nebyl inicializován"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Tato schránka nevyžaduje žádná další nastavení."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Název schránky:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Sledování elektronické pošty"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Schránka vyžaduje název."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Vložte prosím název schránky."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Upravit schránku: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Vyberte typ schránky"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Vyberte typ schránky. Popis typu najdete níže."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Přidat novou schránku"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Odebrat schránku"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Jste si jisti?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Odebráním schránky zrušíte všechna nastavení, tuto operaci nelze vrátit zpět."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Poštovní schránky"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Ověřovat poštu ve více schránkách."
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Sledování elektronické pošty"

Modified: xfce4-mailwatch-plugin/trunk/po/de.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/de.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/de.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-18 16:46+0100\n"
 "Last-Translator: Enrico Tröger <enrico.troeger at uvena.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -18,42 +18,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Eine offene Verbindung konnte nicht geschlossen werden. Bei "
-"Verbindungsproblemen kann es vorkommen, dass die Leiste nicht beendet werden "
-"kann."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Verbindungsaufbau zu Server %s fehlgeschlagen"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Eine Verbindung konnte nicht korrekt aufgebaut werden. Dadurch können "
-"Probleme beim Datenempfang entstehen."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS Verbindungsaufbau fehlgeschlagen: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -62,7 +34,7 @@
 "HTTP Antwort %d erhalten. Wahrscheinlich ist Ihr GoogleMail Passwort oder "
 "Benutzername inkorrekt."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -73,38 +45,47 @@
 "gibt es Probleme mit den GoogleMail Servern (Änderung des Loginvorgangs, "
 "Verschiebung der Seite mit den Informationen über neue Nachrichten)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Prüfung nach _neuen Nachrichten im Intervall"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "Minute(n)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Entferntes GoogleMail-Postfach"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -112,7 +93,7 @@
 "Das GoogleMail Plugin kann sich mit Google verbinden und über eine sichere "
 "Verbindung die Anzahl der neuen Nachrichten herausfinden."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -120,40 +101,37 @@
 "IMAP über eine verschlüsselte Verbindung ist nicht möglich, und der Server "
 "unterstützt keine Klartext-Logins."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "STARTTLS-Login wurde verlangt, der Server unterstützt das Verfahren aber "
 "nicht."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Der IMAP-Server hat eine unerwartete Antwort geliefert. Dies könnte in "
-"Ordnung sein, oder dieses Plugin müsste geändert werden, um Ihren Mail-"
-"Server zu unterstützen, falls die Anzahl an neuen Nachrichten inkorrekt ist."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Laden der Ordnerliste fehlgeschlagen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Fehler"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Es ist kein Server- oder Benutzername eingegeben."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -163,72 +141,72 @@
 "wahrscheinlich Passwort eingegeben wurden. Bitte sehen Sie sich auch im "
 "Dialog \"Erweitert\" die Sicherheitseinstellungen an."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Ordner für neue Emails eingeben"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Ordner für neue Emails"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Erweiterte IMAP-Optionen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Unsichere Verbindung verwenden"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Verwende SSL/TLS über einen anderen Port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Verwende SSL/TLS über STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Verwende anderen IMAP-_Port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Ordner"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP-Server_verzeichnis:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP-Server"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Mailserver:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Erweitert..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Ordner _für neue Emails..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Entferntes IMAP-Postfach"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -236,39 +214,39 @@
 "Das IMAP-Plugin kann sich mit einem entfernten Server verbinden, auch mit "
 "SSL-Verschlüsselung für mehr Verbindungssicherheit."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Konnte Status von Datei %s nicht feststellen: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 "%s ist kein Verzeichnis. Ist %s wirklich ein gültiges Maildir-Verzeichnis?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Maildir-Ordner auswählen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir-_Pfad"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervall:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Lokales Maildir-Postfach"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -276,29 +254,29 @@
 "Das Maildir-Plugin kann ein lokales Maildir-Verzeichnis auf neue Nachrichten "
 "überwachen."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Mbox-Datei auswählen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox-_Dateiname:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Lokales Mbox-Postfach"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Das Mbox-Plugin überwacht ein lokales Mbox-Postfach auf neue Nachrichten."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Ungültige Zeile %s in %s wird ignoriert."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -307,35 +285,35 @@
 "Standard-Profildatei für das MH Maildir-Verzeichnis\n"
 "~/.mh_profile gelesen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Lokale MH-Mailordner"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Das MH-Plugin überwacht lokale MH-Ordner auf neue Nachrichten."
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Erweiterte POP3-Optionen"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Nutze SSL/TLS über STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Verwende anderen _POP3-Port:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3-Server"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Entferntes POP3-Postfach"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -343,10 +321,148 @@
 "Das POP3-Plugin kann sich mit einem entfernten Server verbinden, auch mit "
 "SSL-Verschlüsselung für mehr Verbindungssicherheit."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Verbindungsaufbau zu Server %s fehlgeschlagen"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Nicht mit SSL-Unterstützung kompiliert"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Verbindungsaufbau zu Server %s fehlgeschlagen"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Verbindungsaufbau zu Server %s fehlgeschlagen"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Verbindungsaufbau zu Server %s fehlgeschlagen"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Initialisierung der GThread-Unterstützung "
+"fehlgeschlagen. Dies ist möglicherweise ein Problem mit Ihrer GLib-"
+"Installation."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Fehler beim Schreiben der Konfigurationsdatei '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Fehler beim Setzen der Zugriffsrechte für die Konfigurationsdatei '%s'. Wenn "
+"die Datei Passwörter oder andere sensible Informationen beinhaltet, ist sie "
+"nun möglicherweise von anderen Benutzern auf Ihrem System lesbar."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Dieser Postfach-Typ benötigt keine Konfigurationseinstellungen."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Postfach-_Name:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Postfachname wird benötigt."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Bitte geben Sie einen Namen für das Postfach ein."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Postfach bearbeiten: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Postfach-Typ auswählen"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Wählen Sie einen Postfach-Typ. Eine Beschreibung des Typs erscheint unten."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Neues Postfach hinzufügen"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Postfach entfernen"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Sind Sie sicher?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Das Entfernen eines Postfachs löscht alle Einstellungen und kann nicht "
+"rückgängig gemacht werden."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Postfächer:"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Keine neuen Nachrichten"
 
@@ -364,113 +480,113 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "tells how many new messages in each mailbox|    %d in %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Die Mailüberwachung kann nicht zur Leiste hinzugefügt werden."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Es ist möglich, dass Ihre Glib-Version Threads nicht unterstützt."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch Logdatei"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Logzei_len"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Log_status im Symbol anzeigen"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Symbol auswählen"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "_Neue Nachrichten"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Externe Programme"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "_Ausführen bei Klick:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Ausführen bei _neuen Nachrichten:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Symbole"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "_Neue Nachrichten"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Logdatei betrachten..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Mail Watcher"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "Die Hilfe ist nicht verfügbar, da 'xfhelp4' nicht ausgeführt werden konnte: %"
 "s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Hilfe nicht verfügbar"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Konnte xfhelp4 nicht ausführen"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce4 Mailwatch-Plugin"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Ein funktionsreiches Mail-Prüf-Plugin für die Xfce-Leiste"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -478,126 +594,59 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Ursprünglicher Autor/Maintainer"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Entwickler"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Aktualisieren"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS-Verbindungsaufbau fehlgeschlagen: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Mehrere Postfächer auf neue Nachrichten überprüfen"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Nicht mit SSL-Unterstützung kompiliert"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Eine offene Verbindung konnte nicht geschlossen werden. Bei "
+#~ "Verbindungsproblemen kann es vorkommen, dass die Leiste nicht beendet "
+#~ "werden kann."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: TLS-Verbindungsaufbau fehlgeschlagen: nicht mit SSL-"
-"Unterstützung kompiliert."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Eine Verbindung konnte nicht korrekt aufgebaut werden. Dadurch können "
+#~ "Probleme beim Datenempfang entstehen."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-"Eine sichere Verbindung wurde angefordert, aber gnutls ist noch nicht "
-"initialisiert"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Der IMAP-Server hat eine unerwartete Antwort geliefert. Dies könnte in "
+#~ "Ordnung sein, oder dieses Plugin müsste geändert werden, um Ihren Mail-"
+#~ "Server zu unterstützen, falls die Anzahl an neuen Nachrichten inkorrekt "
+#~ "ist."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Initialisierung der GThread-Unterstützung "
-"fehlgeschlagen. Dies ist möglicherweise ein Problem mit Ihrer GLib-"
-"Installation."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS-Verbindungsaufbau fehlgeschlagen: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Fehler beim Schreiben der Konfigurationsdatei '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: TLS-Verbindungsaufbau fehlgeschlagen: nicht mit SSL-"
+#~ "Unterstützung kompiliert."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Fehler beim Setzen der Zugriffsrechte für die Konfigurationsdatei '%s'. Wenn "
-"die Datei Passwörter oder andere sensible Informationen beinhaltet, ist sie "
-"nun möglicherweise von anderen Benutzern auf Ihrem System lesbar."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "Eine sichere Verbindung wurde angefordert, aber gnutls ist noch nicht "
+#~ "initialisiert"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Dieser Postfach-Typ benötigt keine Konfigurationseinstellungen."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Postfach-_Name:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Postfachname wird benötigt."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Bitte geben Sie einen Namen für das Postfach ein."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Postfach bearbeiten: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Postfach-Typ auswählen"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Wählen Sie einen Postfach-Typ. Eine Beschreibung des Typs erscheint unten."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Neues Postfach hinzufügen"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Postfach entfernen"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Sind Sie sicher?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Das Entfernen eines Postfachs löscht alle Einstellungen und kann nicht "
-"rückgängig gemacht werden."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Postfächer:"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Mehrere Postfächer auf neue Nachrichten überprüfen"
-
 #~ msgid "About Mailwatch"
 #~ msgstr "Über Mailwatch"

Modified: xfce4-mailwatch-plugin/trunk/po/el.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/el.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/el.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-14 21:32+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg at hellug.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -19,41 +19,14 @@
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Unable to set socket to non-blocking mode.  Εάν κρεμάσει η προσπάθεια "
-"σύνδεσης. το ταμπλό μπορεί να κρεμάσει κατά το κλείσιμο."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Αδυναμία σύνδεσης στον εξυπηρετητή: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Unable to return socket to blocking mode.  Τα δεδομένα μπορεί να μην "
-"διαβαστούν σωστά."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Η χειραψία TLS απέτυχε: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -62,7 +35,7 @@
 "Ελήφθη κωδικός απάντησης HTTP %d. Ο πιο πιθανός λόγος είναι ότι το όνομα "
 "χρήστη ή το συνθηματικό σας για το GMail είναι λανθασμένο."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -74,38 +47,47 @@
 "μέθοδο πιστοποίησης με μη συμβατό τρόπο ή την τοποθεσία της παροχής νέων "
 "μηνυμάτων."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Συνθηματικό:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "λεπτά."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Απομακρυσμένο γραμματοκιβώτιο GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -113,7 +95,7 @@
 "Το πρόσθετο GMail μπορεί να συνδεθεί στον διακομιστή αλληλογραφίας του "
 "Google και να διαβάσει με ασφάλεια τον αριθμό των νέων μηνυμάτων σας."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -121,40 +103,36 @@
 "Δεν υπάρχει διαθέσιμο ασφαλές IMAP, και ο διακομιστής IMAP δεν υποστηρίζει "
 "διαπίστευση με απλό κείμενο."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "Ζητήθηκε ασφάλεια STARTTLS, αλλά αυτός ο διακομιστής δεν το υποστηρίζει."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Ο εξυπηρετητής IMAP αποκρίθηκε με μη αναμενόνεμο τρόπο. Αυτό μπορεί να είναι "
-"εντάξει, ή θα πρέπει αυτό το πρόσθετο να τροποποιηθεί για να υποστηρίξει τον "
-"εξυπηρετητή αλληλογραφίας σας αν η μέτρηση νέας αλληλογραφίας δεν είναι "
-"σωστή."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Αποτυχία λήψης λίστας φακέλων"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Δεν έχει οριστεί διακομιστής ή όνομα χρήστη."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -164,72 +142,72 @@
 "όνομα χρήστη και πιθανόν κωδικός. Επίσης ελέγξετε τις ρυθμίσεις ασφαλείας "
 "στον διάλογο Για προχωρημένους."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Ορισμός νέων φακέλων αλληλογραφίας"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Νέοι φάκελοι ταχυδρομείου"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Προχωρημένες επιλογές IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Χρήση μη-ασφαλούς σύνδεσης:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Χρήση SSL/TLS σε εναλλακτική θύρα"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Χρήση SSL/TLS μέσω STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Χρήση μη-καθιε_ρωμένης θύρας IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Φάκελοι"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "Κατάλογος _διακομιστή IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Διακομιστής IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Διακο_μιστής Αλληλογραφίας:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "Για προ_χωρημένους..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Νέοι _φάκελοι ταχυδρομείου..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Απομακρυσμένο γραμματοκιβώτιο IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -238,38 +216,38 @@
 "υποστηρίζει το πρωτόκολλο IMAP, χρησιμοποιώντας προαιρετικά SSL για την "
 "προστασία της σύνδεσης."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Αποτυχία λήψης της κατάστασης του αρχείου %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "Το %s δεν είναι κατάλογος. Είναι το %s σίγουρα ένα έγκυρο maildir;"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Επιλογή φακέλου Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Διαδ_ρομή του Maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "Δ_ιάστημα ανανέωσης:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Τοπικό Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -277,30 +255,30 @@
 "Το άρθρωμα Maildir μπορεί να παρακολουθεί ένα τοπικό αρχείο αλληλογραφίας "
 "τύπου maildir για νέα μηνύματα."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Επιλογή αρχείου mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Όνομα _αρχείου mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Αρχείο αλληλογραφίας Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Το άρθρωμα mbox παρακολουθεί τοπικά γραμματοκιβώτια τύπου mbox για νέα "
 "μηνύματα."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Η κακοσχηματισμένη γραμμή %s στο %s αγνοήθηκε."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -308,35 +286,35 @@
 "Οι ρυθμίσεις αυτού του αρθρώματος διαβάζονται από το\n"
 "προκαθορισμένο αρχείο προφίλ του mh maildir ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Τοπικός φάκελος αλληλογραφίας MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Το άρθρωμα MH παρακολουθεί τοπικούς φακέλους MH για νέα αλληλογραφία"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Προχωρημένες επιλογές POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Χρήση SSL/TLS μέσω STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Χρήση μη-καθιερωμένης θύ_ρας POP3:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Διακομιστής POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Απομακρυσμένο γραμματοκιβώτιο POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -345,10 +323,148 @@
 "αλληλογραφίας που υποστηρίζει το πρωτόκολλο POP3, προαιρετικά "
 "χρησιμοποιώντας SSL για την προστασία της σύνδεσης"
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Αδυναμία σύνδεσης στον εξυπηρετητή: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Δε μεταγλωττίστηκε με υποστήριξη για SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Αδυναμία σύνδεσης στον εξυπηρετητή: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Αδυναμία σύνδεσης στον εξυπηρετητή: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Αδυναμία σύνδεσης στον εξυπηρετητή: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Δεν ήταν δυνατή η ενεργοποίηση υποστήριξης GThread. "
+"Αυτό είναι ένα πιθανό πρόβλημα με την εγκατάσταση της  GLib σας."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Αδυναμία εγγραφής στο αρχείο ρυθμίσεων '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Αδύνατος ο ορισμός των δικαιωμάτων στο αρχείο ρυθμίσεων '%s'. Εάν αυτό το "
+"αρχείο περιέχει κωδικούς ή άλλες ευαίσθητες πληροφορίες, μπορεί να είναι "
+"προσβάσιμο και από άλλους στο σύστημα σας."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Αυτός ο τύπος γραμματοκιβωτίου δεν απαιτεί ρυθμίσεις."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Ό_νομα γραμματοκιβωτίου:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Παρακολούθηση αλληλογραφίας"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Απαιτείται όνομα γραμματοκιβωτίου."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Εισάγετε ένα όνομα για αυτό το γραμματοκιβώτιο."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Επεξεργασία γραμματοκιβωτίου: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Επιλογή είδους γραμματοκιβωτίου"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Επιλέξτε έναν τύπο γραμματοκιβωτίου. Θα εμφανιστεί μια περιγραφή του "
+"παρακάτω."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Προσθήκη νέου γραμματοκιβωτίου"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Αφαίρεση γραμματοκιβωτίου"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Είστε σίγουροι;"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Με την αφαίρεση ενός γραμματοκιβωτίου θα χαθούν όλες οι ρυθμίσεις, και δεν "
+"μπορεί να αναιρεθεί."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Γραμματοκιβώτια"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Δεν υπάρχουν νέα μηνύματα"
 
@@ -366,114 +482,114 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "    %d στο %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Το εφαρμογίδιο mailwatch δεν μπορεί να προστεθεί στον πίνακα."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 "Πιθανόν η έκδοση της Glib που διαθέτετε δεν έχει υποστήριξη για νήματα."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Καταγραφή του Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Γραμμές κατα_γραφής:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Εμφάνιση κατάστασης της καταγραφής στο εικονίδιο"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Επιλέξτε εικονίδιο"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Κανονικό"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Νέ_α αλληλογραφία"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Εξωτερικά προγράμματα"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Εκτέλεση στ_ο κλικ:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Εκτέλεση στα νέα _μηνύματα:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Εικονίδια"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Νέ_α αλληλογραφία"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "Εμφάνιση του α_ρχείου καταγραφών..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Παρακολούθηση αλληλογραφίας"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "Η Βοήθεια δεν είναι διαθέσιμη επειδή το 'xfhelp4' δεν μπόρεσε να εκτελεστεί: "
 "%s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Η Βοήθεια δεν είναι διαθέσιμη"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Η εκτέλεση του xfhelp4 απέτυχε"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Πρόσθετο παρακολούθησης αλληλογραφίας"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Έλεγχος αλληλογραφίας από το ταμπλό του Xfce με πολλές δυνατότητες"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -481,124 +597,57 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Αρχική ανάπτυξη, συντήρηση"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Ανάπτυξη"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Ενημέρωση τώρα"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: Η χειραψία TLS απέτυχε: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Έλεγχος πολλαπλών γραμματοκιβωτίων"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Δε μεταγλωττίστηκε με υποστήριξη για SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Unable to set socket to non-blocking mode.  Εάν κρεμάσει η προσπάθεια "
+#~ "σύνδεσης. το ταμπλό μπορεί να κρεμάσει κατά το κλείσιμο."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: Η χειραψία TLS απέτυχε: δε μεταγλωττίστηκε με υποστήριξη SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Unable to return socket to blocking mode.  Τα δεδομένα μπορεί να μην "
+#~ "διαβαστούν σωστά."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Απαιτήθηκε ασφαλής σύνδεση, αλλά δεν ξεκίνησε το gnutls"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Ο εξυπηρετητής IMAP αποκρίθηκε με μη αναμενόνεμο τρόπο. Αυτό μπορεί να "
+#~ "είναι εντάξει, ή θα πρέπει αυτό το πρόσθετο να τροποποιηθεί για να "
+#~ "υποστηρίξει τον εξυπηρετητή αλληλογραφίας σας αν η μέτρηση νέας "
+#~ "αλληλογραφίας δεν είναι σωστή."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Δεν ήταν δυνατή η ενεργοποίηση υποστήριξης GThread. "
-"Αυτό είναι ένα πιθανό πρόβλημα με την εγκατάσταση της  GLib σας."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: Η χειραψία TLS απέτυχε: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Αδυναμία εγγραφής στο αρχείο ρυθμίσεων '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: Η χειραψία TLS απέτυχε: δε μεταγλωττίστηκε με υποστήριξη "
+#~ "SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Αδύνατος ο ορισμός των δικαιωμάτων στο αρχείο ρυθμίσεων '%s'. Εάν αυτό το "
-"αρχείο περιέχει κωδικούς ή άλλες ευαίσθητες πληροφορίες, μπορεί να είναι "
-"προσβάσιμο και από άλλους στο σύστημα σας."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Απαιτήθηκε ασφαλής σύνδεση, αλλά δεν ξεκίνησε το gnutls"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Αυτός ο τύπος γραμματοκιβωτίου δεν απαιτεί ρυθμίσεις."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Ό_νομα γραμματοκιβωτίου:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Παρακολούθηση αλληλογραφίας"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Απαιτείται όνομα γραμματοκιβωτίου."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Εισάγετε ένα όνομα για αυτό το γραμματοκιβώτιο."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Επεξεργασία γραμματοκιβωτίου: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Επιλογή είδους γραμματοκιβωτίου"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Επιλέξτε έναν τύπο γραμματοκιβωτίου. Θα εμφανιστεί μια περιγραφή του "
-"παρακάτω."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Προσθήκη νέου γραμματοκιβωτίου"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Αφαίρεση γραμματοκιβωτίου"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Είστε σίγουροι;"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Με την αφαίρεση ενός γραμματοκιβωτίου θα χαθούν όλες οι ρυθμίσεις, και δεν "
-"μπορεί να αναιρεθεί."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Γραμματοκιβώτια"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Έλεγχος πολλαπλών γραμματοκιβωτίων"
-
 #~ msgid "About Mailwatch"
 #~ msgstr "Περί του Mailwatch"
 

Modified: xfce4-mailwatch-plugin/trunk/po/en_GB.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/en_GB.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/en_GB.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-05-10 13:25+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -17,41 +17,14 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Failed to connect to server: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS handshake failed: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +33,7 @@
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -71,38 +44,47 @@
 "with GMail's servers, or they have incompatibly changed their authentication "
 "method or location of the new messages feed."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minute(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Remote GMail Mailbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -110,7 +92,7 @@
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -118,38 +100,35 @@
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "STARTTLS security was requested, but this server does not support it."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Failed to get folder list"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Please wait..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Error"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "No server or username is set."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -159,72 +138,72 @@
 "password are set.  Also be sure to check any security settings in the "
 "Advanced dialogue."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Set New Mail Folders"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "New Mail Folders"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Advanced IMAP Options"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Connection"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Use unsecured connection"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Use SSL/TLS on alternate port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Use SSL/TLS via STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Use non-standard IMAP _port:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Folders"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP server _directory:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP Server"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Mail server:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Advanced..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "New mail _folders..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Remote IMAP Mailbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -232,38 +211,38 @@
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Failed to get status of file %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s is not a directory. Is %s really a valid maildir?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Select Maildir Folder"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir _Path:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Interval:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Local Maildir Spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -271,28 +250,28 @@
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Select mbox file"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox _Filename:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Local Mbox spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Mbox plugin watches a local mbox-type mail spool for new messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Malformed line %s in %s ignored."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -300,35 +279,35 @@
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Local MH mail folder"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH plugin watches local MH folders for new mail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Advanced POP3 Options"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Use SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Use non-standard POP3 _port:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 Server"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Remote POP3 Mailbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -336,10 +315,144 @@
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Failed to connect to server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Not compiled with SSL/TLS support"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Failed to connect to server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Failed to connect to server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Failed to connect to server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Unable to write config file '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "This mailbox type does not require any configuration settings."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Mailbox _Name:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Mailbox name required."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Please enter a name for the mailbox."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Edit Mailbox: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Select Mailbox Type"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Select a mailbox type.  A description of the type will appear below."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Add New Mailbox"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Remove Mailbox"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Are you sure?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "Removing a mailbox will discard all settings, and cannot be undone."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Mailboxes"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "No new mail"
 
@@ -357,112 +470,112 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "%d in %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "The mailwatch applet cannot be added to the panel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 "It is possible that your version of GLib does not have threads support."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch log"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Log _lines:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Show log _status in icon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Select Icon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Ne_w mail"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "External Programs"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Run _on click:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Run on new _messages:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Icons"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Ne_w Mail"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_View Log..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Mail Watcher"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Help is unavailable because 'xfhelp4' could not be run: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Help Unavailable"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Failed to run xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce4 Mailwatch Plugin"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "A featureful mail-checker applet for the Xfce Panel"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -470,119 +583,54 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Maintainer, Original Author"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Developer"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Update Now"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS handshake failed: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Check mail from multiple mailboxes"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Not compiled with SSL/TLS support"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "A secure connection was requested, but gnutls was not initialised"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS handshake failed: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Unable to write config file '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "A secure connection was requested, but gnutls was not initialised"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "This mailbox type does not require any configuration settings."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Mailbox _Name:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Mailbox name required."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Please enter a name for the mailbox."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Edit Mailbox: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Select Mailbox Type"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Select a mailbox type.  A description of the type will appear below."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Add New Mailbox"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Remove Mailbox"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Are you sure?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "Removing a mailbox will discard all settings, and cannot be undone."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Mailboxes"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Check mail from multiple mailboxes"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Mailwatch"

Modified: xfce4-mailwatch-plugin/trunk/po/eu.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/eu.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/eu.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-05-01 23:36+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -18,40 +18,14 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Ezin da socket-a ez-blokeatu egoeran ezarri. Konexio eten ezkero panela "
-"izoztu egin daiteke ixterakoan."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Huts zerbitzarira konektatzerakoan: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Ezin da socket-a blokeo modura itzuli.  Datuak ez dira behar bezala jasoko."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS agurrak huts egin du: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +34,7 @@
 "HTTP erantzun %d kodea jaso da.  Arrazoi arruntena zure GMail erabiltzailea "
 "edo pasahitza okerra izatea da."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -71,38 +45,47 @@
 "GMail zerbitzariekin edo beraiek era bateraezin batetara autentifikazio "
 "modua aldatu edo mezu berri jario kokalekua aldatu dute."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Erabiltzailea:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Posta berri bila arakatze aldia"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minutu."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Urruneko GMail postakutxa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -110,7 +93,7 @@
 "GMail plugin-ak Googleren eposta zerbitzura konektatu eta modu seguruan mezu "
 "berri kopurua eskura dezake."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -118,38 +101,35 @@
 "IMAP segurua ez da erabilgarri, eta IMAP zerbitzariak ez ditu testu "
 "arrunteko saioak onartzen."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "STARTTLS segurtasuna eskatu da baina zerbitzariak ez du onartzen."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"IMAP zerbitzariak espero ez genuen erantzun bat eman du.  Hau agian ondo "
-"egon liteke, edo plugin hau eraldatua izan behar da zure zerbitzaria "
-"onartzeko mezu berri kopurua ez bada zuzena."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Huts karpeta zerrenda eskuratzerakoan"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Itxoin mesedez..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Errorea"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Ez da zerbitzari edo erabiltzaile izenik ezarri."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -159,72 +139,72 @@
 "pasahitza ezarri baino lehen.  Ziurtatu ere Aurreratuak aukerako seguratsun "
 "ezarpenak behar dituzunak direla."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Ezarri posta karpeta berriak"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Posta karpeta berria"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "IMAP aukera aurreratuak"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Konexioa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Segurtasun gabeko konexioa erabili"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "SSL/TLS beste ataka batetan erabili"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "SSL/TLS STARTTLS bidez erabili"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "IMAP _ataka ez estandarra erabili:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Karpetak"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP zerbitzari _direktorioa:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP zerbitzaria"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Posta _zerbitzaria"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Aurreratua..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Posta _karpeta berriak..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Urruneko IMAP postakutxa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -232,68 +212,68 @@
 "IMAP plugin-ak IMAP onartzen duen urruneko posta zerbitzari batetara "
 "konektatu daiteke, SSL konexio babesa aukera du."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Huts %s fitxategiaren egoera eskuratzerakoan: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s ez da direktorio bat. Benetan %s baliozko posta karpeta bat dela?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Hautatu Maildir Karpeta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir B_idea:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Tartea:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Maildir hilara lokala"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 "Maildir plugin-ak maildir-moduko posta hilara araka dezake mezu berrien bila."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Hautatu mbox fitxategia"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox _Fitxategi izena"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Mbox hilara lokala"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Mbox plugin-ak mbox-moduko posta hilara lokalak arakatzen ditu mezu berrien "
 "bila."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Gaizki eratutako %s lerroa alde batetara utziko da %s fitxategian."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -301,35 +281,35 @@
 "Plugin honen konfigurazioa lehenetsiriko maildir\n"
 " ~/.mh_profile profil fitxategitik artzen da"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "MH posta karpeta lokala"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH plugin-ak MH karpeta lokalak arakatzen ditu mezu berrien bila"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "POP3 aukera aurreratuak"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "SSL/TLS STLS bidez erabili"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "POP3 _ataka ez estandarra:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 Zerbitzaria"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Urruneko POP3 Postakutxa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -337,10 +317,148 @@
 "POP3 plugin-ak POP3 onartzen duen urruneko posta zerbitzari batetara "
 "konektatu daiteke, SSL konexio babesa aukera du."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Huts zerbitzarira konektatzerakoan: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Ez da SSL/TLS onarpenarekin konpilatu"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Huts zerbitzarira konektatzerakoan: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Huts zerbitzarira konektatzerakoan: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Huts zerbitzarira konektatzerakoan: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Ezin da GThread onarpena abiarazi.  Hau ziurrenik "
+"zure GLib instalazioaren arazo bat da."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Ezinda '%s' konfigurazio fitxategia idatzi"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Ezin dira '%s' konfigurazio fitxategiaren baimenak ezarri.  Fitxategi honek "
+"pasahitzak edo datu pribatuak izan ezkero zure sistemako besteek irakurri "
+"ahal izango dute."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Postakutxa mota honek ez du konfigurazio ezarpenik behar."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Postakutxa _Izena:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Posta arakatzailea"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Postakutxa izena beharrezkoa da."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Mesedez idatzi postakutxarentzat izen bat."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Editatu postakutxa: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Hautatu postakutxa mota"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Postakutxa mota hautatu.  Moten deskribapen bat beherago agertu beharko "
+"litzateke."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Postakutxa Berria gehitu"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Postakutxa Ezabatu"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Ziur al zaude?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Postakutxa bat ezabatzeak ezarpen guztiak ezabatzen ditu, eta ezin da "
+"desegin."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Postakutxak"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Ez dago posta berririk"
 
@@ -358,111 +476,111 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "esan zenbat mezu beri daude postakutxa bakoitzean|    %d %s-etan"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce PostaArakatzailea"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Ezin da posta arakatze applet-a panelera gehitu."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Posible da zure GLib bertsioak ez haririk onartzea."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "PostaArakatze erregistroa"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Erregistro _lerroak:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Bistarazi _erregistro egoera ikonoan"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Hautatu ikonoa"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normala"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Posta b_erria"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Kanpo aplikazioak"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Kli_katzean abiarazi"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Mezu _berriekin abiarazi:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikonoak"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Posta be_rria"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Erregistroa ikusi..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Posta arakatzailea"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Laguntza ezin da eskuratu ezin bait da 'xfhelp4' abiarazi: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Laguntza Erabilezina"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Huts xfhelp4 abiaraztean"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce posta arakatzaile plugina"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Xfce panelerako posta egiaztatze plugin boteretsua"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -470,120 +588,52 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mantentzea, jatorrizko garatzailea"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Garatzailea"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Eguneratu orain"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS agurrak huts egin du: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Postakutxa anitzetako posta arakatu"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Ez da SSL/TLS onarpenarekin konpilatu"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Ezin da socket-a ez-blokeatu egoeran ezarri. Konexio eten ezkero panela "
+#~ "izoztu egin daiteke ixterakoan."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: TLS agurrak huts egin du: ez dago SSL onarpenaz konpilaturik."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Ezin da socket-a blokeo modura itzuli.  Datuak ez dira behar bezala "
+#~ "jasoko."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Konexio seguru bat eskatu da, baina gnutls ez dago abiarazirik"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "IMAP zerbitzariak espero ez genuen erantzun bat eman du.  Hau agian ondo "
+#~ "egon liteke, edo plugin hau eraldatua izan behar da zure zerbitzaria "
+#~ "onartzeko mezu berri kopurua ez bada zuzena."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Ezin da GThread onarpena abiarazi.  Hau ziurrenik "
-"zure GLib instalazioaren arazo bat da."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS agurrak huts egin du: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Ezinda '%s' konfigurazio fitxategia idatzi"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: TLS agurrak huts egin du: ez dago SSL onarpenaz "
+#~ "konpilaturik."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Ezin dira '%s' konfigurazio fitxategiaren baimenak ezarri.  Fitxategi honek "
-"pasahitzak edo datu pribatuak izan ezkero zure sistemako besteek irakurri "
-"ahal izango dute."
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Postakutxa mota honek ez du konfigurazio ezarpenik behar."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Postakutxa _Izena:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Posta arakatzailea"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Postakutxa izena beharrezkoa da."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Mesedez idatzi postakutxarentzat izen bat."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Editatu postakutxa: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Hautatu postakutxa mota"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Postakutxa mota hautatu.  Moten deskribapen bat beherago agertu beharko "
-"litzateke."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Postakutxa Berria gehitu"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Postakutxa Ezabatu"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Ziur al zaude?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Postakutxa bat ezabatzeak ezarpen guztiak ezabatzen ditu, eta ezin da "
-"desegin."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Postakutxak"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Postakutxa anitzetako posta arakatu"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Konexio seguru bat eskatu da, baina gnutls ez dago abiarazirik"

Modified: xfce4-mailwatch-plugin/trunk/po/fi.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/fi.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/fi.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-14 10:35+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -17,41 +17,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Pistoketta ei voi asettaa estämättömään tilaan. Jos yhdistäminen ei onnistu, "
-"paneeli saattaa jumiutua suljettaessa."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Palvelimeen ei saatu yhteyttä: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Pistokkeen palauttaminen estävään tilaan ei onnistu. Tiedonhaku saattaa "
-"epäonnistua."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS-kättely epäonnistui: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +33,7 @@
 "Vastaanotettiin HTTP-vastauskoodi %d. Todennäköisesti tämä tarkoittaa sitä, "
 "että GMail ei hyväksy käyttäjänimeäsi tai salasanaasi."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -71,38 +44,47 @@
 "johtua esimerkiksi palvelinviasta, tai Google on mahdollisesti muuttanut "
 "palvelun todennustapaa tai uudet viestit -syötteen sijaintia."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "_Tarkista uudet postit"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minuutin välein."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "GMail-etäpostilaatikko"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -110,7 +92,7 @@
 "GMail-liitännäinen osaa yhdistää Googlen postipalveluun ja noutaa uusien "
 "viestien määrän turvallisesti."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -118,38 +100,35 @@
 "Salattua IMAP-yhteyttä ei ole saatavilla, ja tämä IMAP-palvelin ei tue "
 "salaamattomia kirjautumisia."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Pyydettiin STARTTLS-turvallisuuskäytäntöä, mutta palvelin ei tue sitä."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"IMAP-palvelin vastasi odottamattomalla tavalla. Tämä ei ehkä ole ongelma, "
-"tai sitten tämä liitännäinen täytyy muokata tukemaan postipalvelintasi jos "
-"uusien postien määrät eivät täsmää."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Kansiolistan nouto epäonnistui"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Odota..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Virhe"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Palvelinta tai käyttäjätunnusta ei ole asetettu."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -159,72 +138,72 @@
 "todennäköisesti myös salasanan asettamista. Tarkista myös lisäasetukset-"
 "dialogissa olevat tietoturva-asetukset."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Aseta uuden postin kansiot"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Uuden postin kansiot"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "IMAP-lisäasetukset"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Yhteys"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Käytä turvaamatonta yhteyttä"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Käytä vaihtoehtoisia SSL/TLS-portteja"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Käytä STARTTLS-käytäntöä SSL/TLS-yhteyksissä"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Käytä standardista poikkeavaa IMAP-_porttia:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Kansiot"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP-palvelimen _hakemisto:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP-palvelin"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Postipalvelin:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Lisäasetukset..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Uuden postin _kansiot..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "IMAP-etäpostilaatikko"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -232,38 +211,38 @@
 "IMAP-liitännäinen voi yhdistää IMAP-protokollaa tukevaan etäpostipalvelimeen "
 "käyttäen halutessasi SSL-protokollaa yhteyden suojaamiseen."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Tiedoston %s tilan selvitys epäonnistui: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s ei ole hakemisto. Onko %s todellakin kelvollinen postihakemisto?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Valitse Maildir-hakemisto"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Maildir-polku:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "Tarkistus_väli:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Paikallinen Maildir-jono"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -271,30 +250,30 @@
 "Maildir-liitännäinen voi vahtia paikallista maildir-tyyppistä postijonoa "
 "uusien viestien varalta."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Valitse mbox-tiedosto"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox-tiedoston _nimi:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Paikallinen Mbox-jono"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Mbox-liitännäinen vahtii paikallista mbox-tyyppistä postijonoa uusien "
 "viestien varalta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Virheellinen rivi %s syötteessä %s ohitettiin."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -302,35 +281,35 @@
 "Liitännäisen asetukset luetaan oletusarvoisesta\n"
 "mh-maildir -profiilitiedostosta ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Paikallinen MH-postihakemisto"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH-liitännäinen vahtii paikallisia MH-hakemistoja uuden postin varalta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "POP3-lisäasetukset"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Käytä STLS-käytäntöä SSL/TLS-yhteyksissä"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Käytä _standardista poikkeavaa POP3-porttia:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3-palvelin"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "POP3-etäpostilaatikko"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -338,10 +317,145 @@
 "POP3-liitännäinen voi yhdistää POP3-protokollaa tukevaan etäpostipalvelimeen "
 "käyttäen halutessasi SSL-protokollaa yhteyden suojaamiseen."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Palvelimeen ei saatu yhteyttä: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "SSL/TLS-tuki jätetty pois kääntäessä"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Palvelimeen ei saatu yhteyttä: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Palvelimeen ei saatu yhteyttä: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Palvelimeen ei saatu yhteyttä: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: GThread-tukea ei voi alustaa. Tämä johtuu "
+"luultavasti ongelmasta GLib-asennuksessasi."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Asetustiedostoa \"%s\" ei voi kirjoittaa"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Asetustiedoston \"%s\" oikeuksia ei voi asettaa. Jos tiedosto sisältää "
+"salasanoja tai muuta arkaluonteista tietoa, se voi olla muiden järjestelmäsi "
+"käyttäjien luettavissa."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Tämä postilaatikkotyyppi ei edellytä asetuksien säätämistä."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Postilaatikon _nimi:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Postivahti"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Postilaatikon nimi vaaditaan."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Syötä nimi postilaatikolle."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Muokkaa postilaatikkoa: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Valitse postilaatikon tyyppi"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Valitse postilaatikon tyyppi. Tyypin kuvaus ilmestyy alapuolelle."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Lisää uusi postilaatikko"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Poista postilaatikko"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Oletko varma?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Postilaatikon poistaminen kadottaa kaikki asetukset peruuttamattomasti."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Postilaatikot"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Ei uusia posteja"
 
@@ -359,112 +473,112 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "    %d tilillä %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce-postivahti"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Postivahtisovelmaa ei voi lisätä paneeliin"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Voi olla, että GLib-versiosi ei tue säikeitä."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch-loki"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Loki_rivejä:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "_Näytä lokin tila paneelin kuvakkeessa"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Valitse kuvake"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Tavanomainen"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "_Uutta postia"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Ulkoiset sovellukset"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Suorita _napsautettaessa:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Suorita, kun uusia _viestejä:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Kuvakkeet"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "_Uutta postia"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Näytä loki..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Postivahti"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "Ohjeita ei ole saatavilla, koska komentoa \"xfhelp4\" ei voi suorittaa: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Ohjeita ei saatavilla"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Xfhelp4:n suorittaminen epäonnistui"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce-Postivahtiliitännäinen"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Monipuolinen sähköpostintarkistaja Xfce:n paneeliin"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -472,120 +586,54 @@
 "Tekijänoikeus (c) 2005-2008 Brian Tarricone\n"
 "Tekijänoikeus (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Ylläpitäjä, projektin alkuunpanija"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Kehittäjä"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Päivitä nyt"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfcePostivahti: TLS-kättely epäonnistui: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Tarkista posti useista postilaatikoista"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "SSL/TLS-tuki jätetty pois kääntäessä"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Pistoketta ei voi asettaa estämättömään tilaan. Jos yhdistäminen ei "
+#~ "onnistu, paneeli saattaa jumiutua suljettaessa."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfcePostivahti: TLS-kättely epäonnistui: SSL-tuki jätetty pois kääntäessä."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Pistokkeen palauttaminen estävään tilaan ei onnistu. Tiedonhaku saattaa "
+#~ "epäonnistua."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Pyydettiin suojattua yhteyttä, mutta gnutls:ää ei alustettu"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "IMAP-palvelin vastasi odottamattomalla tavalla. Tämä ei ehkä ole ongelma, "
+#~ "tai sitten tämä liitännäinen täytyy muokata tukemaan postipalvelintasi "
+#~ "jos uusien postien määrät eivät täsmää."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: GThread-tukea ei voi alustaa. Tämä johtuu "
-"luultavasti ongelmasta GLib-asennuksessasi."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfcePostivahti: TLS-kättely epäonnistui: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Asetustiedostoa \"%s\" ei voi kirjoittaa"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfcePostivahti: TLS-kättely epäonnistui: SSL-tuki jätetty pois kääntäessä."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Asetustiedoston \"%s\" oikeuksia ei voi asettaa. Jos tiedosto sisältää "
-"salasanoja tai muuta arkaluonteista tietoa, se voi olla muiden järjestelmäsi "
-"käyttäjien luettavissa."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Pyydettiin suojattua yhteyttä, mutta gnutls:ää ei alustettu"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Tämä postilaatikkotyyppi ei edellytä asetuksien säätämistä."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Postilaatikon _nimi:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Postivahti"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Postilaatikon nimi vaaditaan."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Syötä nimi postilaatikolle."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Muokkaa postilaatikkoa: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Valitse postilaatikon tyyppi"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Valitse postilaatikon tyyppi. Tyypin kuvaus ilmestyy alapuolelle."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Lisää uusi postilaatikko"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Poista postilaatikko"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Oletko varma?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Postilaatikon poistaminen kadottaa kaikki asetukset peruuttamattomasti."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Postilaatikot"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Tarkista posti useista postilaatikoista"
-
 #~ msgid "About Mailwatch"
 #~ msgstr "Tietoja Postivahdista"

Modified: xfce4-mailwatch-plugin/trunk/po/fr.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/fr.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/fr.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-17 17:21+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -16,42 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Incapable de passer le socket en mode non-bloquant. Si la tentative de "
-"connexion reste suspendue, la fermeture du panneau risque de traîner en "
-"longueur."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Échec à la connexion au serveur : %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Impossible de repasser le socket en mode bloquant. Les données peuvent ne "
-"pas être récupérées correctement."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Échec de la poignée de main TLS : %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +32,7 @@
 "Le code de la réponse HTTP reçu est %d. La raison la plus probable est que "
 "le nom d'utilisateur ou le mot de passe GMail est incorrect."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -72,38 +44,47 @@
 "incompatibles la méthode d'authentification ou l'emplacement des nouveaux "
 "messages entrants."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Nom d'_utilisateur :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Vérifier les _nouveaux messages toutes les"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minute(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Boîte aux lettres GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -111,7 +92,7 @@
 "Le greffon GMail peut se connecter sur le service de courrier de Google et "
 "récupérer le nombre de nouveaux messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -119,39 +100,36 @@
 "L'IMAP sécurisé n'est pas disponible, et le serveur IMAP ne supporte pas les "
 "identifications en texte clair."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "La sécurité STARTTLS a été demandée, mais ce serveur ne le supporte pas."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Le serveur IMAP a répondu de manière inattendu. Ceci peut être correct, ou "
-"le greffon devra être modifié pour supporter votre serveur de messagerie au "
-"cas où le nombre de messages affichés ne correspond pas."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Échec à la récupération de la liste des dossiers"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Erreur"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Aucun serveur ou nom d'utilisateur n'est précisé."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -162,72 +140,72 @@
 "aussi certain de vérifier tous les paramètres de sécurité dans le dialogue "
 "Avancé."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Affecter de nouveaux dossiers de courrier"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Nouveaux dossiers de courrier"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Options IMAP avancées"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Utiliser une connexion non sécurisée"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Utiliser SSL/TLS sur un autre port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Utiliser SSL/TLS via STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Utiliser un _port IMAP non-standard :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Dossiers"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Répertoire sur le serveur IMAP :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Serveur IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Serveur de courrier :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avancé..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Nouveaux _dossiers de courrier..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Boîte aux lettres IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -236,38 +214,38 @@
 "supporte le protocole IMAP, utilisant SSL de manière optionnelle pour un "
 "lien sécurisé."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Échec à la récupération du statut du fichier %s : %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s n'est pas un répertoire. %s est-il vraiment un maildir valide ?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Choisir un dossier Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Chemin vers le Maildir :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervalle :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Répertoire maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -275,30 +253,30 @@
 "Le greffon Maildir peut surveiller un répertoire mail de style maildir pour "
 "des nouveaux messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Choisir un fichier mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nom du _fichier mbox :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Fichier mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Le greffon Mbox peut surveiller un répertoire mail de style mbox pour des "
 "nouveaux messages."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Ligne mal formée %s dans %s a été ignorée."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -306,37 +284,37 @@
 "La configuration de ce greffon est lue depuis\n"
 "le fichier de profile par défaut ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Dossier MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 "Le greffon MH surveille l'arrivée des nouveaux messages dans des dossiers MH "
 "locaux"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Options POP3 avancées"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Utiliser SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Utiliser un _port POP3 non-standard :"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Serveur POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Boîte aux lettres POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -345,10 +323,148 @@
 "supporte le protocole POP3, utilisant SSL de manière optionnelle pour un "
 "lien sécurisé."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Échec à la connexion au serveur : %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Compilé sans support SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Échec à la connexion au serveur : %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Échec à la connexion au serveur : %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Échec à la connexion au serveur : %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin : Impossible d'initialiser le support GThread. Il est "
+"possible qu'il y ait un problème avec l'installation de la GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Impossible d'écrire le fichier de configuration « %s »"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Impossible de changer les droits sur le fichier de configuration « %s ». Si "
+"ce fichier contient des mots de passes ou des informations sensibles, il "
+"peut être lisible par d'autres personnes sur votre système."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Cette boîte aux lettres ne requiert aucune configuration."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Nom de la boîte aux lettres :"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Un nom pour la boîte aux lettres est requis."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Veuillez entrer un nom pour la boîte aux lettres."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Éditer la boîte aux lettres : %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Choisir le type de la boîte aux lettres"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Choisir le type d'une boîte aux lettres. Une description du type apparaîtra "
+"au-dessous."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Ajouter une nouvelle boîte aux lettres"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Supprimer une boîte aux lettres"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Êtes-vous sûr(e) ?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Supprimer une boîte aux lettres détruira tous ses paramètres, et ne peut pas "
+"être annulé."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Boîtes aux lettres"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Aucun nouveau message"
 
@@ -366,114 +482,114 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "    %d sur %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr ""
 "Le greffon de surveillance de courrier ne peut pas être ajouté au panneau."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 "Il est possible que votre version de la GLib n'ait pas le support des "
 "threads."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Historique de la surveillance du courier"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Lignes d'historique :"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Montrer le _statut de l'historique dans l'icône"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Choisir une icône"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Nou_veau courrier"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programmes externes à exécuter"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Exécuter lors d'un _clic :"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Nouveaux _messages :"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Icônes"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Nou_veau courrier"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Voir l'historique..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Surveillance du courrier"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "L'aide est indisponible car 'xfhelp4' ne peut pas être exécutée : %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Aide indisponible"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Échec à l'exécution de xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Greffon Xfce4 Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Un greffon de vérification de mail pour le panneau Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -481,124 +597,58 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mainteneur, Auteur original"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Développeur"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Mettre à jour"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch : échec de la poignée de main TLS : %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Surveiller le courrier de multiples boîtes aux lettres"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Compilé sans support SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Incapable de passer le socket en mode non-bloquant. Si la tentative de "
+#~ "connexion reste suspendue, la fermeture du panneau risque de traîner en "
+#~ "longueur."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch : Échec de la poignée de main TLS : compilé sans support SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Impossible de repasser le socket en mode bloquant. Les données peuvent ne "
+#~ "pas être récupérées correctement."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Une connexion sécurisée est demandée, mais gnutls n'est pas initialisé"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Le serveur IMAP a répondu de manière inattendu. Ceci peut être correct, "
+#~ "ou le greffon devra être modifié pour supporter votre serveur de "
+#~ "messagerie au cas où le nombre de messages affichés ne correspond pas."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin : Impossible d'initialiser le support GThread. Il est "
-"possible qu'il y ait un problème avec l'installation de la GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch : échec de la poignée de main TLS : %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Impossible d'écrire le fichier de configuration « %s »"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch : Échec de la poignée de main TLS : compilé sans support "
+#~ "SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Impossible de changer les droits sur le fichier de configuration « %s ». Si "
-"ce fichier contient des mots de passes ou des informations sensibles, il "
-"peut être lisible par d'autres personnes sur votre système."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "Une connexion sécurisée est demandée, mais gnutls n'est pas initialisé"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Cette boîte aux lettres ne requiert aucune configuration."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Nom de la boîte aux lettres :"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Un nom pour la boîte aux lettres est requis."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Veuillez entrer un nom pour la boîte aux lettres."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Éditer la boîte aux lettres : %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Choisir le type de la boîte aux lettres"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Choisir le type d'une boîte aux lettres. Une description du type apparaîtra "
-"au-dessous."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Ajouter une nouvelle boîte aux lettres"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Supprimer une boîte aux lettres"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Êtes-vous sûr(e) ?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Supprimer une boîte aux lettres détruira tous ses paramètres, et ne peut pas "
-"être annulé."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Boîtes aux lettres"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Surveiller le courrier de multiples boîtes aux lettres"
-
 #~ msgid "About Mailwatch"
 #~ msgstr "À propos"
 

Modified: xfce4-mailwatch-plugin/trunk/po/gl.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/gl.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/gl.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-06-24 19:47+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,44 +20,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Fallo ó conectar ó servidor: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -65,257 +42,395 @@
 "method or location of the new messages feed."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minuto(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
-msgid "STARTTLS security was requested, but this server does not support it."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
+msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Agarde..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Erro"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
 "Advanced dialog."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Usar conexión non segura"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avanzado..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Servidor POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Fallo ó conectar ó servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Fallo ó conectar ó servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Fallo ó conectar ó servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Fallo ó conectar ó servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Está seguro?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr ""
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Non hai correo novo"
 
@@ -333,220 +448,128 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programas Externos"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Iconas"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Axuda non dispoñible"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Fallo ó executar xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mantedor, Autor Orixinal"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Desenvolvedor"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Está seguro?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr ""
-
 #: ../panel-plugin/mailwatch.desktop.in.in.h:1
 msgid "Check mail from multiple mailboxes"
 msgstr ""

Modified: xfce4-mailwatch-plugin/trunk/po/gu.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/gu.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/gu.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2005-10-08 01:35+0900\n"
 "Last-Translator: Ankit Patel <ankit644 at yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati at lists.sourceforge.net>\n"
@@ -17,46 +17,21 @@
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"બિન-બ્લોકીંગ સ્થિતિમાં સોકેટ સુયોજિત કરવામાં અસમર્થ.  જો જોડાણ અટકી જાય, તો પેનલ બંધ "
-"કરવા પર અટકી જશે."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr "બ્લોકીંગ સ્થિતિમાં સોકેટ મળવામાં અસમર્થ.  માહિતી યોગ્ય રીતે મેળવી શકાશે."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS હેન્ડશેક નિષ્ફળ: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -64,79 +39,88 @@
 "method or location of the new messages feed."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "વપરાશકર્તા નામ (_U):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "પાસવર્ડ (_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "આટલા દરે નવા સંદેશાઓ માટે ચકાસો (_n)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "મિનિટો."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 #, fuzzy
 msgid "Remote GMail Mailbox"
 msgstr "દૂરસ્થ IMAP મેઈલબોક્સ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr "સુરક્ષિત IMAP ઉપલબ્ધ નથી, અને IMAP સર્વર સાદાલખાણ પ્રવેશોને આધાર આપતું નથી."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "STARTTLS સુરક્ષાની અરજી થઈ હતી, પરંતુ આ સર્વર તેને આધાર આપતું નથી."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "ફોલ્ડર યાદી મેળવવામાં નિષ્ફળ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "મહેરબાની કરીને રાહ જુઓ..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "ભૂલ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "કોઈ સર્વર અથવા વપરાશકર્તાનામ સુયોજિત નથી."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -146,72 +130,72 @@
 "પાછી મેળવી શકાતી નથી.  અદ્યતન સંવાદમાં કોઈપણ સુરક્ષા સુયોજનો ચકાસવા માટે ખાતરી પણ "
 "કરો."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "નવા મેઈલ ફોલ્ડરો સુયોજિત કરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "નવા મેઈલ ફોલ્ડરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "અદ્યતન IMAP વિકલ્પો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "જોડાણ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "અસુરક્ષિત જોડાણ વાપરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "વૈકલ્પિક પોર્ટ પર SSL/TLS વાપરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "SSL/TLS ને STARTTLS મારફતે વાપરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "બિન-પ્રમાણભૂત IMAP પોર્ટ વાપરો (_p):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "ફોલ્ડરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP સર્વર ડિરેક્ટરી (_d):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP સર્વર"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "મેઈલ સર્વર (_M):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "અદ્યતન (_A)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "નવા મેઈલ ફોલ્ડરો (_f)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "દૂરસ્થ IMAP મેઈલબોક્સ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -219,65 +203,65 @@
 "IMAP પ્લગઈન દૂરસ્થ મેઈલ સર્વર સાથે જોડાઈ શકતું નથી કે જે IMAP પ્રોટોકોલને આધાર આપે, "
 "વૈકલ્પિક રીતે ને કડી સુરક્ષા માટે SSL વાપરી રહ્યા છીએ."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "ફાઈલ %s ની પરિસ્થિતિ મેળવવામાં નિષ્ફળ: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s એ ડિરેક્ટરી નથી. શું %s એ ખરેખર maildir છે?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Maildir ફોલ્ડર પસંદ કરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir પાથ (_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "અંતરાલ (_I):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "સ્થાનિક Maildir સ્પુલ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr "Maildir પ્લગઈન સ્થાનિક maildir-શૈલી મેઈલ સ્પુલને નવા સંદેશાઓ માટે જોઈ શકતું નથી."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "mbox ફાઈલ પસંદ કરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox ફાઈલનામ (_F):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "સ્થાનિક Mbox સ્પુલ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Mbox પ્લગઈન સ્થાનિક mbox-પ્રકારના મેઈલ સ્પુલને નવા સંદેશાઓ માટે ધ્યાન રાખે છે."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "મલીન વાક્ય %s એ %s માં અવગણાયેલ છે."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -285,35 +269,35 @@
 "આ પ્લગઈનનું રૂપરેખાંકન એ મૂળભુત mh maildir રૂપરેખા ફાઈલ ~/.mh_profile\n"
 "માંથી વાંચી રહ્યું છે"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "સ્થાનિક MH મેઈલ ફોલ્ડર"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH પ્લગઈન સ્થાનિક MH ફોલ્ડરોને નવા મેઈલ માટે ધ્યાન રાખે છે"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "અદ્યતન POP3 વિકલ્પો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "SSL/TLS ને STLS મારફતે વાપરો"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "બિન-પ્રમાણભૂત POP3 પોર્ટ વાપરો (_p):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 સર્વર"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "દૂરસ્થ POP3 મેઈલબોક્સ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -321,10 +305,143 @@
 "POP3 પ્લગઈન દૂરસ્થ મેઈલ સર્વર સાથે જોડાઈ શકે છે કે જે POP3 પ્રોટોકોલને આધાર આપે છે, વૈકલ્પિક "
 "રીતે કડી સુરક્ષા માટે SSL વાપરીને."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "SSL/TLS આધાર સાથે કમ્પાઈલ થયેલ નથી"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: GThread આધારનો પ્રારંભ કરવામાં અસમર્થ.  આ તમારા GLib "
+"સ્થાપન સાથે સમસ્યા હોય એમ લાગે છે."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "રૂપરેખા ફાઈલ '%s' માં લખવામાં અસમર્થ"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"રૂપરેખા ફાઈલ '%s' પર પરવાનગીઓ સુયોજિત કરવામાં અસમર્થ.  જો આ ફાઈલ પાસવર્ડો અથવા અન્ય "
+"સંવેદનશીલ જાણકારી સમાવે, તો તે તમારી સિસ્ટમ પર અન્યો દ્વારા વાંચી શકાશે."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "આ મેઈલબોક્સ પ્રકાર માટે કોઈપણ રૂપરેખાંકન સુયોજનો જરૂરી નથી."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "મેઈલબોક્સ નામ (_N):"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "મેઈલવોચ"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "મેઈલબોક્સ નામ જરૂરી છે."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "મહેરબાની કરીને મેઈલબોક્સ માટે નામ દાખલ કરો."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "મેઈલબોક્સમાં ફેરફાર કરો: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "મેઈલબોક્સ પ્રકાર પસંદ કરો"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "મેઈલબોક્સ પ્રકાર પસંદ કરો.  પ્રકારનું વર્ણન નીચે દૃશ્યમાન થશે."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "નવો મેઈલબોક્સ ઉમેરો"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "દૂરસ્થ મેઈલબોક્સ"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "શું તમે ચોક્કસ છો?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "મેઈલબોક્સ દૂર કરવાનું બધા સુયોજનો રદ કરશે, અને તે ફરીથી રદ કરી શકાશે નહિં."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "મેઈલબોક્સ"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "કોઈ નવો મેઈલ નથી"
 
@@ -342,230 +459,155 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "mailwatch એપ્લેટ પેનલમાં ઉમેરી શકાશે નહિં."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "એ શક્ય છે કે તમારી GLib ની આવૃત્તિ પાસે થ્રેડોનો આધાર નહિં હોય."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch લોગ"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "લોગ લીટીઓ (_l):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "લોગ પરિસ્થિતિ ચિહ્નમાં બતાવો (_s)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "ચિહ્ન પસંદ કરો"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "સામાન્ય (_N)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "નવો મેઈલ (_w)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "બાહ્ય કાર્યક્રમો"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "ક્લિક કરવા પર ચલાવો (_o):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "નવા સંદેશાઓ પર ચલાવો (_m):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "ચિહ્નો"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "નવો મેઈલ (_w)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "લોગ જુઓ (_V)..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "મેઈલ ધ્યાન રાખનાર"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 #, fuzzy
 msgid "Failed to run xfhelp4"
 msgstr "ફોલ્ડર યાદી મેળવવામાં નિષ્ફળ"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS હેન્ડશેક નિષ્ફળ: %s"
-
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "SSL/TLS આધાર સાથે કમ્પાઈલ થયેલ નથી"
-
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch: TLS હેન્ડશેક નિષ્ફળ: SSL આધાર સાથે કમ્પાઈલ થયેલ નથી."
-
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "સુરક્ષિત જોડાણની અરજી થઈ હતી, પરંતુ gnutls નો પ્રારંભ થયો ન હતો"
-
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
 msgstr ""
-"xfce4-mailwatch-plugin: GThread આધારનો પ્રારંભ કરવામાં અસમર્થ.  આ તમારા GLib "
-"સ્થાપન સાથે સમસ્યા હોય એમ લાગે છે."
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "રૂપરેખા ફાઈલ '%s' માં લખવામાં અસમર્થ"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "બિન-બ્લોકીંગ સ્થિતિમાં સોકેટ સુયોજિત કરવામાં અસમર્થ.  જો જોડાણ અટકી જાય, તો પેનલ "
+#~ "બંધ કરવા પર અટકી જશે."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"રૂપરેખા ફાઈલ '%s' પર પરવાનગીઓ સુયોજિત કરવામાં અસમર્થ.  જો આ ફાઈલ પાસવર્ડો અથવા અન્ય "
-"સંવેદનશીલ જાણકારી સમાવે, તો તે તમારી સિસ્ટમ પર અન્યો દ્વારા વાંચી શકાશે."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr "બ્લોકીંગ સ્થિતિમાં સોકેટ મળવામાં અસમર્થ.  માહિતી યોગ્ય રીતે મેળવી શકાશે."
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "આ મેઈલબોક્સ પ્રકાર માટે કોઈપણ રૂપરેખાંકન સુયોજનો જરૂરી નથી."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS હેન્ડશેક નિષ્ફળ: %s"
 
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "મેઈલબોક્સ નામ (_N):"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch: TLS હેન્ડશેક નિષ્ફળ: SSL આધાર સાથે કમ્પાઈલ થયેલ નથી."
 
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "મેઈલવોચ"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "સુરક્ષિત જોડાણની અરજી થઈ હતી, પરંતુ gnutls નો પ્રારંભ થયો ન હતો"
 
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "મેઈલબોક્સ નામ જરૂરી છે."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "મહેરબાની કરીને મેઈલબોક્સ માટે નામ દાખલ કરો."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "મેઈલબોક્સમાં ફેરફાર કરો: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "મેઈલબોક્સ પ્રકાર પસંદ કરો"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "મેઈલબોક્સ પ્રકાર પસંદ કરો.  પ્રકારનું વર્ણન નીચે દૃશ્યમાન થશે."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "નવો મેઈલબોક્સ ઉમેરો"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "દૂરસ્થ મેઈલબોક્સ"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "શું તમે ચોક્કસ છો?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "મેઈલબોક્સ દૂર કરવાનું બધા સુયોજનો રદ કરશે, અને તે ફરીથી રદ કરી શકાશે નહિં."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "મેઈલબોક્સ"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr ""
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "મેઈલવોચ"

Modified: xfce4-mailwatch-plugin/trunk/po/he.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/he.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/he.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-04-28 13:28+0300\n"
 "Last-Translator: Yuval Tanny <tanai at int.gov.il>\n"
 "Language-Team: Hebrew\n"
@@ -18,40 +18,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"אין אפשרות להגדיר את השקע למצב לא-חוסם. אם יתנתק ניסיון ההתחברות ייתכן כי "
-"הלוח יתנתק ביציאה."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "כשל בהתחברות לשרת: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"אין אפשרות להחזיר את השקע למצב לא-חסימה. ייתכן כי מידע לא יאוחזר כראוי."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "לחיצת-יד TLS כשלה: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +34,7 @@
 "התקבל קוד %d מתגובת HTTP. כנראה משום ששם המשתמש או הססמה שלך ב-GMail אינה "
 "נכונים."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +44,47 @@
 "התקבל קוד %d מתגובת HTTP במקום קוד 200. ייתכן כי קיימת בעיה עם שרתי GMail או "
 "שהשתנו אופן ההזדהות שלהם או מיקומם באופן שאינו מאפשר עוד לקבל הודעות חדשות."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_שם משתמש:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_ססמה:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "בדוק אם יש הודעות _חדשות כל"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "דקות."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "תיבת דוא\"ל GMail מרוחקת"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,41 +92,41 @@
 "התוסף ל-GMail יכול להתחבר לשירות הדוא\"ל של Google ולאחזר באופן מאובטח את "
 "מספר ההודעות החדשות."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr "IMAP מאובטח אינו זמין ושרת ה-IMAP אינו תומך בכניסות עם טקסט פשוט."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "אבטחת STARTTLS התבקשה אך שרת זה אינו תומך בכך."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "כשל בקבלת רשימת התיקיות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "נא להמתין..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "לא הוגדר שרת או שם משתמש."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -152,72 +135,72 @@
 "אין אפשרות לאחזר את רשימת התיקיות עד ששרת, שם משתמש וכנראה גם ססמה יוגדרו. "
 "נא לבדוק גם את הגדרות האבטחה בתיבת הדו-שיח המתקדמת."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "הגדרת תיקיות דוא\"ל חדשות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "תיקיות דוא\"ל חדשות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "אפשרויות IMAP מתקדמות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "חיבור"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "השתמש בחיבור שאינו מאובטח"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "השתמש ב-SSL/TLS בערוץ חלופי"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "השתמש ב-SSL/TLS דרך STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "השתמש בערוץ IMAP _לא תקני"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "תיקיות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_ספרית IMAP בשרת:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "שרת IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_שרת דוא\"ל:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_מתקדם..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "תיקיות דוא\"ל ֹחדשות..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "תיבת דוא\"ל IMAP מרוחקת"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -225,38 +208,38 @@
 "תוסף ה-IMAP יכול להתחבר לשרת דוא\"ל מרוחק התומך בפרוטוקולIMAP אפשרי גם עם "
 "SSL להגנת קישור."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "כשל בקבלת מצב של קובץ %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s אינה ספריה. האם באמת %s היא ספריית maildir תקינה?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "בחירת תיקיית Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_נתיב ל-Maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_מרווח זמן:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "מיכל Maildir מקומי"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -264,28 +247,28 @@
 "תוסף ה-Maildir יכול לעקוב אחר מיכל דוא\"ל מקומי בסגנון Maildir לקבלת הודעות "
 "חדשות."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "בחירת קובץ Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "שם _קובץ Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "מיכל Mbox מקומי"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "תוסף ה-Mbox עוקב אחר מיכל דוא\"ל מקומי בסגנון Mbox לקבלת הודעות חדשות."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "התעלם משורה לא תקינה %s ב-%s."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -293,35 +276,35 @@
 "ההגדרות לתוסף זה נקראות מקובץ ברירת המחדל\n"
 "של mh maildir ב ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "תיקיית דוא\"ל MH מקומית"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "תוסף ה-MH בודק אם יש הודעות חדשות בתיקיות MH מקומיות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "אפשרויות POP3 מתקדמות"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "השתמש ב-SSL/TLS דרך STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "השתמש בערוץ POP3 _לא תקני:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "שרת POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "תיבת דוא\"ל POP3 מרוחקת"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -329,10 +312,143 @@
 "תוסף ה-POP3 יכול להתחבר לשרת מרוחק התומך בפרוטוקול POP3 אפשרי גם עם SSL "
 "להגנת קישור."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "כשל בהתחברות לשרת: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "לא מהודר עם תמיכת SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "כשל בהתחברות לשרת: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "כשל בהתחברות לשרת: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "כשל בהתחברות לשרת: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"תוסף xfce4-mailwatch: אין אפשרות לאתחל תמיכה ב-GThread. כנראה מדובר בבעיה "
+"בהתקנת ה-GLib שלך."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "אין אפשרות לכתוב קובץ הגדרות %s"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"אין אפשרות להגדיר הרשאות בקובץ ההגדרות %s. אם קובץ זה מכיל ססמאות או מידע "
+"רגיש אחר ייתכן כי הוא בר קריאה על ידי אחרים במערכת שלך."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "סוג זה של תיבת דוא\"ל אינו דורש הגדרות."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_שם תיבת הדוא\"ל:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "דרוש שם לתיבת הדוא\"ל."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "נא להזין שם לתיבת הדוא\"ל."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "עריכת תיבת הדוא\"ל: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "בחירת סוג תיבת הדוא\"ל"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "בחירת סוג תיבת הדוא\"ל. תיאורו של הסוג המצוין יוצג מטה."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "הוספת תיבת דוא\"ל"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "הסרת תיבת דוא\"ל"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "האם אתה בטוח?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "הסרת תיבת דוא\"ל תסיר את כל ההגדרות ואין אפשרות לבטל את הפעולה."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "תיבות דוא\"ל"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "אין הודעות חדש"
 
@@ -350,229 +466,155 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "אין אפשרות להוסיף את יישומון ה-mailwatch ללוח."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "ייתכן שגרסת ה-GLib שלך אינה תומכת בפתילים."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "דו\"ח mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_שורות דו\"ח:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "הצגת _מצב הדו\"כ בסמל"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "בחירת סמל"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_רגיל"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "הודעה _חדש"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "תכניות חיצוניות"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "הרץ _בלחיצה:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "הרץ בקבלת _דוא\"ל חדש:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "סמלים"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "הודעה חדשה"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_הצגת דו\"כ..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "בודק דוא\"ל"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "אין עזרה זמינה בגלל שאין אפשרות להריץ את xfhelp4: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "אין עזרה זמינה"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "כשל בהרצת xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: לחיצת יד TLS כשלה: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "בדוק דוא\"ל ממספר תיבות"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "לא מהודר עם תמיכת SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "אין אפשרות להגדיר את השקע למצב לא-חוסם. אם יתנתק ניסיון ההתחברות ייתכן כי "
+#~ "הלוח יתנתק ביציאה."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch: לחיצת יד TLS כשלה: לא מהודר עם תמיכת SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "אין אפשרות להחזיר את השקע למצב לא-חסימה. ייתכן כי מידע לא יאוחזר כראוי."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "התבקש חיבור מאובטח אך gnutls לא אותחל"
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: לחיצת יד TLS כשלה: %s"
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"תוסף xfce4-mailwatch: אין אפשרות לאתחל תמיכה ב-GThread. כנראה מדובר בבעיה "
-"בהתקנת ה-GLib שלך."
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch: לחיצת יד TLS כשלה: לא מהודר עם תמיכת SSL."
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "אין אפשרות לכתוב קובץ הגדרות %s"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "התבקש חיבור מאובטח אך gnutls לא אותחל"
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"אין אפשרות להגדיר הרשאות בקובץ ההגדרות %s. אם קובץ זה מכיל ססמאות או מידע "
-"רגיש אחר ייתכן כי הוא בר קריאה על ידי אחרים במערכת שלך."
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "סוג זה של תיבת דוא\"ל אינו דורש הגדרות."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_שם תיבת הדוא\"ל:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "דרוש שם לתיבת הדוא\"ל."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "נא להזין שם לתיבת הדוא\"ל."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "עריכת תיבת הדוא\"ל: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "בחירת סוג תיבת הדוא\"ל"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "בחירת סוג תיבת הדוא\"ל. תיאורו של הסוג המצוין יוצג מטה."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "הוספת תיבת דוא\"ל"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "הסרת תיבת דוא\"ל"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "האם אתה בטוח?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "הסרת תיבת דוא\"ל תסיר את כל ההגדרות ואין אפשרות לבטל את הפעולה."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "תיבות דוא\"ל"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "בדוק דוא\"ל ממספר תיבות"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Mailwatch"

Modified: xfce4-mailwatch-plugin/trunk/po/hu.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/hu.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/hu.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-04-17 09:28+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian at lists.debian.org>\n"
@@ -18,41 +18,14 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"A foglalat nem állítható nem blokkoló módba. Ha a csatlakozási kísérlet "
-"elakad, akkor a párbeszédablak is elakadhat bezáráskor."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "A csatlakozás meghiúsult a kiszolgálóhoz: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"A foglalat nem állítható vissza blokkoló módba. Lehetséges, hogy az adatok "
-"nem kerültek helyesen lekérésre."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "A TLS kézfogás meghiúsult: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -61,7 +34,7 @@
 "A(z) %d HTTP válaszkód érkezett. Ennek legvalószínűbb oka, hogy a GMail "
 "felhasználói nevét vagy jelszavát helytelenül adta meg."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -72,38 +45,47 @@
 "lehet a GMail kiszolgálóival, vagy inkompatibilis módon módosították a "
 "hitelesítési eljárásukat vagy az új üzenetek folyamának helyét."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Felhasználói név:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Új üzenetek _ellenőrzése minden"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "percben."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Távoli GMail postafiók"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -111,7 +93,7 @@
 "A GMail bővítmény képes kapcsolódni a Google levelezőszolgáltatásához és "
 "biztonságosan lekérni az új üzenetek számát."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -119,40 +101,37 @@
 "A biztonságos IMAP nem érhető el és az IMAP kiszolgáló nem támogatja az "
 "egyszerű szöveges bejelentkezést."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "STARTTLS biztonsági szolgáltatást kértél, de ez a kiszolgáló nem támogatja "
 "azt."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Az IMAP kiszolgáló váratlan választ adott. Talán lényegtelen, de lehet, hogy "
-"e beillesztést módosítani kell e levelező kiszolgáló támogatásához, ha az új "
-"levelek számát elvéti."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "A mappalista lekérése meghiúsult"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Kis türelmet..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Hiba"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Nincs kiszolgáló vagy felhasználói név beállítva."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -162,72 +141,72 @@
 "valószínűleg a jelszó nincsenek beállítva. Ezen kívül ellenőrizd a "
 "biztonsági beállításokat a Haladó párbeszédablakban."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Új levélmappák beállítása"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Új levélmappák"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Haladó IMAP beállítások"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Kapcsolat"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Nem biztonságos kapcsolat használata"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "SSL/TLS használata másik porton"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "SSL/TLS használata STARTTLS használatával"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Nem szabványos IMAP _port használata:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Mappák"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP kiszolgáló _könyvtára:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP kiszolgáló"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Levélkiszolgáló:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Haladó..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Új le_vélmappák..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Távoli IMAP postafiók"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -236,38 +215,38 @@
 "levelezőkiszolgálóhoz, a kapcsolat védelme érdekében opcionálisan SSL "
 "használatával."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "A(z) %s fájl állapotának lekérése meghiúsult: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "A(z) %s nem könyvtár. A(z) %s valóban érvényes levélkönyvtár?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Válaszd ki a levélkönyvtár mappáját"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Levélkönyvtár útvonala:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "In_tervallum:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Helyi levélkönyvtár-tároló"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -275,31 +254,31 @@
 "A levélmappa bővítmény képes figyelni az új üzeneteket egy helyi levélmappa-"
 "stílusú levéltárolóban."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Válassz egy mbox fájlt"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox _fájl neve:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Helyi Mbox tároló"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Az Mbox bővítmény képes figyelni az új üzeneteket egy helyi mbox-stílusú "
 "levéltárolóban."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr ""
 "A(z) %s rosszul formázott sor figyelmen kívül hagyva a következőben: %s."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -307,35 +286,35 @@
 "A bővítmény beállításai az mh levélmappa alapértelmezett\n"
 " ~/.mh_profile fájljából kerül beolvasásra"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Helyi MH levélmappa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Az MH bővítmény a helyi MH mappákban figyeli az új leveleket"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Haladó POP3 beállítások"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "SSL/TLS használata STLS segítségével"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Nem szabványos POP3 _port használata:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 kiszolgáló"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Távoli POP3 postafiók"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -344,10 +323,144 @@
 "levelezőkiszolgálóhoz kapcsolódni, a kapcsolat védelme érdekében "
 "opcionálisan SSL használatával."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "A csatlakozás meghiúsult a kiszolgálóhoz: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "A program SSL/TLS támogatás nélkül lett lefordítva"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "A csatlakozás meghiúsult a kiszolgálóhoz: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "A csatlakozás meghiúsult a kiszolgálóhoz: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "A csatlakozás meghiúsult a kiszolgálóhoz: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Nem lehet inicializálni a GThread támogatást. Ez a "
+"probléma valószínűleg a Glib telepítéssel kapcsolatos."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Nem lehet a következő konfigurációs fájlba írni: \"%s\""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Nem lehet beállítani a(z) \"%s\" beállítófájl jogosultságait. Ha a fájl "
+"jelszavakat vagy más érzékeny információkat tartalmaz, akkor azok "
+"olvashatóvá válhatnak a rendszer más felhasználói számára."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "A postafióktípus nem igényel beállításokat."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Postafiók _neve:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Levélfigyelő"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "A postafiók neve kötelező."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Adj meg egy nevet a postafióknak."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Postafiók szerkesztése: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Válaszd ki a postafiók típusát"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Válassz egy postafióktípust. A típus leírása alább meg fog jelenni."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Új postafiók hozzáadása"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Postafiók eltávolítása"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Biztosan ezt szeretnéd?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "Egy postafiók eltávolítása véglegesen eldobja a beállításokat."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Postafiókok"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Nincs új levél"
 
@@ -365,113 +478,113 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "mutatja, hány ú üzenet van az egyes levelesládákban|    %d itt: %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce levélfigyelő"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "A levélfigyelő kisalkalmazás nem adható a panelhez."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 "Lehetséges, hogy a Glib használt verziója nem rendelkezik a szálak "
 "támogatásával."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Levélfigyelő naplója"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Naplósorok:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "A _naplóállapot megjelenítése az ikonon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Válassz ikont"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normál"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Ú_j levél"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Külső programok"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Futtatás _kattintásra:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "_Futtatás új üzenet érkezésekor:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikonok"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Ú_j levél"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Napló megjelenítése..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Levélfigyelő"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "A súgó nem érhető el, mivel az xfhelp4 program nem futtatható: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "A súgó nem érhető el"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Az xfhelp4 futtatása meghiúsult"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce4 levél-figyelő beillesztés"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Egy okos levél-figyelő kisalkalmazás az Xfce panelhoz"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -479,121 +592,56 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Karbantartó, eredeti szerző"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Fejlesztő"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Frissíts most"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "Xfce levélfigyelő: A TLS kézfogás meghiúsult: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Levél ellenőrzése több postafiókból"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "A program SSL/TLS támogatás nélkül lett lefordítva"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "A foglalat nem állítható nem blokkoló módba. Ha a csatlakozási kísérlet "
+#~ "elakad, akkor a párbeszédablak is elakadhat bezáráskor."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"Xfce levélfigyelő: A TLS kézfogás meghiúsult: A program SSL támogatás nélkül "
-"lett lefordítva."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "A foglalat nem állítható vissza blokkoló módba. Lehetséges, hogy az "
+#~ "adatok nem kerültek helyesen lekérésre."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Biztonságos kapcsolatot kértél, de a gnutls nem lett inicializálva"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Az IMAP kiszolgáló váratlan választ adott. Talán lényegtelen, de lehet, "
+#~ "hogy e beillesztést módosítani kell e levelező kiszolgáló támogatásához, "
+#~ "ha az új levelek számát elvéti."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Nem lehet inicializálni a GThread támogatást. Ez a "
-"probléma valószínűleg a Glib telepítéssel kapcsolatos."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "Xfce levélfigyelő: A TLS kézfogás meghiúsult: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Nem lehet a következő konfigurációs fájlba írni: \"%s\""
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "Xfce levélfigyelő: A TLS kézfogás meghiúsult: A program SSL támogatás "
+#~ "nélkül lett lefordítva."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Nem lehet beállítani a(z) \"%s\" beállítófájl jogosultságait. Ha a fájl "
-"jelszavakat vagy más érzékeny információkat tartalmaz, akkor azok "
-"olvashatóvá válhatnak a rendszer más felhasználói számára."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Biztonságos kapcsolatot kértél, de a gnutls nem lett inicializálva"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "A postafióktípus nem igényel beállításokat."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Postafiók _neve:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Levélfigyelő"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "A postafiók neve kötelező."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Adj meg egy nevet a postafióknak."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Postafiók szerkesztése: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Válaszd ki a postafiók típusát"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Válassz egy postafióktípust. A típus leírása alább meg fog jelenni."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Új postafiók hozzáadása"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Postafiók eltávolítása"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Biztosan ezt szeretnéd?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "Egy postafiók eltávolítása véglegesen eldobja a beállításokat."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Postafiókok"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Levél ellenőrzése több postafiókból"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Levélfigyelő"

Modified: xfce4-mailwatch-plugin/trunk/po/id.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/id.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/id.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-06-20 19:34+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
@@ -16,41 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Tak dapat mengubah soket ke mode non-blok. Jika usaha menghubungi macet, "
-"panel mungkin macet ketika ditutup."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Gagal menghubungi server: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Tak dapat mengembalikan soket ke mode blok. Data mungkin tak diterima secara "
-"benar."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Jabat tangan TLS gagal: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -59,7 +32,7 @@
 "Menerima kode balasan HTTP %d. Alasan yang paling memungkinkan untuk ini "
 "adalah nama pengguna atau sandi lewat GMail anda salah."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +43,47 @@
 "dengan server GMail, atau mereka telah mengganti metode otentikasi mereka "
 "atau lokasi umpan pesan baru sehingga tidak cocok."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Nama Pengguna:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Sandi Lewat:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Cek _pesan baru tiap"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "menit."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Kotak Surat Jarak Jauh GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,45 +91,42 @@
 "Plugin GMail dapat menghubungi layanan surat Google dan menerima sejumlah "
 "pesan baru dengan aman."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr ""
 "IMAP aman tak tersedia, dan server IMAP tidak mendukung log masuk teks biasa."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Keamanan STARTTLS diminta, tapi server ini tidak mendukungnya."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Server IMAP membalas dengan pesan yang tidak kami harapkan. Ini mungkin baik-"
-"baik saja, atau plugin ini memerlukan modifikasi agar mendukung server surat "
-"anda jika hitungan pesan baru tidak tepat."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Gagal mendapatkan senarai folder"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Silakan tunggu..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Galat"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Tak ada server atau nama pengguna yang diatur."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -157,72 +136,72 @@
 "sandi lewat diatur. Pastikan juga untuk mencek pengaturan keamanan apapun di "
 "dialog Mahir."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Atur Folder Surat Baru"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Folder Surat Baru"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Opsi IMAP Mahir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Koneksi"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Gunakan koneksi tidak aman"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Gunakan SSL/TLS pada pangkalan alternatif"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Gunakan SSL/TLS via STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Gunakan _pangkalan IMAP non-standar:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Folder"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "Direktori _server IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Server IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Server surat:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Mahir..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Folder surat _baru..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Kotak Surat Jarak Jauh IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -230,38 +209,38 @@
 "Plugin IMAP dapat menghubungi server surat jarak jauh yang mendukung "
 "protokol IMAP, dan sebagai tambahan menggunakan SSL untuk proteksi taut."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Gagal mendapatkan status berkas %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s bukan direktori. Apakah %s benar-benar direktori surat yang sah?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Pilih Folder Direktori Surat"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Alamat _Direktori Surat:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Interval:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Catatan Direktori Surat Lokal"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -269,28 +248,28 @@
 "Plugin direktori surat dapat mengawasi catatan surat gaya direktori surat "
 "untuk pesan baru."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Pilih berkas mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nama Berkas _Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Catatan Mbox lokal"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Plugin mbox mengawasi catatan surat tipe mbox lokal untuk pesan baru."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Baris %s yang salah pada %s diabaikan."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -298,35 +277,35 @@
 "Konfigurasi plugin ini dibaca dari berkas profil\n"
 "direktori surat mh standar ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Folder surat MH lokal"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Plugin MH mengawasi folder MH lokal untuk pesan baru"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Opsi POP3 Mahir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Gunakan SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Gunakan pangkalan POP3 _non-standar:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Server POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Kotak Surat POP3 Jarak Jauh"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -334,10 +313,146 @@
 "Plugin POP3 dapat menghubungi server surat jarak jauh yang mendukung "
 "protokol POP3, dan sebagai tambahan menggunakan SSL untuk proteksi taut."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Gagal menghubungi server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Tak dikompilasi dengan dukungan SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Gagal menghubungi server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Gagal menghubungi server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Gagal menghubungi server: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Tak dapat menginisialisasi dukungan GThread.  "
+"Tampaknya ini masalah pada instalasi GLib anda."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Tak dapat menulis berkas konfigurasi '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Tak dapat mengubah hak akses pada berkas konfigurasi '%s'.  Jika berkas ini "
+"berisi sandi lewat atau informasi sensitif lainnya, ada kemungkinan dapat "
+"terbaca oleh yang lain pada sistem anda."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Tipe kotak surat ini tidak memerlukan pengaturan konfigurasi lain."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Nama _Kotak Surat:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Pengawas Surat"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Nama kotak surat diperlukan."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Silakan masukkan nama untuk kotak surat."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Sunting Kotak Surat: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Pilih Tipe Kotak Surat"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Pilih tipe kota surat. Keterangan tentang tipe akan tampak di bawah."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Tambah Kotak Surat Baru"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Hapus Kotak Surat"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Anda yakin?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Menghapus kotak surat akan menghapus semua pengaturan, dan tak dapat "
+"dikembalikan."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Kotak Surat"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Tak ada pesan baru"
 
@@ -354,111 +469,111 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "memberitahu berapa banyak pesan baru di tiap kotak surat|    %d di %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Pengawas Surat Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Applet pengawas surat tak dapat ditambah ke panel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Ada kemungkinan versi GLib anda tidak memiliki dukungan ulir. "
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Catatan pengawas surat"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Baris _catatan:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Tampilkan _status catatan pada ikon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Pilih Ikon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Sura_t baru"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Program Eksternal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Jalankan _pada klik:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Jalankan pada pesan _baru:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Sura_t Baru"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Tampilkan Catatan..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Pengawas Surat"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Bantuan tak tersedia karena 'xfhelp4' tak dapat dijalankan: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Bantuan Tak Tersedia"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Gagal menjalankan xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Plugin Pengawas Surat Xfce4"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Applet pemeriksa surat kaya fitur untuk Panel Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -466,118 +581,52 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Pengelola, Penulis Asli"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Pengembang"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Mutakhirkan Sekarang"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: jabat tangan TLS gagal: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Cek surat dari banyak kotak surat"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Tak dikompilasi dengan dukungan SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Tak dapat mengubah soket ke mode non-blok. Jika usaha menghubungi macet, "
+#~ "panel mungkin macet ketika ditutup."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: jabat tangan TLS gagal: tak dikompilasi dengan dukungan SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Tak dapat mengembalikan soket ke mode blok. Data mungkin tak diterima "
+#~ "secara benar."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Koneksi aman diminta, tapi gnutls tak dapat diinisialisasi"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Server IMAP membalas dengan pesan yang tidak kami harapkan. Ini mungkin "
+#~ "baik-baik saja, atau plugin ini memerlukan modifikasi agar mendukung "
+#~ "server surat anda jika hitungan pesan baru tidak tepat."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Tak dapat menginisialisasi dukungan GThread.  "
-"Tampaknya ini masalah pada instalasi GLib anda."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: jabat tangan TLS gagal: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Tak dapat menulis berkas konfigurasi '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: jabat tangan TLS gagal: tak dikompilasi dengan dukungan "
+#~ "SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Tak dapat mengubah hak akses pada berkas konfigurasi '%s'.  Jika berkas ini "
-"berisi sandi lewat atau informasi sensitif lainnya, ada kemungkinan dapat "
-"terbaca oleh yang lain pada sistem anda."
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Tipe kotak surat ini tidak memerlukan pengaturan konfigurasi lain."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Nama _Kotak Surat:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Pengawas Surat"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Nama kotak surat diperlukan."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Silakan masukkan nama untuk kotak surat."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Sunting Kotak Surat: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Pilih Tipe Kotak Surat"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Pilih tipe kota surat. Keterangan tentang tipe akan tampak di bawah."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Tambah Kotak Surat Baru"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Hapus Kotak Surat"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Anda yakin?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Menghapus kotak surat akan menghapus semua pengaturan, dan tak dapat "
-"dikembalikan."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Kotak Surat"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Cek surat dari banyak kotak surat"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Koneksi aman diminta, tapi gnutls tak dapat diinisialisasi"

Modified: xfce4-mailwatch-plugin/trunk/po/it.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/it.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/it.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2007-05-20 00:26+0200\n"
 "Last-Translator: Fabio Riga <usul at aruba.it>\n"
 "Language-Team: Italian <xfce-i18n at xfce.org>\n"
@@ -16,41 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Impossibile impostare il socket in modalità non-bloccata. Se il tentativo di "
-"connessione si arresta, il pannello potrebbe bloccarsi alla chiusura."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Connessione al server fallita: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Impossibile riportare il socket in modalità bloccata.  I dati potrebbero non "
-"essere recuperati correttamente."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Handshake TLS fallito: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -59,7 +32,7 @@
 "Ricevuto un codice di responso HTTP %d.  La ragione più probabile per questo "
 "è che il nome utente o la password per GMail non siano corretti."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -71,38 +44,47 @@
 "autenticazione o la posizione della fonte dei nuovi messaggi sono stati "
 "cambiati in modo incompatibile."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Nome _utente:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Controlla _nuovi messaggi ogni"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minuto/i."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Casella GMail remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -110,7 +92,7 @@
 "L'estensione GMail può connettersi al servizio di posta di Google e "
 "recuperare in sicurezza il numero di nuovi messaggi."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -118,39 +100,35 @@
 "IMAP sicuro non disponibile e il server IMAP non supporta accessi in testo "
 "semplice."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "È stato richiesto STARTTLS, ma questo server non lo supporta."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Il server IMAP ha restituito un responso inaspettato.  Potrebbe essere tutto "
-"aposto oppure, se il conteggio dei nuovi messaggi non fosse corretto, questa "
-"estensione potrebbe necessitare di modifiche per supportare questo server di "
-"posta."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Impossibile ottenere l'elenco delle cartelle"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Attendere prego..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Errore"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Server o nome utente non impostati."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -160,72 +138,72 @@
 "server, un nome utente e probabilmente una password.  Controllare inoltre le "
 "impostazioni di sicurezza nella finestra delle impostazioni avanzate."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Imposta le cartelle di nuova posta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Cartelle di nuova posta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Opzioni IMAP avanzate"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Usa connessione insicura"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Usa SSL/TLS su una porta alternativa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Usa SSL/TLS attraverso STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Usa una _porta IMAP non standard:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Cartelle"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Directory IMAP del server:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Server IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Server di posta"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avanzate..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Cartelle di nuova posta..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Casella IMAP remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -234,38 +212,38 @@
 "il protocollo IMAP, usando eventualmente SSL per la protezione del "
 "collegamento."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Impossibile ottenere lo stato del file %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s non è una directory. %s è davvero una maildir valida?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Selezionare la cartella Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Percorso Maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervallo:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Spola Maildir locale"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -273,30 +251,30 @@
 "L'estensione Maildir può controllare la presenza di nuovi messaggi in una "
 "spola di posta locale in stile maildir."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Seleziona il file mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nome del _file mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Spola mbox locale"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "L'estensione Mbox controlla la presenza di nuovi messaggi in una spola "
 "locale di tipo mbox."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Ignorata la linea malformata %s in %s."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -304,36 +282,36 @@
 "La configurazione per questa estensione è letta dal\n"
 "profilo predefinito delle caselle mh, il file ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Cartella di posta locale MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 "L'estensione MH controlla la presenza di nuova posta nelle cartelle MH locali"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Opzioni POP3 avanzate"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Usa SSL/TSL attraverso STSL"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Usa _porta POP3 non standard:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Server POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Casella POP3 remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -342,10 +320,146 @@
 "il protocollo POP3, usando eventualmente SSL per la protezione del "
 "collegamento."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Connessione al server fallita: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Compilato senza supporto per SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Connessione al server fallita: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Connessione al server fallita: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Connessione al server fallita: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Impossibile inizializzare il supporto GThread.  È "
+"probabilmente un problema relativo all'installazione di Glib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Impossibile scrivere nel file di configurazione \"%s\""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Impossibile impostare i permessi del file di configurazione \"%s\".  Se il "
+"file contiene password o altre informazioni sensibili, saranno leggibili da "
+"altri utenti del sistema."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Questo tipo di casella non richiede impostazioni di configurazione."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Nome della casella:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Guardaposta"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "È necessario un nome per la casella."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Inserire un nome per la casella."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Modifica la casella: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Seleziona il tipo di casella"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Selezionare un tipo di casella.  Una descrizione del tipo apparirà sotto."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Aggiungi una nuova casella"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Rimuovi casella"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Procedere?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"La rimozione della casella scarterà tutte le impostazioni, è irreversibile."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Caselle di posta"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Non ci sono nuovi messaggi"
 
@@ -363,237 +477,172 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Guardaposta di Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Impossibile aggiungere l'estensione guardaposta al pannello."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "La versione installata di Glib potrebbe non supportare il thread."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Registro del guardaposta"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Linee del registro:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Mostra lo _stato del registro nell'icona"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Selezionare l'icona"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Nuova _posta"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programmi esterni"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Quando premuto _esegui:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr ""
 "All'arrivo di nuovi\n"
 "_messaggi esegui:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Icone"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Nuova _posta"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Vista registro..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Guardaposta"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "L'aiuto non è disponibile perché \"xfhelp4\" non può essere eseguito: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "L'aiuto non è disponibile"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Esecuzione di xfhelp4 fallita"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Guardaposta di Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "GuardapostaXfce: handshake TLS fallito: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Controlla la posta da diverse caselle"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Compilato senza supporto per SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Impossibile impostare il socket in modalità non-bloccata. Se il tentativo "
+#~ "di connessione si arresta, il pannello potrebbe bloccarsi alla chiusura."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"GuardapostaXfce: handshake TLS fallito: compilato senza supporto per SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Impossibile riportare il socket in modalità bloccata.  I dati potrebbero "
+#~ "non essere recuperati correttamente."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-"È stata richiesta una connessione sicura, ma gnutls non è stato inizializzato"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Il server IMAP ha restituito un responso inaspettato.  Potrebbe essere "
+#~ "tutto aposto oppure, se il conteggio dei nuovi messaggi non fosse "
+#~ "corretto, questa estensione potrebbe necessitare di modifiche per "
+#~ "supportare questo server di posta."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Impossibile inizializzare il supporto GThread.  È "
-"probabilmente un problema relativo all'installazione di Glib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "GuardapostaXfce: handshake TLS fallito: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Impossibile scrivere nel file di configurazione \"%s\""
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "GuardapostaXfce: handshake TLS fallito: compilato senza supporto per SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Impossibile impostare i permessi del file di configurazione \"%s\".  Se il "
-"file contiene password o altre informazioni sensibili, saranno leggibili da "
-"altri utenti del sistema."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "È stata richiesta una connessione sicura, ma gnutls non è stato "
+#~ "inizializzato"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Questo tipo di casella non richiede impostazioni di configurazione."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Nome della casella:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Guardaposta"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "È necessario un nome per la casella."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Inserire un nome per la casella."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Modifica la casella: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Seleziona il tipo di casella"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Selezionare un tipo di casella.  Una descrizione del tipo apparirà sotto."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Aggiungi una nuova casella"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Rimuovi casella"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Procedere?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"La rimozione della casella scarterà tutte le impostazioni, è irreversibile."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Caselle di posta"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Controlla la posta da diverse caselle"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Guardaposta"

Modified: xfce4-mailwatch-plugin/trunk/po/ja.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/ja.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/ja.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-01-29 16:13+0900\n"
 "Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -18,41 +18,14 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"ソケットを非停止モードにセットできません。接続しようとしてハングするなら、こ"
-"の接続を閉じる場合にパネルがハングするかもしれません。"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "サーバーへの接続に失敗しました: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"ソケットを停止モードに戻せません。データを正確に取得できない可能性がありま"
-"す。"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS ハンドシェイクに失敗: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -61,7 +34,7 @@
 "HTTP 応答コード %d を受信しました。あなたの GMail ユーザー名またはパスワード"
 "が誤っていることが原因と思われます。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -72,38 +45,47 @@
 "題がある可能性があります。あるいは、認証方式を互換性のないものに変更している"
 "か、新着メッセージを受信する場所を変更しています。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "ユーザー名(_U):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "新着メッセージを(_N)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "分毎に確認する。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "リモート GMail メール箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -111,7 +93,7 @@
 "GMail プラグインを利用して Google が提供しているメールサービスに接続します。"
 "また、新着メッセージを安全に取得します。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -119,37 +101,37 @@
 "安全な IMAP が利用できません、また IMAP サーバーは平文でのログインに対応しま"
 "せん。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "STARTTLS セキュリティがリクエストされましたが、このサーバーはそれをサポートし"
 "ません。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "フォルダ一覧の取得に失敗しました"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "お待ち下さい..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "エラー"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "サーバーまたはユーザー名がセットされていません。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -159,72 +141,72 @@
 "得できません。高度な設定用のダイアログでセキュリティの設定を確認するのも忘れ"
 "ないで下さい。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "新規メールフォルダをセット"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "新規メールフォルダ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "高度な IMAP オプション"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "接続"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "安全ではない接続を利用する"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "別のポートで SSL/TLS を利用する"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "STARTTLS 経由で SSL/TLS を利用する"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "非標準の IMAP ポートを利用する(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "フォルダ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP サーバーフォルダ(_D):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP サーバー"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "メールサーバー(_M):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "高度な設定(_A)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "新規メールフォルダ(_F)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "リモート IMAP メール箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -232,38 +214,38 @@
 "IMAP プラグインを利用して IMAP プロトコルに対応しているリモート・メールサー"
 "バーに接続します。リンクを保護するため任意に SSL を利用します。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "ファイル %s のステータス取得に失敗しました: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s はフォルダではありません。%s は本当に適切な maildir ですか?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Maildir フォルダを選択して下さい"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir のパス(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "間隔(_I):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "ローカル Maildir スプール"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -271,30 +253,30 @@
 "Maildir プラグインを利用して Maildir 様式のローカル・メールスプールの新着メッ"
 "セージを確認します。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "mbox ファイルを選択して下さい"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox ファイル名(_F):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "ローカル Mbox スプール"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "Mbox プラグインを利用して mbox タイプのローカル・メールスプールの新着メッセー"
 "ジを確認します。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "%2$s のおかしな行 %1$s が無視されました。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -302,36 +284,36 @@
 "このプラグインの設定は標準の MH メールフォルダの\n"
 "プロファイル・ファイル ~/.mh_profile から読まれます"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "ローカル MH メールフォルダ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 "MH プラグインを利用してローカル MH フォルダの新着メッセージを確認します。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "高度な POP3 オプション"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "STLS 経由で SSL/TLS を利用する"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "非標準の POP3 ポートを利用する(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 サーバー"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "リモート POP3 メール箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -339,10 +321,144 @@
 "POP3 プラグインを利用して POP3 プロトコルに対応しているリモート・メールサー"
 "バーに接続します。リンクを保護するため任意に SSL を利用します。"
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "サーバーへの接続に失敗しました: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "SSL/TLS サポートでコンパイルされていません。"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "サーバーへの接続に失敗しました: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "サーバーへの接続に失敗しました: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "サーバーへの接続に失敗しました: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: GTread サポートを初期化できません。あなたの GLib のイ"
+"ンストールに問題があるようです。"
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "設定ファイル '%s' を書き出せません"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"設定ファイル '%s' のアクセス権をセットできません。このファイルがパスワードや"
+"他の機密情報を含んでいる場合、あなたと同じシステムを使う他の人達に見られてし"
+"まうかもしれません。"
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "このタイプのメール箱はいずれの設定も必要ありません。"
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "メール箱の名前(_N):"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "メールウォッチ"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "メール箱の名前が必要です。"
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "メール箱の名前を入力して下さい。"
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "メール箱の編集: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "メール箱の選択"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "タイプを選択して下さい。説明は下に表示されます。"
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "新規メール箱の追加"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "メール箱を削除"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "よろしいですか?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "メール箱を削除するとすべての設定が破棄されます、また元に戻せません。"
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "メール箱"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "新着メールはありません"
 
@@ -360,233 +476,160 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce メールウォッチ"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "このメールウォッチ・アプレットはパネルに追加できません。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 "あなたの GLib のバージョンはスレッドをサポートしていないためできません。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "メールウォッチ・ログ"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "ログの行数(_L):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "アイコンでログ・ステータスを表示(_S)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "アイコンを選択して下さい"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "通常(_N)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "新着メール(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "外部プログラム"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "クリックで実行(_O):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "メッセージが来た場合に実行(_M):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "アイコン"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "新着メール(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "ログを表示(_V)..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "メールウォッチャー"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "「xfhelp4」を実行できませんのでヘルプは利用できません: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "ヘルプは利用できません"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "xfhelp4 の実行に失敗しました"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce メールウォッチ"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS ハンドシェイクに失敗: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "様々なタイプのメール箱に届くメールをチェックします。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "SSL/TLS サポートでコンパイルされていません。"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "ソケットを非停止モードにセットできません。接続しようとしてハングするなら、"
+#~ "この接続を閉じる場合にパネルがハングするかもしれません。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: TLS ハンドシェイク失敗: SSL サポートでコンパイルされていませ"
-"ん。"
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "ソケットを停止モードに戻せません。データを正確に取得できない可能性がありま"
+#~ "す。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "安全な接続がリクエストされましたが、GnuTLS が初期化されませんでした。"
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS ハンドシェイクに失敗: %s"
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: GTread サポートを初期化できません。あなたの GLib のイ"
-"ンストールに問題があるようです。"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: TLS ハンドシェイク失敗: SSL サポートでコンパイルされていま"
+#~ "せん。"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "設定ファイル '%s' を書き出せません"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "安全な接続がリクエストされましたが、GnuTLS が初期化されませんでした。"
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"設定ファイル '%s' のアクセス権をセットできません。このファイルがパスワードや"
-"他の機密情報を含んでいる場合、あなたと同じシステムを使う他の人達に見られてし"
-"まうかもしれません。"
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "このタイプのメール箱はいずれの設定も必要ありません。"
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "メール箱の名前(_N):"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "メールウォッチ"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "メール箱の名前が必要です。"
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "メール箱の名前を入力して下さい。"
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "メール箱の編集: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "メール箱の選択"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "タイプを選択して下さい。説明は下に表示されます。"
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "新規メール箱の追加"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "メール箱を削除"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "よろしいですか?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "メール箱を削除するとすべての設定が破棄されます、また元に戻せません。"
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "メール箱"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "様々なタイプのメール箱に届くメールをチェックします。"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "メールウォッチ"

Modified: xfce4-mailwatch-plugin/trunk/po/nb_NO.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/nb_NO.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/nb_NO.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-14 12:58+0100\n"
 "Last-Translator: Terje Uriansrud <ter at operamail.com>\n"
 "Language-Team: Norwegian Bokmal\n"
@@ -16,41 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Klarte ikke sette tilkobling i non-blocking modus. Hvis tilkoblingenlåser "
-"seg, kan panelet også låse seg når dialogen lukkes."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Klarte ikke koble til tjener: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Klarte ikke returnere tilkobling til blocking mode. Data kan ha blitt "
-"overført med feil."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS handshake feilet: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -59,7 +32,7 @@
 "Mottok HTTP responskode %d. Mest sannsynligvis er årsaken at GMail "
 "brukernavn eller passord er feil."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +43,47 @@
 "med GMail sine tjenere, eller de har endret påloggingsmetode eller endret "
 "plassering av ny meldingstjeneste."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Se etter _nye meldinger hvert"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minutt(er)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "GMail epostboks"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,7 +91,7 @@
 "GMail modulen kan koble seg til Google's epost tjeneste og hente antall nye "
 "meldinger."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -117,39 +99,36 @@
 "Sikker IMAP er ikke tilgjengelig og IMAP tjeneren støtter ikke innlogging "
 "via klartekst."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 "STARTTLS sikkerhet ble forsøkt, men denne tjeneren har ikke støtte for dette."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"IMAP tjeneren returnerte en uventet respons. Dette kan være OK. Hvis ikke "
-"trenger kanskje denne modulen endres for å støtte eposttjeneren din hvis "
-"rapportert antall nye meldinger er feil."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Klarte ikke hente mappeliste"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Feil"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Tjenernavn eller brukernavn er ikke angitt."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -159,72 +138,72 @@
 "passord er angitt. Du kan også kontrollere sikkerhetsrelaterte innstillinger "
 "under avanserte innstillinger."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Sett ny epostmapper"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Ny epostmapper"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Avanserte IMAP innstillinger"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Bruk usikret tilkobling"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Bruk SSL/TLS på alternativ port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Bruk SSL/TLS vha STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Bruk ikke-standard IMAP _port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP tjener _katalog:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP tjener"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Eposttjener"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avansert..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Nye epost_mapper"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "IMAP epostboks"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -232,66 +211,66 @@
 "IMAP modulen kan koble seg til en eposttjener som støtter IMAP protokollen, "
 "med muligheter for å bruke SSL kryptering"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Klarte ikke hente status for filen %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s er ikke en mappe. Er %s en gyldig mappe?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Velg epostmappe"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Epostmappe _sti:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervall:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Lokal epostmappe"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 "Epostmappe modulen kan overvåke lokale epostkontoer etter nye meldinger."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Velg mbox fil"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox _filnavn:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Lokal Mbox kø"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Mbox modulen overvåker a lokal mbox mailkø etter nye meldinger."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Ugyldig linje %s i %s er ignorert."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -299,35 +278,35 @@
 "Oppsett av denne modulen leses fra\n"
 "forvalgt mh maildir profil ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Lokal MH epostmappe"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH plugin overvåker lokale MH mapper etter nye epost."
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Avanserte Pop3 innstillinger"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Bruk SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Bruk ikke-standard Pop3 _port"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Pop3 tjener"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Ekstern Pop3 epostboks"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -335,10 +314,144 @@
 "Pop3 modulen kan koble seg til eksterne tjenere som støtter POP3 "
 "protokollen, med mulighet for å bruke kryptert forbindelse"
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Klarte ikke koble til tjener: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Ikke kompilert med SSL/TLS støtte"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Klarte ikke koble til tjener: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Klarte ikke koble til tjener: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Klarte ikke koble til tjener: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce-mailwatch-plugin: Klarte ikke initialisere GThread støtte.  Dette "
+"ersannsynlig et problem med GLib installasjonen din."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Klarte ikke skrive konfigurasjonsfil '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Klarte ikke sette rettighetene til konfigurasjonsfilen '%s'. Hvis denne "
+"filen inneholder passord eller annen konfidensiell informasjon, kan dette "
+"leses av andre som bruker denne maskinen."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Denne epostboks typen krever ingen innstillinger."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Epostboks _navn:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Epostboks navn er påkrevet"
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Vennligst skriv inn et navn på epostboksen."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Rediger epostboks: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Velg epostbokstype"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Velg en epostbokstype. En beskrivelse av typen vil vises nedenfor."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Legg til epostboks"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Fjern epostboks"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "Ved å fjerne en epostboks fjernes alle innstillinger."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Epostbokser"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Ingen ny epost"
 
@@ -356,111 +469,111 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "informerer hvor mange nye meldinger i hver epostboks| %d i %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Mailwatch program kan ikke legges til panelet."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Det er mulig din versjon av GLib ikke ha trådstøtte."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch logg"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Logg_linjer"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Vis logg_status i ikon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Velg ikon"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Ny_ epost"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Eksterne programmer"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Kjør _ved klikk:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Kjør ved nye _meldinger:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikoner"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Ny _epost"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Vis logg..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Epost varsling"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Hjelp er ikke tilgjengelig fordi 'xfhelp' ikke kan kjøres: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Hjelp ikke tilgjengelig"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Klarte ikke starte xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce4 Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "En funksjonsrik epostvarsler for Xfce panelet"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -468,118 +581,54 @@
 "Opphavsrett (c) 2005-2008 Brian Tarricone\n"
 "Opphavsrett (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Vedlikeholder, opprinnelig utvikler"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Utvikler"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Oppdater nå"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: TLS handshake feilet: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Varsle epost fra flere epostbokser"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Ikke kompilert med SSL/TLS støtte"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Klarte ikke sette tilkobling i non-blocking modus. Hvis tilkoblingenlåser "
+#~ "seg, kan panelet også låse seg når dialogen lukkes."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch: TLS handshare feilet: ikke kompilert med SSL støtte."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Klarte ikke returnere tilkobling til blocking mode. Data kan ha blitt "
+#~ "overført med feil."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "En sikker forbindelse ble etterspurt men gnutls var ikke initialisert."
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "IMAP tjeneren returnerte en uventet respons. Dette kan være OK. Hvis ikke "
+#~ "trenger kanskje denne modulen endres for å støtte eposttjeneren din hvis "
+#~ "rapportert antall nye meldinger er feil."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce-mailwatch-plugin: Klarte ikke initialisere GThread støtte.  Dette "
-"ersannsynlig et problem med GLib installasjonen din."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: TLS handshake feilet: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Klarte ikke skrive konfigurasjonsfil '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch: TLS handshare feilet: ikke kompilert med SSL støtte."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Klarte ikke sette rettighetene til konfigurasjonsfilen '%s'. Hvis denne "
-"filen inneholder passord eller annen konfidensiell informasjon, kan dette "
-"leses av andre som bruker denne maskinen."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr ""
+#~ "En sikker forbindelse ble etterspurt men gnutls var ikke initialisert."
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Denne epostboks typen krever ingen innstillinger."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Epostboks _navn:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Epostboks navn er påkrevet"
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Vennligst skriv inn et navn på epostboksen."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Rediger epostboks: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Velg epostbokstype"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Velg en epostbokstype. En beskrivelse av typen vil vises nedenfor."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Legg til epostboks"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Fjern epostboks"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Er du sikker?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "Ved å fjerne en epostboks fjernes alle innstillinger."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Epostbokser"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Varsle epost fra flere epostbokser"
-
 #~ msgid "About Mailwatch"
 #~ msgstr "Mailwatch"

Modified: xfce4-mailwatch-plugin/trunk/po/pt_BR.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/pt_BR.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/pt_BR.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-07-22 19:35-0300\n"
 "Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -19,41 +19,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Não é possível ajustar o soquete para o modo não-bloqueante. Se a tentativa "
-"de conexão travar, o painel pode travar ao fechar."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Falha ao conectar ao servidor: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Não é possível retornar o soquete ao modo de bloqueio. As informações podem "
-"não ser recuperadas corretamente."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Falha no aperto de mãos TLS: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -62,7 +35,7 @@
 "Recebido o código de resposta HTTP %d. A razão mais provável para isto é que "
 "o seu nome de usuário e senha do GMail estão incorretos."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -74,38 +47,47 @@
 "autenticação ou a localização das informações sobre novas mensagens de forma "
 "incompatível."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Nome do _usuário:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Verificar por _novas mensagens a cada"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minuto(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Caixa de mensagens remota do GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -113,7 +95,7 @@
 "O plug-in do GMail pode conectar-se ao serviço de correio eletrônico do "
 "Google e recuperar de forma segura o número de mensagens novas."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -121,39 +103,35 @@
 "IMAP seguro não está disponível e o servidor de IMAP não suporta "
 "autenticação por texto puro."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Segurança STARTTLS foi requisitada, mas este servidor não a suporta."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"O servidor de IMAP retornou uma resposta pela qual não estávamos esperando. "
-"Isto pode não ser nenhum problema, ou este plug-in pode precisar ser "
-"modificado para suportar o seu servidor de e-mail se a contagem de novas "
-"mensagens estiver incorreta."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Falhou ao obter a lista de pastas"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Erro"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Nenhum servidor ou nome de usuário foi configurado."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -163,72 +141,72 @@
 "usuário e provavelmente uma senha forem definidos. Certifique-se também de "
 "verificar as opções de segurança no diálogo Avançado."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Defina pastas de novas mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Pastas de novas mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Opções avançadas de IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Usar conexão insegura"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Usar SSL/TLS em porta alternativa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Usar SSL/TLS via STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Usar uma _porta IMAP não padrão:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Pastas"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "Servidor de _diretório IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Servidor de _mensagens:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avançado..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Pastas de novas mensagens..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Caixa de mensagens IMAP remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -237,39 +215,39 @@
 "suporta o protocolo IMAP, opcionalmente utilizando SSL para proteção de "
 "conexão."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Falha ao obter o status do arquivo %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 "%s não é um diretório. %s é realmente um diretório de mensagens válido?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Selecione a pasta do diretório de mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Caminho do diretório de mensagens:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervalo:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Diretório de mensagens local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -277,29 +255,29 @@
 "O plug-in de diretório de mensagens pode monitorar novas mensagens numa "
 "caixa de mensagens estilo \"maildir\"."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Selecione arquivo Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nome do _arquivo Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Arquivo Mbox local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "O plug-in Mbox monitora novas mensagens em um arquivo local tipo \"Mbox\"."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Linha mal-formada %s em %s ignorada."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -307,35 +285,35 @@
 "A configuração deste plug-in é lida a partir do\n"
 "arquivo de perfil padrão mh maildir ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Pasta de mensagens MH local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "O plug-in MH monitora novas mensagens em pastas MH locais."
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Opções avançadas de POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Usar SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Usar _porta POP3 não padrão:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Servidor POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Caixa de mensagens POP3 remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -343,10 +321,148 @@
 "O plug-in POP3 pode conectar-se a um servidor remoto que suporta o protocolo "
 "POP3, opcionalmente usando SSL para proteção de conexão."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Não compilado com suporte a SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Não foi possível iniciar o suporte GThread. Isto é "
+"provavelmente um problema com sua instalação da GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Não foi possível salvar o arquivo de configuração \"%s\""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Não foi possível ajustar as permissões no arquivo de configuração \"%s\". Se "
+"este arquivo contém senhas ou outras informações privadas, elas poderão ser "
+"lidas por outros no seu sistema."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Este tipo de caixa de mensagens não requer nenhuma configuração."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Nome da caixa de mensagens:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Monitor de mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Nome da caixa de mensagens requerido."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Por favor escolha um nome para a caixa de mensagens."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Editar caixa de mensagens: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Selecione o tipo de caixa de mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Selecione um tipo de caixa de mensagens. Uma descrição do tipo aparecerá "
+"abaixo."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Adicionar nova caixa de mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Remover caixa de mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Você tem certeza?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Remover uma caixa de mensagens irá descartar todas as configurações e não "
+"pode ser desfeito."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Caixas de mensagens"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Nenhuma mensagem nova"
 
@@ -366,112 +482,112 @@
 "informa quantas mensagens novas existem em cada caixa de mensagem|    %d em %"
 "s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Monitor de mensagens do Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "O item do monitor de mensagens não pode ser adicionado ao painel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "É possível que sua versão da GLib não possua suporte à threads."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Histórico do monitor de mensagens."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Linhas do _histórico:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Mostrar _status do histórico no ícone"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Selecione icone"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "No_va mensagem"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programas externos"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Executar ao _clicar:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Executar para novas _mensagens:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ícones"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "No_va mensagem"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "Ver _histórico..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Monitor de mensagens"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "A ajuda não está disponível porque \"xfhelp4\" não pôde ser executado: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Ajuda indisponível"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Falhou ao executar xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Monitor de mensagens do Xfce4"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Um poderoso miniaplicativo verificador de e-mail para o painel do Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -479,125 +595,57 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mantenedor, Autor Original"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Desenvolvedor"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Atualizar agora"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Verificar mensagens de várias caixas de mensagens"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Não compilado com suporte a SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Não é possível ajustar o soquete para o modo não-bloqueante. Se a "
+#~ "tentativa de conexão travar, o painel pode travar ao fechar."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"Monitor de mensagens do Xfce: aperto de mãos TLS falhou: não compilado com "
-"suporte a SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Não é possível retornar o soquete ao modo de bloqueio. As informações "
+#~ "podem não ser recuperadas corretamente."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Uma conexão segura foi requisitada, mas gnutls não foi inicializado"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "O servidor de IMAP retornou uma resposta pela qual não estávamos "
+#~ "esperando. Isto pode não ser nenhum problema, ou este plug-in pode "
+#~ "precisar ser modificado para suportar o seu servidor de e-mail se a "
+#~ "contagem de novas mensagens estiver incorreta."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Não foi possível iniciar o suporte GThread. Isto é "
-"provavelmente um problema com sua instalação da GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Não foi possível salvar o arquivo de configuração \"%s\""
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: não compilado "
+#~ "com suporte a SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Não foi possível ajustar as permissões no arquivo de configuração \"%s\". Se "
-"este arquivo contém senhas ou outras informações privadas, elas poderão ser "
-"lidas por outros no seu sistema."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Uma conexão segura foi requisitada, mas gnutls não foi inicializado"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Este tipo de caixa de mensagens não requer nenhuma configuração."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Nome da caixa de mensagens:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Monitor de mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Nome da caixa de mensagens requerido."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Por favor escolha um nome para a caixa de mensagens."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Editar caixa de mensagens: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Selecione o tipo de caixa de mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Selecione um tipo de caixa de mensagens. Uma descrição do tipo aparecerá "
-"abaixo."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Adicionar nova caixa de mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Remover caixa de mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Você tem certeza?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Remover uma caixa de mensagens irá descartar todas as configurações e não "
-"pode ser desfeito."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Caixas de mensagens"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Verificar mensagens de várias caixas de mensagens"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Monitor de Mensagens"

Modified: xfce4-mailwatch-plugin/trunk/po/pt_PT.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/pt_PT.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/pt_PT.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-06-10 15:02+0100\n"
 "Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
 "Language-Team: \n"
@@ -17,41 +17,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Não é possível ajustar o socket para o modo não-bloqueante.  Se a tentativa "
-"de ligação falhar, o painel pode bloquear ao fechar."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Falha ao conectar ao servidor: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Não é possível retornar o socket ao modo de bloqueio. As informações podem "
-"não ser recuperadas correctamente."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Falha no aperto de mãos TLS: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -60,7 +33,7 @@
 "Recebido o código de resposta HTTP %d. A razão mais provável para isto é que "
 "o seu nome de utilizador e senha do GMail estão incorrectos."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -72,38 +45,47 @@
 "autenticação ou a localização das informações sobre novas mensagens de forma "
 "incompatível."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Nome do _utilizador:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Verificar por _novas mensagens a cada"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minuto(s)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Caixa de mensagens remota do GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -111,7 +93,7 @@
 "O plugin do GMail pode conectar-se ao serviço de correio electrónico do "
 "Google e recuperar de forma segura o número de mensagens novas."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -119,39 +101,35 @@
 "IMAP seguro não está disponível e o servidor de IMAP não suporta "
 "autenticação em texto puro."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Segurança STARTTLS foi requisitada, mas este servidor não a suporta."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"O servidor de IMAP retornou uma resposta pela qual não estávamos à espera. "
-"Isto pode não ser nenhum problema, ou este plugin pode precisar ser "
-"modificado para suportar o seu servidor de e-mail se a contagem de novas "
-"mensagens estiver incorrecta."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Falhou ao obter a lista de pastas"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Erro"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Nenhum servidor ou nome de utilizador foi configurado."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -161,72 +139,72 @@
 "utilizador e provavelmente uma senha forem informados. Certifique-se também "
 "de verificar as opções de segurança no diálogo Avançado."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Ajuste de Pastas de Novas Mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Pastas de Novas Mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Opções Avançadas de IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Usar ligação insegura"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Usar SSL/TLS em porta alternativa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Usar SSL/TLS via STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Usar uma _porta IMAP não padrão:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Pastas"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "Servidor de _directório IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Servidor IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Servidor de _Mensagens:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Avançado..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Pastas de novas mensagens..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Caixa de mensagens IMAP remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -234,38 +212,38 @@
 "O plugin IMAP pode ligar-se a um servidor de mensagens remoto que suporta o "
 "protocolo IMAP, opcionalmente usando SSL para protecção da ligação."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Falha ao obter o estado do ficheiro %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s não é uma pasta. %s é realmente uma pasta de mensagens válida?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Seleccione a Pasta do Directório de Mensagens"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Caminho do Directório de Mensagens:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Intervalo:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Directório de Mensagens Local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -273,29 +251,29 @@
 "O plugin de directório de mensagens pode monitorizar novas mensagens numa "
 "caixa de mensagens estilo \"maildir\"."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Seleccione ficheiro mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Nome do _Ficheiro Mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Arquivo Mbox local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 "O plugin Mbox monitoriza novas mensagens em um arquivo local tipo \"mbox\"."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Linha mal-formada %s em %s ignorada."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -303,35 +281,35 @@
 "A configuração deste plugin é lida a partir do\n"
 "ficheiro de configuração omisso mh maildir ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Pasta de mensagens MH local"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "O plugin MH monitoriza novas mensagens em pastas MH locais."
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Opções POP3 Avançadas"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Usar SSL/TLS via STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Usar _porta POP3 não padrão:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Servidor POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Caixa de mensagens POP3 remota"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -339,10 +317,148 @@
 "O plugin POP3 pode ligar-se a um servidor remoto que suporta o protocolo "
 "POP3, opcionalmente usando SSL para protecção da ligação."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Não compilado com suporte a SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Falha ao conectar ao servidor: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Não é possível iniciar o suporte GThread. Isto é "
+"provavelmente um problema com a sua instalação da GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Não é possível gravar o ficheiro de configuração '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Não é possível ajustar as permissões no ficheiro de configuração '%s'. Se "
+"este ficheiro contém senhas ou outras informações privadas, elas poderão ser "
+"lidas por outros no seu sistema."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Este tipo de caixa de mensagens não requer nenhuma configuração."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Nome da Caixa de Mensagens:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Monitor de mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Nome da caixa de mensagens requerido."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Por favor escolha um nome para a caixa de mensagens."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Editar Caixa de Mensagens: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Seleccione o Tipo de Caixa de Mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+"Seleccione um tipo de caixa de mensagens. Uma descrição do tipo aparecerá "
+"abaixo."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Adicionar Nova Caixa de Mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Remover Caixa de Mensagens"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Tem a certeza?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Remover uma caixa de mensagens irá apagar todas as configurações e não pode "
+"ser desfeito."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Caixas de mensagens"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Nenhuma mensagem nova"
 
@@ -360,112 +476,112 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "    %d em %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Monitor de mensagens do Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "O item do monitor de mensagens não pode ser adicionado ao painel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "É possível que a sua versão da GLib não possua suporte a threads."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Histórico do monitor de mensagens."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Linhas do _histórico:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Mostrar e_stado do histórico no ícone"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Seleccionar Ícone"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "No_va mensagem"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programas Externos"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Executar ao _clicar:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Executar para novas _mensagens:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ícones"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "No_va Mensagem"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "Ver _Histórico..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Monitor de Mensagens"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 "A ajuda não está disponível porque 'xfhelp4' não pode ser executado: %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Ajuda Indisponível"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Falhou ao executar xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Plugin Mailwatch Xfce4"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Uma funcional applet de verificador de mail para o Painel Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -473,125 +589,57 @@
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Mantenedor, Autor Original"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Programador"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Actualizar Agora"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Verificar mensagens de várias caixas de mensagens"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Não compilado com suporte a SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Não é possível ajustar o socket para o modo não-bloqueante.  Se a "
+#~ "tentativa de ligação falhar, o painel pode bloquear ao fechar."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"Monitor de mensagens do Xfce: aperto de mãos TLS falhou: não compilado com "
-"suporte a SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Não é possível retornar o socket ao modo de bloqueio. As informações "
+#~ "podem não ser recuperadas correctamente."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Uma ligação segura foi requisitada, mas gnutls não foi inicializada"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "O servidor de IMAP retornou uma resposta pela qual não estávamos à "
+#~ "espera. Isto pode não ser nenhum problema, ou este plugin pode precisar "
+#~ "ser modificado para suportar o seu servidor de e-mail se a contagem de "
+#~ "novas mensagens estiver incorrecta."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Não é possível iniciar o suporte GThread. Isto é "
-"provavelmente um problema com a sua instalação da GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Não é possível gravar o ficheiro de configuração '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "Monitor de mensagens do Xfce: aperto de mãos TLS falhou: não compilado "
+#~ "com suporte a SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Não é possível ajustar as permissões no ficheiro de configuração '%s'. Se "
-"este ficheiro contém senhas ou outras informações privadas, elas poderão ser "
-"lidas por outros no seu sistema."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Uma ligação segura foi requisitada, mas gnutls não foi inicializada"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Este tipo de caixa de mensagens não requer nenhuma configuração."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Nome da Caixa de Mensagens:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Monitor de mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Nome da caixa de mensagens requerido."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Por favor escolha um nome para a caixa de mensagens."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Editar Caixa de Mensagens: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Seleccione o Tipo de Caixa de Mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-"Seleccione um tipo de caixa de mensagens. Uma descrição do tipo aparecerá "
-"abaixo."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Adicionar Nova Caixa de Mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Remover Caixa de Mensagens"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Tem a certeza?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Remover uma caixa de mensagens irá apagar todas as configurações e não pode "
-"ser desfeito."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Caixas de mensagens"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Verificar mensagens de várias caixas de mensagens"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Monitor de mensagens"

Modified: xfce4-mailwatch-plugin/trunk/po/ru.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/ru.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/ru.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-04-22 14:48+0600\n"
 "Last-Translator: Sergey Fedoseev <fedoseev.sergey at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -16,44 +16,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Не удалось соединиться с сервером: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -61,257 +38,397 @@
 "method or location of the new messages feed."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Имя пользователя:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "Пароль:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Проверять наличие новых сообщений каждые"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "минут."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Удаленный почтовый ящик GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
-msgid "STARTTLS security was requested, but this server does not support it."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
+msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Не удалось получить список папок"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Подождите..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Не задан сервер или имя пользователя."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
 "Advanced dialog."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Новые почтовые папки"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Расширенные настройки IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Использовать небезопасное соединение"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Использовать SSL/TLS через STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Использовать нестандартный порт IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Папки"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Сервер IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Почтовый сервер:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "Дополнительно..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "Новые почтовые папки..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Удалённый почтовый ящик IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Выберите папку maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Путь к папке maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "Интервал:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Выберите файл mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Имя файла mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Некорректная строка %s в %s проигнорирована."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Расширенные настройки POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Использовать SSL/TLS через STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Использовать нестандартный порт POP3:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Сервер POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Удалённый почтовый ящик POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Не удалось соединиться с сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Собрано без поддержки SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Не удалось соединиться с сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Не удалось соединиться с сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Не удалось соединиться с сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Не удалось записать файл конфигурации '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Этот тип почтового ящика не требует дополнительных настроек."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Название почтового ящика:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Проверка почты"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Необходимо указать имя почтового ящика."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Укажите название почтового ящика."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Параметры почтового ящика: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Тип почтового ящика"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Выберите тип почтового ящика. Описание этого типа будет показано ниже."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Добавить новый почтовый ящик"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Удалить почтовый ящик"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Вы уверены?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Удаляя почтовый ящик, вы удалите все его настройки и не сможете их "
+"восстановить."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Почтовые ящики"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Нет новых писем"
 
@@ -329,224 +446,130 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Проверка почты Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 #, fuzzy
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Не удалось добавить апплет проверки почты на панель."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Журнал проверки почты"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "Строк в журнале:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Показывать статус из журнала на значке"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Выберите значок"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "Обычный"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Новая почта"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Внешние программы"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Запускать при щелчке мышью:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Запускать при наличии новых сообщений:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Значки"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Новая почта"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "Просмотреть журнал..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Проверка почты"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Справка недоступна, потому что не удается запустить 'xfhelp4': %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Справка недоступна"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Не удалось запустить xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Проверка почты Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Собрано без поддержки SSL/TLS"
-
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Не удалось записать файл конфигурации '%s'"
-
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Этот тип почтового ящика не требует дополнительных настроек."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Название почтового ящика:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Проверка почты"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Необходимо указать имя почтового ящика."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Укажите название почтового ящика."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Параметры почтового ящика: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Тип почтового ящика"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Выберите тип почтового ящика. Описание этого типа будет показано ниже."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Добавить новый почтовый ящик"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Удалить почтовый ящик"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Вы уверены?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Удаляя почтовый ящик, вы удалите все его настройки и не сможете их "
-"восстановить."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Почтовые ящики"
-
 #: ../panel-plugin/mailwatch.desktop.in.in.h:1
 msgid "Check mail from multiple mailboxes"
 msgstr "Проверять почту из нескольких ящиков"

Modified: xfce4-mailwatch-plugin/trunk/po/sq.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/sq.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/sq.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2007-01-30 21:17+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,41 +15,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"I pazoti të vendos \"socket\"-in nën mënyrën jobllokuese.  Nëse përpjekja "
-"për t'u lidhur ngec, paneli mund të ngecë gjatë mbylljes."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Dështova në lidhjen me shërbyesin: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"I pazoti të kthej \"socket\"-in nën mënyrën bllokuese.  Të dhënat mund të "
-"mos jenë marrë saktësisht."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Duarshtrëngimi TLS dështoi: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -58,7 +31,7 @@
 "Mora kod përgjigjegjeje HTTP %d. Shkaku më i mundshëm për këtë është fakti "
 "që emri juaj i përdoruesit apo fjalëkalimi GMail nuk është i saktë."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +43,47 @@
 "mënyrë  të papërputhshme metodën e tyre të mirëfilltësimit ose vendin e "
 "prurjes për mesazhe të rinj."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Emër përdoruesi:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Fjalëkalim:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Kontrollo për mesazhe të _rinj çdo"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "minutë(a)."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Kuti postare GMail e largët"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,7 +91,7 @@
 "Shtojca GMail mund të lidhet te shërbimi Google i postës dhe të marrë në "
 "mënyrë të sigurtë numrin e mesazheve të rinj."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -117,39 +99,35 @@
 "IMAP i sigurt nuk është i passhëm, dhe shërbyesi IMAP nuk mbulon hryje në të "
 "përmes teksti të thjeshtë."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Lypsej sigurimi përmes STARTTLS, por ky shërbyes nuk e mbulon atë."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Shërbyesi IMAP ktheu një përgjigje që nuk e prisnim dhe aq.  Kjo mund të "
-"jetë OK, ose kjo shtojcë mund të ketë nevojë të ndryshohet që tt mbulojë "
-"shërbyesin tuaj të postës nëse numërimi i mesazheve tuaj të rinj nuk është i "
-"saktë."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Dështova në pasjen e listës së dosjeve"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Ju lutem prisni..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Gabim"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Nuk është caktuar shërbyes apo emër përdoruesi."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -160,72 +138,72 @@
 "sigurohuni se keni kontrolluar çfarëdo rregullimi sigurie te dialogu Të "
 "mëtejshëm."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Caktoni Dosje Poste të Re"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Dosje Poste të Re"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Mundësi të Mëtejshme IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Ndërlidhje"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Përdor lidhje të pasigurtë"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Përdor SSL/TSL në portë alternative"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Përdor SSL/TLS përmes STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Përdor portë IMAP jo standarde:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Dosje"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Drejtori shërbyesi IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Shërbyes IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Shërbyes _poste:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Të mëtejshme..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Dosje poste të re..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Kuti postare IMAP e largët"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -234,66 +212,66 @@
 "protokollin IMAP, duke paasur mundësinë edhe të lidhet duke përdorur SSL për "
 "mbrojtje lidhjeje."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Dështova në pasjen e gjendjes së kartelës %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 "%s nuk është drejtori. A është %s vërtet një drejtori e vlefshme poste?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Përzgjidhni Dosje Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Shteg Maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Interval:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Përzgjidhni kartelë mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "_Emër kartele mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "U shpërfill rresht i keqformuar %s te %s."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -301,35 +279,35 @@
 "Formësimi i kësaj shtojce lexohet prej\n"
 "kartelës parazgjedhje të profilit maildir mh ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Dosje poste MH vendore"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Shtojca MH mban nën vëzhgim dosje MH vendore për postë të re"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Mundësi të Mëtejshme POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Përdor SSL/tsl përmes STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Përdor _portë POP3 jo standarde:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Shërbyes POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Kuti postare POP3 e largët"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -337,10 +315,146 @@
 "Shtojca POP3 mund të lidhet me një shërbyes të largët që mbulon protokollin "
 "POP3, mundësisht duke përdorur SSL-në për mbrojtje lidhjeje."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Dështova në lidhjen me shërbyesin: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Nuk është përpiluar me mbulim për SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Dështova në lidhjen me shërbyesin: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Dështova në lidhjen me shërbyesin: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Dështova në lidhjen me shërbyesin: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: I pazoti të gatis mbulimin për GThread.  Ka të "
+"ngjarë që ky të jetë problem i instalimit tuaj të GLib-it."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "I pazoti të shkruaj kartelë formësimi '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"I pazoti të caktoj lejet mbi kartelën e formësimit '%s'.  Nëse kjo kartelë "
+"përmban fjalëkalime apo të tjera të dhëna të rezervuara, mund të jetë e "
+"lexueshme nga të tjerët në sistemin tuaj."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Ky tip kutie postare nuk lyp ndonjë rregullim formësimi."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Emër Kutie Postare:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Lypset emër kutie postare."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Ju lutem jepni emër për kutinë postare."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Përpunoni Kutinë Postare: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Përzgjidhni Tip Kutie Postare"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Përzgjidhni tip kutie postare. Më poshtë jepet një përshkrim i tipit."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Shto Kuti të Re Postare"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Hiq Kuti Postare"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Jeni i sigurt?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Heqja e një kutie postare do të hedhë tej tërë rrregullimet për të, dhe kjo "
+"nuk mund të zbbëhet."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Kuti Postare"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Pa postë të re"
 
@@ -358,234 +472,168 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Zbatimthi mailwatch nuk mund të shtohet te paneli."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Ka të ngjarë që versioni juaj i GLib-it nuk mbulon rrjedha."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Regjistër Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Rreshta regjistri:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Shfaq _gjendje regjistri si ikonë"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Përzgjidhni Ikonë"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Postë e _re"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Programe të Jashtme"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Xhiro _kur klikohet:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Me _mesazhe të rinj xhiro:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Ikona"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "Postë e _Re"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Shihni Regjistrim..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Vëzhgues Poste"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Ndihma nuk është e passhme ngaqë nuk xhiroi dot 'xfhelp4': %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Nuk ka Ndihmë të passhme"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Dështova në xhirimin e xfhelp4-s"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: duarshtrëngimi TLS dështoi: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Kontrollo për postë prej shumë kutish postare"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Nuk është përpiluar me mbulim për SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "I pazoti të vendos \"socket\"-in nën mënyrën jobllokuese.  Nëse përpjekja "
+#~ "për t'u lidhur ngec, paneli mund të ngecë gjatë mbylljes."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: duarshtrëngimi TLS dështoi: nuk është përpiluar me mbulim për "
-"SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "I pazoti të kthej \"socket\"-in nën mënyrën bllokuese.  Të dhënat mund të "
+#~ "mos jenë marrë saktësisht."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "U kërkua lidhje e sigurt, por gnutls nuk qe gatitur"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Shërbyesi IMAP ktheu një përgjigje që nuk e prisnim dhe aq.  Kjo mund të "
+#~ "jetë OK, ose kjo shtojcë mund të ketë nevojë të ndryshohet që tt mbulojë "
+#~ "shërbyesin tuaj të postës nëse numërimi i mesazheve tuaj të rinj nuk "
+#~ "është i saktë."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: I pazoti të gatis mbulimin për GThread.  Ka të "
-"ngjarë që ky të jetë problem i instalimit tuaj të GLib-it."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: duarshtrëngimi TLS dështoi: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "I pazoti të shkruaj kartelë formësimi '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: duarshtrëngimi TLS dështoi: nuk është përpiluar me mbulim "
+#~ "për SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"I pazoti të caktoj lejet mbi kartelën e formësimit '%s'.  Nëse kjo kartelë "
-"përmban fjalëkalime apo të tjera të dhëna të rezervuara, mund të jetë e "
-"lexueshme nga të tjerët në sistemin tuaj."
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "U kërkua lidhje e sigurt, por gnutls nuk qe gatitur"
 
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Ky tip kutie postare nuk lyp ndonjë rregullim formësimi."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Emër Kutie Postare:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Lypset emër kutie postare."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Ju lutem jepni emër për kutinë postare."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Përpunoni Kutinë Postare: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Përzgjidhni Tip Kutie Postare"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Përzgjidhni tip kutie postare. Më poshtë jepet një përshkrim i tipit."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Shto Kuti të Re Postare"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Hiq Kuti Postare"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Jeni i sigurt?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Heqja e një kutie postare do të hedhë tej tërë rrregullimet për të, dhe kjo "
-"nuk mund të zbbëhet."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Kuti Postare"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Kontrollo për postë prej shumë kutish postare"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Mailwatch"

Modified: xfce4-mailwatch-plugin/trunk/po/uk.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/uk.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/uk.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-07-08 18:01+0300\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -19,41 +19,14 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Не вдається встановити сокет в неблокуючий режим. Якщо програма зависає при "
-"спробі з'єднання, панель може зависнути при закритті."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Не вдається з'єднатись з сервером: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Не вдається повернути сокет у блокуючий режим.  Дані можуть бути отримані "
-"некоректно."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "Помилка встановлення з'єднання TLS: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -62,7 +35,7 @@
 "Отримано відповідь HTTP з кодом %d.  Швидше за все причина у неправильній "
 "назві облікового рахунку GMail чи паролі."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -73,38 +46,47 @@
 "сервером GMail, чи на сервері несумісним чином змінено метод аутентифікації "
 "або адресу джерела новин."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "_Ім'я користувача:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Перевіряти _нові повідомлення кожні"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "хвилин."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Віддалена поштова скринька GMail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -112,7 +94,7 @@
 "Модуль GMail може з'єднуватись зі службою Google та безпечно отримувати "
 "кількість нових повідомлень."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -120,38 +102,35 @@
 "Безпечний IMAP недоступний, а сервер IMAP не підтримує передачу паролів "
 "прямим текстом."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Запитано функціональність STARTTLS, але сервер її не підтримує."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-"Сервер IMAP повернув відповідь - ми зовсім не очікували. Це ймовірно є "
-"нормальним, але це розширення мабуть потребує змін для підтримки вашого "
-"поштового серверу якщо нове враховане повідомлення є неправильним."
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Не вдається отримати список тек"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Зачекайте..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Помилка"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Не встановлено назву сервера або ім'я користувача."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -161,72 +140,72 @@
 "та, можливо, пароль.  Також перевірте параметри безпеки у діалоговому вікні "
 "Додатково."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Встановлення теки нової пошти"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Теки нової пошти"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Додаткові параметри IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "З'єднання"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Використовувати небезпечне з'єднання"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Використовувати SSL/TLS на альтернативному порту"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Використовувати SSL/TLS через STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Використовувати нестандартний _порт IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Теки"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Каталог сервера IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Сервер IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "_Поштовий сервер:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Додатково..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Тека нової пошти..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Віддалена скринька IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -234,38 +213,38 @@
 "Модуль IMAP можу з'єднуватись з віддаленим поштовим сервером, який підтримує "
 "протокол IMAP, можливо, з використанням протоколу SSL для захисту з'єднання."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Не вдається отримати статус файлу %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s не є каталогом. Чи %s справді є правильним maildir?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Вибір теки maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "_Шлях maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Інтервал:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Локальний буфер maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -273,28 +252,28 @@
 "Розширення Maildir може спостерігати за новими повідомленнями у локальній "
 "теці типу maildir."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Виберіть файл mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "_Файл Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Локальний буфер mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Модуль mbox перевіряє нові повідомлення у локальній теці mbox."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Неправильний рядок %s у %s ігнорується."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -302,35 +281,35 @@
 "Конфігурація цього модулю читається з\n"
 "профілю типової теки mh maildir у файлі ~/.mh_profile"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Локальна тека MH mail"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Модуль MH перевіряє нову пошту у локальній теці MH"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Параметри розширеного POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Використовувати SSL/TLS через STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Використовувати нестандартний _порт POP3:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Сервер POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Віддалена тека POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -338,10 +317,146 @@
 "Модуль POP3 можу з'єднуватись з віддаленим поштовим сервером, який підтримує "
 "протокол POP3, можливо з використанням протоколу SSL."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Не вдається з'єднатись з сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Зібрано без підтримки SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Не вдається з'єднатись з сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Не вдається з'єднатись з сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Не вдається з'єднатись з сервером: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Не вдається ініціалізувати підтримку GThread.  Це "
+"проблема у встановленні GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Не вдається записати конфігураційний файл '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Не вдається встановити права на конфігураційний файл '%s'.  Якщо цей файл "
+"містить паролі чи іншу конфіденційну інформацію, доступ до неї зможуть "
+"отримати інші користувачі системи."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Цей тип поштової скриньки не вимагає параметрів конфігурації."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "_Назва поштової скриньки:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Перевірка пошти"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Потрібно вказати назву поштової скриньки."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Введіть назву поштової скриньки."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Редагування поштової скриньки: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Виберіть тип потової скриньки"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Виберіть тип поштової скриньки. Опис типу з'явиться нижче."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Додати нову поштову скриньку"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Видалити нову поштову скриньку"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Ви впевнені?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+"Видалення поштової скриньки призведе до видалення усіх параметрів, і їх не "
+"можна буде відновити."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Поштові скриньки"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Немає нової пошти"
 
@@ -360,111 +475,111 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr "    %d в %s"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Перевірка пошти Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Аплет перевірки пошти не можна додати до панелі."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Можливо, що ваша версія GLib не має підтримки потоків виконання."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Журнал перевірки пошти"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Рядків у журналі:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Показувати _статус журналу у значку"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Виберіть значок"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Звичайний"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "_Нова пошта"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Зовнішня програма"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Запускати при кла_цанні мишею:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Запускати при появі нових _повідомлень:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Значки"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "_Нова пошта"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Переглянути журнал..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Перевірка пошти"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Довідка недоступна, оскільки не вдається запустити 'xfhelp4': %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Довідка недоступна"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Не вдається запустити xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Плагін для перевірки пошти Xfce4"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr "Повнофункціональний аплет перевірки пошти для панелі Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
@@ -472,119 +587,52 @@
 "Авторські права (c) 2005-2008 Brian Tarricone\n"
 "Авторські права (c) 2005 Pasi Orovuo"
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr "Підтримка, основний автор"
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr "Розробник"
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr "Оновити зараз"
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: помилка встановлення з'єднання TLS: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Перевіряти пошту з кількох поштових скриньок"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Зібрано без підтримки SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Не вдається встановити сокет в неблокуючий режим. Якщо програма зависає "
+#~ "при спробі з'єднання, панель може зависнути при закритті."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: помилка встановлення з'єднання TLS: програму зібрано без "
-"підтримки SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Не вдається повернути сокет у блокуючий режим.  Дані можуть бути отримані "
+#~ "некоректно."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Вимагається безпечне з'єднання, але gnutls не ініціалізована"
+#~ msgid ""
+#~ "The IMAP server returned a response we weren't quite expecting.  This "
+#~ "might be OK, or this plugin might need to be modified to support your "
+#~ "mail server if the new message counts are incorrect."
+#~ msgstr ""
+#~ "Сервер IMAP повернув відповідь - ми зовсім не очікували. Це ймовірно є "
+#~ "нормальним, але це розширення мабуть потребує змін для підтримки вашого "
+#~ "поштового серверу якщо нове враховане повідомлення є неправильним."
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Не вдається ініціалізувати підтримку GThread.  Це "
-"проблема у встановленні GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: помилка встановлення з'єднання TLS: %s"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Не вдається записати конфігураційний файл '%s'"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: помилка встановлення з'єднання TLS: програму зібрано без "
+#~ "підтримки SSL."
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Не вдається встановити права на конфігураційний файл '%s'.  Якщо цей файл "
-"містить паролі чи іншу конфіденційну інформацію, доступ до неї зможуть "
-"отримати інші користувачі системи."
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Цей тип поштової скриньки не вимагає параметрів конфігурації."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "_Назва поштової скриньки:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Перевірка пошти"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Потрібно вказати назву поштової скриньки."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Введіть назву поштової скриньки."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Редагування поштової скриньки: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Виберіть тип потової скриньки"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Виберіть тип поштової скриньки. Опис типу з'явиться нижче."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Додати нову поштову скриньку"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Видалити нову поштову скриньку"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Ви впевнені?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-"Видалення поштової скриньки призведе до видалення усіх параметрів, і їх не "
-"можна буде відновити."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Поштові скриньки"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Перевіряти пошту з кількох поштових скриньок"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Вимагається безпечне з'єднання, але gnutls не ініціалізована"

Modified: xfce4-mailwatch-plugin/trunk/po/vi.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/vi.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/vi.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-01-27 01:04+0300\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
 "Language-Team: Vietnamese <none at li.org>\n"
@@ -16,41 +16,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"Không đặt được socket cho chế độ không phải khối.  Nếu kết nối ngắt, thì "
-"bảng panel có thể sẽ đóng."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "Không kết nối được tới máy chủ: %s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-"Không trả lại được socket về chế độ khối.  Có thể không nhận được dữ liệu "
-"đúng."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "\"Bắt tay\" TLS không thành công: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
@@ -59,7 +32,7 @@
 "Nhận được mã trả lời HTTP %d.  Nguyên nhân có khả năng cao nhất là người "
 "dùng hoặc mật khẩu GMail không đúng."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -70,38 +43,47 @@
 "vấn đề với máy chủ GMail, hoặc phương thức xác thực người dùng hay vị trí "
 "thư mới của GMail đã thay đổi."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "Người _dùng:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "_Mật khẩu:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "Kiểm tra thư mới _sau"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "phút."
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "Hộp thư GMail ở xa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
@@ -109,7 +91,7 @@
 "Plugin GMail có thể kết nối tới dịch vụ thư của Google và nhận thư mới theo "
 "đường truyền bảo mật."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
@@ -117,35 +99,35 @@
 "Không dùng được IMAP bảo mật, và máy chủ IMAP không hỗ trợ đăng nhập thông "
 "thường."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "Yêu cầu dùng bảo mật STARTTLS, nhưng máy chủ này không hỗ trợ."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "Không lấy được danh sách thư mục"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "Xin hãy đợi..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "Chưa đặt máy chủ hoặc người dùng."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -155,72 +137,72 @@
 "và mật khẩu.  Đồng thời cần kiểm tra lại các thiết lập bảo mật trong hộp "
 "thoại Nâng cao."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "Đặt các Thư mục Mới"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "Thư mục mới"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "Tùy chọn IMAP nâng cao"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "Kết nối"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "Dùng kết nối không bảo mật"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "Dùng SSL/TLS trên cổng xen kẽ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "Dùng SSL/TLS qua STARTTLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "Dùng _cổng IMAP không theo chuẩn:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "Thư mục"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "_Thư mục máy chủ IMAP:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "Máy chủ IMAP"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "Máy _chủ:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "_Nâng cao..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "_Thư mục mới..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "Hộp thư IMAP ở xa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -228,38 +210,38 @@
 "Plugin IMAP kết nối tới một máy chủ thư ở xa có hỗ trợ giao thức IMAP, có "
 "thể chọn dùng SSL để bảo mật kết nối."
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "Không lấy được trạng thái của tập tin %s: %s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s không phải là một thư mục. %s là một maildir?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "Chọn Thư mục Maildir"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Đường _dẫn Maildir:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "_Kiểm tra thư mới sau:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "Maildir trên máy"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
@@ -267,28 +249,28 @@
 "Plugin Maildir dùng để kiểm tra thư mới của hộp thư dạng maildir trên máy "
 "nội bộ."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "Chọn tập tin mbox"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "_Tên tập tin Mbox:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "Mbox trên máy"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Plugin Mbox theo dõi hộp thư dạng mbox trên máy nội bộ."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "Lờ đi dòng bị sai %s trong %s."
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -296,35 +278,35 @@
 "Đọc cấu hình của plugin này từ tập tin\n"
 "~/.mh_profile mặc định của mh"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "Hộp thư MH trên máy"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "Plugin MH theo dõi thư mục MH nội bộ"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "Tùy chọn POP3 nâng cao"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "Dùng SSL/TLS qua STLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "Dùng _cổng POP3 không theo chuẩn:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "Máy chủ POP3"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "Hộp thư POP3 ở xa"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -332,10 +314,144 @@
 "Plugin POP3 kết nối tới một máy chủ thư ở xa có hỗ trợ giao thức POP3, có "
 "thể chọn dùng SSL để bảo mật kết nối."
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "Không kết nối được tới máy chủ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "Biên dịch không có hỗ trợ SSL/TLS"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "Không kết nối được tới máy chủ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "Không kết nối được tới máy chủ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "Không kết nối được tới máy chủ: %s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin: Không chạy được hỗ trợ GThread support.  Rất có thể "
+"có vấn đề từ cài đặt GLib."
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "Không ghi được tập tin cấu hình '%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"Không đặt được quyền hạn cho tập tin cấu hình '%s'.  Nếu tập tin này chứa "
+"mật khẩu hoặc thông tin có giá trị, thì những người dùng khác sẽ đọc được "
+"chúng."
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "Dạng hộp thư này không yêu cầu bất kỳ thiết lập cấu hình nào."
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "Tên _Hộp thư:"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Trình theo dõi thư"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "Cần tên hộp thư."
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "Xin hãy nhập tên cho hộp thư."
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "Sửa Hộp thư: %s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "Chọn dạng Hộp thư"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "Chọn dạng hộp thư.  Đọc mô tả của dạng ở dưới."
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "Thêm Hộp thư Mới"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "Xóa hộp thư"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "Chắc chắn xóa?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "Xóa hộp thư sẽ bỏ mọi thiết lập, và không thể phục hồi lại."
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "Hộp thư"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "Không có thư mới"
 
@@ -353,232 +469,158 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Trình theo dõi thư của Xfce"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "Không thêm được trình theo dõi thư vào thanh panel."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "Có thể phiên bản GLib trên máy không hỗ trợ luồng."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Bản ghi"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "_Dòng ghi:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "Hiển thị _trạng thái trong biểu tượng"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "Chọn Biểu tượng"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "_Bình thường"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "Thư _mới"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "Chương trình ngoài"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "Khi nhấn chuột, _chạy:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "Khi có thư _mới, chạy:"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "Biểu tượng"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "_Thư mới"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "_Xem Bản ghi..."
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "Theo dõi Thư"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "Không xem được trợ giúp vì không chạy được 'xfhelp4': %s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "Không xem được Trợ giúp"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "Không chạy được xfhelp4"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Trình theo dõi thư của Xfce"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch: \"Bắt tay\" TLS không thành công: %s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "Kiểm tra thư từ nhiều hộp thư"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "Biên dịch không có hỗ trợ SSL/TLS"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "Không đặt được socket cho chế độ không phải khối.  Nếu kết nối ngắt, thì "
+#~ "bảng panel có thể sẽ đóng."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-"XfceMailwatch: \"Bắt tay\" TLS không thành công: không biên dịch với hỗ trợ "
-"SSL."
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr ""
+#~ "Không trả lại được socket về chế độ khối.  Có thể không nhận được dữ liệu "
+#~ "đúng."
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "Yêu cầu một kết nối bảo mật, nhưng chưa chạy gnutls"
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch: \"Bắt tay\" TLS không thành công: %s"
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin: Không chạy được hỗ trợ GThread support.  Rất có thể "
-"có vấn đề từ cài đặt GLib."
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr ""
+#~ "XfceMailwatch: \"Bắt tay\" TLS không thành công: không biên dịch với hỗ "
+#~ "trợ SSL."
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "Không ghi được tập tin cấu hình '%s'"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "Yêu cầu một kết nối bảo mật, nhưng chưa chạy gnutls"
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"Không đặt được quyền hạn cho tập tin cấu hình '%s'.  Nếu tập tin này chứa "
-"mật khẩu hoặc thông tin có giá trị, thì những người dùng khác sẽ đọc được "
-"chúng."
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "Dạng hộp thư này không yêu cầu bất kỳ thiết lập cấu hình nào."
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "Tên _Hộp thư:"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Trình theo dõi thư"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "Cần tên hộp thư."
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "Xin hãy nhập tên cho hộp thư."
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "Sửa Hộp thư: %s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "Chọn dạng Hộp thư"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "Chọn dạng hộp thư.  Đọc mô tả của dạng ở dưới."
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "Thêm Hộp thư Mới"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "Xóa hộp thư"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "Chắc chắn xóa?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "Xóa hộp thư sẽ bỏ mọi thiết lập, và không thể phục hồi lại."
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "Hộp thư"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "Kiểm tra thư từ nhiều hộp thư"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Trình theo dõi thư"

Modified: xfce4-mailwatch-plugin/trunk/po/xfce4-mailwatch-plugin.pot
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/xfce4-mailwatch-plugin.pot	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/xfce4-mailwatch-plugin.pot	2008-08-30 09:08:03 UTC (rev 5327)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,44 +17,21 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -62,257 +39,395 @@
 "method or location of the new messages feed."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
-msgid "STARTTLS security was requested, but this server does not support it."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
+msgid "STARTTLS security was requested, but this server does not support it."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
 "Advanced dialog."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, c-format
+msgid "Failed to send data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, c-format
+msgid "Failed to receive data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr ""
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr ""
 
@@ -330,220 +445,128 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 msgid "Xfce4 Mailwatch Plugin"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr ""
-
 #: ../panel-plugin/mailwatch.desktop.in.in.h:1
 msgid "Check mail from multiple mailboxes"
 msgstr ""

Modified: xfce4-mailwatch-plugin/trunk/po/zh_CN.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/zh_CN.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/zh_CN.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2008-03-17 09:16+0800\n"
 "Last-Translator: Vern Sun <s5unty at gmail.com>\n"
 "Language-Team: Chinese <xfce-i18n at xfce.org>\n"
@@ -15,46 +15,21 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"无法将 socket 设为非阻塞状态。If the connect attempt hangs, the panel may "
-"hang on close."
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "无法连接到服务器:%s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr "无法将 socket 切回阻塞状态,数据可能无法正常取回。"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS 交握失败:%s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr "收到 HTTP 回应代码 %d。最可能的原因是您 GMail 的帐号或是密码不正确。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -64,79 +39,88 @@
 "收到 HTTP 回应代码 %d,本来应该是200。这可能是 GMail 服务器的问题,或者他们改"
 "了一个不相容的认证方式,或是新信息的 feed 换了位置。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "检查信息间隔时间(_N)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "分钟。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "远端 GMail 邮箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 "GMail 插件无法连接到 Goolge 的邮件服务,所以无法安全地取回新邮件的数目。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr "无法使用安全的 IMAP,而且该 IMAP 服务器不支持明文(plaintext)登入。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "已经要求 STARTTLS 安全连线,但是这个服务器不支持。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "无法取得文件夹清单"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "请等待..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "错误"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "服务器或是使用者名称没设定。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -145,72 +129,72 @@
 "在服务器、使用者名称、甚至是密码还没设好之前,无法取回文件夹清单。请顺便检查"
 "在进阶对话窗中所有的安全设定。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "设定新邮箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "新邮箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "进阶 IMAP 选项"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "连接"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "使用没有保全的连接"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "在另外的连接端口上使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "经由 STARTTLS 使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "使用非标准的 IMAP 连接端口:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "文件夹"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP 服务器目录(_D)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP 服务器"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "邮件服务器(_M):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "进阶(_A)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "新的邮箱(_F)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "远端 IMAP 邮箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -218,109 +202,242 @@
 "本 IMAP 插件能够连接支持 IMAP 协定的远端邮件服务器,可选用 SSL 来进行连接保"
 "护。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "无法取得文件 %s 的状态:%s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s 不是一个目录。请问 %s 真的是有效的 maildir 吗?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "选择 Maildir 文件夹"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir 路径(_P)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "间隔(_I):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "本地 Maildir Spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr "本 Maildir 插件可以监视本地的 maildir 形式的邮件 spool中是否有新邮件"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "选择 mbox 文件"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox 文件名称(_F)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "本地 Mbox spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Mbox 插件监视本地 mobox 型的邮件 spool 中是否有新邮件。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "第 %s 行( %s )不正常,已忽略。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
 msgstr "本插件的配置读自默认的 mh maildir 的profile 文件 ~/.mh_profile。(_P)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "本地 MH 邮件文件夹"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH 插件监视本地 MH 文件夹中是否有新信件。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "进阶 POP3 选项"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "经 STLS 使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "使用非标准的 POP3 连接端口(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 服务器"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "远端 POP3 邮箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
 msgstr ""
 "本 POP3 插件能连接到支持 POP3 协定的远端邮件服务器,可选用 SSL 进行连接保护。"
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "无法连接到服务器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "没有编译 SSL/TLS 支持"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "无法连接到服务器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "无法连接到服务器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "无法连接到服务器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin:无法初始化 GThread 支持。这应该是您 GLib 安装上的问"
+"题。"
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "无法写入配置文件'%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"无法设定配置文件'%s'的权限。如果这个文件包含密码或其他敏感信息,您系统上的其"
+"他人可能读得到。"
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "本类型的邮箱不需要任何配置设定。"
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "邮箱名称(_N)"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "需要邮箱名称。"
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "请键入邮箱名称。"
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "编辑邮箱:%s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "选择类型"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "选择一种类型的邮箱。关於类型的描述在下方。"
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "新增邮箱"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "移除邮箱"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "您确定吗?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "移除一个邮箱会废弃所有的设定,而且不能反悔。"
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "邮箱"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "无新信件"
 
@@ -338,229 +455,154 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "无法将邮件监视程式新增到面板中。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "这可能是因为您 GLib 的版本没有支持执行绪(threads)。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch 记录"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "记录行数(_L):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "在图示中显示记录状态(_S)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "选择图示"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "正常(_N)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "新信件(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "外部程式"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "按下后启动(_O)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "有新讯息时启动(_M):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "图示"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "新信件(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "检视记录(_V)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "邮件监视器"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "「说明」无法使用,因为'xfhelp4'无法执行:%s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "「说明」无法使用"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "执行 xfhelp4 失败"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch:TLS 交握失败:%s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "检查诸多邮箱中的信件"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "没有编译 SSL/TLS 支持"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "无法将 socket 设为非阻塞状态。If the connect attempt hangs, the panel may "
+#~ "hang on close."
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch:TLS 交握失败:没有编译 SSL/TLS 支持。"
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr "无法将 socket 切回阻塞状态,数据可能无法正常取回。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "需要安全连接,但是 gnutls 并未初始化。"
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch:TLS 交握失败:%s"
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin:无法初始化 GThread 支持。这应该是您 GLib 安装上的问"
-"题。"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch:TLS 交握失败:没有编译 SSL/TLS 支持。"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "无法写入配置文件'%s'"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "需要安全连接,但是 gnutls 并未初始化。"
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"无法设定配置文件'%s'的权限。如果这个文件包含密码或其他敏感信息,您系统上的其"
-"他人可能读得到。"
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "本类型的邮箱不需要任何配置设定。"
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "邮箱名称(_N)"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "需要邮箱名称。"
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "请键入邮箱名称。"
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "编辑邮箱:%s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "选择类型"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "选择一种类型的邮箱。关於类型的描述在下方。"
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "新增邮箱"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "移除邮箱"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "您确定吗?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "移除一个邮箱会废弃所有的设定,而且不能反悔。"
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "邮箱"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "检查诸多邮箱中的信件"
-
 #~ msgid ""
 #~ "A buffer was too small to receive all of an IMAP response.  This is a bug!"
 #~ msgstr ""

Modified: xfce4-mailwatch-plugin/trunk/po/zh_TW.po
===================================================================
--- xfce4-mailwatch-plugin/trunk/po/zh_TW.po	2008-08-30 09:07:43 UTC (rev 5326)
+++ xfce4-mailwatch-plugin/trunk/po/zh_TW.po	2008-08-30 09:08:03 UTC (rev 5327)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-mailwatch-plugin 1.0.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-17 16:51-0700\n"
+"POT-Creation-Date: 2008-08-30 02:02-0700\n"
 "PO-Revision-Date: 2006-06-12 21:36+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore at educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -15,46 +15,21 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:228
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:458
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:434
-msgid ""
-"Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
-"the panel may hang on close."
-msgstr ""
-"無法將 socket 設為非阻斷狀態(non-blocking mode)。如果連結的企圖持續的話,面板"
-"在關閉時可能會卡住。"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:265
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:495
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:471
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:399
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:308
 #, c-format
-msgid "Failed to connect to server: %s"
-msgstr "無法連結到伺服器:%s"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:303
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:533
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:509
-msgid ""
-"Unable to return socket to blocking mode.  Data may not be retreived "
-"correctly."
-msgstr "無法將 socket 切回阻斷狀態,資料可能無法正常取回。"
-
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:341
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:352
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:334
-#, c-format
 msgid "TLS handshake failed: %s"
 msgstr "TLS 交握失敗:%s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:389
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:255
 #, c-format
 msgid ""
 "Received HTTP response code %d.  The most likely reason for this is that "
 "your GMail username or password is incorrect."
 msgstr "收到 HTTP 回應代碼 %d。最可能的原因是您 GMail 的帳號或是密碼不正確。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:395
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid ""
 "Received HTTP response code %d, which should be 200.  There may be a problem "
@@ -64,79 +39,88 @@
 "收到 HTTP 回應代碼 %d,本來應該是200。這可能是 GMail 伺服器的問題,或者他們改"
 "了一個不相容的認證方式,或是新訊息的 feed 換了位置。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:640
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1808
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1014
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:179
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:225
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:487
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:548
+msgid "Previous thread hasn't exited yet, not checking mail this time."
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:660
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1828
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1034
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:681
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1867
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1066
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid "Check for _new messages every"
 msgstr "檢查訊息間隔時間(_N)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:696
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1881
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:459
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:472
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:643
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1080
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:425
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:456
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:929
 msgid "minute(s)."
 msgstr "分鐘。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:777
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:668
 msgid "Remote GMail Mailbox"
 msgstr "遠端 GMail 信箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:778
+#: ../libmailwatch-core/mailwatch-mailbox-gmail.c:669
 msgid ""
 "The GMail plugin can connect to Google's mail service and securely retrieve "
 "the number of new messages."
 msgstr ""
 "GMail 外掛程式無法連結到 Goolge 的郵件服務,所以無法安全地取回新訊息的數目。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:252
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid ""
 "Secure IMAP is not available, and the IMAP server does not support plaintext "
 "logins."
 msgstr "無法使用安全的 IMAP,而且該 IMAP 伺服器不支援明文(plaintext)登入。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:385
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
+msgid "Authentication failed.  Perhaps your username or password is incorrect?"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:433
 msgid "STARTTLS security was requested, but this server does not support it."
 msgstr "已經要求 STARTTLS 安全連線,但是這個伺服器不支援。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:645
-msgid ""
-"The IMAP server returned a response we weren't quite expecting.  This might "
-"be OK, or this plugin might need to be modified to support your mail server "
-"if the new message counts are incorrect."
-msgstr ""
-
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1245
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1144
 msgid "Failed to get folder list"
 msgstr "無法取得資料夾清單"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1371
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1582
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1289
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1524
 msgid "Please wait..."
 msgstr "請等待..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1465
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1396
 msgid "Error"
 msgstr "錯誤"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1466
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1397
 msgid "No server or username is set."
 msgstr "伺服器或是使用者名稱沒設定。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1467
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1398
 msgid ""
 "The folder list cannot be retrieved until a server, username, and probably "
 "password are set.  Also be sure to check any security settings in the "
@@ -145,72 +129,72 @@
 "在伺服器、使用者名稱、甚至是密碼還沒設好之前,無法取回資料夾清單。請順便檢查"
 "在進階對話窗中所有的安全設定。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1472
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1403
 msgid "Set New Mail Folders"
 msgstr "設定新信匣"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1483
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1417
 msgid "New Mail Folders"
 msgstr "新信匣"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1666
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1608
 msgid "Advanced IMAP Options"
 msgstr "進階 IMAP 選項"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1677
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:906
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1619
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:757
 msgid "Connection"
 msgstr "連結"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1686
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1628
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:766
 msgid "Use unsecured connection"
 msgstr "使用沒有保全的連結"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1687
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:916
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1629
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:767
 msgid "Use SSL/TLS on alternate port"
 msgstr "在另外的連接埠上使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1688
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1630
 msgid "Use SSL/TLS via STARTTLS"
 msgstr "經由 STARTTLS 使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1704
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1646
 msgid "Use non-standard IMAP _port:"
 msgstr "使用非標準的 IMAP 連接埠:"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1734
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1676
 msgid "Folders"
 msgstr "資料夾"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1742
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1684
 msgid "IMAP server _directory:"
 msgstr "IMAP 伺服器目錄(_D)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1774
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1714
 msgid "IMAP Server"
 msgstr "IMAP 伺服器"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1788
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:994
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1728
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:843
 msgid "_Mail server:"
 msgstr "郵件伺服器(_M):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1849
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1055
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1789
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:904
 msgid "_Advanced..."
 msgstr "進階(_A)..."
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1856
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 msgid "New mail _folders..."
 msgstr "新的郵件匣(_F)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2029
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1985
 msgid "Remote IMAP Mailbox"
 msgstr "遠端 IMAP 信箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:2030
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1986
 msgid ""
 "The IMAP plugin can connect to a remote mail server that supports the IMAP "
 "protocol, optionally using SSL for link protection."
@@ -218,66 +202,66 @@
 "本 IMAP 外掛程式能夠連結支援 IMAP 協定的遠端郵件伺服器,可選用 SSL 來進行連結"
 "保護。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:100
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:99
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:399
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:410
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:93
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:95
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:392
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:403
 #, c-format
 msgid "Failed to get status of file %s: %s"
 msgstr "無法取得檔案 %s 的狀態:%s"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:109
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:102
 #, c-format
 msgid "%s is not a directory. Is %s really a valid maildir?"
 msgstr "%s 不是一個目錄。請問 %s 真的是有效的 maildir 嗎?"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:345
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:304
 msgid "Select Maildir Folder"
 msgstr "選擇 Maildir 資料夾"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:406
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:372
 msgid "Maildir _Path:"
 msgstr "Maildir 路徑(_P)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:443
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:455
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:628
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:409
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:439
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:590
 msgid "_Interval:"
 msgstr "間隔(_I):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:493
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:501
 msgid "Local Maildir Spool"
 msgstr "本地 Maildir Spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:494
+#: ../libmailwatch-core/mailwatch-mailbox-maildir.c:502
 msgid ""
 "The Maildir plugin can watch a local maildir-style mail spool for new "
 "messages."
 msgstr ""
 "本 Maildir 外掛程式可以監視本地的 maildir 形式的郵件 spool中是否有新訊息"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:371
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:347
 msgid "Select mbox file"
 msgstr "選擇 mbox 檔案"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:418
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:402
 msgid "Mbox _Filename:"
 msgstr "Mbox 檔案名稱(_F)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:497
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:520
 msgid "Local Mbox spool"
 msgstr "本地 Mbox spool"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:498
+#: ../libmailwatch-core/mailwatch-mailbox-mbox.c:521
 msgid "Mbox plugin watches a local mbox-type mail spool for new messages."
 msgstr "Mbox 外掛程式監視本地 mobox 型的郵件 spool 中是否有新訊息。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:248
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:241
 #, c-format
 msgid "Malformed line %s in %s ignored."
 msgstr "第 %s 行( %s )不正常,已忽略。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:619
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:581
 msgid ""
 "The configuration of this plugin is read from\n"
 "the default mh maildir profile file ~/.mh_profile"
@@ -285,35 +269,35 @@
 "本外掛程式的組態設定乃讀自預設的 mh maildir 的profile 檔案 ~/.mh_profile。"
 "(_P)"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:669
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:683
 msgid "Local MH mail folder"
 msgstr "本地 MH 郵件資料夾"
 
-#: ../libmailwatch-core/mailwatch-mailbox-mh.c:670
+#: ../libmailwatch-core/mailwatch-mailbox-mh.c:684
 msgid "MH plugin watches local MH folders for new mail"
 msgstr "MH 外掛程式監視本地 MH 資料夾中是否有新信件。"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:895
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:746
 msgid "Advanced POP3 Options"
 msgstr "進階 POP3 選項"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:917
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:768
 msgid "Use SSL/TLS via STLS"
 msgstr "經 STLS 使用 SSL/TLS"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:933
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:784
 msgid "Use non-standard POP3 _port:"
 msgstr "使用非標準的 POP3 連接埠(_P):"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:980
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:829
 msgid "POP3 Server"
 msgstr "POP3 伺服器"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1192
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1037
 msgid "Remote POP3 Mailbox"
 msgstr "遠端 POP3 信箱"
 
-#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1193
+#: ../libmailwatch-core/mailwatch-mailbox-pop3.c:1038
 msgid ""
 "The POP3 plugin can connect to a remote mail server that supports the POP3 "
 "protocol, optionally using SSL for link protection."
@@ -321,10 +305,143 @@
 "本 POP3 外掛程式能連結到支援 POP3 協定的遠端郵件伺服器,可選用 SSL 進行連結保"
 "護。"
 
+#: ../libmailwatch-core/mailwatch-net-conn.c:221
+#: ../libmailwatch-core/mailwatch-net-conn.c:265
+#: ../libmailwatch-core/mailwatch-net-conn.c:347
+#: ../libmailwatch-core/mailwatch-net-conn.c:692
+#: ../libmailwatch-core/mailwatch-net-conn.c:725
+#: ../libmailwatch-core/mailwatch-net-conn.c:774
+#: ../libmailwatch-core/mailwatch-net-conn.c:806
+#: ../libmailwatch-core/mailwatch-net-conn.c:836
+#, c-format
+msgid "Operation aborted"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:496
+#, c-format
+msgid "Could not find host \"%s\": %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:580
+#, fuzzy, c-format
+msgid "Failed to connect to server \"%s\": %s"
+msgstr "無法連結到伺服器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:643
+#, c-format
+msgid "Not compiled with SSL/TLS support"
+msgstr "沒有編譯 SSL/TLS 支援"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:699
+#, fuzzy, c-format
+msgid "Failed to send encrypted data: %s"
+msgstr "無法連結到伺服器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:732
+#, fuzzy, c-format
+msgid "Failed to send data: %s"
+msgstr "無法連結到伺服器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:813
+#, c-format
+msgid "Failed to receive encrypted data: %s"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:843
+#, fuzzy, c-format
+msgid "Failed to receive data: %s"
+msgstr "無法連結到伺服器:%s"
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:941
+#, c-format
+msgid "Canceling read: read too many bytes without a newline"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch-net-conn.c:950
+#, c-format
+msgid "Buffer is not large enough to hold a full line (%d < %d)"
+msgstr ""
+
+#: ../libmailwatch-core/mailwatch.c:126
+msgid ""
+"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
+"likely a problem with your GLib install."
+msgstr ""
+"xfce4-mailwatch-plugin:無法初始化 GThread 支援。這應該是您 GLib 安裝上的問"
+"題。"
+
+#: ../libmailwatch-core/mailwatch.c:341 ../libmailwatch-core/mailwatch.c:342
+#, c-format
+msgid "Unable to write config file '%s'"
+msgstr "無法寫入設定檔'%s'"
+
+#: ../libmailwatch-core/mailwatch.c:388 ../libmailwatch-core/mailwatch.c:390
+#, c-format
+msgid ""
+"Unable to set permissions on config file '%s'.  If this file contains "
+"passwords or other sensitive information, it may be readable by others on "
+"your system."
+msgstr ""
+"無法設定設定檔'%s'的權限。如果這個檔案包含密碼或其他敏感資訊,您系統上的其他"
+"人可能讀得到。"
+
+#: ../libmailwatch-core/mailwatch.c:610
+msgid "This mailbox type does not require any configuration settings."
+msgstr "本類型的信箱不需要任何組態設定。"
+
+#: ../libmailwatch-core/mailwatch.c:637
+msgid "Mailbox _Name:"
+msgstr "信箱名稱(_N)"
+
+#: ../libmailwatch-core/mailwatch.c:655
+msgid "Mailwatch"
+msgstr "Mailwatch"
+
+#: ../libmailwatch-core/mailwatch.c:656
+msgid "Mailbox name required."
+msgstr "需要信箱名稱。"
+
+#: ../libmailwatch-core/mailwatch.c:657
+msgid "Please enter a name for the mailbox."
+msgstr "請鍵入信箱名稱。"
+
+#: ../libmailwatch-core/mailwatch.c:698
+#, c-format
+msgid "Edit Mailbox: %s"
+msgstr "編輯信箱:%s"
+
+#: ../libmailwatch-core/mailwatch.c:757
+msgid "Select Mailbox Type"
+msgstr "選擇類型"
+
+#: ../libmailwatch-core/mailwatch.c:767
+msgid "Select a mailbox type.  A description of the type will appear below."
+msgstr "選擇一種類型的信箱。關於類型的描述在下方。"
+
+#: ../libmailwatch-core/mailwatch.c:821
+msgid "Add New Mailbox"
+msgstr "新增信箱"
+
+#: ../libmailwatch-core/mailwatch.c:881
+msgid "Remove Mailbox"
+msgstr "移除信箱"
+
+#: ../libmailwatch-core/mailwatch.c:882
+msgid "Are you sure?"
+msgstr "您確定嗎?"
+
+#: ../libmailwatch-core/mailwatch.c:883
+msgid "Removing a mailbox will discard all settings, and cannot be undone."
+msgstr "移除一個信箱會廢棄所有的設定,而且不能反悔。"
+
+#: ../libmailwatch-core/mailwatch.c:948
+msgid "Mailboxes"
+msgstr "信箱"
+
 #: ../panel-plugin/mailwatch-plugin-4.2.c:114
-#: ../panel-plugin/mailwatch-plugin-4.2.c:271
+#: ../panel-plugin/mailwatch-plugin-4.2.c:269
 #: ../panel-plugin/mailwatch-plugin.c:105
-#: ../panel-plugin/mailwatch-plugin.c:363
+#: ../panel-plugin/mailwatch-plugin.c:405
 msgid "No new mail"
 msgstr "無新信件"
 
@@ -342,229 +459,154 @@
 msgid "tells how many new messages in each mailbox|    %d in %s"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:253
-#: ../panel-plugin/mailwatch-plugin.c:345
+#: ../panel-plugin/mailwatch-plugin-4.2.c:251
+#: ../panel-plugin/mailwatch-plugin.c:387
 msgid "Xfce Mailwatch"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:254
-#: ../panel-plugin/mailwatch-plugin.c:346
+#: ../panel-plugin/mailwatch-plugin-4.2.c:252
+#: ../panel-plugin/mailwatch-plugin.c:388
 msgid "The mailwatch applet cannot be added to the panel."
 msgstr "無法將郵件監視程式新增到面板中。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:255
-#: ../panel-plugin/mailwatch-plugin.c:347
+#: ../panel-plugin/mailwatch-plugin-4.2.c:253
+#: ../panel-plugin/mailwatch-plugin.c:389
 msgid "It is possible that your version of GLib does not have threads support."
 msgstr "這可能是因為您 GLib 的版本沒有支援執行緒(threads)。"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:480
-#: ../panel-plugin/mailwatch-plugin.c:566
+#: ../panel-plugin/mailwatch-plugin-4.2.c:476
+#: ../panel-plugin/mailwatch-plugin.c:608
 msgid "Mailwatch log"
 msgstr "Mailwatch 記錄"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:538
-#: ../panel-plugin/mailwatch-plugin.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:534
+#: ../panel-plugin/mailwatch-plugin.c:666
 msgid "Log _lines:"
 msgstr "記錄行數(_L):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:552
-#: ../panel-plugin/mailwatch-plugin.c:638
+#: ../panel-plugin/mailwatch-plugin-4.2.c:548
+#: ../panel-plugin/mailwatch-plugin.c:680
 msgid "Show log _status in icon"
 msgstr "在圖示中顯示記錄狀態(_S)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:598
-#: ../panel-plugin/mailwatch-plugin.c:682
+#: ../panel-plugin/mailwatch-plugin-4.2.c:594
+#: ../panel-plugin/mailwatch-plugin.c:724
 msgid "Select Icon"
 msgstr "選擇圖示"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:628
-#: ../panel-plugin/mailwatch-plugin-4.2.c:750
-#: ../panel-plugin/mailwatch-plugin.c:713
-#: ../panel-plugin/mailwatch-plugin.c:894
+#: ../panel-plugin/mailwatch-plugin-4.2.c:624
+#: ../panel-plugin/mailwatch-plugin-4.2.c:744
+#: ../panel-plugin/mailwatch-plugin.c:755
+#: ../panel-plugin/mailwatch-plugin.c:936
 msgid "_Normal"
 msgstr "正常(_N)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:653
-#: ../panel-plugin/mailwatch-plugin.c:739
+#: ../panel-plugin/mailwatch-plugin-4.2.c:649
+#: ../panel-plugin/mailwatch-plugin.c:781
 msgid "Ne_w mail"
 msgstr "新信件(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:682
-#: ../panel-plugin/mailwatch-plugin.c:826
+#: ../panel-plugin/mailwatch-plugin-4.2.c:676
+#: ../panel-plugin/mailwatch-plugin.c:868
 msgid "External Programs"
 msgstr "外部程式"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:694
-#: ../panel-plugin/mailwatch-plugin.c:838
+#: ../panel-plugin/mailwatch-plugin-4.2.c:688
+#: ../panel-plugin/mailwatch-plugin.c:880
 msgid "Run _on click:"
 msgstr "按下後啟動(_O)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:711
-#: ../panel-plugin/mailwatch-plugin.c:855
+#: ../panel-plugin/mailwatch-plugin-4.2.c:705
+#: ../panel-plugin/mailwatch-plugin.c:897
 msgid "Run on new _messages:"
 msgstr "有新訊息時啟動(_M):"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:724
-#: ../panel-plugin/mailwatch-plugin.c:868
+#: ../panel-plugin/mailwatch-plugin-4.2.c:718
+#: ../panel-plugin/mailwatch-plugin.c:910
 msgid "Icons"
 msgstr "圖示"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:770
-#: ../panel-plugin/mailwatch-plugin.c:914
+#: ../panel-plugin/mailwatch-plugin-4.2.c:764
+#: ../panel-plugin/mailwatch-plugin.c:956
 msgid "Ne_w Mail"
 msgstr "新信件(_W)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:778
-#: ../panel-plugin/mailwatch-plugin.c:805
+#: ../panel-plugin/mailwatch-plugin-4.2.c:772
+#: ../panel-plugin/mailwatch-plugin.c:847
 msgid "_View Log..."
 msgstr "檢視記錄(_V)"
 
-#: ../panel-plugin/mailwatch-plugin-4.2.c:891
-#: ../panel-plugin/mailwatch-plugin.c:786
+#: ../panel-plugin/mailwatch-plugin-4.2.c:885
+#: ../panel-plugin/mailwatch-plugin.c:828
 #: ../panel-plugin/mailwatch.desktop.in.in.h:2
 msgid "Mail Watcher"
 msgstr "郵件監視器"
 
-#: ../panel-plugin/mailwatch-plugin.c:757
+#: ../panel-plugin/mailwatch-plugin.c:799
 #, c-format
 msgid "Help is unavailable because 'xfhelp4' could not be run: %s"
 msgstr "「說明」無法使用,因為'xfhelp4'無法執行:%s"
 
-#: ../panel-plugin/mailwatch-plugin.c:759
+#: ../panel-plugin/mailwatch-plugin.c:801
 msgid "Help Unavailable"
 msgstr "「說明」無法使用"
 
-#: ../panel-plugin/mailwatch-plugin.c:760
+#: ../panel-plugin/mailwatch-plugin.c:802
 msgid "Failed to run xfhelp4"
 msgstr "執行 xfhelp4 失敗"
 
-#: ../panel-plugin/mailwatch-plugin.c:976
+#: ../panel-plugin/mailwatch-plugin.c:1018
 #, fuzzy
 msgid "Xfce4 Mailwatch Plugin"
 msgstr "Xfce Mailwatch"
 
-#: ../panel-plugin/mailwatch-plugin.c:978
+#: ../panel-plugin/mailwatch-plugin.c:1020
 msgid "A featureful mail-checker applet for the Xfce Panel"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:979
+#: ../panel-plugin/mailwatch-plugin.c:1021
 msgid ""
 "Copyright (c) 2005-2008 Brian Tarricone\n"
 "Copyright (c) 2005 Pasi Orovuo"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:985
+#: ../panel-plugin/mailwatch-plugin.c:1027
 msgid "Maintainer, Original Author"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:987
+#: ../panel-plugin/mailwatch-plugin.c:1029
 msgid "Developer"
 msgstr ""
 
-#: ../panel-plugin/mailwatch-plugin.c:1032
+#: ../panel-plugin/mailwatch-plugin.c:1074
 msgid "Update Now"
 msgstr ""
 
-#: ../libmailwatch-core/mailwatch-utils.c:250
-#, c-format
-msgid "XfceMailwatch: TLS handshake failed: %s"
-msgstr "XfceMailwatch:TLS 交握失敗:%s"
+#: ../panel-plugin/mailwatch.desktop.in.in.h:1
+msgid "Check mail from multiple mailboxes"
+msgstr "檢查諸多信箱中的信件"
 
-#: ../libmailwatch-core/mailwatch-utils.c:260
-#, c-format
-msgid "Not compiled with SSL/TLS support"
-msgstr "沒有編譯 SSL/TLS 支援"
+#~ msgid ""
+#~ "Unable to set socket to non-blocking mode.  If the connect attempt hangs, "
+#~ "the panel may hang on close."
+#~ msgstr ""
+#~ "無法將 socket 設為非阻斷狀態(non-blocking mode)。如果連結的企圖持續的話,"
+#~ "面板在關閉時可能會卡住。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:262
-msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
-msgstr "XfceMailwatch:TLS 交握失敗:沒有編譯 SSL/TLS 支援。"
+#~ msgid ""
+#~ "Unable to return socket to blocking mode.  Data may not be retreived "
+#~ "correctly."
+#~ msgstr "無法將 socket 切回阻斷狀態,資料可能無法正常取回。"
 
-#: ../libmailwatch-core/mailwatch-utils.c:285
-#: ../libmailwatch-core/mailwatch-utils.c:358
-#, c-format
-msgid "A secure connection was requested, but gnutls was not initialised"
-msgstr "需要安全連結,但是 gnutls 並未初始化。"
+#~ msgid "XfceMailwatch: TLS handshake failed: %s"
+#~ msgstr "XfceMailwatch:TLS 交握失敗:%s"
 
-#: ../libmailwatch-core/mailwatch.c:138
-msgid ""
-"xfce4-mailwatch-plugin: Unable to initialise GThread support.  This is "
-"likely a problem with your GLib install."
-msgstr ""
-"xfce4-mailwatch-plugin:無法初始化 GThread 支援。這應該是您 GLib 安裝上的問"
-"題。"
+#~ msgid "XfceMailwatch: TLS handshake failed: not compiled with SSL support."
+#~ msgstr "XfceMailwatch:TLS 交握失敗:沒有編譯 SSL/TLS 支援。"
 
-#: ../libmailwatch-core/mailwatch.c:356 ../libmailwatch-core/mailwatch.c:357
-#, c-format
-msgid "Unable to write config file '%s'"
-msgstr "無法寫入設定檔'%s'"
+#~ msgid "A secure connection was requested, but gnutls was not initialised"
+#~ msgstr "需要安全連結,但是 gnutls 並未初始化。"
 
-#: ../libmailwatch-core/mailwatch.c:403 ../libmailwatch-core/mailwatch.c:405
-#, c-format
-msgid ""
-"Unable to set permissions on config file '%s'.  If this file contains "
-"passwords or other sensitive information, it may be readable by others on "
-"your system."
-msgstr ""
-"無法設定設定檔'%s'的權限。如果這個檔案包含密碼或其他敏感資訊,您系統上的其他"
-"人可能讀得到。"
-
-#: ../libmailwatch-core/mailwatch.c:627
-msgid "This mailbox type does not require any configuration settings."
-msgstr "本類型的信箱不需要任何組態設定。"
-
-#: ../libmailwatch-core/mailwatch.c:654
-msgid "Mailbox _Name:"
-msgstr "信箱名稱(_N)"
-
-#: ../libmailwatch-core/mailwatch.c:672
-msgid "Mailwatch"
-msgstr "Mailwatch"
-
-#: ../libmailwatch-core/mailwatch.c:673
-msgid "Mailbox name required."
-msgstr "需要信箱名稱。"
-
-#: ../libmailwatch-core/mailwatch.c:674
-msgid "Please enter a name for the mailbox."
-msgstr "請鍵入信箱名稱。"
-
-#: ../libmailwatch-core/mailwatch.c:717
-#, c-format
-msgid "Edit Mailbox: %s"
-msgstr "編輯信箱:%s"
-
-#: ../libmailwatch-core/mailwatch.c:780
-msgid "Select Mailbox Type"
-msgstr "選擇類型"
-
-#: ../libmailwatch-core/mailwatch.c:790
-msgid "Select a mailbox type.  A description of the type will appear below."
-msgstr "選擇一種類型的信箱。關於類型的描述在下方。"
-
-#: ../libmailwatch-core/mailwatch.c:846
-msgid "Add New Mailbox"
-msgstr "新增信箱"
-
-#: ../libmailwatch-core/mailwatch.c:909
-msgid "Remove Mailbox"
-msgstr "移除信箱"
-
-#: ../libmailwatch-core/mailwatch.c:910
-msgid "Are you sure?"
-msgstr "您確定嗎?"
-
-#: ../libmailwatch-core/mailwatch.c:911
-msgid "Removing a mailbox will discard all settings, and cannot be undone."
-msgstr "移除一個信箱會廢棄所有的設定,而且不能反悔。"
-
-#: ../libmailwatch-core/mailwatch.c:978
-msgid "Mailboxes"
-msgstr "信箱"
-
-#: ../panel-plugin/mailwatch.desktop.in.in.h:1
-msgid "Check mail from multiple mailboxes"
-msgstr "檢查諸多信箱中的信件"
-
 #, fuzzy
 #~ msgid "About Mailwatch"
 #~ msgstr "Mailwatch"




More information about the Goodies-commits mailing list