diff --git a/ChangeLog b/ChangeLog
index 737eca5b6..e83ccb2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.9-dev, 2012-06-03
+v0.3.9-dev, 2012-06-04
 
 
 Version 0.3.9 (under dev!)
 --------------------------
 
+* alias: prohibit names beginning with "#" for aliases (bug #36584)
+
 Version 0.3.8 (2012-06-03)
 --------------------------
 
diff --git a/doc/de/autogen/user/alias_commands.txt b/doc/de/autogen/user/alias_commands.txt
index c45075a52..50ce305cc 100644
--- a/doc/de/autogen/user/alias_commands.txt
+++ b/doc/de/autogen/user/alias_commands.txt
@@ -3,32 +3,33 @@
 ........................................
 /alias  [-completion <completion>] <alias> [<command> [;<command>...]]
 
-completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet)
-            Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden
-     alias: Name des Alias (kann mit Joker "*" beginnen oder enden um Aliase aufzulisten)
-   command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden)
+completion: completion for alias (optional, by default completion is done with target command)
+            note: you can use %%command to use completion of an existing command
+     alias: name of alias (can start or end with "*" for alias listing)
+            note: the name can not start with "#"
+   command: command name with arguments (many commands can be separated by semicolons)
 
-Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt.
+Without argument, this command lists all defined alias.
 
-Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden:
-        $n: Argument 'n' (zwischen 1 und 9)
-       $-m: Argumente von 1 bis 'm'
-       $n-: Argumente von 'n' bis zum letzten Argument
-      $n-m: Argumente von 'n' bis 'm'
-        $*: alle Argumente
-        $~: letztes Argument
-     $nick: aktueller Nick
-  $channel: aktueller Channel
-   $server: aktueller Server
+Note: in command, special variables are replaced:
+        $n: argument 'n' (between 1 and 9)
+       $-m: arguments from 1 to 'm'
+       $n-: arguments from 'n' to last
+      $n-m: arguments from 'n' to 'm'
+        $*: all arguments
+        $~: last argument
+     $nick: current nick
+  $channel: current channel
+   $server: current server
 
-Um ein Alias zu löschen wird der Befehl "/unalias" genutzt.
+To remove an alias, use command /unalias.
 
-Beispiele:
-  Alias "/split" wird anlegt um damit ein Fenster horizontal zu teilen:
+Examples:
+  alias /split to split window horizontally:
     /alias split /window splith
-  Alias "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben:
-    /alias hallo /allchan -exclude=#weechat msg * Hallo
-  Alias "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen:
+  alias /hello to say "hello" on all channels but not on #weechat:
+    /alias hello /allchan -exclude=#weechat msg * hello
+  alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin:
     /alias -completion %%sajoin forcejoin /quote forcejoin
 ........................................
 
diff --git a/doc/en/autogen/user/alias_commands.txt b/doc/en/autogen/user/alias_commands.txt
index 9db1ec962..c877fd937 100644
--- a/doc/en/autogen/user/alias_commands.txt
+++ b/doc/en/autogen/user/alias_commands.txt
@@ -6,6 +6,7 @@
 completion: completion for alias (optional, by default completion is done with target command)
             note: you can use %%command to use completion of an existing command
      alias: name of alias (can start or end with "*" for alias listing)
+            note: the name can not start with "#"
    command: command name with arguments (many commands can be separated by semicolons)
 
 Without argument, this command lists all defined alias.
diff --git a/doc/fr/autogen/user/alias_commands.txt b/doc/fr/autogen/user/alias_commands.txt
index 739e4e718..6a1ec358a 100644
--- a/doc/fr/autogen/user/alias_commands.txt
+++ b/doc/fr/autogen/user/alias_commands.txt
@@ -6,6 +6,7 @@
 complétion: complétion pour l'alias (optionnel, par défaut la complétion se fait avec la commande cible)
             note: vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante
      alias: nom de l'alias (peut démarrer ou se terminer par "*" pour une liste d'alias)
+            note: le nom ne peut pas commencer par "#"
   commande: nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules)
 
 Sans paramètre, cette commande liste tous les alias définis.
diff --git a/doc/it/autogen/user/alias_commands.txt b/doc/it/autogen/user/alias_commands.txt
index 782799073..f4342586d 100644
--- a/doc/it/autogen/user/alias_commands.txt
+++ b/doc/it/autogen/user/alias_commands.txt
@@ -3,32 +3,33 @@
 ........................................
 /alias  [-completion <completamento>] <alias> [<comando> [;<comando>...]]
 
-completamento: completamento per l'alias (opzionale, per default il completamento viene eseguito con il comando di destinazione)
-	     nota: è possibile usare %%comando per usare il completamento di un comando esistente
-        alias: nome dell'alias (può iniziare o terminare con "*" per elencare gli alias)
-      comando: nome del comando con gli argomenti (più comandi vanno separati da punto e virgola)
+completion: completion for alias (optional, by default completion is done with target command)
+            note: you can use %%command to use completion of an existing command
+     alias: name of alias (can start or end with "*" for alias listing)
+            note: the name can not start with "#"
+   command: command name with arguments (many commands can be separated by semicolons)
 
-Senza argomento, questo comando elenca tutti gli alias definiti.
+Without argument, this command lists all defined alias.
 
-Nota: nel comando, vengono sostituite le variabili speciali:
-        $n: argomento 'n' (tra 1 e 9)
-       $-m: argomenti da 1 a 'm'
-       $n-: argomenti da 'n' all'ultimo
-      $n-m: argomenti da 'n' a 'm'
-        $*: tutti gli argomenti
-        $~: l'ultimo argomento
-     $nick: nick corrente
-  $channel: canale corrente
-   $server: server corrente
+Note: in command, special variables are replaced:
+        $n: argument 'n' (between 1 and 9)
+       $-m: arguments from 1 to 'm'
+       $n-: arguments from 'n' to last
+      $n-m: arguments from 'n' to 'm'
+        $*: all arguments
+        $~: last argument
+     $nick: current nick
+  $channel: current channel
+   $server: current server
 
-Per rimuovere un alias, usare il comando /unalias.
+To remove an alias, use command /unalias.
 
-Esempi:
-  alias /split per dividere la finestra orizzontalmente:
+Examples:
+  alias /split to split window horizontally:
     /alias split /window splith
-  alias /ciao per dire "ciao" su tutti i canali tranne #weechat:
-    /alias ciao /allchan -exclude=#weechat msg * ciao
-  alias /forcejoin per inviare il comando IRC "forcejoin" con il completamento di /sajoin:
+  alias /hello to say "hello" on all channels but not on #weechat:
+    /alias hello /allchan -exclude=#weechat msg * hello
+  alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin:
     /alias -completion %%sajoin forcejoin /quote forcejoin
 ........................................
 
diff --git a/po/cs.po b/po/cs.po
index c72c97e8d..5f5a6a048 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3397,14 +3397,6 @@ msgstr[2] "normálních"
 msgid "Debug disabled for cursor mode"
 msgstr "Ladění vypnuto pro \"%s\""
 
-#, fuzzy, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Ladění vypnuto pro \"%s\""
-
-#, fuzzy
-msgid "Debug disabled for mouse"
-msgstr "Ladění vypnuto pro \"%s\""
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Chyba: nedostatek paměti pro přidáni bufferu do hotlistu"
 
@@ -3435,6 +3427,14 @@ msgstr "výchozí příkaz:"
 msgid "Not enough memory for new line"
 msgstr "Nedostatek paměti pro nový řádek"
 
+#, fuzzy, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Ladění vypnuto pro \"%s\""
+
+#, fuzzy
+msgid "Debug disabled for mouse"
+msgstr "Ladění vypnuto pro \"%s\""
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: chyba, cyklický odkaz při volání aliasu \"%s\""
@@ -3483,6 +3483,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/de.po b/po/de.po
index 281baf405..2b820126b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -3728,13 +3728,6 @@ msgstr[1] "normale"
 msgid "Debug disabled for cursor mode"
 msgstr "Debug für Cursor Modus deaktiviert"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debug-Modus (%s) für Maus aktiviert"
-
-msgid "Debug disabled for mouse"
-msgstr "Debug für Maus deaktiviert"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 "Fehler: nicht genügend Speicher um den Buffer der Hotlist hinzu zu fügen"
@@ -3765,6 +3758,13 @@ msgstr "führe Befehl \"%s\" aus"
 msgid "Not enough memory for new line"
 msgstr "Nicht genügend Speicher für eine neue Zeile"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debug-Modus (%s) für Maus aktiviert"
+
+msgid "Debug disabled for mouse"
+msgstr "Debug für Maus deaktiviert"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: Fehler, Zirkelbezug beim Aufruf des Alias \"%s\""
@@ -3805,13 +3805,14 @@ msgstr "Einem Befehl wird ein Alias zugewiesen"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/es.po b/po/es.po
index 62bae96b7..70afdfdb5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3582,13 +3582,6 @@ msgstr[1] "normales"
 msgid "Debug disabled for cursor mode"
 msgstr "Depurado para el modo cursor desactivado"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Depurado para el modo cursor activado (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Depurado para el ratón desactivado"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 "Error: no hay suficiente memoria para agregar el buffer a la lista de "
@@ -3620,6 +3613,13 @@ msgstr "Ejecutando el comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "No hay suficiente memoria para una línea nueva"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Depurado para el modo cursor activado (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Depurado para el ratón desactivado"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: error, referencia circular al ejecutar el alias \"%s\""
@@ -3660,13 +3660,14 @@ msgstr "crear un alias para un comando"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completador>] <alias> [<comando> [;<comando>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index 5b8922085..f1a2227cb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
-"PO-Revision-Date: 2012-06-03 09:49+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
+"PO-Revision-Date: 2012-06-04 09:58+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -3616,13 +3616,6 @@ msgstr[1] "normaux"
 msgid "Debug disabled for cursor mode"
 msgstr "Debug désactivé pour le mode curseur"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debug activé pour la souris (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debug désactivé pour la souris"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Erreur: impossible d'ajouter le tampon à la liste des tampons actifs"
 
@@ -3652,6 +3645,13 @@ msgstr "Lancement de la commande: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Pas assez de mémoire pour une nouvelle ligne"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debug activé pour la souris (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debug désactivé pour la souris"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: erreur, référence circulaire lors de l'appel à l'alias \"%s\""
@@ -3699,6 +3699,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
@@ -3732,6 +3733,7 @@ msgstr ""
 "complétion d'une commande existante\n"
 "     alias: nom de l'alias (peut démarrer ou se terminer par \"*\" pour une "
 "liste d'alias)\n"
+"            note: le nom ne peut pas commencer par \"#\"\n"
 "  commande: nom de la commande avec les paramètres (plusieurs commandes "
 "peuvent être séparées par des points-virgules)\n"
 "\n"
diff --git a/po/hu.po b/po/hu.po
index 10eb0e33b..b905645a9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3061,13 +3061,6 @@ msgstr[1] "normál"
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 #, fuzzy
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "%s nincs elég memória az ignore elkészítéséhez\n"
@@ -3099,6 +3092,13 @@ msgstr "%s belső parancsok:\n"
 msgid "Not enough memory for new line"
 msgstr "Nincs elég memória az új sorhoz\n"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n"
@@ -3149,6 +3149,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/it.po b/po/it.po
index 70c2bd45a..be92fcd79 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3573,13 +3573,6 @@ msgstr[1] "normali"
 msgid "Debug disabled for cursor mode"
 msgstr "Debug disabilitato per la modalità cursore"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debug abilitato per il mouse (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debug disabilitato per il mouse"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Errore: memoria non sufficiente per aggiungere un buffer alla hotlist"
 
@@ -3609,6 +3602,13 @@ msgstr "Esecuzione comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Memoria non sufficiente per una nuova riga"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debug abilitato per il mouse (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debug disabilitato per il mouse"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: errore, riferimento circolare alla chiamata dell'alias \"%s\""
@@ -3649,13 +3649,14 @@ msgstr "crea un alias per un comando"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completamento>] <alias> [<comando> [;<comando>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/ja.po b/po/ja.po
index 9dfaab533..203516cd7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -3479,13 +3479,6 @@ msgstr[0] "通常"
 msgid "Debug disabled for cursor mode"
 msgstr "カーソルモードのデバッグを無効化"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "マウス (%s) のデバッグを有効化"
-
-msgid "Debug disabled for mouse"
-msgstr "マウスのデバッグを無効化"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "エラー: バッファをホットリストに追加するメモリが足りません"
 
@@ -3515,6 +3508,13 @@ msgstr "コマンド実行中: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "新しい行に使うメモリが足りません"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "マウス (%s) のデバッグを有効化"
+
+msgid "Debug disabled for mouse"
+msgstr "マウスのデバッグを無効化"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: エラー、別名 \"%s\" の呼び出し中に循環参照を検知"
@@ -3555,13 +3555,14 @@ msgstr "コマンドの別名を作成"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/pl.po b/po/pl.po
index b9356e9d8..bcc09ad50 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -29,7 +29,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
 #, c-format
@@ -3565,13 +3566,6 @@ msgstr[2] "normalnych"
 msgid "Debug disabled for cursor mode"
 msgstr "Debugowanie wyłączone dla trybu kursora"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Debugowanie włączone dla myszy (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Debugowanie wyłączone dla myszy"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "Błąd: za mało pamięci, aby dodać bufor do hotlisty"
 
@@ -3601,6 +3595,13 @@ msgstr "Wykonuję komendę: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Za mało pamięci na nowy wiersz"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Debugowanie włączone dla myszy (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Debugowanie wyłączone dla myszy"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: błąd, cykliczna referencja przy wywoływaniu aliasu \"%s\""
@@ -3641,13 +3642,14 @@ msgstr "tworzy alias do komendy"
 msgid "[-completion <completion>] <alias> [<command> [;<command>...]]"
 msgstr "[-completion <dopełnienie>] <alias> [<komenda> [;<komenda>...]]"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "completion: completion for alias (optional, by default completion is done "
 "with target command)\n"
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 25beb372a..5eebcc006 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3486,13 +3486,6 @@ msgstr[1] "normais"
 msgid "Debug disabled for cursor mode"
 msgstr "Depuração desabilitada para modo cursor"
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr "Depuração habilitada para mouse (%s)"
-
-msgid "Debug disabled for mouse"
-msgstr "Depuração desabilitada para mouse"
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 "Erro: memória insuficiente para adicionar um buffer na lista de atividades"
@@ -3523,6 +3516,13 @@ msgstr "Executando comando: \"%s\""
 msgid "Not enough memory for new line"
 msgstr "Memória insuficiente para nova linha"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr "Depuração habilitada para mouse (%s)"
+
+msgid "Debug disabled for mouse"
+msgstr "Depuração desabilitada para mouse"
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: erro, referência circular ao chamar atalho \"%s\""
@@ -3570,6 +3570,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/ru.po b/po/ru.po
index 99a9cc400..14d5ae676 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -29,7 +29,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
 
 #. TRANSLATORS: "%s %s" after "compiled on" is date and time
@@ -3091,13 +3092,6 @@ msgstr[2] "обычные"
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 #, fuzzy
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr "%s не могу добавить буфер в хотлист\n"
@@ -3129,6 +3123,13 @@ msgstr "Внутренние команды %s:\n"
 msgid "Not enough memory for new line"
 msgstr "Недостаточно памяти для новой строчки\n"
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s рекурсия при вызове сокращения \"/%s\"\n"
@@ -3179,6 +3180,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index cf99681c7..fd0b676b4 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: 2012-06-03 09:00+0200\n"
+"POT-Creation-Date: 2012-06-04 09:57+0200\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"
@@ -2692,13 +2692,6 @@ msgstr[1] ""
 msgid "Debug disabled for cursor mode"
 msgstr ""
 
-#, c-format
-msgid "Debug enabled for mouse (%s)"
-msgstr ""
-
-msgid "Debug disabled for mouse"
-msgstr ""
-
 msgid "Error: not enough memory to add a buffer to hotlist"
 msgstr ""
 
@@ -2728,6 +2721,13 @@ msgstr ""
 msgid "Not enough memory for new line"
 msgstr ""
 
+#, c-format
+msgid "Debug enabled for mouse (%s)"
+msgstr ""
+
+msgid "Debug disabled for mouse"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr ""
@@ -2775,6 +2775,7 @@ msgid ""
 "            note: you can use %%command to use completion of an existing "
 "command\n"
 "     alias: name of alias (can start or end with \"*\" for alias listing)\n"
+"            note: the name can not start with \"#\"\n"
 "   command: command name with arguments (many commands can be separated by "
 "semicolons)\n"
 "\n"
diff --git a/src/plugins/alias/alias.c b/src/plugins/alias/alias.c
index 77d5aa49f..514c98491 100644
--- a/src/plugins/alias/alias.c
+++ b/src/plugins/alias/alias.c
@@ -566,7 +566,7 @@ alias_new (const char *name, const char *command, const char *completion)
 {
     struct t_alias *new_alias, *ptr_alias, *pos_alias;
 
-    if (!name || !name[0] || !command || !command[0])
+    if (!name || !name[0] || (name[0] == '#') || !command || !command[0])
         return NULL;
 
     while (weechat_string_is_command_char (name))
@@ -979,6 +979,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
                              "completion of an existing command\n"
                              "     alias: name of alias (can start or end "
                              "with \"*\" for alias listing)\n"
+                             "            note: the name can not start with "
+                             "\"#\"\n"
                              "   command: command name with arguments (many "
                              "commands can be separated by semicolons)\n\n"
                              "Without argument, this command lists all "