From b60aec975ba13d347edd3a110cbfef7699bc3cfb Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Mon, 25 Feb 2013 08:46:41 +0100
Subject: [PATCH] script: add control of autoload (enable/disable/toggle) (task
 #12393)

New option script.scripts.autoload, new options autoload/noautoload/toggleautoload
for command /script, new action "A" (meta-A) on script buffer (toggle autoload).
---
 ChangeLog                               |   5 +-
 doc/de/autogen/user/script_commands.txt |  92 ++++++------
 doc/de/autogen/user/script_options.txt  |   5 +
 doc/en/autogen/user/script_commands.txt |  34 +++--
 doc/en/autogen/user/script_options.txt  |   5 +
 doc/fr/autogen/user/script_commands.txt |  34 +++--
 doc/fr/autogen/user/script_options.txt  |   5 +
 doc/it/autogen/user/script_commands.txt |  34 +++--
 doc/it/autogen/user/script_options.txt  |   5 +
 doc/ja/autogen/user/script_commands.txt |  96 ++++++------
 doc/ja/autogen/user/script_options.txt  |   5 +
 po/cs.po                                |  73 +++++----
 po/de.po                                |  79 ++++++----
 po/es.po                                |  73 +++++----
 po/fr.po                                | 122 +++++++++------
 po/hu.po                                |  73 +++++----
 po/it.po                                |  73 +++++----
 po/ja.po                                |  77 ++++++----
 po/pl.po                                |  77 ++++++----
 po/pt_BR.po                             |  73 +++++----
 po/ru.po                                |  73 +++++----
 po/weechat.pot                          |  69 +++++----
 src/plugins/guile/weechat-guile.c       |  28 +++-
 src/plugins/lua/weechat-lua.c           |  34 ++++-
 src/plugins/perl/weechat-perl.c         |  34 ++++-
 src/plugins/plugin-script.c             | 188 +++++++++++++++++++-----
 src/plugins/plugin-script.h             |   3 +
 src/plugins/python/weechat-python.c     |  31 +++-
 src/plugins/ruby/weechat-ruby.c         |  34 ++++-
 src/plugins/script/script-action.c      |  99 ++++++++++++-
 src/plugins/script/script-buffer.c      |  44 +++---
 src/plugins/script/script-command.c     |  42 ++++--
 src/plugins/script/script-config.c      |   8 +
 src/plugins/script/script-config.h      |   1 +
 src/plugins/tcl/weechat-tcl.c           |  34 ++++-
 35 files changed, 1227 insertions(+), 535 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60f959415..ab7234c48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-dev, 2013-02-23
+v0.4.1-dev, 2013-02-25
 
 
 This document lists all changes for each version.
@@ -54,6 +54,9 @@ Version 0.4.1 (under dev!)
 * rmodifier: rename default rmodifier "nickserv" to "command_auth" (with new
   modifier "irc_command_auth"), add default rmodifier "message_auth" (modifier
   "irc_message_auth")
+* script: add option script.scripts.autoload, add options "autoload",
+  "noautoload" and "toggleautoload" for command /script, add action "A" (meta-A)
+  on script buffer (toggle autoload) (task #12393)
 * scripts: do not allow empty script name in function "register"
 
 Version 0.4.0 (2013-01-20)
diff --git a/doc/de/autogen/user/script_commands.txt b/doc/de/autogen/user/script_commands.txt
index 4e3d55d6d..d73fd843a 100644
--- a/doc/de/autogen/user/script_commands.txt
+++ b/doc/de/autogen/user/script_commands.txt
@@ -5,62 +5,66 @@
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <script> [<script>...]
          install|remove|installremove|hold [-q] <script> [<script>...]
          upgrade
          update
 
-    list: gibt alle geladenen Skripten im Buffer aus (unabhängig der Programmiersprache)
-           -o: gibt eine Liste der gestarteten Skripten im Buffer aus
-           -i: eine Liste der gestarteten Skripten wird in die Eingabezeile kopiert (um sie dann manuell in einen Buffer zu senden)
-  search: sucht Skripten nach Schlagwörtern oder beliebigem Text. Das Ergebnis wird im Skripten-Buffer dargestellt
-    show: zeigt detailliert Informationen zu einem Skript an
-    load: startet Skript(en)
-  unload: beendet Skript(en)
-  reload: Skript(en) werden neu geladen
- install: installiert/aktualisiert Skript(en) (physikalisch, auf dem Datenträger)
-  remove: deinstalliert Skript(en) (physikalisch, vom Datenträger)
-installremove: installiert oder deinstalliert Skript(en), abhängig davon welcher Status vorliegt
-    hold: halten/freigeben von Skript(en) (ein Skript welches gehalten wird, kann weder aktualisiert noch entfernt werden)
-           -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
- upgrade: aktualisiert alle installierten Skripten, die obsolet sind (wenn eine neue Version verfügbar ist)
-  update: aktualisiert den lokalen Cache für die Skripten
+          list: list loaded scripts (all languages)
+            -o: send list of loaded scripts to buffer
+            -i: copy list of loaded scripts in command line (for sending to buffer)
+        search: search scripts by tags or text and display result on scripts buffer
+          show: show detailed info about a script
+          load: load script(s)
+        unload: unload script(s)
+        reload: reload script(s)
+      autoload: autoload the script
+    noautoload: do not autoload the script
+toggleautoload: toggle autoload
+       install: install/upgrade script(s)
+        remove: remove script(s)
+ installremove: install or remove script(s), depending on current state
+          hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
+            -q: quiet mode: do not display messages
+       upgrade: upgrade all installed scripts which are obsolete (new version available)
+        update: update local scripts cache
 
-Ohne Angaben von Argumenten öffnet dieser Befehl einen Buffer in welchem eine Liste der Skripten dargestellt wird.
+Without argument, this command opens a buffer with list of scripts.
 
-Im Skript-Buffer, werden folgende Statusangaben zu einem Skript angezeigt:
+On script buffer, the possible status for each script are:
   * i a H r N
   | | | | | |
-  | | | | | obsolete (neue Version verfügbar)
-  | | | | Skript wird ausgeführt (geladen)
-  | | | gehalten
-  | | Skript wird beim Start, von Weechat, automatisch gestartet
-  | Skript ist installiert (wird aber nicht ausgeführt)
-  es wird empfohlen dieses Skript zu installieren
+  | | | | | obsolete (new version available)
+  | | | | running (loaded)
+  | | | held
+  | | autoloaded
+  | installed
+  popular script
 
-Tastenbefehle die im Skript-Buffer genutzt werden können:
-  alt+i  installiert Skript (physikalisch)
-  alt+r  deinstalliert Skript (physikalisch
-  alt+l  startet ein Skript (Skript wird ausgeführt)
-  alt+L  Skript wird neu gestartet
-  alt+u  beendet ein Skript
-  alt+h  Skript wird gehalten bzw. freigegeben
-  alt+v  Skript anzeigen
+Keys on script buffer:
+  alt+i  install script
+  alt+r  remove script
+  alt+l  load script
+  alt+L  reload script
+  alt+u  unload script
+  alt+h  (un)hold script
+  alt+v  view script
 
-Befehle die in der Eingabezeile des Skript-Buffers eingegeben werden können:
-  i/r/l/L/u/h  Aktionen die für ein Skript ausgeführt werden können (siehe Tastenbefehle, weiter oben)
-  q            schließt den Buffer
-  $            Buffer wird aktualisiert
-  s:x,y        Buffer wird nach den Vorgaben x und y  sortiert (siehe /help script.look.sort)
-  s:           die Sortierung des Buffers wird zurückgesetzt (Standardwerte werden genutzt)
-  word(s)      Skripten werden gefiltert: sucht nach einem oder mehreren Wörtern in den Skripten (der Beschreibung, in den Schlagwörtern, ...)
-  *            Filter wird zurückgesetzt
+Input allowed on script buffer:
+  i/r/l/L/u/h  action on script (same as keys above)
+  q            close buffer
+  $            refresh buffer
+  s:x,y        sort buffer using keys x and y (see /help script.look.sort)
+  s:           reset sort (use default sort)
+  word(s)      filter scripts: search word(s) in scripts (description, tags, ...)
+  *            remove filter
 
-Mausbefehle innerhalb des Skripten-Buffer:
-  Mausrad            in der Liste scrollen
-  linke Maustaste    Skript anwählen
-  rechte Maustaste   Skript installieren/entfernen
+Mouse actions on script buffer:
+  wheel         scroll list
+  left button   select script
+  right button  install/remove script
 
-Beispiele:
+Examples:
   /script search url
   /script install iset.pl buffers.pl
   /script remove iset.pl
diff --git a/doc/de/autogen/user/script_options.txt b/doc/de/autogen/user/script_options.txt
index ae4b5108e..4261930d2 100644
--- a/doc/de/autogen/user/script_options.txt
+++ b/doc/de/autogen/user/script_options.txt
@@ -168,6 +168,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** Beschreibung: `autoload scripts installed (make a link in "autoload" directory to script in parent directory`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
 ** Beschreibung: `Ablaufdatum des lokalen Caches, in Minuten (-1 = ohne Ablaufdatum, 0 = umgehend)`
 ** Typ: integer
diff --git a/doc/en/autogen/user/script_commands.txt b/doc/en/autogen/user/script_commands.txt
index 4455af8b9..f36095f05 100644
--- a/doc/en/autogen/user/script_commands.txt
+++ b/doc/en/autogen/user/script_commands.txt
@@ -5,25 +5,29 @@
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <script> [<script>...]
          install|remove|installremove|hold [-q] <script> [<script>...]
          upgrade
          update
 
-         list: list loaded scripts (all languages)
-           -o: send list of loaded scripts to buffer
-           -i: copy list of loaded scripts in command line (for sending to buffer)
-       search: search scripts by tags or text and display result on scripts buffer
-         show: show detailed info about a script
-         load: load script(s)
-       unload: unload script(s)
-       reload: reload script(s)
-      install: install/upgrade script(s)
-       remove: remove script(s)
-installremove: install or remove script(s), depending on current state
-         hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
-           -q: quiet mode: do not display messages
-      upgrade: upgrade all installed scripts which are obsolete (new version available)
-       update: update local scripts cache
+          list: list loaded scripts (all languages)
+            -o: send list of loaded scripts to buffer
+            -i: copy list of loaded scripts in command line (for sending to buffer)
+        search: search scripts by tags or text and display result on scripts buffer
+          show: show detailed info about a script
+          load: load script(s)
+        unload: unload script(s)
+        reload: reload script(s)
+      autoload: autoload the script
+    noautoload: do not autoload the script
+toggleautoload: toggle autoload
+       install: install/upgrade script(s)
+        remove: remove script(s)
+ installremove: install or remove script(s), depending on current state
+          hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
+            -q: quiet mode: do not display messages
+       upgrade: upgrade all installed scripts which are obsolete (new version available)
+        update: update local scripts cache
 
 Without argument, this command opens a buffer with list of scripts.
 
diff --git a/doc/en/autogen/user/script_options.txt b/doc/en/autogen/user/script_options.txt
index d180d8402..ddaea279f 100644
--- a/doc/en/autogen/user/script_options.txt
+++ b/doc/en/autogen/user/script_options.txt
@@ -168,6 +168,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** description: `autoload scripts installed (make a link in "autoload" directory to script in parent directory`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
 ** description: `local cache expiration time, in minutes (-1 = never expires, 0 = always expire)`
 ** type: integer
diff --git a/doc/fr/autogen/user/script_commands.txt b/doc/fr/autogen/user/script_commands.txt
index feda348b2..085b1f92a 100644
--- a/doc/fr/autogen/user/script_commands.txt
+++ b/doc/fr/autogen/user/script_commands.txt
@@ -5,25 +5,29 @@
          search <texte>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <script> [<script>...]
          install|remove|installremove|hold [-q] <script> [<script>...]
          upgrade
          update
 
-         list: lister les scripts chargés (tous les langages)
-           -o: envoyer la liste des scripts chargés au tampon
-           -i: copier la liste des scripts chargés dans la ligne de commande (pour envoi au tampon)
-       search: chercher des scripts par étiquettes ou texte et afficher le résultat sur le tampon des scripts
-         show: afficher des infos détaillées sur le script
-         load: charger un ou plusieurs scripts
-       unload: décharger un ou plusieurs scripts
-       reload: recharger un ou plusieurs scripts
-      install: installer/mettre à jour un ou plusieurs scripts
-       remove: supprimer un ou plusieurs scripts
-installremove: installer ou supprimer un ou plusieurs scripts, selon l'état courant
-         hold: figer/défiger un ou plusieurs scripts (un script figé ne sera plus mis à jour et ne peut pas être supprimé)
-           -q: mode silencieux: ne pas afficher de messages
-      upgrade: mettre à jour les scripts obsolètes (avec nouvelle version disponible)
-       update: mettre à jour le cache local des scripts
+          list: lister les scripts chargés (tous les langages)
+            -o: envoyer la liste des scripts chargés au tampon
+            -i: copier la liste des scripts chargés dans la ligne de commande (pour envoi au tampon)
+        search: chercher des scripts par étiquettes ou texte et afficher le résultat sur le tampon des scripts
+          show: afficher des infos détaillées sur le script
+          load: charger un ou plusieurs scripts
+        unload: décharger un ou plusieurs scripts
+        reload: recharger un ou plusieurs scripts
+      autoload: charger automatiquement un ou plusieurs scripts
+    noautoload: ne pas charger automatiquement un ou plusieurs scripts
+toggleautoload: activer/désactiver le chargement automatique
+       install: installer/mettre à jour un ou plusieurs scripts
+        remove: supprimer un ou plusieurs scripts
+ installremove: installer ou supprimer un ou plusieurs scripts, selon l'état courant
+          hold: figer/défiger un ou plusieurs scripts (un script figé ne sera plus mis à jour et ne peut pas être supprimé)
+            -q: mode silencieux: ne pas afficher de messages
+       upgrade: mettre à jour les scripts obsolètes (avec nouvelle version disponible)
+        update: mettre à jour le cache local des scripts
 
 Sans paramètre, cette commande ouvre un tampon avec la liste des scripts.
 
diff --git a/doc/fr/autogen/user/script_options.txt b/doc/fr/autogen/user/script_options.txt
index fd3593190..4d1ef6747 100644
--- a/doc/fr/autogen/user/script_options.txt
+++ b/doc/fr/autogen/user/script_options.txt
@@ -168,6 +168,11 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** description: `charger automatiquement les scripts installés (faire un lien dans le répertoire "autoload" vers le script dans le répertoire parent)`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
 * [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
 ** description: `temps d'expiration du cache local, en minutes (-1 = n'expire jamais, 0 = expire toujours)`
 ** type: entier
diff --git a/doc/it/autogen/user/script_commands.txt b/doc/it/autogen/user/script_commands.txt
index 7d40f68b7..c286ad8e5 100644
--- a/doc/it/autogen/user/script_commands.txt
+++ b/doc/it/autogen/user/script_commands.txt
@@ -5,25 +5,29 @@
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <script> [<script>...]
          install|remove|installremove|hold [-q] <script> [<script>...]
          upgrade
          update
 
-         list: list loaded scripts (all languages)
-           -o: send list of loaded scripts to buffer
-           -i: copy list of loaded scripts in command line (for sending to buffer)
-       search: search scripts by tags or text and display result on scripts buffer
-         show: show detailed info about a script
-         load: load script(s)
-       unload: unload script(s)
-       reload: reload script(s)
-      install: install/upgrade script(s)
-       remove: remove script(s)
-installremove: install or remove script(s), depending on current state
-         hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
-           -q: quiet mode: do not display messages
-      upgrade: upgrade all installed scripts which are obsolete (new version available)
-       update: update local scripts cache
+          list: list loaded scripts (all languages)
+            -o: send list of loaded scripts to buffer
+            -i: copy list of loaded scripts in command line (for sending to buffer)
+        search: search scripts by tags or text and display result on scripts buffer
+          show: show detailed info about a script
+          load: load script(s)
+        unload: unload script(s)
+        reload: reload script(s)
+      autoload: autoload the script
+    noautoload: do not autoload the script
+toggleautoload: toggle autoload
+       install: install/upgrade script(s)
+        remove: remove script(s)
+ installremove: install or remove script(s), depending on current state
+          hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
+            -q: quiet mode: do not display messages
+       upgrade: upgrade all installed scripts which are obsolete (new version available)
+        update: update local scripts cache
 
 Without argument, this command opens a buffer with list of scripts.
 
diff --git a/doc/it/autogen/user/script_options.txt b/doc/it/autogen/user/script_options.txt
index b5000fcc6..681e2e977 100644
--- a/doc/it/autogen/user/script_options.txt
+++ b/doc/it/autogen/user/script_options.txt
@@ -168,6 +168,11 @@
 ** tipo: bool
 ** valori: on, off (valore predefinito: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** descrizione: `autoload scripts installed (make a link in "autoload" directory to script in parent directory`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
 * [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
 ** descrizione: `local cache expiration time, in minutes (-1 = never expires, 0 = always expire)`
 ** tipo: intero
diff --git a/doc/ja/autogen/user/script_commands.txt b/doc/ja/autogen/user/script_commands.txt
index 8665029e9..8fe3e432b 100644
--- a/doc/ja/autogen/user/script_commands.txt
+++ b/doc/ja/autogen/user/script_commands.txt
@@ -1,66 +1,70 @@
 [[command_script_script]]
 [command]*`script`* WeeChat スクリプトマネージャ::
 ........................................
-/script  list
+/script  list [-o|-i]
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
-         install|remove|hold <script> [<script>...]
+         autoload|noautoload|toggleautoload <script> [<script>...]
+         install|remove|installremove|hold [-q] <script> [<script>...]
          upgrade
          update
 
-         list: ロード済みスクリプトの表示 (すべての言語)
-           -o: バッファにロード済みスクリプトのリストを表示
-           -i: コマンドラインにロード済みスクリプトのリストをコピー (バッファ送信用)
-       search: タグまたはテキストでスクリプトを検索し、スクリプトバッファに結果を表示
-         show: スクリプトに関する詳細を表示
-         load: スクリプトのロード (複数可)
-       unload: スクリプトのアンロード (複数可)
-       reload: スクリプトのリロード (複数可)
-      install: スクリプトのインストール/アップグレード (複数可)
-       remove: スクリプトの削除 (複数可)
-installremove: スクリプトのインストール又は削除 (複数可)、スクリプトの状態に依存
-         hold: スクリプトのホールド/アンホールド (複数可) (ホールドされたスクリプトはアップグレードされず、削除もできなくなる)
-           -q: 出力を抑制するモード: メッセージを表示しない
-      upgrade: 全ての古いインストール済みスクリプトをアップグレード (新バージョンが利用可能な場合)
-       update: ローカルスクリプトキャッシュのアップデート
+          list: list loaded scripts (all languages)
+            -o: send list of loaded scripts to buffer
+            -i: copy list of loaded scripts in command line (for sending to buffer)
+        search: search scripts by tags or text and display result on scripts buffer
+          show: show detailed info about a script
+          load: load script(s)
+        unload: unload script(s)
+        reload: reload script(s)
+      autoload: autoload the script
+    noautoload: do not autoload the script
+toggleautoload: toggle autoload
+       install: install/upgrade script(s)
+        remove: remove script(s)
+ installremove: install or remove script(s), depending on current state
+          hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
+            -q: quiet mode: do not display messages
+       upgrade: upgrade all installed scripts which are obsolete (new version available)
+        update: update local scripts cache
 
-引数がない場合、スクリプト表示用にバッファを開く
+Without argument, this command opens a buffer with list of scripts.
 
-スクリプトバッファでは、以下の状態識別子が利用できます:
+On script buffer, the possible status for each script are:
   * i a H r N
   | | | | | |
-  | | | | | アップデートが必要 (新バージョンが利用可能)
-  | | | | 起動済み (ロード済み)
-  | | | ホールド状態
-  | | 自動ロード
-  | インストール済み
-  人気のあるスクリプト
+  | | | | | obsolete (new version available)
+  | | | | running (loaded)
+  | | | held
+  | | autoloaded
+  | installed
+  popular script
 
-スクリプトバッファで利用可能なキーの組み合わせ:
-  alt+i  スクリプトのインストール
-  alt+r  スクリプトの削除
-  alt+l  スクリプトのロード
-  alt+L  スクリプトのリロード
-  alt+u  スクリプトのアンロード
-  alt+h  スクリプトの(アン)ホールド
-  alt+v  スクリプトの表示
+Keys on script buffer:
+  alt+i  install script
+  alt+r  remove script
+  alt+l  load script
+  alt+L  reload script
+  alt+u  unload script
+  alt+h  (un)hold script
+  alt+v  view script
 
-スクリプトバッファで利用可能な入力:
-  i/r/l/L/u/h  スクリプトに対するアクション (上記キーと同じ)
-  q            バッファを閉じる
-  $            バッファのリフレッシュ
-  s:x,y        x と y をキーにしてバッファをソート (/help script.look.sort 参照)
-  s:           ソート解除 (デフォルトのソート順)
-  word(s)      スクリプトのフィルタ: スクリプトを単語で検索 (複数可) (説明、タグ、...)
-  *            フィルタの解除
+Input allowed on script buffer:
+  i/r/l/L/u/h  action on script (same as keys above)
+  q            close buffer
+  $            refresh buffer
+  s:x,y        sort buffer using keys x and y (see /help script.look.sort)
+  s:           reset sort (use default sort)
+  word(s)      filter scripts: search word(s) in scripts (description, tags, ...)
+  *            remove filter
 
-スクリプトバッファにおけるマウス操作:
-  ホイール      リストのスクロール
-  左ボタン      スクリプトの選択
-  右ボタン      スクリプトのインストール / 削除
+Mouse actions on script buffer:
+  wheel         scroll list
+  left button   select script
+  right button  install/remove script
 
-例:
+Examples:
   /script search url
   /script install iset.pl buffers.pl
   /script remove iset.pl
diff --git a/doc/ja/autogen/user/script_options.txt b/doc/ja/autogen/user/script_options.txt
index be5dbddd7..8e8088c23 100644
--- a/doc/ja/autogen/user/script_options.txt
+++ b/doc/ja/autogen/user/script_options.txt
@@ -168,6 +168,11 @@
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** 説明: `autoload scripts installed (make a link in "autoload" directory to script in parent directory`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `on`)
+
 * [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
 ** 説明: `ローカルキャッシュが無効になる時間、分単位 (-1 = 再取得しない、0 = 常に再取得)`
 ** タイプ: 整数
diff --git a/po/cs.po b/po/cs.po
index ad7870c12..1b9d0b4f0 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8495,6 +8495,18 @@ msgstr "%s%s: skript \"%s\" nenačten"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s%s: skript \"%s\" nenačten"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: odebírám skript \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: odebírám skript \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s%s: skript \"%s\" nenalezen"
+
 #, fuzzy, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s: odebírám skript \"%s\""
@@ -8509,10 +8521,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: odebírám skript \"%s\""
 
-#, fuzzy, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s%s: skript \"%s\" nenalezen"
-
 #, fuzzy, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s%s: skript \"%s\" nenačten"
@@ -8605,9 +8613,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8619,30 +8627,34 @@ msgstr "stránka WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -8848,6 +8860,11 @@ msgstr "barva textu řádku vybraného klienta"
 msgid "background color for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9350,3 +9367,7 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s%s: skript \"%s\" nenačten"
diff --git a/po/de.po b/po/de.po
index 16d5d1297..6d6137816 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-02-23 18:30+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 18:31+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -9255,6 +9255,20 @@ msgstr "%s: Erweiterung \"%s\" ist nicht installiert"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: Das Skript \"%s\" wurde nicht installiert"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr ""
+"%s: Skript \"%s\" liegt in einer nicht unterstützen Programmiersprache vor"
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr ""
+"%s: Skript \"%s\" liegt in einer nicht unterstützen Programmiersprache vor"
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: Skript \"%s\" nicht gefunden"
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: Fehler beim Herunterladen des Skriptes \"%s\": %s"
@@ -9270,10 +9284,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: Lade Skript \"%s\" herunter..."
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: Skript \"%s\" nicht gefunden"
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: Skript \"%s\" ist nicht installiert"
@@ -9360,12 +9370,12 @@ msgstr "Max WeeChat"
 msgid "Alt+key/input: v=back to list d=jump to diff"
 msgstr "Alt+Taste/Eingabezeile: v=zurück zur Liste d=gehe zu Diff"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 "%d/%d Skripten (Filter: %s) | Sortierung: %s | Alt+Taste/Eingabe: "
 "i=installieren r=entfernen l=starten L=erneut starten u=beenden h=halten/"
@@ -9379,35 +9389,41 @@ msgstr "Skripten"
 msgid "WeeChat scripts manager"
 msgstr "WeeChat Skripten-Manager"
 
+#, fuzzy
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
 "<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 
+#, fuzzy
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9708,6 +9724,11 @@ msgstr ""
 msgid "background color for selected line in script buffer"
 msgstr "Hintergrundfarbe"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -10225,3 +10246,7 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Konstanten"
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: Das Skript \"%s\" wurde nicht installiert"
diff --git a/po/es.po b/po/es.po
index e38f382ad..209ed2e06 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8755,6 +8755,18 @@ msgstr "%s: el plugin \"%s\" no está cargado"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: el script \"%s\" no está cargado"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: lenguaje del script \"%s\" desconocido"
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: lenguaje del script \"%s\" desconocido"
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: script \"%s\" no encontrado"
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: error al descargar el script \"%s\": %s"
@@ -8769,10 +8781,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: descargando el script \"%s\"..."
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: script \"%s\" no encontrado"
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: el script \"%s\" no esta instalado"
@@ -8859,9 +8867,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8872,30 +8880,34 @@ msgstr "Administrador de scripts de WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9089,6 +9101,11 @@ msgstr ""
 msgid "background color for selected line in script buffer"
 msgstr "color de fondo para la línea seleccionada en el buffer de scripts"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9593,3 +9610,7 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Constantes"
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: el script \"%s\" no está cargado"
diff --git a/po/fr.po b/po/fr.po
index d535c914f..ffe736d56 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-02-23 12:49+0100\n"
-"PO-Revision-Date: 2013-02-23 12:50+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
+"PO-Revision-Date: 2013-02-24 22:19+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -9011,6 +9011,18 @@ msgstr "%s: l'extension \"%s\" n'est pas chargée"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: script \"%s\" non chargé"
 
+#, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: chargement automatique activé pour le script \"%s\""
+
+#, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: chargement automatique désactivé pour le script \"%s\""
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: script \"%s\" non trouvé"
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: erreur de téléchargement du script \"%s\": %s"
@@ -9026,10 +9038,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: téléchargement du script \"%s\"..."
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: script \"%s\" non trouvé"
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: le script \"%s\" n'est pas installé"
@@ -9117,14 +9125,14 @@ msgstr "Alt+touche/entrée: v=retour à la liste d=sauter au diff"
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 "%d/%d scripts (filtre: %s) | Tri: %s | Alt+touche/entrée: i=installer "
-"r=supprimer l=charger L=recharger u=décharger h=(dé)figer v=voir script | "
-"Entrée: q=fermer $=rafraîchir s:x,y=trier words=filtrer *=réinit filtre | "
-"Souris: gauche=sélectionner droit=installer/supprimer"
+"r=supprimer l=charger L=recharger u=décharger A=chargement auto h=(dé)figer "
+"v=voir script | Entrée: q=fermer $=rafraîchir s:x,y=trier words=filtrer "
+"*=réinit filtre | Souris: gauche=sélectionner droit=installer/supprimer"
 
 msgid "Scripts"
 msgstr "Scripts"
@@ -9134,33 +9142,38 @@ msgstr "Gestionnaire de scripts WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 "list [-o|-i] || search <texte> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9206,26 +9219,29 @@ msgid ""
 "  /script reload urlserver\n"
 "  /script upgrade"
 msgstr ""
-"         list: lister les scripts chargés (tous les langages)\n"
-"           -o: envoyer la liste des scripts chargés au tampon\n"
-"           -i: copier la liste des scripts chargés dans la ligne de commande "
-"(pour envoi au tampon)\n"
-"       search: chercher des scripts par étiquettes ou texte et afficher le "
+"          list: lister les scripts chargés (tous les langages)\n"
+"            -o: envoyer la liste des scripts chargés au tampon\n"
+"            -i: copier la liste des scripts chargés dans la ligne de "
+"commande (pour envoi au tampon)\n"
+"        search: chercher des scripts par étiquettes ou texte et afficher le "
 "résultat sur le tampon des scripts\n"
-"         show: afficher des infos détaillées sur le script\n"
-"         load: charger un ou plusieurs scripts\n"
-"       unload: décharger un ou plusieurs scripts\n"
-"       reload: recharger un ou plusieurs scripts\n"
-"      install: installer/mettre à jour un ou plusieurs scripts\n"
-"       remove: supprimer un ou plusieurs scripts\n"
-"installremove: installer ou supprimer un ou plusieurs scripts, selon l'état "
+"          show: afficher des infos détaillées sur le script\n"
+"          load: charger un ou plusieurs scripts\n"
+"        unload: décharger un ou plusieurs scripts\n"
+"        reload: recharger un ou plusieurs scripts\n"
+"      autoload: charger automatiquement un ou plusieurs scripts\n"
+"    noautoload: ne pas charger automatiquement un ou plusieurs scripts\n"
+"toggleautoload: activer/désactiver le chargement automatique\n"
+"       install: installer/mettre à jour un ou plusieurs scripts\n"
+"        remove: supprimer un ou plusieurs scripts\n"
+" installremove: installer ou supprimer un ou plusieurs scripts, selon l'état "
 "courant\n"
-"         hold: figer/défiger un ou plusieurs scripts (un script figé ne sera "
-"plus mis à jour et ne peut pas être supprimé)\n"
-"           -q: mode silencieux: ne pas afficher de messages\n"
-"      upgrade: mettre à jour les scripts obsolètes (avec nouvelle version "
+"          hold: figer/défiger un ou plusieurs scripts (un script figé ne "
+"sera plus mis à jour et ne peut pas être supprimé)\n"
+"            -q: mode silencieux: ne pas afficher de messages\n"
+"       upgrade: mettre à jour les scripts obsolètes (avec nouvelle version "
 "disponible)\n"
-"       update: mettre à jour le cache local des scripts\n"
+"        update: mettre à jour le cache local des scripts\n"
 "\n"
 "Sans paramètre, cette commande ouvre un tampon avec la liste des scripts.\n"
 "\n"
@@ -9448,6 +9464,13 @@ msgstr ""
 msgid "background color for selected line in script buffer"
 msgstr "couleur du fond pour la ligne sélectionnée dans le tampon script"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+"charger automatiquement les scripts installés (faire un lien dans le "
+"répertoire \"autoload\" vers le script dans le répertoire parent)"
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9963,3 +9986,6 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Constantes"
+
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: le script \"%s\" est maintenant automatiquement chargé"
diff --git a/po/hu.po b/po/hu.po
index 564c2eaf1..8ae914e02 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7952,6 +7952,18 @@ msgstr "%s a \"%s\" szerver nem található\n"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s a \"%s\" szerver nem található\n"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "folyamat: \"%s\" szerver betöltése\n"
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "folyamat: \"%s\" szerver betöltése\n"
+
+#, fuzzy, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s a \"%s\" szerver nem található\n"
+
 #, fuzzy, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "folyamat: \"%s\" szerver betöltése\n"
@@ -7967,10 +7979,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "folyamat: \"%s\" szerver betöltése\n"
 
-#, fuzzy, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s a \"%s\" szerver nem található\n"
-
 #, fuzzy, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s a \"%s\" szerver nem található\n"
@@ -8065,9 +8073,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8079,30 +8087,34 @@ msgstr "WeeChat szlogen"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -8308,6 +8320,11 @@ msgstr "szerver nevének színe"
 msgid "background color for selected line in script buffer"
 msgstr "szerver nevének színe"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -8826,3 +8843,7 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s a \"%s\" szerver nem található\n"
diff --git a/po/it.po b/po/it.po
index 992345338..90b6fecc3 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8787,6 +8787,18 @@ msgstr "%s: il plugin \"%s\" non caricato"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: script \"%s\" non caricato"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: linguaggio sconosciuto per lo script \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: linguaggio sconosciuto per lo script \"%s\""
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: script \"%s\" non trovato"
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: errore durante il download dello script \"%s\": %s"
@@ -8802,10 +8814,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: download dello script \"%s\"..."
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: script \"%s\" non trovato"
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: script \"%s\" non installato"
@@ -8893,9 +8901,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8906,30 +8914,34 @@ msgstr "Gestore script di WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9127,6 +9139,11 @@ msgstr "colore della riga selezionata nel buffer xfer"
 msgid "background color for selected line in script buffer"
 msgstr "colore della riga selezionata nel buffer xfer"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9625,3 +9642,7 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Costanti"
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: script \"%s\" non caricato"
diff --git a/po/ja.po b/po/ja.po
index 649fb1fb3..78f9ea78c 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -8695,6 +8695,18 @@ msgstr "%s: プラグイン \"%s\" はロードされていません"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: スクリプト \"%s\" はロードされていません"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: スクリプト \"%s\" は利用できない言語で書かれています"
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: スクリプト \"%s\" は利用できない言語で書かれています"
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: スクリプト \"%s\" が見つかりません"
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: スクリプト \"%s\" のダウンロード中にエラーが発生: %s"
@@ -8710,10 +8722,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: スクリプト \"%s\" のダウンロード中"
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: スクリプト \"%s\" が見つかりません"
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: スクリプト \"%s\" はインストールされていません"
@@ -8798,12 +8806,12 @@ msgstr "WeeChat を最大化"
 msgid "Alt+key/input: v=back to list d=jump to diff"
 msgstr "Alt+key/input: v=リストに戻る d=比較する"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 "%d/%d 個のスクリプト (フィルタ: %s) | ソート: %s | Alt+key/input: i=インス"
 "トール r=削除 l=ロード L=リロード u=アンロード h=(アン)ホールド v=スクリプト"
@@ -8816,35 +8824,41 @@ msgstr "スクリプト"
 msgid "WeeChat scripts manager"
 msgstr "WeeChat スクリプトマネージャ"
 
+#, fuzzy
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 "list || search <text> || show <script> || load|unload|reload <script> "
 "[<script>...] || install|remove|hold <script> [<script>...] || upgrade || "
 "update"
 
+#, fuzzy
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9112,6 +9126,11 @@ msgstr "スクリプトバッファ内のロード済みバージョンが選択
 msgid "background color for selected line in script buffer"
 msgstr "スクリプトバッファ内の選択行の背景色"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9611,3 +9630,7 @@ msgstr "タイプ"
 
 msgid "Constants"
 msgstr "定数"
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: スクリプト \"%s\" はロードされていません"
diff --git a/po/pl.po b/po/pl.po
index ee1fb6de5..9dc30abd8 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:11+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8842,6 +8842,18 @@ msgstr "%s: wtyczka \"%s\" nie załadowana"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s: skrypt \"%s\" nie załadowany"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: nieznany język dla skryptu \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: nieznany język dla skryptu \"%s\""
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s: nie znaleziono skryptu \"%s\""
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s%s: błąd podczas pobierania skryptu \"%s\": %s"
@@ -8857,10 +8869,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: pobieram skrypt \"%s\"..."
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s: nie znaleziono skryptu \"%s\""
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s: skrypt \"%s\" nie zainstalowany"
@@ -8945,12 +8953,12 @@ msgstr "Max WeeChat"
 msgid "Alt+key/input: v=back to list d=jump to diff"
 msgstr "Alt+klawisz/wejście: v=wróć do listy d=skocz do diff"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 "%d/%d skrypty (filtry: %s) | Sort: %s | Alt+klawisz/wejście: i=instaluj "
 "r=usuń l=załaduj L=przeładuj u=wyładuj h=(un)hold v=pokaż skrypt | Wejście: "
@@ -8963,35 +8971,41 @@ msgstr "Skrypty"
 msgid "WeeChat scripts manager"
 msgstr "Manager skryptów  WeeChat"
 
+#, fuzzy
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 "list [-o|-i] || search <tekst> || show <skrypt> || load|unload|reload "
 "<skrypt> [<skrypt>...] || install|remove|installremove|hold [-q] <skrypt> "
 "[<skrypt>...] || upgrade || update"
 
+#, fuzzy
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -9266,6 +9280,11 @@ msgstr ""
 msgid "background color for selected line in script buffer"
 msgstr "kolor tła dla zaznaczonej linii w buforze skryptów"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -9765,3 +9784,7 @@ msgstr "Typ"
 
 msgid "Constants"
 msgstr "Stałe"
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s: skrypt \"%s\" nie załadowany"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4a40af5a3..f37a6e624 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:12+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8117,6 +8117,18 @@ msgstr "%s%s: script \"%s\" não carregado"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s%s: script \"%s\" não carregado"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "%s: descarregando script \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "%s: descarregando script \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s%s: script \"%s\" não encontrado"
+
 #, fuzzy, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "%s: descarregando script \"%s\""
@@ -8131,10 +8143,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "%s: descarregando script \"%s\""
 
-#, fuzzy, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s%s: script \"%s\" não encontrado"
-
 #, fuzzy, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s%s: script \"%s\" não carregado"
@@ -8227,9 +8235,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8241,30 +8249,34 @@ msgstr "site do WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -8470,6 +8482,11 @@ msgstr "cor do texto da linha do cliente selecionada"
 msgid "background color for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -8979,3 +8996,7 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s%s: script \"%s\" não carregado"
diff --git a/po/ru.po b/po/ru.po
index 49594f846..eef3ff3de 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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-23 11:12+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7975,6 +7975,18 @@ msgstr "%s сервер \"%s\" не найден\n"
 msgid "%s: script \"%s\" is not loaded"
 msgstr "%s сервер \"%s\" не найден\n"
 
+#, fuzzy, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr "сессия: загружаю сервер \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr "сессия: загружаю сервер \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: script \"%s\" not found"
+msgstr "%s сервер \"%s\" не найден\n"
+
 #, fuzzy, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr "сессия: загружаю сервер \"%s\"\n"
@@ -7990,10 +8002,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr "сессия: загружаю сервер \"%s\"\n"
 
-#, fuzzy, c-format
-msgid "%s: script \"%s\" not found"
-msgstr "%s сервер \"%s\" не найден\n"
-
 #, fuzzy, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr "%s сервер \"%s\" не найден\n"
@@ -8088,9 +8096,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -8102,30 +8110,34 @@ msgstr "слоган WeeChat"
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -8331,6 +8343,11 @@ msgstr "цвет названия сервера"
 msgid "background color for selected line in script buffer"
 msgstr "цвет названия сервера"
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
@@ -8843,3 +8860,7 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: script \"%s\" is now autoloaded"
+#~ msgstr "%s сервер \"%s\" не найден\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 46c25a576..eb0ce4384 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -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-02-23 12:49+0100\n"
+"POT-Creation-Date: 2013-02-24 22:17+0100\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7045,6 +7045,18 @@ msgstr ""
 msgid "%s: script \"%s\" is not loaded"
 msgstr ""
 
+#, c-format
+msgid "%s: autoload enabled for script \"%s\""
+msgstr ""
+
+#, c-format
+msgid "%s: autoload disabled for script \"%s\""
+msgstr ""
+
+#, c-format
+msgid "%s: script \"%s\" not found"
+msgstr ""
+
 #, c-format
 msgid "%s%s: error downloading script \"%s\": %s"
 msgstr ""
@@ -7058,10 +7070,6 @@ msgstr ""
 msgid "%s: downloading script \"%s\"..."
 msgstr ""
 
-#, c-format
-msgid "%s: script \"%s\" not found"
-msgstr ""
-
 #, c-format
 msgid "%s: script \"%s\" is not installed"
 msgstr ""
@@ -7147,9 +7155,9 @@ msgstr ""
 #, c-format
 msgid ""
 "%d/%d scripts (filter: %s) | Sort: %s | Alt+key/input: i=install r=remove "
-"l=load L=reload u=unload h=(un)hold v=view script | Input: q=close $=refresh "
-"s:x,y=sort words=filter *=reset filter | Mouse: left=select right=install/"
-"remove"
+"l=load L=reload u=unload A=autoload h=(un)hold v=view script | Input: "
+"q=close $=refresh s:x,y=sort words=filter *=reset filter | Mouse: "
+"left=select right=install/remove"
 msgstr ""
 
 msgid "Scripts"
@@ -7160,30 +7168,34 @@ msgstr ""
 
 msgid ""
 "list [-o|-i] || search <text> || show <script> || load|unload|reload "
-"<script> [<script>...] || install|remove|installremove|hold [-q] <script> "
+"<script> [<script>...] || autoload|noautoload|toggleautoload <script> "
+"[<script>...] || install|remove|installremove|hold [-q] <script> "
 "[<script>...] || upgrade || update"
 msgstr ""
 
 msgid ""
-"         list: list loaded scripts (all languages)\n"
-"           -o: send list of loaded scripts to buffer\n"
-"           -i: copy list of loaded scripts in command line (for sending to "
+"          list: list loaded scripts (all languages)\n"
+"            -o: send list of loaded scripts to buffer\n"
+"            -i: copy list of loaded scripts in command line (for sending to "
 "buffer)\n"
-"       search: search scripts by tags or text and display result on scripts "
+"        search: search scripts by tags or text and display result on scripts "
 "buffer\n"
-"         show: show detailed info about a script\n"
-"         load: load script(s)\n"
-"       unload: unload script(s)\n"
-"       reload: reload script(s)\n"
-"      install: install/upgrade script(s)\n"
-"       remove: remove script(s)\n"
-"installremove: install or remove script(s), depending on current state\n"
-"         hold: hold/unhold script(s) (a script held will not be upgraded any "
-"more and cannot be removed)\n"
-"           -q: quiet mode: do not display messages\n"
-"      upgrade: upgrade all installed scripts which are obsolete (new version "
-"available)\n"
-"       update: update local scripts cache\n"
+"          show: show detailed info about a script\n"
+"          load: load script(s)\n"
+"        unload: unload script(s)\n"
+"        reload: reload script(s)\n"
+"      autoload: autoload the script\n"
+"    noautoload: do not autoload the script\n"
+"toggleautoload: toggle autoload\n"
+"       install: install/upgrade script(s)\n"
+"        remove: remove script(s)\n"
+" installremove: install or remove script(s), depending on current state\n"
+"          hold: hold/unhold script(s) (a script held will not be upgraded "
+"any more and cannot be removed)\n"
+"            -q: quiet mode: do not display messages\n"
+"       upgrade: upgrade all installed scripts which are obsolete (new "
+"version available)\n"
+"        update: update local scripts cache\n"
 "\n"
 "Without argument, this command opens a buffer with list of scripts.\n"
 "\n"
@@ -7366,6 +7378,11 @@ msgstr ""
 msgid "background color for selected line in script buffer"
 msgstr ""
 
+msgid ""
+"autoload scripts installed (make a link in \"autoload\" directory to script "
+"in parent directory"
+msgstr ""
+
 msgid ""
 "local cache expiration time, in minutes (-1 = never expires, 0 = always "
 "expire)"
diff --git a/src/plugins/guile/weechat-guile.c b/src/plugins/guile/weechat-guile.c
index 154bcba73..ba4a13373 100644
--- a/src/plugins/guile/weechat-guile.c
+++ b/src/plugins/guile/weechat-guile.c
@@ -60,7 +60,7 @@ struct t_guile_function
 
 /*
  * string used to execute action "install":
- * when signal "guile_install_script" is received, name of string
+ * when signal "guile_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -68,12 +68,20 @@ char *guile_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "guile_remove_script" is received, name of string
+ * when signal "guile_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *guile_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "guile_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *guile_action_autoload_list = NULL;
+
 
 /*
  * Flushes stdout.
@@ -815,6 +823,12 @@ weechat_guile_timer_action_cb (void *data, int remaining_calls)
                                          &guile_quiet,
                                          &guile_action_remove_list);
         }
+        else if (data == &guile_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_guile_plugin,
+                                           &guile_quiet,
+                                           &guile_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -850,6 +864,14 @@ weechat_guile_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_guile_timer_action_cb,
                                 &guile_action_remove_list);
         }
+        else if (strcmp (signal, "guile_script_autoload") == 0)
+        {
+            plugin_script_action_add (&guile_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_guile_timer_action_cb,
+                                &guile_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -971,6 +993,8 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
         free (guile_action_install_list);
     if (guile_action_remove_list)
         free (guile_action_remove_list);
+    if (guile_action_autoload_list)
+        free (guile_action_autoload_list);
 
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/lua/weechat-lua.c b/src/plugins/lua/weechat-lua.c
index 824ec2d48..cdd4990e4 100644
--- a/src/plugins/lua/weechat-lua.c
+++ b/src/plugins/lua/weechat-lua.c
@@ -52,7 +52,7 @@ lua_State *lua_current_interpreter = NULL;
 
 /*
  * string used to execute action "install":
- * when signal "lua_install_script" is received, name of string
+ * when signal "lua_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -60,12 +60,20 @@ char *lua_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "lua_remove_script" is received, name of string
+ * when signal "lua_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *lua_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "lua_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *lua_action_autoload_list = NULL;
+
 
 /*
  * Callback called for each key/value in a hashtable.
@@ -769,6 +777,12 @@ weechat_lua_timer_action_cb (void *data, int remaining_calls)
                                          &lua_quiet,
                                          &lua_action_remove_list);
         }
+        else if (data == &lua_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_lua_plugin,
+                                           &lua_quiet,
+                                           &lua_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -804,6 +818,14 @@ weechat_lua_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_lua_timer_action_cb,
                                 &lua_action_remove_list);
         }
+        else if (strcmp (signal, "lua_script_autoload") == 0)
+        {
+            plugin_script_action_add (&lua_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_lua_timer_action_cb,
+                                &lua_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -852,5 +874,13 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     plugin_script_end (plugin, &lua_scripts, &weechat_lua_unload_all);
     lua_quiet = 0;
 
+    /* free some data */
+    if (lua_action_install_list)
+        free (lua_action_install_list);
+    if (lua_action_remove_list)
+        free (lua_action_remove_list);
+    if (lua_action_autoload_list)
+        free (lua_action_autoload_list);
+
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/perl/weechat-perl.c b/src/plugins/perl/weechat-perl.c
index 785733aeb..9c61950a1 100644
--- a/src/plugins/perl/weechat-perl.c
+++ b/src/plugins/perl/weechat-perl.c
@@ -50,7 +50,7 @@ int perl_quit_or_upgrade = 0;
 
 /*
  * string used to execute action "install":
- * when signal "perl_install_script" is received, name of string
+ * when signal "perl_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -58,12 +58,20 @@ char *perl_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "perl_remove_script" is received, name of string
+ * when signal "perl_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *perl_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "perl_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *perl_action_autoload_list = NULL;
+
 #ifdef NO_PERL_MULTIPLICITY
 #undef MULTIPLICITY
 #endif
@@ -850,6 +858,12 @@ weechat_perl_timer_action_cb (void *data, int remaining_calls)
                                          &perl_quiet,
                                          &perl_action_remove_list);
         }
+        else if (data == &perl_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_perl_plugin,
+                                           &perl_quiet,
+                                           &perl_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -885,6 +899,14 @@ weechat_perl_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_perl_timer_action_cb,
                                 &perl_action_remove_list);
         }
+        else if (strcmp (signal, "perl_script_autoload") == 0)
+        {
+            plugin_script_action_add (&perl_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_perl_timer_action_cb,
+                                &perl_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -1003,5 +1025,13 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
         PERL_SYS_TERM ();
 #endif
 
+    /* free some data */
+    if (perl_action_install_list)
+        free (perl_action_install_list);
+    if (perl_action_remove_list)
+        free (perl_action_remove_list);
+    if (perl_action_autoload_list)
+        free (perl_action_autoload_list);
+
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/plugin-script.c b/src/plugins/plugin-script.c
index 169172f07..3f311cccc 100644
--- a/src/plugins/plugin-script.c
+++ b/src/plugins/plugin-script.c
@@ -93,8 +93,8 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin,
                     int argc, char *argv[],
                     struct t_plugin_script_init *init)
 {
-    char *string, *completion;
-    char signal_name[128];
+    char *string, *completion, signal_name[128];
+    char *action_signals[] = { "install", "remove", "autoload", NULL };
     int length, i, auto_load_scripts;
 
     /* read script configuration */
@@ -192,15 +192,15 @@ plugin_script_init (struct t_weechat_plugin *weechat_plugin,
     weechat_hook_signal ("buffer_closed",
                          init->callback_signal_buffer_closed, NULL);
 
-    /* add signal for a script action (install/remove) */
-    snprintf (signal_name, sizeof (signal_name), "%s_script_install",
-              weechat_plugin->name);
-    weechat_hook_signal (signal_name,
-                         init->callback_signal_script_action, NULL);
-    snprintf (signal_name, sizeof (signal_name), "%s_script_remove",
-              weechat_plugin->name);
-    weechat_hook_signal (signal_name,
-                         init->callback_signal_script_action, NULL);
+    /* add signals for script actions (install/remove/autoload) */
+    for (i = 0; action_signals[i]; i++)
+    {
+        snprintf (signal_name, sizeof (signal_name), "%s_script_%s",
+                  weechat_plugin->name,
+                  action_signals[i]);
+        weechat_hook_signal (signal_name,
+                             init->callback_signal_script_action, NULL);
+    }
 
     /* parse arguments */
     auto_load_scripts = 1;
@@ -931,7 +931,7 @@ plugin_script_remove_file (struct t_weechat_plugin *weechat_plugin,
  *   1. unloads script (if script is loaded)
  *   2. removes script file(s)
  *   3. moves script file from "install" dir to language dir
- *   4. makes link in autoload dir
+ *   4. makes link in autoload dir (if option "-a" is given)
  *   5. loads script.
  */
 
@@ -946,18 +946,33 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
     char **argv, *name, *ptr_base_name, *base_name, *new_path, *autoload_path;
     char *symlink_path, str_signal[128], *ptr_list;
     const char *dir_home, *dir_separator;
-    int argc, i, length, rc;
+    int argc, i, length, rc, autoload;
     struct t_plugin_script *ptr_script;
 
     if (!*list)
         return;
 
     ptr_list = *list;
+    autoload = 0;
     *quiet = 0;
-    if (strncmp (ptr_list, "-q ", 3) == 0)
+
+    while ((ptr_list[0] == ' ') || (ptr_list[0] == '-'))
     {
-        *quiet = 1;
-        ptr_list += 3;
+        if (ptr_list[0] == ' ')
+            ptr_list++;
+        else
+        {
+            switch (ptr_list[1])
+            {
+                case 'a': /* no autoload */
+                    autoload = 1;
+                    break;
+                case 'q': /* quiet mode */
+                    *quiet = 1;
+                    break;
+            }
+            ptr_list += 2;
+        }
     }
 
     argv = weechat_string_split (ptr_list, ",", 0, 0, &argc);
@@ -994,29 +1009,32 @@ plugin_script_action_install (struct t_weechat_plugin *weechat_plugin,
                         if (rename (name, new_path) == 0)
                         {
                             /* make link in autoload dir */
-                            length = strlen (dir_home) +
-                                strlen (weechat_plugin->name) + 8 +
-                                strlen (base_name) + 16;
-                            autoload_path = malloc (length);
-                            if (autoload_path)
+                            if (autoload)
                             {
-                                snprintf (autoload_path, length,
-                                          "%s/%s/autoload/%s",
-                                          dir_home, weechat_plugin->name,
-                                          base_name);
-                                dir_separator = weechat_info_get ("dir_separator", "");
-                                length = 2 + strlen (dir_separator) +
-                                    strlen (base_name) + 1;
-                                symlink_path = malloc (length);
-                                if (symlink_path)
+                                length = strlen (dir_home) +
+                                    strlen (weechat_plugin->name) + 8 +
+                                    strlen (base_name) + 16;
+                                autoload_path = malloc (length);
+                                if (autoload_path)
                                 {
-                                    snprintf (symlink_path, length, "..%s%s",
-                                              dir_separator, base_name);
-                                    rc = symlink (symlink_path, autoload_path);
-                                    (void) rc;
-                                    free (symlink_path);
+                                    snprintf (autoload_path, length,
+                                              "%s/%s/autoload/%s",
+                                              dir_home, weechat_plugin->name,
+                                              base_name);
+                                    dir_separator = weechat_info_get ("dir_separator", "");
+                                    length = 2 + strlen (dir_separator) +
+                                        strlen (base_name) + 1;
+                                    symlink_path = malloc (length);
+                                    if (symlink_path)
+                                    {
+                                        snprintf (symlink_path, length, "..%s%s",
+                                                  dir_separator, base_name);
+                                        rc = symlink (symlink_path, autoload_path);
+                                        (void) rc;
+                                        free (symlink_path);
+                                    }
+                                    free (autoload_path);
                                 }
-                                free (autoload_path);
                             }
 
                             /* load script */
@@ -1111,6 +1129,104 @@ plugin_script_action_remove (struct t_weechat_plugin *weechat_plugin,
     *list = NULL;
 }
 
+/*
+ * Enables/disables autoload for some scripts (using comma separated list).
+ */
+
+void
+plugin_script_action_autoload (struct t_weechat_plugin *weechat_plugin,
+                               int *quiet,
+                               char **list)
+{
+    char **argv, *name, *ptr_base_name, *base_name, *autoload_path;
+    char *symlink_path, *ptr_list;
+    const char *dir_home, *dir_separator;
+    int argc, i, length, rc, autoload;
+
+    if (!*list)
+        return;
+
+    ptr_list = *list;
+    autoload = 0;
+    *quiet = 0;
+
+    while ((ptr_list[0] == ' ') || (ptr_list[0] == '-'))
+    {
+        if (ptr_list[0] == ' ')
+            ptr_list++;
+        else
+        {
+            switch (ptr_list[1])
+            {
+                case 'a': /* no autoload */
+                    autoload = 1;
+                    break;
+                case 'q': /* quiet mode */
+                    *quiet = 1;
+                    break;
+            }
+            ptr_list += 2;
+        }
+    }
+
+    argv = weechat_string_split (ptr_list, ",", 0, 0, &argc);
+    if (argv)
+    {
+        for (i = 0; i < argc; i++)
+        {
+            name = strdup (argv[i]);
+            if (name)
+            {
+                ptr_base_name = basename (name);
+                base_name = strdup (ptr_base_name);
+                if (base_name)
+                {
+                    dir_home = weechat_info_get ("weechat_dir", "");
+                    length = strlen (dir_home) +
+                        strlen (weechat_plugin->name) + 8 +
+                        strlen (base_name) + 16;
+                    autoload_path = malloc (length);
+                    if (autoload_path)
+                    {
+                        snprintf (autoload_path, length,
+                                  "%s/%s/autoload/%s",
+                                  dir_home, weechat_plugin->name,
+                                  base_name);
+                        if (autoload)
+                        {
+                            dir_separator = weechat_info_get ("dir_separator", "");
+                            length = 2 + strlen (dir_separator) +
+                                strlen (base_name) + 1;
+                            symlink_path = malloc (length);
+                            if (symlink_path)
+                            {
+                                snprintf (symlink_path, length, "..%s%s",
+                                          dir_separator, base_name);
+                                rc = symlink (symlink_path, autoload_path);
+                                (void) rc;
+                                free (symlink_path);
+                            }
+                        }
+                        else
+                        {
+                            unlink (autoload_path);
+                        }
+                        free (autoload_path);
+                    }
+                    free (base_name);
+                }
+                free (name);
+            }
+        }
+        weechat_string_free_split (argv);
+    }
+
+    *quiet = 0;
+
+    free (*list);
+    *list = NULL;
+}
+
 /*
  * Displays list of scripts.
  */
diff --git a/src/plugins/plugin-script.h b/src/plugins/plugin-script.h
index 0a4c29323..aaf770148 100644
--- a/src/plugins/plugin-script.h
+++ b/src/plugins/plugin-script.h
@@ -145,6 +145,9 @@ extern void plugin_script_action_remove (struct t_weechat_plugin *weechat_plugin
                                          void (*script_unload)(struct t_plugin_script *script),
                                          int *quiet,
                                          char **list);
+extern void plugin_script_action_autoload (struct t_weechat_plugin *weechat_plugin,
+                                           int *quiet,
+                                           char **list);
 extern void plugin_script_display_list (struct t_weechat_plugin *weechat_plugin,
                                         struct t_plugin_script *scripts,
                                         const char *name, int full);
diff --git a/src/plugins/python/weechat-python.c b/src/plugins/python/weechat-python.c
index f5f6fde23..72304b4a7 100644
--- a/src/plugins/python/weechat-python.c
+++ b/src/plugins/python/weechat-python.c
@@ -86,7 +86,7 @@ static struct PyModuleDef moduleDefOutputs = {
 
 /*
  * string used to execute action "install":
- * when signal "python_install_script" is received, name of string
+ * when signal "python_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -94,12 +94,20 @@ char *python_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "python_remove_script" is received, name of string
+ * when signal "python_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *python_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "python_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *python_action_autoload_list = NULL;
+
 char python_buffer_output[128];
 
 
@@ -1167,13 +1175,20 @@ weechat_python_timer_action_cb (void *data, int remaining_calls)
                                          &python_quiet,
                                          &python_action_remove_list);
         }
+        else if (data == &python_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_python_plugin,
+                                           &python_quiet,
+                                           &python_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
 }
 
 /*
- * Callback called when a script action is asked (install/remove a script).
+ * Callback called when a script action is asked (install/remove/autoload a
+ * script).
  */
 
 int
@@ -1202,6 +1217,14 @@ weechat_python_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_python_timer_action_cb,
                                 &python_action_remove_list);
         }
+        else if (strcmp (signal, "python_script_autoload") == 0)
+        {
+            plugin_script_action_add (&python_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_python_timer_action_cb,
+                                &python_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -1314,6 +1337,8 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
         free (python_action_install_list);
     if (python_action_remove_list)
         free (python_action_remove_list);
+    if (python_action_autoload_list)
+        free (python_action_autoload_list);
 
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/ruby/weechat-ruby.c b/src/plugins/ruby/weechat-ruby.c
index 18fc0f914..0e2ec75e1 100644
--- a/src/plugins/ruby/weechat-ruby.c
+++ b/src/plugins/ruby/weechat-ruby.c
@@ -71,7 +71,7 @@ const char *ruby_current_script_filename = NULL;
 
 /*
  * string used to execute action "install":
- * when signal "ruby_install_script" is received, name of string
+ * when signal "ruby_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -79,12 +79,20 @@ char *ruby_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "ruby_remove_script" is received, name of string
+ * when signal "ruby_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *ruby_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "ruby_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *ruby_action_autoload_list = NULL;
+
 VALUE ruby_mWeechat, ruby_mWeechatOutputs;
 
 #define MOD_NAME_PREFIX "WeechatRubyModule"
@@ -987,6 +995,12 @@ weechat_ruby_timer_action_cb (void *data, int remaining_calls)
                                          &ruby_quiet,
                                          &ruby_action_remove_list);
         }
+        else if (data == &ruby_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_ruby_plugin,
+                                           &ruby_quiet,
+                                           &ruby_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -1022,6 +1036,14 @@ weechat_ruby_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_ruby_timer_action_cb,
                                 &ruby_action_remove_list);
         }
+        else if (strcmp (signal, "ruby_script_autoload") == 0)
+        {
+            plugin_script_action_add (&ruby_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_ruby_timer_action_cb,
+                                &ruby_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -1175,5 +1197,13 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
      */
     /*ruby_cleanup (0);*/
 
+    /* free some data */
+    if (ruby_action_install_list)
+        free (ruby_action_install_list);
+    if (ruby_action_remove_list)
+        free (ruby_action_remove_list);
+    if (ruby_action_autoload_list)
+        free (ruby_action_autoload_list);
+
     return WEECHAT_RC_OK;
 }
diff --git a/src/plugins/script/script-action.c b/src/plugins/script/script-action.c
index c00f5fa13..8c5a7c323 100644
--- a/src/plugins/script/script-action.c
+++ b/src/plugins/script/script-action.c
@@ -407,6 +407,79 @@ script_action_reload (const char *name, int quiet)
     }
 }
 
+/*
+ * Enables/disables autoload for a script.
+ *
+ * Argument "autoload" can be:
+ *    0: disables autoload
+ *    1: enables autoload
+ *   -1: toggles autoload
+ */
+
+void
+script_action_autoload (const char *name, int quiet, int autoload)
+{
+    struct t_script_repo *ptr_script;
+    char str_signal[256], *filename;
+    int length;
+
+    ptr_script = script_repo_search_by_name_ext (name);
+    if (!ptr_script)
+    {
+        if (!quiet)
+        {
+            weechat_printf (NULL,
+                            _("%s: script \"%s\" not found"),
+                            SCRIPT_PLUGIN_NAME, name);
+        }
+        return;
+    }
+
+    /* check that script is installed */
+    if (!(ptr_script->status & SCRIPT_STATUS_INSTALLED))
+    {
+        if (!quiet)
+        {
+            weechat_printf (NULL,
+                            _("%s: script \"%s\" is not installed"),
+                            SCRIPT_PLUGIN_NAME, name);
+        }
+        return;
+    }
+
+    /* toggle autoload if value is -1 */
+    if (autoload < 0)
+        autoload = (ptr_script->status & SCRIPT_STATUS_AUTOLOADED) ? 0 : 1;
+
+    /* ask plugin to autoload (or not) script */
+    length = 16 + strlen (ptr_script->name_with_extension) + 1;
+    filename = malloc (length);
+    if (filename)
+    {
+        snprintf (filename, length,
+                  "%s%s%s",
+                  (quiet && weechat_config_boolean (script_config_look_quiet_actions)) ? "-q " : "",
+                  (autoload) ? "-a " : "",
+                  ptr_script->name_with_extension);
+        snprintf (str_signal, sizeof (str_signal),
+                  "%s_script_autoload",
+                  script_language[ptr_script->language]);
+        weechat_hook_signal_send (str_signal,
+                                  WEECHAT_HOOK_SIGNAL_STRING,
+                                  filename);
+        free (filename);
+    }
+    if (!quiet)
+    {
+        weechat_printf (NULL,
+                        (autoload) ?
+                        _("%s: autoload enabled for script \"%s\"") :
+                        _("%s: autoload disabled for script \"%s\""),
+                        SCRIPT_PLUGIN_NAME, name);
+    }
+    script_repo_update_status (ptr_script);
+}
+
 /*
  * Installs next script.
  */
@@ -461,13 +534,14 @@ script_action_install_process_cb (void *data, const char *command,
                                                                        NULL);
                 if (filename)
                 {
-                    length = 3 + strlen (filename) + 1;
+                    length = 16 + strlen (filename) + 1;
                     filename2 = malloc (length);
                     if (filename2)
                     {
                         snprintf (filename2, length,
-                                  "%s%s",
+                                  "%s%s%s",
                                   (quiet && weechat_config_boolean (script_config_look_quiet_actions)) ? "-q " : "",
+                                  (weechat_config_boolean (script_config_scripts_autoload)) ? "-a " : "",
                                   filename);
                         snprintf (str_signal, sizeof (str_signal),
                                   "%s_script_install",
@@ -1157,6 +1231,27 @@ script_action_run ()
                         script_action_reload (argv[j], quiet);
                     }
                 }
+                else if (weechat_strcasecmp (argv[0], "autoload") == 0)
+                {
+                    for (j = 1; j < argc; j++)
+                    {
+                        script_action_autoload (argv[j], quiet, 1);
+                    }
+                }
+                else if (weechat_strcasecmp (argv[0], "noautoload") == 0)
+                {
+                    for (j = 1; j < argc; j++)
+                    {
+                        script_action_autoload (argv[j], quiet, 0);
+                    }
+                }
+                else if (weechat_strcasecmp (argv[0], "toggleautoload") == 0)
+                {
+                    for (j = 1; j < argc; j++)
+                    {
+                        script_action_autoload (argv[j], quiet, -1);
+                    }
+                }
                 else if (weechat_strcasecmp (argv[0], "install") == 0)
                 {
                     script_found = 0;
diff --git a/src/plugins/script/script-buffer.c b/src/plugins/script/script-buffer.c
index 536d07f3f..65d5d09d1 100644
--- a/src/plugins/script/script-buffer.c
+++ b/src/plugins/script/script-buffer.c
@@ -510,9 +510,9 @@ script_buffer_refresh (int clear)
         snprintf (str_title, sizeof (str_title),
                   _("%d/%d scripts (filter: %s) | Sort: %s | "
                     "Alt+key/input: i=install r=remove l=load L=reload "
-                    "u=unload h=(un)hold v=view script | Input: q=close "
-                    "$=refresh s:x,y=sort words=filter *=reset filter | "
-                    "Mouse: left=select right=install/remove"),
+                    "u=unload A=autoload h=(un)hold v=view script | "
+                    "Input: q=close $=refresh s:x,y=sort words=filter "
+                    "*=reset filter | Mouse: left=select right=install/remove"),
                   script_repo_count_displayed,
                   script_repo_count,
                   (script_repo_filter) ? script_repo_filter : "*",
@@ -706,15 +706,16 @@ int
 script_buffer_input_cb (void *data, struct t_gui_buffer *buffer,
                         const char *input_data)
 {
-    char *actions[][2] = { { "l", "load"     },
-                           { "u", "unload"   },
-                           { "L", "reload"   },
-                           { "i", "install"  },
-                           { "r", "remove"   },
-                           { "h", "hold"     },
-                           { "v", "show"     },
-                           { "d", "showdiff" },
-                           { NULL, NULL      } };
+    char *actions[][2] = { { "A", "toggleautoload" },
+                           { "l", "load"           },
+                           { "u", "unload"         },
+                           { "L", "reload"         },
+                           { "i", "install"        },
+                           { "r", "remove"         },
+                           { "h", "hold"           },
+                           { "v", "show"           },
+                           { "d", "showdiff"       },
+                           { NULL, NULL            } };
     char str_command[64];
     int i;
 
@@ -814,15 +815,16 @@ script_buffer_set_callbacks ()
 void
 script_buffer_set_keys ()
 {
-    char *keys[][2] = { { "meta-l",  "load"     },
-                        { "meta-u",  "unload"   },
-                        { "meta-L",  "reload"   },
-                        { "meta-i",  "install"  },
-                        { "meta-r",  "remove"   },
-                        { "meta-h",  "hold"     },
-                        { "meta-v",  "show"     },
-                        { "meta-d",  "showdiff" },
-                        { NULL,     NULL        } };
+    char *keys[][2] = { { "meta-A",  "toggleautoload" },
+                        { "meta-l",  "load"           },
+                        { "meta-u",  "unload"         },
+                        { "meta-L",  "reload"         },
+                        { "meta-i",  "install"        },
+                        { "meta-r",  "remove"         },
+                        { "meta-h",  "hold"           },
+                        { "meta-v",  "show"           },
+                        { "meta-d",  "showdiff"       },
+                        { NULL,     NULL              } };
     char str_key[64], str_command[64];
     int i;
 
diff --git a/src/plugins/script/script-command.c b/src/plugins/script/script-command.c
index 012482465..7f2e1944f 100644
--- a/src/plugins/script/script-command.c
+++ b/src/plugins/script/script-command.c
@@ -169,7 +169,10 @@ script_command_script (void *data, struct t_gui_buffer *buffer, int argc,
 
     if ((weechat_strcasecmp (argv[1], "load") == 0)
         || (weechat_strcasecmp (argv[1], "unload") == 0)
-        || (weechat_strcasecmp (argv[1], "reload") == 0))
+        || (weechat_strcasecmp (argv[1], "reload") == 0)
+        || (weechat_strcasecmp (argv[1], "autoload") == 0)
+        || (weechat_strcasecmp (argv[1], "noautoload") == 0)
+        || (weechat_strcasecmp (argv[1], "toggleautoload") == 0))
     {
         script_command_action (buffer,
                                argv[1],
@@ -264,29 +267,33 @@ script_command_init ()
                           N_("WeeChat scripts manager"),
                           N_("list [-o|-i] || search <text> || show <script>"
                              " || load|unload|reload <script> [<script>...]"
+                             " || autoload|noautoload|toggleautoload <script> [<script>...]"
                              " || install|remove|installremove|hold [-q] <script> [<script>...]"
                              " || upgrade || update"),
-                          N_("         list: list loaded scripts (all languages)\n"
-                             "           -o: send list of loaded scripts to buffer\n"
-                             "           -i: copy list of loaded scripts in "
+                          N_("          list: list loaded scripts (all languages)\n"
+                             "            -o: send list of loaded scripts to buffer\n"
+                             "            -i: copy list of loaded scripts in "
                              "command line (for sending to buffer)\n"
-                             "       search: search scripts by tags or text and "
+                             "        search: search scripts by tags or text and "
                              "display result on scripts buffer\n"
-                             "         show: show detailed info about a script\n"
-                             "         load: load script(s)\n"
-                             "       unload: unload script(s)\n"
-                             "       reload: reload script(s)\n"
-                             "      install: install/upgrade script(s)\n"
-                             "       remove: remove script(s)\n"
-                             "installremove: install or remove script(s), "
+                             "          show: show detailed info about a script\n"
+                             "          load: load script(s)\n"
+                             "        unload: unload script(s)\n"
+                             "        reload: reload script(s)\n"
+                             "      autoload: autoload the script\n"
+                             "    noautoload: do not autoload the script\n"
+                             "toggleautoload: toggle autoload\n"
+                             "       install: install/upgrade script(s)\n"
+                             "        remove: remove script(s)\n"
+                             " installremove: install or remove script(s), "
                              "depending on current state\n"
-                             "         hold: hold/unhold script(s) (a script held "
+                             "          hold: hold/unhold script(s) (a script held "
                              "will not be upgraded any more and cannot be "
                              "removed)\n"
-                             "           -q: quiet mode: do not display messages\n"
-                             "      upgrade: upgrade all installed scripts which "
+                             "            -q: quiet mode: do not display messages\n"
+                             "       upgrade: upgrade all installed scripts which "
                              "are obsolete (new version available)\n"
-                             "       update: update local scripts cache\n\n"
+                             "        update: update local scripts cache\n\n"
                              "Without argument, this command opens a buffer "
                              "with list of scripts.\n\n"
                              "On script buffer, the possible status for each "
@@ -338,6 +345,9 @@ script_command_init ()
                           " || reload %(python_script)|%(perl_script)|"
                           "%(ruby_script)|%(tcl_script)|%(lua_script)|"
                           "%(guile_script)|%*"
+                          " || autoload %(script_scripts_installed)|%*"
+                          " || noautoload %(script_scripts_installed)|%*"
+                          " || toggleautoload %(script_scripts_installed)|%*"
                           " || install %(script_scripts)|%*"
                           " || remove %(script_scripts_installed)|%*"
                           " || installremove %(script_scripts)|%*"
diff --git a/src/plugins/script/script-config.c b/src/plugins/script/script-config.c
index 186e9dc88..5f29dd2a5 100644
--- a/src/plugins/script/script-config.c
+++ b/src/plugins/script/script-config.c
@@ -80,6 +80,7 @@ struct t_config_option *script_config_color_text_bg_selected;
 
 /* script config, scripts section */
 
+struct t_config_option *script_config_scripts_autoload;
 struct t_config_option *script_config_scripts_cache_expire;
 struct t_config_option *script_config_scripts_dir;
 struct t_config_option *script_config_scripts_hold;
@@ -670,6 +671,13 @@ script_config_init ()
         return 0;
     }
 
+    script_config_scripts_autoload = weechat_config_new_option (
+        script_config_file, ptr_section,
+        "autoload", "boolean",
+        N_("autoload scripts installed (make a link in \"autoload\" directory "
+           "to script in parent directory"),
+        NULL, 0, 0, "on", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL);
     script_config_scripts_cache_expire = weechat_config_new_option (
         script_config_file, ptr_section,
         "cache_expire", "integer",
diff --git a/src/plugins/script/script-config.h b/src/plugins/script/script-config.h
index caf00eabc..cead7f3ee 100644
--- a/src/plugins/script/script-config.h
+++ b/src/plugins/script/script-config.h
@@ -60,6 +60,7 @@ extern struct t_config_option *script_config_color_text_version_selected;
 extern struct t_config_option *script_config_color_text_version_loaded_selected;
 extern struct t_config_option *script_config_color_text_bg_selected;
 
+extern struct t_config_option *script_config_scripts_autoload;
 extern struct t_config_option *script_config_scripts_cache_expire;
 extern struct t_config_option *script_config_scripts_dir;
 extern struct t_config_option *script_config_scripts_hold;
diff --git a/src/plugins/tcl/weechat-tcl.c b/src/plugins/tcl/weechat-tcl.c
index d379c0133..733af1c45 100644
--- a/src/plugins/tcl/weechat-tcl.c
+++ b/src/plugins/tcl/weechat-tcl.c
@@ -52,7 +52,7 @@ const char *tcl_current_script_filename = NULL;
 
 /*
  * string used to execute action "install":
- * when signal "tcl_install_script" is received, name of string
+ * when signal "tcl_script_install" is received, name of string
  * is added to this string, to be installed later by a timer (when nothing is
  * running in script)
  */
@@ -60,12 +60,20 @@ char *tcl_action_install_list = NULL;
 
 /*
  * string used to execute action "remove":
- * when signal "tcl_remove_script" is received, name of string
+ * when signal "tcl_script_remove" is received, name of string
  * is added to this string, to be removed later by a timer (when nothing is
  * running in script)
  */
 char *tcl_action_remove_list = NULL;
 
+/*
+ * string used to execute action "autoload":
+ * when signal "tcl_script_autoload" is received, name of string
+ * is added to this string, to autoload or disable autoload later by a timer
+ * (when nothing is running in script)
+ */
+char *tcl_action_autoload_list = NULL;
+
 Tcl_Interp* cinterp;
 
 
@@ -728,6 +736,12 @@ weechat_tcl_timer_action_cb (void *data, int remaining_calls)
                                          &tcl_quiet,
                                          &tcl_action_remove_list);
         }
+        else if (data == &tcl_action_autoload_list)
+        {
+            plugin_script_action_autoload (weechat_tcl_plugin,
+                                           &tcl_quiet,
+                                           &tcl_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -763,6 +777,14 @@ weechat_tcl_signal_script_action_cb (void *data, const char *signal,
                                 &weechat_tcl_timer_action_cb,
                                 &tcl_action_remove_list);
         }
+        else if (strcmp (signal, "tcl_script_autoload") == 0)
+        {
+            plugin_script_action_add (&tcl_action_autoload_list,
+                                      (const char *)signal_data);
+            weechat_hook_timer (1, 0, 1,
+                                &weechat_tcl_timer_action_cb,
+                                &tcl_action_autoload_list);
+        }
     }
 
     return WEECHAT_RC_OK;
@@ -811,5 +833,13 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
     plugin_script_end (plugin, &tcl_scripts, &weechat_tcl_unload_all);
     tcl_quiet = 0;
 
+    /* free some data */
+    if (tcl_action_install_list)
+        free (tcl_action_install_list);
+    if (tcl_action_remove_list)
+        free (tcl_action_remove_list);
+    if (tcl_action_autoload_list)
+        free (tcl_action_autoload_list);
+
     return WEECHAT_RC_OK;
 }