always display error dialog when connection to SMTP server failed.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1973 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 86 insertions, 79 deletions

diff --git a/po/sr.po b/po/sr.po
index d797b42e..3e9fc092 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-08 16:14+0900\n"
+"POT-Creation-Date: 2008-04-09 17:55+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -689,7 +689,7 @@ msgstr ""
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5011 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj adresu u adresar"
 
-#: src/addressadd.c:187 src/compose.c:3125 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "Adresa"
@@ -1002,17 +1002,17 @@ msgstr "Adresar"
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/addressbook.c:673 src/compose.c:3073 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:677 src/compose.c:3089 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:681 src/compose.c:3105 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "Bcc:"
@@ -1217,7 +1217,7 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6287 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
 msgid "Notice"
 msgstr "Obaveštenje"
 
@@ -1622,7 +1622,7 @@ msgstr "Datoteka %s ne postoji\n"
 msgid "Can't get file size of %s\n"
 msgstr "Ne mogu dobiti veličinu datoteke %s\n"
 
-#: src/compose.c:2135 src/compose.c:4105
+#: src/compose.c:2135 src/compose.c:4118
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
@@ -1673,33 +1673,33 @@ msgstr "Dodatak"
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2968 src/compose.c:2993
+#: src/compose.c:2969 src/compose.c:2995
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3013
+#: src/compose.c:3015
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/compose.c:3026 src/compose.c:4877 src/headerview.c:54
+#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3044 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "Tema:"
 
-#: src/compose.c:3130
+#: src/compose.c:3143
 #, fuzzy
 msgid "_Send"
 msgstr "Pošalji"
 
-#: src/compose.c:3215
+#: src/compose.c:3228
 msgid "can't get recipient list."
 msgstr "ne mogu dobiti listu prilmalaca."
 
-#: src/compose.c:3235
+#: src/compose.c:3248
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1707,26 +1707,26 @@ msgstr ""
 "Nalog za slanje pošte nije definisan.\n"
 "Odaberite nalog pre slanja."
 
-#: src/compose.c:3249 src/send_message.c:315
+#: src/compose.c:3262 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/compose.c:3299
+#: src/compose.c:3312
 msgid "Can't save the message to outbox."
 msgstr "Ne mogu sačuvati poruku u direktorijumu poslato."
 
-#: src/compose.c:3337
+#: src/compose.c:3350
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Ne mogu pronaći nijedan ključ kome je trenutno dodeljen id ključa `%s'."
 
-#: src/compose.c:3465 src/compose.c:3804 src/compose.c:3867 src/compose.c:3987
+#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
 msgid "can't change file mode\n"
 msgstr "ne mogu promeniti atribut datoteke\n"
 
-#: src/compose.c:3498
+#: src/compose.c:3511
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1736,12 +1736,12 @@ msgstr ""
 "Ne mogu promeniti kodni raspored poruke.\n"
 "Da je ipak pošaljem?"
 
-#: src/compose.c:3504
+#: src/compose.c:3517
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/compose.c:3590
+#: src/compose.c:3603
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1750,15 +1750,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3594
+#: src/compose.c:3607
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3756
+#: src/compose.c:3769
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3757
+#: src/compose.c:3770
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1767,92 +1767,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3947
+#: src/compose.c:3960
 msgid "can't remove the old message\n"
 msgstr "ne mogu skloniti staru poruku\n"
 
-#: src/compose.c:3965
+#: src/compose.c:3978
 msgid "queueing message...\n"
 msgstr "odlaganje poruke...\n"
 
-#: src/compose.c:4053
+#: src/compose.c:4066
 msgid "can't find queue folder\n"
 msgstr "ne mogu da pronađem direktorijum odloženo\n"
 
-#: src/compose.c:4060
+#: src/compose.c:4073
 msgid "can't queue the message\n"
 msgstr "ne mogu odložiti poruku\n"
 
-#: src/compose.c:4100
+#: src/compose.c:4113
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/compose.c:4109
+#: src/compose.c:4122
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: src/compose.c:4709
+#: src/compose.c:4722
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generisan ID-poruke: %s\n"
 
-#: src/compose.c:4824
+#: src/compose.c:4837
 msgid "Creating compose window...\n"
 msgstr "Stvaranje prozora za pisanje...\n"
 
-#: src/compose.c:4951
+#: src/compose.c:4964
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Alat/Akci_je"
 
-#: src/compose.c:4954
+#: src/compose.c:4967
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Poruka/_Enkriptuj"
 
-#: src/compose.c:4992 src/compose.c:6106
+#: src/compose.c:5005 src/compose.c:6119
 msgid "MIME type"
 msgstr "MIME tip"
 
 #. S_COL_DATE
-#: src/compose.c:5001 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "Veličina"
 
-#: src/compose.c:6001
+#: src/compose.c:6014
 msgid "Invalid MIME type."
 msgstr "Pogrešan MIME tip"
 
-#: src/compose.c:6019
+#: src/compose.c:6032
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne postoji ili je prazna."
 
-#: src/compose.c:6088
+#: src/compose.c:6101
 #, fuzzy
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/compose.c:6108 src/prefs_common_dialog.c:1551
+#: src/compose.c:6121 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:6131 src/prefs_folder_item.c:202
+#: src/compose.c:6144 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
-#: src/compose.c:6132
+#: src/compose.c:6145
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:6222
+#: src/compose.c:6235
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Naredba za nezavisni editor je pogrešna: `%s'\n"
 
-#: src/compose.c:6284
+#: src/compose.c:6297
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1862,52 +1862,52 @@ msgstr ""
 "Nasilno prekinuti proces?\n"
 "grupa procesa: %d"
 
-#: src/compose.c:6621 src/mainwindow.c:2976
+#: src/compose.c:6634 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6741 src/compose.c:6746 src/compose.c:6752
+#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
 msgid "Can't queue the message."
 msgstr "Ne mogu odložiti poruku."
 
-#: src/compose.c:6843
+#: src/compose.c:6856
 #, fuzzy
 msgid "Select files"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6866
+#: src/compose.c:6879
 msgid "Select file"
 msgstr "Odaberite datoteku"
 
-#: src/compose.c:6901
+#: src/compose.c:6914
 #, fuzzy
 msgid "Save message"
 msgstr "Pošalji poruku"
 
-#: src/compose.c:6902
+#: src/compose.c:6915
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "Ova poruka je promenjena, odbaciti?"
 
-#: src/compose.c:6904
+#: src/compose.c:6917
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6946
+#: src/compose.c:6959
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Želite li primeniti šablon `%s'?"
 
-#: src/compose.c:6948
+#: src/compose.c:6961
 msgid "Apply template"
 msgstr "Primeni šablon"
 
-#: src/compose.c:6949
+#: src/compose.c:6962
 #, fuzzy
 msgid "_Replace"
 msgstr "Zameni"
 
-#: src/compose.c:6949
+#: src/compose.c:6962
 #, fuzzy
 msgid "_Insert"
 msgstr "Unesi"
@@ -2823,7 +2823,7 @@ msgstr "Povezujem se na POP3 server: %s ..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Ne mogu se povezati na POP3 server: %s:%d\n"
 
-#: src/inc.c:949 src/send_message.c:810
+#: src/inc.c:949 src/send_message.c:813
 msgid "Authenticating..."
 msgstr "Prijavljujem se..."
 
@@ -2853,7 +2853,7 @@ msgstr "Preuzimam veličinu poruka (LIST)..."
 msgid "Deleting message %d"
 msgstr "Brišem poruke %d"
 
-#: src/inc.c:984 src/send_message.c:828
+#: src/inc.c:984 src/send_message.c:831
 msgid "Quitting"
 msgstr "Izlazim"
 
@@ -2902,7 +2902,7 @@ msgid "Socket error."
 msgstr "Protokol greška."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1324 src/send_message.c:757 src/send_message.c:955
+#: src/inc.c:1324 src/send_message.c:760 src/send_message.c:963
 msgid "Connection closed by the remote host."
 msgstr ""
 
@@ -2917,19 +2917,19 @@ msgid ""
 "%s"
 msgstr "Sanduče je zaključano."
 
-#: src/inc.c:1340 src/send_message.c:940
+#: src/inc.c:1340 src/send_message.c:943
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Način provere identieta"
 
-#: src/inc.c:1345 src/send_message.c:943
+#: src/inc.c:1345 src/send_message.c:946
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "Način provere identieta"
 
-#: src/inc.c:1350 src/send_message.c:959
+#: src/inc.c:1350 src/send_message.c:967
 msgid "Session timed out."
 msgstr ""
 
@@ -6551,71 +6551,81 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "Spajam se na SMTP server: %s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:762
+#: src/send_message.c:765
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/send_message.c:800
+#: src/send_message.c:803
 #, fuzzy
 msgid "Sending HELO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:801 src/send_message.c:806 src/send_message.c:811
+#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
 #, fuzzy
 msgid "Authenticating"
 msgstr "Provera identiteta"
 
-#: src/send_message.c:802 src/send_message.c:807
+#: src/send_message.c:805 src/send_message.c:810
 #, fuzzy
 msgid "Sending message..."
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:805
+#: src/send_message.c:808
 #, fuzzy
 msgid "Sending EHLO..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:814
+#: src/send_message.c:817
 msgid "Sending MAIL FROM..."
 msgstr "Šaljem MAIL FROM..."
 
-#: src/send_message.c:815 src/send_message.c:819 src/send_message.c:824
+#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
 msgid "Sending"
 msgstr "Šaljem"
 
-#: src/send_message.c:818
+#: src/send_message.c:821
 msgid "Sending RCPT TO..."
 msgstr "Šaljem RCPT TO..."
 
-#: src/send_message.c:823
+#: src/send_message.c:826
 msgid "Sending DATA..."
 msgstr "Šaljem DATA..."
 
-#: src/send_message.c:827
+#: src/send_message.c:830
 msgid "Quitting..."
 msgstr "Završavnje..."
 
-#: src/send_message.c:855
+#: src/send_message.c:858
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: src/send_message.c:886
+#: src/send_message.c:889
 msgid "Sending message"
 msgstr "Šaljem poruku"
 
-#: src/send_message.c:931 src/send_message.c:951
+#: src/send_message.c:934 src/send_message.c:958
 msgid "Error occurred while sending the message."
 msgstr "Došlo je do greške prilikom slanja poruke."
 
-#: src/send_message.c:934
+#: src/send_message.c:937
 #, fuzzy, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
 msgstr "Došlo je do greške prilikom slanja poruke."
 
+#: src/send_message.c:954
+#, fuzzy
+msgid "Can't connect to SMTP server."
+msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
+
+#: src/send_message.c:956
+#, fuzzy, c-format
+msgid "Can't connect to SMTP server: %s:%d"
+msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
+
 #: src/setup.c:43
 msgid "Mailbox setting"
 msgstr "Podešavanje sandučeta"
@@ -7799,9 +7809,6 @@ msgstr "Stari Sylpheed"
 #~ msgid "Error occurred while sending QUIT\n"
 #~ msgstr "Došlo je do greške prilikom slanja QUIT\n"
 
-#~ msgid "Can't connect to SMTP server: %s:%d\n"
-#~ msgstr "Ne mogu se povezati na SMTP server: %s:%d\n"
-
 #~ msgid "Error occurred while connecting to %s:%d\n"
 #~ msgstr "Došlo je do greške prilikom povezivanja na %s:%d\n"