xfer: evaluate content of options xfer.file.download_path and xfer.file.upload_path (issue #388)

22 files changed, 359 insertions, 170 deletions

diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index a399b0853..b65458b59 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -27,6 +27,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
   (closes #440)
 * script: rename option script.scripts.dir to script.scripts.path, evaluate
   content of option (issue #388)
+* xfer: evaluate content of options xfer.file.download_path and
+  xfer.file.upload_path (issue #388)
 
 === Bugs fixed
 
diff --git a/doc/de/autogen/user/xfer_options.asciidoc b/doc/de/autogen/user/xfer_options.asciidoc
index 0331a0408..7ca74ab4c 100644
--- a/doc/de/autogen/user/xfer_options.asciidoc
+++ b/doc/de/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** Beschreibung: `Pfad in welchem die ankommenden Dateien gespeichert werden ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")`
+** Beschreibung: `path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** Beschreibung: `Pfad in welchem sich die Quelldatei befindet (falls vom Anwender kein Pfad angegeben wurde) ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")`
+** Beschreibung: `path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"~"`)
 
diff --git a/doc/en/autogen/user/xfer_options.asciidoc b/doc/en/autogen/user/xfer_options.asciidoc
index 921572e88..6a5824ad8 100644
--- a/doc/en/autogen/user/xfer_options.asciidoc
+++ b/doc/en/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** values: on, off (default value: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** description: `path for writing incoming files ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
+** description: `path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** description: `path for reading files when sending (when no path is specified by user) ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
+** description: `path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `"~"`)
 
diff --git a/doc/fr/autogen/user/xfer_options.asciidoc b/doc/fr/autogen/user/xfer_options.asciidoc
index 28fbdc09d..007fe64ba 100644
--- a/doc/fr/autogen/user/xfer_options.asciidoc
+++ b/doc/fr/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** valeurs: on, off (valeur par défaut: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** description: `chemin où écrire les fichiers reçus ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")`
+** description: `chemin où écrire les fichiers reçus : "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** description: `chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par l'utilisateur) ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")`
+** description: `chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par l'utilisateur) : "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"~"`)
 
diff --git a/doc/it/autogen/user/xfer_options.asciidoc b/doc/it/autogen/user/xfer_options.asciidoc
index 85d66634b..06efba3fa 100644
--- a/doc/it/autogen/user/xfer_options.asciidoc
+++ b/doc/it/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** valori: on, off (valore predefinito: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** descrizione: `path per il salvataggio dei file in arrivo ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)`
+** descrizione: `path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** descrizione: `path per la lettura dei file da inviare (quando non specificato dall'utente) ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)`
+** descrizione: `path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"~"`)
 
diff --git a/doc/ja/autogen/user/xfer_options.asciidoc b/doc/ja/autogen/user/xfer_options.asciidoc
index 26d847a0b..c7226ad9d 100644
--- a/doc/ja/autogen/user/xfer_options.asciidoc
+++ b/doc/ja/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** 値: on, off (デフォルト値: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** 説明: `受信ファイルを書き込むパス ("%h" は WeeChat ホームに置換されます、デフォルトは "~/.weechat")`
+** 説明: `path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** 説明: `ファイル送信の際に読み込むファイルのパス (ユーザがパスを指定しなかった場合) ("%h" は WeeChat ホームに置換されます、デフォルトは "~/.weechat")`
+** 説明: `path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"~"`)
 
diff --git a/doc/pl/autogen/user/xfer_options.asciidoc b/doc/pl/autogen/user/xfer_options.asciidoc
index 9973e69c6..fbbef55f7 100644
--- a/doc/pl/autogen/user/xfer_options.asciidoc
+++ b/doc/pl/autogen/user/xfer_options.asciidoc
@@ -83,12 +83,12 @@
 ** wartości: on, off (domyślna wartość: `on`)
 
 * [[option_xfer.file.download_path]] *xfer.file.download_path*
-** opis: `ścieżka do zapisywania pobieranych plików ("%h" zostanie zastąpione katalogiem domowym WeeChat - domyślnie "~/.weechat")`
+** opis: `path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"%h/xfer"`)
 
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** opis: `ścieżka dla odczytu plików podczas wysyłania (jeśli nie zostanie podana przez użytkownika) ("%h" zostanie zastąpione katalogiem domowym WeeChat - domyślnie "~/.weechat")`
+** opis: `path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"~"`)
 
diff --git a/po/cs.po b/po/cs.po
index eb9f4efe4..fd6b53a3c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10967,19 +10967,25 @@ msgstr ""
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "konvertovat mezery na podtržítka při odesílání souborů"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"cesta pro zápis příchozích souborů (\"%h\" bude nahrazeno domácím adresářem "
-"WeeChat, \"~/.weechat\" je výchozí)"
+"cesta pro logovací soubory WeeChat; \"%h\" na záčátku řetězce je nahrazeno "
+"domácím adresářem WeeChat (\"~/.weechat\" je výchozí); jsou povoleny "
+"specifikátory data (viz. man strftime)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"cesta pro čtení souborů při posílání (pokud není zadána cesta uživatelem) "
-"(\"%h\" bude nahrazeno domácím adresářem WeeChat, \"~/.weechat\" je výchozí)"
+"cesta pro logovací soubory WeeChat; \"%h\" na záčátku řetězce je nahrazeno "
+"domácím adresářem WeeChat (\"~/.weechat\" je výchozí); jsou povoleny "
+"specifikátory data (viz. man strftime)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -11060,6 +11066,21 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit k odesílateli"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "cesta pro zápis příchozích souborů (\"%h\" bude nahrazeno domácím "
+#~ "adresářem WeeChat, \"~/.weechat\" je výchozí)"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "cesta pro čtení souborů při posílání (pokud není zadána cesta uživatelem) "
+#~ "(\"%h\" bude nahrazeno domácím adresářem WeeChat, \"~/.weechat\" je "
+#~ "výchozí)"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/de.po b/po/de.po
index da45b5ef3..2e155f306 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-06-26 23:27+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -12474,20 +12474,25 @@ msgstr ""
 "beim Versenden und Empfangen von Dateien werden Leerzeichen im Dateinamen "
 "durch einen Unterstrich ersetzt"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"Pfad in welchem die ankommenden Dateien gespeichert werden (\"%h\" wird "
-"durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: \"~/.weechat\")"
+"lokales Cache-Verzeichnis für die Script-Erweiterung; \"%h\" wird durch das "
+"WeeChat Verzeichnis ersetzt (Standardpfad: \"~/.weechat\") (Hinweis: Inhalt "
+"wird evaluiert, siehe /help eval)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"Pfad in welchem sich die Quelldatei befindet (falls vom Anwender kein Pfad "
-"angegeben wurde) (\"%h\" wird durch das WeeChat Verzeichnis ersetzt, "
-"Standardverzeichnis: \"~/.weechat\")"
+"lokales Cache-Verzeichnis für die Script-Erweiterung; \"%h\" wird durch das "
+"WeeChat Verzeichnis ersetzt (Standardpfad: \"~/.weechat\") (Hinweis: Inhalt "
+"wird evaluiert, siehe /help eval)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -12572,6 +12577,22 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "Pfad in welchem die ankommenden Dateien gespeichert werden (\"%h\" wird "
+#~ "durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: \"~/.weechat"
+#~ "\")"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "Pfad in welchem sich die Quelldatei befindet (falls vom Anwender kein "
+#~ "Pfad angegeben wurde) (\"%h\" wird durch das WeeChat Verzeichnis ersetzt, "
+#~ "Standardverzeichnis: \"~/.weechat\")"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/es.po b/po/es.po
index 70ac0111f..412a58104 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11258,20 +11258,25 @@ msgstr ""
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "convertir los espacios a guiones bajos cuando se envían los archivos"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"ruta para guardar archivos entrantes (\"%h\" será reemplazado por el "
-"directorio raíz de WeeChat, \"~/.weechat\" por defecto)"
+"ruta para los registros de WeeChat; \"%h\" al principio de la cadena será "
+"reemplazado por el directorio raíz de WeeChat (\"~/.weechat\" por defecto); "
+"especificadores de fecha son permitidos (ver man strftime)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"ruta para buscar archivos a enviar (cuando no es especificado por el "
-"usuario) (\"%h\" será reemplazado por el directorio raíz de WeeChat, \"~/."
-"weechat\" por defecto)"
+"ruta para los registros de WeeChat; \"%h\" al principio de la cadena será "
+"reemplazado por el directorio raíz de WeeChat (\"~/.weechat\" por defecto); "
+"especificadores de fecha son permitidos (ver man strftime)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -11352,6 +11357,21 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse al transmisor"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "ruta para guardar archivos entrantes (\"%h\" será reemplazado por el "
+#~ "directorio raíz de WeeChat, \"~/.weechat\" por defecto)"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "ruta para buscar archivos a enviar (cuando no es especificado por el "
+#~ "usuario) (\"%h\" será reemplazado por el directorio raíz de WeeChat, \"~/."
+#~ "weechat\" por defecto)"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/fr.po b/po/fr.po
index ee2ce86f8..b836854c0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
-"PO-Revision-Date: 2015-06-23 21:29+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
+"PO-Revision-Date: 2015-06-27 08:06+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -12212,19 +12212,23 @@ msgstr ""
 "fichiers"
 
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"chemin où écrire les fichiers reçus (\"%h\" sera remplacé par le répertoire "
-"de base WeeChat, par défaut : \"~/.weechat\")"
+"chemin où écrire les fichiers reçus : \"%h\" au début de la chaîne est "
+"remplacé par le répertoire de base WeeChat (par défaut : \"~/.weechat\") "
+"(note : le contenu est évalué, voir /help eval)"
 
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
 "chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par "
-"l'utilisateur) (\"%h\" sera remplacé par le répertoire de base WeeChat, par "
-"défaut : \"~/.weechat\")"
+"l'utilisateur) : \"%h\" au début de la chaîne est remplacé par le répertoire "
+"de base WeeChat (par défaut : \"~/.weechat\") (note : le contenu est évalué, "
+"voir /help eval)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -12309,6 +12313,21 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
 
 #~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "chemin où écrire les fichiers reçus (\"%h\" sera remplacé par le "
+#~ "répertoire de base WeeChat, par défaut : \"~/.weechat\")"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié "
+#~ "par l'utilisateur) (\"%h\" sera remplacé par le répertoire de base "
+#~ "WeeChat, par défaut : \"~/.weechat\")"
+
+#~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
 #~ "eval)"
 #~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 55ef33131..cb1b0e94f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10331,16 +10331,18 @@ msgstr "szóközök alulvonássá alakítása küldéskor"
 
 #, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
 "modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
 "könyvtára, alapértelmezésben ~/.weechat, kerül)"
 
 #, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
 "modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
 "könyvtára, alapértelmezésben ~/.weechat, kerül)"
@@ -10422,3 +10424,19 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
+#~ "könyvtára, alapértelmezésben ~/.weechat, kerül)"
+
+#, fuzzy
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
+#~ "könyvtára, alapértelmezésben ~/.weechat, kerül)"
diff --git a/po/it.po b/po/it.po
index 2f8b20d05..874950ca9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11437,19 +11437,25 @@ msgstr ""
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "converti gli spazi in underscore all'invio dei file"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"path per il salvataggio dei file in arrivo (\"%h\" sarà sostituito dalla "
-"home di WeeChat, \"~/.weechat come predefinita)"
+"path per i file di log di WeeChat: \"%h\" all'inizio della stringa viene "
+"sostituito dalla directory home di WeeChat (predefinita è \"~/.weechat); "
+"sono ammessi gli specificatori di data (consultare man strftime)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"path per la lettura dei file da inviare (quando non specificato dall'utente) "
-"(\"%h\" sarà sostituito dalla home di WeeChat, \"~/.weechat come predefinita)"
+"path per i file di log di WeeChat: \"%h\" all'inizio della stringa viene "
+"sostituito dalla directory home di WeeChat (predefinita è \"~/.weechat); "
+"sono ammessi gli specificatori di data (consultare man strftime)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -11531,6 +11537,21 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "path per il salvataggio dei file in arrivo (\"%h\" sarà sostituito dalla "
+#~ "home di WeeChat, \"~/.weechat come predefinita)"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "path per la lettura dei file da inviare (quando non specificato "
+#~ "dall'utente) (\"%h\" sarà sostituito dalla home di WeeChat, \"~/.weechat "
+#~ "come predefinita)"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/ja.po b/po/ja.po
index 850e905a0..6de5f3e19 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-06-21 22:54+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -11736,19 +11736,25 @@ msgstr ""
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "ファイルの送受信時にスペースをアンダースコアに変換"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"受信ファイルを書き込むパス (\"%h\" は WeeChat ホームに置換されます、デフォル"
-"トは \"~/.weechat\")"
+"スクリプト用のローカルキャッシュディレクトリ; 文字列最初の \"%h\" は WeeChat "
+"ホーム (デフォルトでは \"~/.weechat\") に置換されます (注意: 内容は評価されま"
+"す、/help eval 参照)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"ファイル送信の際に読み込むファイルのパス (ユーザがパスを指定しなかった場合) "
-"(\"%h\" は WeeChat ホームに置換されます、デフォルトは \"~/.weechat\")"
+"スクリプト用のローカルキャッシュディレクトリ; 文字列最初の \"%h\" は WeeChat "
+"ホーム (デフォルトでは \"~/.weechat\") に置換されます (注意: 内容は評価されま"
+"す、/help eval 参照)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -11829,6 +11835,20 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "受信ファイルを書き込むパス (\"%h\" は WeeChat ホームに置換されます、デフォ"
+#~ "ルトは \"~/.weechat\")"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "ファイル送信の際に読み込むファイルのパス (ユーザがパスを指定しなかった場"
+#~ "合) (\"%h\" は WeeChat ホームに置換されます、デフォルトは \"~/.weechat\")"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/pl.po b/po/pl.po
index dbf34a159..015444369 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-05-09 14:00+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11960,20 +11960,25 @@ msgstr "automatycznie wznów przesył po utracie połączenia"
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "zamień spacje na podkreślenia podczas wysyłania i odbierania plików"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"ścieżka do zapisywania pobieranych plików (\"%h\" zostanie zastąpione "
-"katalogiem domowym WeeChat - domyślnie \"~/.weechat\")"
+"ścieżka do plików z logami WeeChat; \"%h\" na początku ciągu zostanie "
+"zastąpione przez katalog domowy WeeChat (domyślnie \"~/.weechat\"); "
+"określenia dla daty są dozwolone (zobacz man  strftime)"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"ścieżka dla odczytu plików podczas wysyłania (jeśli nie zostanie podana "
-"przez użytkownika) (\"%h\" zostanie zastąpione katalogiem domowym WeeChat - "
-"domyślnie \"~/.weechat\")"
+"ścieżka do plików z logami WeeChat; \"%h\" na początku ciągu zostanie "
+"zastąpione przez katalog domowy WeeChat (domyślnie \"~/.weechat\"); "
+"określenia dla daty są dozwolone (zobacz man  strftime)"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr "użyj nicku nadawcy jako przedrostka w nazwie odebranego pliku"
@@ -12052,6 +12057,21 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "ścieżka do zapisywania pobieranych plików (\"%h\" zostanie zastąpione "
+#~ "katalogiem domowym WeeChat - domyślnie \"~/.weechat\")"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "ścieżka dla odczytu plików podczas wysyłania (jeśli nie zostanie podana "
+#~ "przez użytkownika) (\"%h\" zostanie zastąpione katalogiem domowym WeeChat "
+#~ "- domyślnie \"~/.weechat\")"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e7b40f7f1..d756d4739 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10744,20 +10744,25 @@ msgstr ""
 msgid "convert spaces to underscores when sending and receiving files"
 msgstr "converter espaços para underscores (_) quando enviar arquivos"
 
+#, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
-"diretório para salvar arquivos recebidos (\"%h\" será substituído pelo "
-"diretório do WeeChat, \"~/.weechat\" por padrão)"
+"diretório para arquivos de registro do WeeChat; \"%h\" no início da string "
+"será substituído pelo diretório do WeeChat (\"~/.weechat\" por padrão); "
+"especificadores de data são permitidos (veja \"man strftime\")"
 
+#, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
-"diretório para ler arquivos quando enviá-los (quando nenhum diretório foi "
-"especificado pelo usuário) (\"%h\" será substituído pelo diretório do "
-"WeeChat, \"~/.weechat\" por padrão)"
+"diretório para arquivos de registro do WeeChat; \"%h\" no início da string "
+"será substituído pelo diretório do WeeChat (\"~/.weechat\" por padrão); "
+"especificadores de data são permitidos (veja \"man strftime\")"
 
 msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
@@ -10838,6 +10843,21 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
 
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "diretório para salvar arquivos recebidos (\"%h\" será substituído pelo "
+#~ "diretório do WeeChat, \"~/.weechat\" por padrão)"
+
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "diretório para ler arquivos quando enviá-los (quando nenhum diretório foi "
+#~ "especificado pelo usuário) (\"%h\" será substituído pelo diretório do "
+#~ "WeeChat, \"~/.weechat\" por padrão)"
+
 #, fuzzy
 #~ msgid ""
 #~ "local cache directory for scripts (note: content is evaluated, see /help "
diff --git a/po/ru.po b/po/ru.po
index 51d35b67b..3299c01e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-21 08:41+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10356,16 +10356,18 @@ msgstr "заменять пробелы знаками подчёркивани�
 
 #, fuzzy
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
 "путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
 "умолчанию - ~/.weechat)"
 
 #, fuzzy
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
 "путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
 "умолчанию - ~/.weechat)"
@@ -10445,3 +10447,19 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+#~ "\"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
+#~ "умолчанию - ~/.weechat)"
+
+#, fuzzy
+#~ msgid ""
+#~ "path for reading files when sending (when no path is specified by user) "
+#~ "(\"%h\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+#~ msgstr ""
+#~ "путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
+#~ "умолчанию - ~/.weechat)"
diff --git a/po/tr.po b/po/tr.po
index e5acec36e..ad7a733ea 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2015-03-10 21:33+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9366,13 +9366,15 @@ msgid "convert spaces to underscores when sending and receiving files"
 msgstr ""
 
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
 
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
 
 msgid "use remote nick as prefix in local filename when receiving a file"
diff --git a/po/weechat.pot b/po/weechat.pot
index f5e41f60d..9fbca0153 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-06-23 21:28+0200\n"
+"POT-Creation-Date: 2015-06-27 08:02+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9278,13 +9278,15 @@ msgid "convert spaces to underscores when sending and receiving files"
 msgstr ""
 
 msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+"path for writing incoming files: \"%h\" at beginning of string is replaced "
+"by WeeChat home (\"~/.weechat\" by default) (note: content is evaluated, "
+"see /help eval)"
 msgstr ""
 
 msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+"path for reading files when sending (when no path is specified by user): \"%h"
+"\" at beginning of string is replaced by WeeChat home (\"~/.weechat\" by "
+"default) (note: content is evaluated, see /help eval)"
 msgstr ""
 
 msgid "use remote nick as prefix in local filename when receiving a file"
diff --git a/src/plugins/xfer/xfer-config.c b/src/plugins/xfer/xfer-config.c
index dec6db897..e2aba74a6 100644
--- a/src/plugins/xfer/xfer-config.c
+++ b/src/plugins/xfer/xfer-config.c
@@ -312,15 +312,17 @@ xfer_config_init ()
     xfer_config_file_download_path = weechat_config_new_option (
         xfer_config_file, ptr_section,
         "download_path", "string",
-        N_("path for writing incoming files (\"%h\" will be replaced by "
-           "WeeChat home, \"~/.weechat\" by default)"),
+        N_("path for writing incoming files: \"%h\" at beginning of string is "
+           "replaced by WeeChat home (\"~/.weechat\" by default) "
+           "(note: content is evaluated, see /help eval)"),
         NULL, 0, 0, "%h/xfer", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     xfer_config_file_upload_path = weechat_config_new_option (
         xfer_config_file, ptr_section,
         "upload_path", "string",
-        N_("path for reading files when sending (when no path is "
-           "specified by user) (\"%h\" will be replaced by "
-           "WeeChat home, \"~/.weechat\" by default)"),
+        N_("path for reading files when sending (when no path is specified "
+           "by user): \"%h\" at beginning of string is replaced by WeeChat "
+           "home (\"~/.weechat\" by default) "
+           "(note: content is evaluated, see /help eval)"),
         NULL, 0, 0, "~", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     xfer_config_file_use_nick_in_filename = weechat_config_new_option (
         xfer_config_file, ptr_section,
diff --git a/src/plugins/xfer/xfer-file.c b/src/plugins/xfer/xfer-file.c
index 63dc9e275..65f2cd42c 100644
--- a/src/plugins/xfer/xfer-file.c
+++ b/src/plugins/xfer/xfer-file.c
@@ -80,37 +80,29 @@ xfer_file_resume (struct t_xfer *xfer, const char *filename)
 void
 xfer_file_find_filename (struct t_xfer *xfer)
 {
-    const char *weechat_home, *dir_separator;
-    char *dir1, *dir2, *filename2;
+    const char *dir_separator;
+    char *path, *filename2;
     int length;
 
     if (!XFER_IS_FILE(xfer->type))
         return;
 
-    dir1 = weechat_string_expand_home (weechat_config_string (xfer_config_file_download_path));
-    if (!dir1)
+    path = weechat_string_eval_path_home (
+        weechat_config_string (xfer_config_file_download_path),
+        NULL, NULL, NULL);
+    if (!path)
         return;
 
-    weechat_home = weechat_info_get ("weechat_dir", "");
-    if (!weechat_home)
-    {
-        free (dir1);
-        return;
-    }
-    dir2 = weechat_string_replace (dir1, "%h", weechat_home);
-    if (!dir2)
-    {
-        free (dir1);
-        return;
-    }
-
-    xfer->local_filename = malloc (strlen (dir2) +
+    xfer->local_filename = malloc (strlen (path) +
                                    strlen (xfer->remote_nick) +
                                    strlen (xfer->filename) + 4);
     if (!xfer->local_filename)
+    {
+        free (path);
         return;
+    }
 
-    strcpy (xfer->local_filename, dir2);
+    strcpy (xfer->local_filename, path);
     dir_separator = weechat_info_get("dir_separator", "");
     if (dir_separator
         && (xfer->local_filename[strlen (xfer->local_filename) - 1] != dir_separator[0]))
@@ -122,10 +114,7 @@ xfer_file_find_filename (struct t_xfer *xfer)
     }
     strcat (xfer->local_filename, xfer->filename);
 
-    if (dir1)
-        free (dir1);
-    if (dir2 )
-        free (dir2);
+    free (path);
 
     /* file already exists? */
     if (access (xfer->local_filename, F_OK) == 0)
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index 02e73ec6d..84d43aade 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -140,21 +140,26 @@ xfer_signal_upgrade_cb (void *data, const char *signal, const char *type_data,
 void
 xfer_create_directories ()
 {
-    const char *weechat_dir;
-    char *dir1, *dir2;
+    char *path;
 
     /* create download directory */
-    weechat_dir = weechat_info_get ("weechat_dir", "");
-    if (weechat_dir)
+    path = weechat_string_eval_path_home (
+        weechat_config_string (xfer_config_file_download_path),
+        NULL, NULL, NULL);
+    if (path)
     {
-        dir1 = weechat_string_expand_home (weechat_config_string (xfer_config_file_download_path));
-        dir2 = weechat_string_replace (dir1, "%h", weechat_dir);
-        if (dir2)
-            (void) weechat_mkdir (dir2, 0700);
-        if (dir1)
-            free (dir1);
-        if (dir2)
-            free (dir2);
+        (void) weechat_mkdir_parents (path, 0700);
+        free (path);
+    }
+
+    /* create upload directory */
+    path = weechat_string_eval_path_home (
+        weechat_config_string (xfer_config_file_upload_path),
+        NULL, NULL, NULL);
+    if (path)
+    {
+        (void) weechat_mkdir_parents (path, 0700);
+        free (path);
     }
 }
 
@@ -998,9 +1003,9 @@ xfer_add_cb (void *data, const char *signal, const char *type_data,
     struct t_infolist *infolist;
     const char *plugin_name, *plugin_id, *str_type, *str_protocol;
     const char *remote_nick, *local_nick, *charset_modifier, *filename, *proxy;
-    const char *weechat_dir, *str_address, *str_port;
+    const char *str_address, *str_port;
     int type, protocol, args, port_start, port_end, sock, port;
-    char *dir1, *dir2, *filename2, *short_filename, *pos, str_port_temp[16];
+    char *path, *filename2, *short_filename, *pos, str_port_temp[16];
     struct stat st;
     struct sockaddr_storage addr, own_ip_addr, bind_addr;
     struct sockaddr *out_addr = (struct sockaddr*)&addr;
@@ -1104,41 +1109,30 @@ xfer_add_cb (void *data, const char *signal, const char *type_data,
             filename2 = weechat_string_expand_home (filename);
         else
         {
-            dir1 = weechat_string_expand_home (weechat_config_string (xfer_config_file_upload_path));
-            if (!dir1)
-            {
-                weechat_printf (NULL,
-                                _("%s%s: not enough memory"),
-                                weechat_prefix ("error"), XFER_PLUGIN_NAME);
-                goto error;
-            }
-
-            weechat_dir = weechat_info_get ("weechat_dir", "");
-            dir2 = weechat_string_replace (dir1, "%h", weechat_dir);
-            if (!dir2)
+            path = weechat_string_eval_path_home (
+                weechat_config_string (xfer_config_file_upload_path),
+                NULL, NULL, NULL);
+            if (!path)
             {
                 weechat_printf (NULL,
                                 _("%s%s: not enough memory"),
                                 weechat_prefix ("error"), XFER_PLUGIN_NAME);
-                free (dir1);
                 goto error;
             }
-            filename2 = malloc (strlen (dir2) + strlen (filename) + 4);
+            filename2 = malloc (strlen (path) + strlen (filename) + 4);
             if (!filename2)
             {
                 weechat_printf (NULL,
                                 _("%s%s: not enough memory"),
                                 weechat_prefix ("error"), XFER_PLUGIN_NAME);
-                free (dir1);
-                free (dir2);
+                free (path);
                 goto error;
             }
-            strcpy (filename2, dir2);
+            strcpy (filename2, path);
             if (filename2[strlen (filename2) - 1] != DIR_SEPARATOR_CHAR)
                 strcat (filename2, DIR_SEPARATOR);
             strcat (filename2, filename);
-            free (dir1);
-            free (dir2);
+            free (path);
         }
 #endif /* _WIN32 */
         /* check if file exists */