diff --git a/ChangeLog b/ChangeLog
index 5191cbfdd..954995e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-01-20
+v0.4.1-dev, 2013-01-22
 
 
 Version 0.4.1 (under dev!)
@@ -9,6 +9,7 @@ Version 0.4.1 (under dev!)
 
 * guile: fix compilation with guile 2.0
 * perl: simplify code to load scripts
+* scripts: do now allow empty script name in function "register"
 
 Version 0.4.0 (2013-01-20)
 --------------------------
diff --git a/po/cs.po b/po/cs.po
index 4e0a4d69a..03357d59b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8247,22 +8247,10 @@ msgstr "%s%s: funkce \"%s\" je vnitřně špatně použitá"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: nedostatek paměti ve funkci \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: nedostatek paměti pro parsování souboru \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: nemůžu parsovat soubor \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: nemůžu spustit soubor \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: neznámá chyba při načítání souboru \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: nemohu inicializovat %s"
@@ -8322,9 +8310,9 @@ msgid ""
 "%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
 msgstr "%s%s: špatné parametry pro funkci \"%s\" (skript: %s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr "%s: chyba načítání skriptu \"%s\" (špatné jméno, mezery jsou zakázány)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: chyba načítání skriptu \"%s\" (nedostatek paměti)"
 
 #, c-format
 msgid ""
@@ -9318,5 +9306,18 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: nedostatek paměti pro parsování souboru \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: nemůžu spustit soubor \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: neznámá chyba při načítání souboru \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: chyba načítání skriptu \"%s\" (špatné jméno, mezery jsou zakázány)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s nemohu vytvořit soket"
diff --git a/po/de.po b/po/de.po
index c30db3c03..f601acdb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -8980,22 +8980,10 @@ msgstr "%s%s: Funktion \"%s\" wird intern falsch genutzt"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s Nicht genug Speicher in Funktion \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: Nicht genug Speicher um Datei \"%s\" zu analysieren"
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: Datei \"%s\" Analyse nicht möglich"
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: Kann Datei \"%s\" nicht ausführen"
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: unbekannter Fehler beim Laden der Datei \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: %s kann nicht initialisiert werden"
@@ -9058,11 +9046,9 @@ msgid ""
 msgstr ""
 "%s%s: Warnung, Pointer (\"%s\") ungültig für Funktion \"%s\" (Skript: %s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
-"%s: Fehler beim Laden des Skriptes \"%s\" (fehlerhafter Name: Leerzeichen "
-"sind nicht erlaubt)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: Skript \"%s\" kann nicht geladen werden (Speichermangel)"
 
 #, c-format
 msgid ""
@@ -10169,6 +10155,20 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Konstanten"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: Nicht genug Speicher um Datei \"%s\" zu analysieren"
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: Kann Datei \"%s\" nicht ausführen"
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: unbekannter Fehler beim Laden der Datei \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: Fehler beim Laden des Skriptes \"%s\" (fehlerhafter Name: Leerzeichen "
+#~ "sind nicht erlaubt)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: Socket konnte nicht angelegt werden"
 
diff --git a/po/es.po b/po/es.po
index 865170317..5dacd6af1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8508,22 +8508,10 @@ msgstr "%s%s: la función \"%s\" es mal usada internamente"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: no hay memoria suficiente en la función \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: no hay suficiente memoria para analizar el archivo \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: no es posible analizar el archivo \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: no es posible ejecutar el archivo \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: error desconocido mientras se cargaba el archivo \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: no ha sido posible inicializar %s"
@@ -8583,11 +8571,9 @@ msgid ""
 msgstr ""
 "%s%s: atención, puntero inválido (\"%s\") para la función \"%s\" (script: %s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
-"%s: error al cargar el script \"%s\" (nombre erróneo, los espacios no son "
-"permitidos)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: error al cargar el script \"%s\" (no hay suficiente memoria)"
 
 #, c-format
 msgid ""
@@ -9563,6 +9549,20 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: no hay suficiente memoria para analizar el archivo \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: no es posible ejecutar el archivo \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: error desconocido mientras se cargaba el archivo \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: error al cargar el script \"%s\" (nombre erróneo, los espacios no son "
+#~ "permitidos)"
+
 #~ msgid "background color for window separators (when split)"
 #~ msgstr "color de fondo para los separadores de ventana (cuando se dividen)"
 
diff --git a/po/fr.po b/po/fr.po
index 66e3c01cc..3c3e55768 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
-"PO-Revision-Date: 2013-01-20 12:07+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
+"PO-Revision-Date: 2013-01-22 09:22+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -8736,22 +8736,10 @@ msgstr "%s%s: la fonction \"%s\" est mal utilisée en interne"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: pas assez de mémoire dans la fonction \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: mémoire insuffisante pour lire le fichier \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: impossible de lire le fichier \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: impossible de lancer le fichier \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: erreur inconnue en chargement du fichier \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: impossible d'initialiser %s"
@@ -8814,10 +8802,9 @@ msgstr ""
 "%s)"
 
 #, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
 msgstr ""
-"%s: erreur de chargement du script \"%s\" (mauvais nom, les espaces sont "
-"interdits)"
+"%s: erreur de chargement du script \"%s\" (espaces ou nom vide non autorisés)"
 
 #, c-format
 msgid ""
@@ -9906,5 +9893,19 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: mémoire insuffisante pour lire le fichier \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: impossible de lancer le fichier \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: erreur inconnue en chargement du fichier \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: erreur de chargement du script \"%s\" (mauvais nom, les espaces sont "
+#~ "interdits)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: impossible de créer la socket"
diff --git a/po/hu.po b/po/hu.po
index 22060577e..7da97eb0d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7712,22 +7712,10 @@ msgstr "%s a \"%s\" modul nem található\n"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s nincs elegendő memória új DCC számára\n"
 
-#, fuzzy, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s nincs elegendő memória új DCC számára\n"
-
 #, fuzzy, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 
-#, fuzzy, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
-
-#, fuzzy, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
-
 #, fuzzy, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s nem sikerült a modult betölteni \"%s\"\n"
@@ -7785,9 +7773,9 @@ msgid ""
 "%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
 msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s nem sikerült a modult betölteni \"%s\" (nincs elég memória)\n"
 
 #, c-format
 msgid ""
@@ -8798,6 +8786,18 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#, fuzzy
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s nincs elegendő memória új DCC számára\n"
+
+#, fuzzy
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
+
+#, fuzzy
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
+
 #, fuzzy
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s nem sikerült a csatornát létrehozni\n"
diff --git a/po/it.po b/po/it.po
index d4e46b120..46d40c65c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8512,22 +8512,10 @@ msgstr "%s%s: uso improprio della funzione interna \"%s\""
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: memoria non sufficiente nella funzione \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: memoria non sufficiente per analizzare il file \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: impossibile analizzare il file \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: impossibile eseguire il file \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: errore sconosciuto durante la lettura del file \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: impossibile inizializzare %s"
@@ -8590,11 +8578,10 @@ msgstr ""
 "%s%s: attenzione, puntatore (\"%s\") non valido per la funzione \"%s"
 "\" (script: %s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
 msgstr ""
-"%s: errore durante il caricamento dello script \"%s\" (nome errato, spazi "
-"non ammessi)"
+"%s: errore durante il caricamento dello script \"%s\" (memoria insufficiente)"
 
 #, c-format
 msgid ""
@@ -9590,5 +9577,19 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Costanti"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: memoria non sufficiente per analizzare il file \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: impossibile eseguire il file \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: errore sconosciuto durante la lettura del file \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: errore durante il caricamento dello script \"%s\" (nome errato, spazi "
+#~ "non ammessi)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: impossibile creare il socket"
diff --git a/po/ja.po b/po/ja.po
index 77769ffdc..62e853f34 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:07+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -8443,22 +8443,10 @@ msgstr "%s%s: 関数 \"%s\" は内部的に誤用されています。"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: 関数 \"%s\" 内に十分なメモリがありません"
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: ファイル \"%s\" を解析する十分なメモリがありません"
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: ファイル \"%s\" を解析できません"
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: ファイル \"%s\" を実行できません"
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: ファイル \"%s\" のロード中の未定義のエラー"
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: %s の初期化に失敗"
@@ -8518,9 +8506,9 @@ msgstr ""
 "%1$s%2$s: 警告、関数 \"%4$s\" の不正な引ポインタ (\"%3$s\") (スクリプト: "
 "%5$s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr "%s: スクリプト \"%s\" のロード中にエラー (無効な名前、スペースは禁止)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: スクリプト \"%s\" のロード中にエラー (メモリ不足)"
 
 #, c-format
 msgid ""
@@ -9573,5 +9561,18 @@ msgstr "タイプ"
 msgid "Constants"
 msgstr "定数"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: ファイル \"%s\" を解析する十分なメモリがありません"
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: ファイル \"%s\" を実行できません"
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: ファイル \"%s\" のロード中の未定義のエラー"
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: スクリプト \"%s\" のロード中にエラー (無効な名前、スペースは禁止)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: ソケットの作成に失敗"
diff --git a/po/pl.po b/po/pl.po
index 39e30e8f4..9ede7342f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:08+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8592,22 +8592,10 @@ msgstr "%s%s: funkcja \"%s\" jest wewnętrznie źle użyta"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: za mało pamięci wewnątrz funkcji \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: za mało pamięci do przetworzenia pliku \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: nie można przetworzyć pliku \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: nie można wykonać pliku \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: nieznany błąd podczas ładowania pliku \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: nie można zainicjować %s"
@@ -8666,11 +8654,9 @@ msgstr ""
 "%s%s: ostrzeżenie, niewłaściwy wskaźnik (\"%s\") dla funkcji \"%s\" (skrypt: "
 "%s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
-"%s: błąd podczas ładowania skryptu \"%s\" (niewłaściwa nazwa, spacje są "
-"zakazane)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: błąd podczas ładowania skryptu \"%s\" (za mało pamięci)"
 
 #, c-format
 msgid ""
@@ -9729,5 +9715,19 @@ msgstr "Typ"
 msgid "Constants"
 msgstr "Stałe"
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: za mało pamięci do przetworzenia pliku \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: nie można wykonać pliku \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: nieznany błąd podczas ładowania pliku \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: błąd podczas ładowania skryptu \"%s\" (niewłaściwa nazwa, spacje są "
+#~ "zakazane)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: nie można utworzyć gniazda"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 85494c25e..3aa62512d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:08+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7868,22 +7868,10 @@ msgstr "%s%s: função \"%s\" é mal utilizada internamente"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s%s: memória insuficiente na função \"%s\""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s%s: memória insuficiente para interpretar arquivo \"%s\""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "%s%s: não foi possível interpretar arquivo \"%s\""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "%s%s: não foi possível executar arquivo \"%s\""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "%s%s: erro desconhecido ao carregar arquivo \"%s\""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s%s: não foi possível inicializar %s"
@@ -7942,10 +7930,9 @@ msgid ""
 "%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
 msgstr "%s%s: argumentos inválidos para a função \"%s\" (script: %s)"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
-"%s: erro ao carregar script \"%s\" (nome inválido, espaços são proibidos)"
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s: erro ao carregar script \"%s\" (memória insuficiente)"
 
 #, c-format
 msgid ""
@@ -8948,5 +8935,18 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s%s: memória insuficiente para interpretar arquivo \"%s\""
+
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "%s%s: não foi possível executar arquivo \"%s\""
+
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "%s%s: erro desconhecido ao carregar arquivo \"%s\""
+
+#~ msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+#~ msgstr ""
+#~ "%s: erro ao carregar script \"%s\" (nome inválido, espaços são proibidos)"
+
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s%s: não foi possível criar socket"
diff --git a/po/ru.po b/po/ru.po
index e59bf004f..cb5c9caca 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: 2013-01-20 12:08+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7735,22 +7735,10 @@ msgstr "%s plugin \"%s\" не найден\n"
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr "%s недостаточно памяти для нового DCC\n"
 
-#, fuzzy, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr "%s недостаточно памяти для нового DCC\n"
-
 #, fuzzy, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr "Не могу записать лог-файл \"%s\"\n"
 
-#, fuzzy, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr "Не могу записать лог-файл \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr "Не могу записать лог-файл \"%s\"\n"
-
 #, fuzzy, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr "%s не могу инициализировать plugin \"%s\"\n"
@@ -7808,9 +7796,9 @@ msgid ""
 "%s%s: warning, invalid pointer (\"%s\") for function \"%s\" (script: %s)"
 msgstr "%s некорректные аргументы команды \"%s\"\n"
 
-#, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
+msgstr "%s не могу загрузить plugin \"%s\" (недостаточно памяти)\n"
 
 #, c-format
 msgid ""
@@ -8815,6 +8803,18 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#, fuzzy
+#~ msgid "%s%s: not enough memory to parse file \"%s\""
+#~ msgstr "%s недостаточно памяти для нового DCC\n"
+
+#, fuzzy
+#~ msgid "%s%s: unable to run file \"%s\""
+#~ msgstr "Не могу записать лог-файл \"%s\"\n"
+
+#, fuzzy
+#~ msgid "%s%s: unknown error while loading file \"%s\""
+#~ msgstr "Не могу записать лог-файл \"%s\"\n"
+
 #, fuzzy
 #~ msgid "%s%s: cannot create socket"
 #~ msgstr "%s невозможно создать сокет\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 69fd9138b..223bb251b 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-01-20 12:08+0100\n"
+"POT-Creation-Date: 2013-01-22 09:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6812,22 +6812,10 @@ msgstr ""
 msgid "%s%s: not enough memory in function \"%s\""
 msgstr ""
 
-#, c-format
-msgid "%s%s: not enough memory to parse file \"%s\""
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to parse file \"%s\""
 msgstr ""
 
-#, c-format
-msgid "%s%s: unable to run file \"%s\""
-msgstr ""
-
-#, c-format
-msgid "%s%s: unknown error while loading file \"%s\""
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to initialize %s"
 msgstr ""
@@ -6870,7 +6858,7 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid "%s: error loading script \"%s\" (bad name, spaces are forbidden)"
+msgid "%s: error loading script \"%s\" (spaces or empty name not allowed)"
 msgstr ""
 
 #, c-format
diff --git a/src/plugins/plugin-script.c b/src/plugins/plugin-script.c
index c3b2b4a25..169172f07 100644
--- a/src/plugins/plugin-script.c
+++ b/src/plugins/plugin-script.c
@@ -550,11 +550,11 @@ plugin_script_add (struct t_weechat_plugin *weechat_plugin,
 {
     struct t_plugin_script *new_script;
 
-    if (strchr (name, ' '))
+    if (!name[0] || strchr (name, ' '))
     {
         weechat_printf (NULL,
-                        _("%s: error loading script \"%s\" (bad name, spaces "
-                          "are forbidden)"),
+                        _("%s: error loading script \"%s\" (spaces or empty name "
+                          "not allowed)"),
                         weechat_plugin->name, name);
         return NULL;
     }