src/setup.c: check whether the specified location includes settings folder.

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

35 files changed, 444 insertions, 216 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d4149a6..e223fa5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-17
+
+	* libsylph/utils.[ch]
+	  src/setup.c: check whether the specified location includes settings
+	  folder.
+
 2009-12-16
 
 	* src/summaryview.c: summary_show(): fixed quick search on refresh.
diff --git a/libsylph/libsylph-0.def b/libsylph/libsylph-0.def
index ad74b796..20df1f10 100644
--- a/libsylph/libsylph-0.def
+++ b/libsylph/libsylph-0.def
@@ -670,3 +670,4 @@ EXPORTS
 	xml_truncate_buf @ 668

 	xml_unescape_str @ 669

 	strcasestr_with_skip_quote @ 670

+	is_path_parent @ 671

diff --git a/libsylph/utils.c b/libsylph/utils.c
index 88b2fafb..3a14e690 100644
--- a/libsylph/utils.c
+++ b/libsylph/utils.c
@@ -392,6 +392,33 @@ gint path_cmp(const gchar *s1, const gchar *s2)
 #endif
 }
 
+/* return TRUE if parent is equal to or ancestor of child */
+gboolean is_path_parent(const gchar *parent, const gchar *child)
+{
+	gint plen;
+	const gchar *base;
+
+	g_return_val_if_fail(parent != NULL, FALSE);
+	g_return_val_if_fail(child != NULL, FALSE);
+
+	plen = strlen(parent);
+	while (plen > 0 && G_IS_DIR_SEPARATOR(parent[plen - 1]))
+		plen--;
+
+#ifdef G_OS_WIN32
+	if (!g_ascii_strncasecmp(parent, child, plen)) {
+#else
+	if (!strncmp(parent, child, plen)) {
+#endif
+		base = child + plen;
+		if (!G_IS_DIR_SEPARATOR(*base) && *base != '\0')
+			return FALSE;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 /* remove trailing return code */
 gchar *strretchomp(gchar *str)
 {
diff --git a/libsylph/utils.h b/libsylph/utils.h
index d062041a..c911fa5f 100644
--- a/libsylph/utils.h
+++ b/libsylph/utils.h
@@ -231,16 +231,21 @@ gint strcmp2		(const gchar	*s1,
 			 const gchar	*s2);
 gint path_cmp		(const gchar	*s1,
 			 const gchar	*s2);
+gboolean is_path_parent	(const gchar	*parent,
+			 const gchar	*child);
+
 gchar *strretchomp	(gchar		*str);
 gchar *strtailchomp	(gchar		*str,
 			 gchar		 tail_char);
 gchar *strcrchomp	(gchar		*str);
+
 gchar *strcasestr	(const gchar	*haystack,
 			 const gchar	*needle);
 gpointer my_memmem	(gconstpointer	 haystack,
 			 size_t		 haystacklen,
 			 gconstpointer	 needle,
 			 size_t		 needlelen);
+
 gchar *strncpy2		(gchar		*dest,
 			 const gchar	*src,
 			 size_t		 n);
diff --git a/po/be.po b/po/be.po
index 77bf9b26..515e2c53 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -592,7 +592,7 @@ msgstr " Тэма: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Выдавец: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запіс у %s схібіў.\n"
@@ -2379,12 +2379,12 @@ msgstr "Устанаўленне інфармацыі па каталогу...\n
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
@@ -3846,11 +3846,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Скрыня `%s' ужо існуе."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Скрыня"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6804,11 +6804,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Скрыня `%s' ужо існуе."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Вынік праверкі подпісу"
diff --git a/po/bg.po b/po/bg.po
index 1d77a575..4e9fdc46 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -593,7 +593,7 @@ msgstr "  Субект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Издател: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "записът в %s се провали.\n"
@@ -2453,12 +2453,12 @@ msgstr "Установяване информация за папка...\n"
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
@@ -3970,11 +3970,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Пощенска кутия"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7023,11 +7023,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Вече съществува пощенска кутия `%s'."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/cs.po b/po/cs.po
index cd1e3d36..2c298727 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-08-29 02:23+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -600,7 +600,7 @@ msgstr "  Předmět: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "neúspěšný zápis do %s.\n"
@@ -2374,12 +2374,12 @@ msgstr "Nastavování informace o složce...\n"
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
@@ -3828,11 +3828,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Poštovní schránka \"%s\" již existuje."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Poštovní schránka"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6774,11 +6774,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Poštovní schránka \"%s\" již existuje."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Výsledek kontroly podpisu"
diff --git a/po/da.po b/po/da.po
index 65acb156..5ba0cb95 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -597,7 +597,7 @@ msgstr "  Emne: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fejl ved skrivning til %s.\n"
@@ -2451,12 +2451,12 @@ msgstr "Indtast mappe information...\n"
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
@@ -3972,11 +3972,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7023,11 +7023,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox `%s' eksisterer allerede."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/de.po b/po/de.po
index 7b7c1fc4..93415aac 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -595,7 +595,7 @@ msgstr "  Betreff: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Schreiben in %s fehlgeschlagen.\n"
@@ -2392,12 +2392,12 @@ msgstr "Setze Ablageinformation...\n"
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
@@ -3865,11 +3865,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6840,11 +6840,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Zeige das Ergebnis der Prüfung der digitalen Unterschrift an"
diff --git a/po/el.po b/po/el.po
index 0ad8ca3f..4b614aff 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -606,7 +606,7 @@ msgstr "  Θέμα: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Εκδότης: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "η εγγραφή στο %s απέτυχε.\n"
@@ -2437,12 +2437,12 @@ msgstr "Ορισμός πληροφοριών φακέλου...\n"
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
@@ -3927,11 +3927,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Γραμματοκιβώτιο"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6906,11 +6906,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Το γραμματοκιβώτιο '%s' υπάρχει ήδη."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Αποτέλεσμα ελέγχου υπογραφής"
diff --git a/po/es.po b/po/es.po
index c2582394..85e63834 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -594,7 +594,7 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Emisor: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribiendo en %s.\n"
@@ -2387,12 +2387,12 @@ msgstr "Estableciendo la información de la carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3855,11 +3855,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6815,11 +6815,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "El buzón «%s» ya existe."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultado de comprobación de la firma"
diff --git a/po/et.po b/po/et.po
index 3d3eb37c..61a7b0b5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -601,7 +601,7 @@ msgstr "  Pealkiri: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Väljalaskja: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s-i kirjutamine ebaõnnestus.\n"
@@ -2461,12 +2461,12 @@ msgstr "Sean kausta info...\n"
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
@@ -3976,11 +3976,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Kirjakast"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7025,11 +7025,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Kirjakast %s on juba olemas."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/fr.po b/po/fr.po
index 9ae10494..7f23a922 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -608,7 +608,7 @@ msgstr "  Sujet : %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Délivré par : %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "L'écriture dans %s a échoué.\n"
@@ -2407,12 +2407,12 @@ msgstr "Enregistrement des données des dossiers...\n"
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
@@ -3891,11 +3891,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Boîte aux lettres"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6863,11 +6863,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La boîte aux lettres « %s » existe déjà."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Résultat de la vérification de signature"
diff --git a/po/gl.po b/po/gl.po
index 10cf20c0..d2efc670 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -597,7 +597,7 @@ msgstr "  Asunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "fallo escribindo en %s.\n"
@@ -2459,12 +2459,12 @@ msgstr "Establecendo información de carpeta...\n"
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
@@ -3977,11 +3977,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Correo"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7024,11 +7024,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "a caixa de correo `%s' xa existe."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/hr.po b/po/hr.po
index fed2a3be..1eea123a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -605,7 +605,7 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspjelo.\n"
@@ -2470,12 +2470,12 @@ msgstr "Postavljam info spisa...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
@@ -4067,11 +4067,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Sandučić"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7117,11 +7117,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Sandučić `%s' već postoji."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/hu.po b/po/hu.po
index f9906ba9..c46d4f2c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-08-15 13:25+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -596,7 +596,7 @@ msgstr "  Tárgy: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Szerző: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s fájlba nem sikerült írni.\n"
@@ -2377,12 +2377,12 @@ msgstr "Mappa információ beállítása...\n"
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
@@ -3828,11 +3828,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Postaláda"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6781,11 +6781,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A(z) `%s' postaláda már létezik."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Aláírásellenőrzés eredménye"
diff --git a/po/it.po b/po/it.po
index a0ab0b5c..49774842 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -595,7 +595,7 @@ msgstr "  Oggetto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "la scrittura su %s è fallita.\n"
@@ -2398,12 +2398,12 @@ msgstr "Impostazione delle informazioni della cartella...\n"
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
@@ -3872,11 +3872,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Casella postale"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6843,11 +6843,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "La casella postale «%s» esiste già."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Risultato del controllo della firma"
diff --git a/po/ja.po b/po/ja.po
index 86ef83be..c5728fae 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -593,7 +593,7 @@ msgstr "  所有者: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  発行者: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s への書き込みに失敗しました。\n"
@@ -2371,12 +2371,12 @@ msgstr "フォルダ情報を設定中...\n"
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
@@ -3823,18 +3823,18 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "メールボックス `%s' はすでに存在します。"
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "メール箱"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 "メールボックスの作成に失敗しました。\n"
-"いくつかのファイルがすでに存在するか、あるいは書き込む権限がありません。"
+"ファイルがすでに存在するか、あるいは書き込む権限がありません。"
 
 #: src/mainwindow.c:2322
 msgid "Sylpheed - Folder View"
@@ -6765,11 +6765,18 @@ msgstr "メールボックスを作成せずに続行しますか?"
 msgid "Please input folder name or full folder path."
 msgstr "フォルダ名または完全なフォルダのパスを入力してください。"
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "メールボックス '%s' はすでに存在します。"
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+"'%s' 以下に設定フォルダが含まれています。別の場所を指定してください。"
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "署名の検証結果"
diff --git a/po/ko.po b/po/ko.po
index ab906d16..f654d0fa 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -601,7 +601,7 @@ msgstr "  제목: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  발행인: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "%s로 쓰기가 실패했습니다.\n"
@@ -2442,12 +2442,12 @@ msgstr "폴더 정보를 설정합니다...\n"
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
@@ -3952,11 +3952,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "메일박스"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6966,11 +6966,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "메일 박스 `%s'가 이미 존재합니다."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/lt.po b/po/lt.po
index 21f3f7c1..d272eef8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -594,7 +594,7 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Leidėjas: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepavyko įrašyti į „%s“.\n"
@@ -2379,12 +2379,12 @@ msgstr "Nustatoma katalogo informacija...\n"
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
@@ -3847,11 +3847,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Dėžutė"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6804,11 +6804,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Dėžutė „%s“ egzistuoja."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Parašo tikrinimo rezultatas"
diff --git a/po/nl.po b/po/nl.po
index c66b0bf0..56f1ea16 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -601,7 +601,7 @@ msgstr "  Onderwerp: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "schrijven naar %s is mislukt.\n"
@@ -2412,12 +2412,12 @@ msgstr "Mapinfo wordt ingesteld...\n"
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
@@ -3902,11 +3902,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6908,11 +6908,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "De mailbox '%s' bestaat al."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultaat van handtekeningcontrole"
diff --git a/po/pl.po b/po/pl.po
index 6d8f89a6..17e9d98e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -586,7 +586,7 @@ msgstr "Temat: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "błąd zapisu do %s.\n"
@@ -2379,12 +2379,12 @@ msgstr "Ustawianie informacji o katalogu...\n"
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
@@ -3847,11 +3847,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Skrzynka"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6873,11 +6873,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Skrzynka \"%s\" już istnieje."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Wyniku sprawdzenia podpisu"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6a5a293c..5e2d48ce 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-07-14 12:28-0400\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -602,7 +602,7 @@ msgstr "  Assunto: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "erro ao gravar em %s.\n"
@@ -2394,12 +2394,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -3861,11 +3861,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6812,11 +6812,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultado da verificação de assinatura"
diff --git a/po/ro.po b/po/ro.po
index 06babe38..99529846 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-12-01 16:54+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -604,7 +604,7 @@ msgstr "  Subiect: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Emitent: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "scrierea în %s a eșuat.\n"
@@ -2414,12 +2414,12 @@ msgstr "Setare informații dosar...\n"
 msgid "Setting folder info..."
 msgstr "Setare informații dosar..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
@@ -3897,11 +3897,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Căsuță poștală"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6883,11 +6883,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Căsuța poștală „%s” există deja."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Rezultat verificare semnătură"
diff --git a/po/ru.po b/po/ru.po
index 33586b5b..7385a217 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-08-10 17:45+0400\n"
 "Last-Translator: Ilya Ponetayev <instenet@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -600,7 +600,7 @@ msgstr "  Субъект: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Сертификат выдал: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "запись в %s не удалась.\n"
@@ -2389,12 +2389,12 @@ msgstr "Установка информации о папке...\n"
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
@@ -3853,11 +3853,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Почтовый ящик"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6805,11 +6805,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Почтовый ящик \"%s\" уже существует."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Результат проверки подписи"
diff --git a/po/sk.po b/po/sk.po
index 0b608bcc..2c65e164 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -595,7 +595,7 @@ msgstr "  Predmet: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Vydavateľ: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "nepodaril sa zápis do %s.\n"
@@ -2457,12 +2457,12 @@ msgstr "Nastavujem informácie o priečinku...\n"
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
@@ -3969,11 +3969,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7021,11 +7021,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/sl.po b/po/sl.po
index 0a94c920..52501227 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -601,7 +601,7 @@ msgstr "  Zadeva: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje v %s ni uspelo.\n"
@@ -2461,12 +2461,12 @@ msgstr "Nastavljam informacije o mapi...\n"
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
@@ -3973,11 +3973,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7020,11 +7020,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Poštni predal `%s' že obstaja."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/sr.po b/po/sr.po
index 21d7afd4..28a917c8 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: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -602,7 +602,7 @@ msgstr "  Tema: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Izdavač: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "pisanje u %s nije uspelo.\n"
@@ -2456,12 +2456,12 @@ msgstr "Postavljam info direktorijuma...\n"
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
@@ -3968,11 +3968,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7016,11 +7016,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Sanduče`%s' već postoji."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/sv.po b/po/sv.po
index 2671e537..472ba667 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -597,7 +597,7 @@ msgstr "  Ärende:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Utfärdare: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "skrivning till %s misslyckades.\n"
@@ -2411,12 +2411,12 @@ msgstr "Ställer in mappinfo...\n"
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
@@ -3903,11 +3903,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6899,11 +6899,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Brevlådan \"%s\" finns redan."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Resultat av signaturundersökning"
diff --git a/po/tr.po b/po/tr.po
index fd041dab..3df2d934 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -599,7 +599,7 @@ msgstr "  Konu: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "yazarken hata oluştu: %s\n"
@@ -2447,12 +2447,12 @@ msgstr "Dizin bilgisi ayarlanıyor...\n"
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
@@ -3945,11 +3945,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Posta kutusu"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6967,11 +6967,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "`%s' posta kutusu zaten var."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 #, fuzzy
 msgid "Signature check result"
diff --git a/po/uk.po b/po/uk.po
index e9cb3d6e..ca864f0c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0svn2386\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2009-12-11 23:45+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -601,7 +601,7 @@ msgstr "  Суб'єкт:  %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Видав: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Невдача запису в %s.\n"
@@ -2373,12 +2373,12 @@ msgstr "Встановлюємо інформацію папки...\n"
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
@@ -3823,11 +3823,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Скринька `%s' вже існує."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Скринька"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6767,11 +6767,17 @@ msgstr "Продовжити без створення скриньки?"
 msgid "Please input folder name or full folder path."
 msgstr "Введіть, будь ласка, назву папки чи повний шлях до неї."
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Скринька '%s' вже існує."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Результат перевірки підпису"
diff --git a/po/vi.po b/po/vi.po
index e767c779..b1b2e20b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -595,7 +595,7 @@ msgstr "  Tiêu đề: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  Người phát hành: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "thất bại khi ghi vào %s.\n"
@@ -2385,12 +2385,12 @@ msgstr "Thiết lập thông tin thư mục...\n"
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
@@ -3869,11 +3869,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6857,11 +6857,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "Hộp thư `%s' đã có trước."
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "Kết quả kiểm tra chữ kí"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 726093ae..d4b8e03a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -594,7 +594,7 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
@@ -2409,12 +2409,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -3897,11 +3897,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6903,11 +6903,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "签名检查结果"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index de2e2221..c4e4deef 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 14:08+0900\n"
+"POT-Creation-Date: 2009-12-17 11:46+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -598,7 +598,7 @@ msgstr "  主旨: %s\n"
 msgid "  Issuer: %s\n"
 msgstr "  發信人: %s\n"
 
-#: libsylph/utils.c:2793 libsylph/utils.c:2916
+#: libsylph/utils.c:2857 libsylph/utils.c:2980
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "寫入到 %s 的動作失敗。\n"
@@ -2405,12 +2405,12 @@ msgstr "設定資料夾...\n"
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:282
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:290
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:287
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:295
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
@@ -3887,11 +3887,11 @@ msgstr ""
 msgid "The mailbox `%s' already exists."
 msgstr "信箱「%s」已存在。"
 
-#: src/mainwindow.c:1794 src/setup.c:256
+#: src/mainwindow.c:1794 src/setup.c:264
 msgid "Mailbox"
 msgstr "信箱"
 
-#: src/mainwindow.c:1800 src/setup.c:262
+#: src/mainwindow.c:1800 src/setup.c:270
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -6869,11 +6869,17 @@ msgstr ""
 msgid "Please input folder name or full folder path."
 msgstr ""
 
-#: src/setup.c:244
+#: src/setup.c:245
 #, fuzzy, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "信箱「%s」已存在。"
 
+#: src/setup.c:251
+#, c-format
+msgid ""
+"The location '%s' includes settings folder. Please specify another location."
+msgstr ""
+
 #: src/sigstatus.c:116
 msgid "Signature check result"
 msgstr "將數位簽章檢查結果"
diff --git a/src/setup.c b/src/setup.c
index 756ec13e..5824c38d 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -240,11 +240,19 @@ void setup(MainWindow *mainwin)
 		} else
 			path = g_strdup("Mail");
 
-		if (path && folder_find_from_path(path)) {
-			alertpanel_error(_("The mailbox '%s' already exists."), path);
-			g_warning("The mailbox '%s' already exists.", path);
-			g_free(path);
-			path = NULL;
+		if (path) {
+			if (folder_find_from_path(path)) {
+				alertpanel_error(_("The mailbox '%s' already exists."), path);
+				g_warning("The mailbox '%s' already exists.", path);
+				g_free(path);
+				path = NULL;
+			} else if (is_path_parent(path, get_rc_dir()) ||
+				   is_path_parent(path, get_mail_base_dir())) {
+				alertpanel_error(_("The location '%s' includes settings folder. Please specify another location."), path);
+				g_warning("The location '%s' includes settings folder.", path);
+				g_free(path);
+				path = NULL;
+			}
 		}
 	} while (path == NULL);