diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/de/autogen/user/weechat_commands.txt | 37 | ||||
| -rw-r--r-- | doc/en/autogen/user/weechat_commands.txt | 13 | ||||
| -rw-r--r-- | doc/en/weechat_plugin_api.en.txt | 2 | ||||
| -rw-r--r-- | doc/fr/autogen/user/weechat_commands.txt | 15 | ||||
| -rw-r--r-- | doc/fr/weechat_plugin_api.fr.txt | 2 | ||||
| -rw-r--r-- | doc/it/autogen/user/weechat_commands.txt | 37 | ||||
| -rw-r--r-- | doc/it/weechat_plugin_api.it.txt | 3 | ||||
| -rw-r--r-- | doc/ja/autogen/user/weechat_commands.txt | 37 | ||||
| -rw-r--r-- | po/cs.po | 29 | ||||
| -rw-r--r-- | po/de.po | 30 | ||||
| -rw-r--r-- | po/es.po | 30 | ||||
| -rw-r--r-- | po/fr.po | 49 | ||||
| -rw-r--r-- | po/hu.po | 28 | ||||
| -rw-r--r-- | po/it.po | 30 | ||||
| -rw-r--r-- | po/ja.po | 30 | ||||
| -rw-r--r-- | po/pl.po | 30 | ||||
| -rw-r--r-- | po/pt_BR.po | 30 | ||||
| -rw-r--r-- | po/ru.po | 28 | ||||
| -rw-r--r-- | po/weechat.pot | 28 | ||||
| -rw-r--r-- | src/core/wee-command.c | 109 | ||||
| -rw-r--r-- | src/plugins/irc/irc.c | 40 | ||||
| -rw-r--r-- | src/plugins/relay/relay.c | 45 | ||||
| -rw-r--r-- | src/plugins/xfer/xfer.c | 59 |
24 files changed, 519 insertions, 224 deletions
@@ -7,6 +7,8 @@ v0.4.0-dev, 2012-10-18 Version 0.4.0 (under dev!) -------------------------- +* core: add option "-quit" for command /upgrade (save session and quit without + restarting WeeChat, for delayed restoration) * core: fix display of zoomed/merged buffer (with number >= 2) after switching to it (bug #37593) * core: fix display problem when option weechat.look.prefix_same_nick is set diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index 3565cd120..068a658cf 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -587,19 +587,30 @@ Beispiele: [[command_weechat_upgrade]] [command]*`upgrade`* Aktualisiert WeeChat ohne die Verbindung zum Server zu trennen:: ........................................ -/upgrade [<path_to_binary>] - -path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei) - -Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Die neue Version von WeeChat muss deshalb vorab kompiliert oder mit einem Paketmanager installiert worden sein, bevor der Befehl ausgeführt werden kann. - -Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da solche Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt. - -Der Upgrade Vorgang besteht aus vier Schritten: - 1. Speicherung der Session in Dateien für Core und Erweiterungen (buffers, history, ..) - 2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert) - 3. Speicherung der WeeChat Konfiguration (weechat.conf) - 4. ausführen einer neuen WeeChat Session. +/upgrade [<path_to_binary>|-quit] + +path_to_binary: path to WeeChat binary (default is current binary) + -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) + +This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. + +Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. + +Upgrade process has 4 steps: + 1. save session into files for core and plugins (buffers, history, ..) + 2. unload all plugins (configuration files (*.conf) are written on disk) + 3. save WeeChat configuration (weechat.conf) + 4. execute new WeeChat binary and reload session. + +With option "-quit", the process is slightly different: + 1. close *ALL* connections (irc, xfer, relay, ...) + 2. save session into files (*.upgrade) + 3. unload all plugins + 4. save WeeChat configuration + 5. quit WeeChat +Then later you can restore session with command: weechat-curses --upgrade +IMPORTANT: you must restore the session with exactly same configuration (files *.conf). +It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat" ........................................ [[command_weechat_uptime]] diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index 70e9b6089..17eeb9b6f 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -587,9 +587,10 @@ Examples: [[command_weechat_upgrade]] [command]*`upgrade`* upgrade WeeChat without disconnecting from servers:: ........................................ -/upgrade [<path_to_binary>] +/upgrade [<path_to_binary>|-quit] path_to_binary: path to WeeChat binary (default is current binary) + -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. @@ -600,6 +601,16 @@ Upgrade process has 4 steps: 2. unload all plugins (configuration files (*.conf) are written on disk) 3. save WeeChat configuration (weechat.conf) 4. execute new WeeChat binary and reload session. + +With option "-quit", the process is slightly different: + 1. close *ALL* connections (irc, xfer, relay, ...) + 2. save session into files (*.upgrade) + 3. unload all plugins + 4. save WeeChat configuration + 5. quit WeeChat +Then later you can restore session with command: weechat-curses --upgrade +IMPORTANT: you must restore the session with exactly same configuration (files *.conf). +It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat" ........................................ [[command_weechat_uptime]] diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt index aa8d23dfd..fbdc7f74b 100644 --- a/doc/en/weechat_plugin_api.en.txt +++ b/doc/en/weechat_plugin_api.en.txt @@ -7777,7 +7777,7 @@ Arguments: command `/quit` issued by user | weechat | upgrade | - - | + string: "quit" if "-quit" argument was given for /upgrade, otherwise NULL | command `/upgrade` issued by user | weechat | upgrade_ended + diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 558b46455..b98bc1725 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -587,9 +587,10 @@ Exemples: [[command_weechat_upgrade]] [command]*`upgrade`* mettre à jour WeeChat sans se déconnecter des serveurs:: ........................................ -/upgrade [<chemin_vers_binaire>] +/upgrade [<chemin_vers_binaire>|-quit] chemin_vers_binaire: chemin vers le binaire WeeChat (par défaut le binaire courant) + -quit: fermer *TOUTES* les connexions, sauver la session et quitter, ce qui rend possible une restauration différée (voir ci-dessous) Cette commande met à jour et recharge une session de WeeChat qui tourne. Le nouveau binaire WeeChat doit avoir été compilé ou installé via un gestionnaire de paquet avant de lancer cette commande. @@ -599,7 +600,17 @@ Le processus de mise à jour comporte 4 étapes : 1. sauvegarder la session pour le coeur et les extensions (tampons, historique, ...) 2. décharger toutes les extensions (les fichiers de configuration (*.conf) sont écrits sur disque) 3. sauvegarder la configuration WeeChat (weechat.conf) - 4. exécuter le nouveau binaire WeeChat et recharger la session. + 4. exécuter le nouveau binaire WeeChat et recharger la session.< + +Avec l'option "-quit", le processus est légèrement différent : + 1. fermer *TOUTES* les connexions + 2. sauvegarder la session (fichiers *.upgrade) + 3. décharger les extensions + 4. sauvegarder la configuration WeeChat + 5. quitter WeeChat +Et plus tard vous pouvez restaurer la session avec la commande: weechat-curses --upgrade +IMPORTANT: vous devez restaurer la session avec exactement la même configuration (fichiers *.conf). +Il est également possible de restaurer la session WeeChat sur une autre machine si vous y copiez le contenu du répertoire "~/.weechat". ........................................ [[command_weechat_uptime]] diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt index d677705ba..38025ce8f 100644 --- a/doc/fr/weechat_plugin_api.fr.txt +++ b/doc/fr/weechat_plugin_api.fr.txt @@ -7888,7 +7888,7 @@ Paramètres : la commande `/quit` a été exécutée par l'utilisateur | weechat | upgrade | - - | + chaîne : "quit" si le paramètre "-quit" a été donné pour /upgrade, sinon NULL | la commande `/upgrade` a été exécutée par l'utilisateur | weechat | upgrade_ended + diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index 6db9ede59..2508775bf 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -587,19 +587,30 @@ Esempi: [[command_weechat_upgrade]] [command]*`upgrade`* aggiorna WeeChat senza disconnettere dai server:: ........................................ -/upgrade [<path_del_binario>] - -path_del_binario: path del binario di WeeChat (di default è il corrente) - -Questo comando aggiorna e ricarica una sessione di WeeChat in esecuzione. Il nuovo binario di WeeChat deve essere stato compilato o installato con un gestore pacchetti prima di eseguire questo comando. - -Nota: le connessioni SSL vengono perdute durante l'aggiornamento, poiché il nuovo caricamento delle sessioni SSL non è ancora possibile con GnuTLS. La riconnessione automatica avviene dopo l'aggiornamento. - -Il processo di aggiornamento è diviso in 4 fasi: - 1. salva la sessione in file per il core e i plugin (buffer, cronologia, ..) - 2. scarica tutti i plugin (i file di configurazione (*.conf) vengono scritti su disco) - 3. salva la configurazione di WeeChat (weechat.conf) - 4. esegui il nuovo binario di WeeChat e carica la sessione. +/upgrade [<path_to_binary>|-quit] + +path_to_binary: path to WeeChat binary (default is current binary) + -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) + +This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. + +Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. + +Upgrade process has 4 steps: + 1. save session into files for core and plugins (buffers, history, ..) + 2. unload all plugins (configuration files (*.conf) are written on disk) + 3. save WeeChat configuration (weechat.conf) + 4. execute new WeeChat binary and reload session. + +With option "-quit", the process is slightly different: + 1. close *ALL* connections (irc, xfer, relay, ...) + 2. save session into files (*.upgrade) + 3. unload all plugins + 4. save WeeChat configuration + 5. quit WeeChat +Then later you can restore session with command: weechat-curses --upgrade +IMPORTANT: you must restore the session with exactly same configuration (files *.conf). +It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat" ........................................ [[command_weechat_uptime]] diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt index dab109398..3afa8a148 100644 --- a/doc/it/weechat_plugin_api.it.txt +++ b/doc/it/weechat_plugin_api.it.txt @@ -7844,8 +7844,9 @@ Argomenti: string: argomenti per /quit | comando `/quit` digitato dall'utente +// TRANSLATION MISSING | weechat | upgrade | - - | + string: "quit" if "-quit" argument was given for /upgrade, otherwise NULL | comando `/upgrade` digitato dall'utente | weechat | upgrade_ended + diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt index 9baeb777d..49c1a5286 100644 --- a/doc/ja/autogen/user/weechat_commands.txt +++ b/doc/ja/autogen/user/weechat_commands.txt @@ -587,19 +587,30 @@ option: オプションの名前 ("*" で始めるか終わるかすれば大量 [[command_weechat_upgrade]] [command]*`upgrade`* サーバとの接続を維持して WeeChat をアップグレード:: ........................................ -/upgrade [<path_to_binary>] - -path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ) - -このコマンドは起動中の WeeChat セッションのアップグレードと再読み込みを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。 - -注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。 - -アップグレードは 4 つの手順を踏みます: - 1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存 - 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます) - 3. WeeChat 設定を保存 (weechat.conf) - 4. 新しい WeeChat バイナリを実行してセッションをリロード。 +/upgrade [<path_to_binary>|-quit] + +path_to_binary: path to WeeChat binary (default is current binary) + -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) + +This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. + +Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. + +Upgrade process has 4 steps: + 1. save session into files for core and plugins (buffers, history, ..) + 2. unload all plugins (configuration files (*.conf) are written on disk) + 3. save WeeChat configuration (weechat.conf) + 4. execute new WeeChat binary and reload session. + +With option "-quit", the process is slightly different: + 1. close *ALL* connections (irc, xfer, relay, ...) + 2. save session into files (*.upgrade) + 3. unload all plugins + 4. save WeeChat configuration + 5. quit WeeChat +Then later you can restore session with command: weechat-curses --upgrade +IMPORTANT: you must restore the session with exactly same configuration (files *.conf). +It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat" ........................................ [[command_weechat_uptime]] @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1875,12 +1875,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "aktualizovat WeeChat bez odpojení od serveru" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<cesta_k_binárce>]" #, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1894,7 +1897,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "cesta_k_binárce: cesta k binárce WeeChat (výchozí je aktuální binárka)\n" "\n" @@ -8750,6 +8765,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: rozhovor zavřen s %s (%d.%d.%d.%d)" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: ruším aktivní xfer: \"%s\" od %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: nedostatek paměti pro nový xfer" @@ -8832,10 +8851,6 @@ msgstr "" "%llu): xfer nenalezen nebo není připraven pro přenos" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: ruším aktivní xfer: \"%s\" od %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: chyba posílání dat k \"%s\" přes xfer chat" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -2045,11 +2045,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "Aktualisiert WeeChat ohne die Verbindung zum Server zu trennen" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<path_to_binary>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -2063,7 +2067,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei " "(Standardeinstellung ist die aktuell ausführbare Datei)\n" @@ -9437,6 +9453,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: Chat mit %s (%d.%d.%d.%d) geschlossen" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: aktiver Transfer (xfer): \"%s\" von %s abgebrochen" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "" "%s%s: Für einen neuen Transfer steht nicht ausreichend Speicher zur Verfügung" @@ -9525,10 +9545,6 @@ msgstr "" "Transfer" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: aktiver Transfer (xfer): \"%s\" von %s abgebrochen" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: Fehler beim Senden von Daten an \"%s\" via Transfer-Chat" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1979,11 +1979,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "actualizar WeeChat sin desconectarse de los servidores" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<ruta_al_ejecutable>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1997,7 +2001,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "ruta_al_ejecutable: ruta al ejecutable de WeeChat (ejecutable actual por " "defecto)\n" @@ -9020,6 +9036,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: charla con %s cerrada (%d.%d.%d.%d)" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: abortando la transferencia activa: \"%s\" desde %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: no hay memoria suficiente para una nueva transferencia" @@ -9108,10 +9128,6 @@ msgstr "" "posición inicial: %llu): xfer encontrado o no está listo para transferir" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: abortando la transferencia activa: \"%s\" desde %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: error al enviar información a \"%s\" vía charla xfer" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" -"PO-Revision-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" +"PO-Revision-Date: 2012-10-18 15:42+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -1982,11 +1982,13 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "mettre à jour WeeChat sans se déconnecter des serveurs" -msgid "[<path_to_binary>]" -msgstr "[<chemin_vers_binaire>]" +msgid "[<path_to_binary>|-quit]" +msgstr "[<chemin_vers_binaire>|-quit]" msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -2000,10 +2002,24 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "chemin_vers_binaire: chemin vers le binaire WeeChat (par défaut le binaire " "courant)\n" +" -quit: fermer *TOUTES* les connexions, sauver la session et " +"quitter, ce qui rend possible une restauration différée (voir ci-dessous)\n" "\n" "Cette commande met à jour et recharge une session de WeeChat qui tourne. Le " "nouveau binaire WeeChat doit avoir été compilé ou installé via un " @@ -2019,7 +2035,20 @@ msgstr "" " 2. décharger toutes les extensions (les fichiers de configuration (*.conf) " "sont écrits sur disque)\n" " 3. sauvegarder la configuration WeeChat (weechat.conf)\n" -" 4. exécuter le nouveau binaire WeeChat et recharger la session." +" 4. exécuter le nouveau binaire WeeChat et recharger la session.<\n" +"\n" +"Avec l'option \"-quit\", le processus est légèrement différent :\n" +" 1. fermer *TOUTES* les connexions\n" +" 2. sauvegarder la session (fichiers *.upgrade)\n" +" 3. décharger les extensions\n" +" 4. sauvegarder la configuration WeeChat\n" +" 5. quitter WeeChat\n" +"Et plus tard vous pouvez restaurer la session avec la commande: weechat-" +"curses --upgrade\n" +"IMPORTANT: vous devez restaurer la session avec exactement la même " +"configuration (fichiers *.conf).\n" +"Il est également possible de restaurer la session WeeChat sur une autre " +"machine si vous y copiez le contenu du répertoire \"~/.weechat\"." msgid "show WeeChat uptime" msgstr "montrer l'uptime de WeeChat" @@ -9210,6 +9239,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: discussion fermée avec %s (%d.%d.%d.%d)" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: abandon du xfer actif: \"%s\" de %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: pas assez de mémoire pour un nouveau xfer" @@ -9296,10 +9329,6 @@ msgstr "" "position de départ: %llu): xfer non trouvé ou non prêt pour le transfert" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: abandon du xfer actif: \"%s\" de %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: erreur d'envoi de données à \"%s\" via discussion xfer" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1607,12 +1607,14 @@ msgid "upgrade WeeChat without disconnecting from servers" msgstr "WeeChat frissítése a szerverekről való lecsatlakozás nélkül" #, fuzzy -msgid "[<path_to_binary>]" +msgid "[<path_to_binary>|-quit]" msgstr "[path_to_binary]" #, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1626,7 +1628,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "path_to_binary: a WeeChat bináris útvonala (alapértelmezetten az aktuális " "bináris útvonala)\n" @@ -8233,6 +8247,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "DCC beszélgetés vége: %s%s %s(%s%d.%d.%d.%d%s)\n" #, fuzzy, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "\"%s\" aktív DCC megszakítása a következővel: %s\n" + +#, fuzzy, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s nincs elegendő memória új DCC számára\n" @@ -8319,10 +8337,6 @@ msgstr "" "%u): DCC nem található vagy véget ért\n" #, fuzzy, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "\"%s\" aktív DCC megszakítása a következővel: %s\n" - -#, fuzzy, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s hiba a(z) \"%s\" felé DCC CHAT-tel történő adatküldés közben\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1964,11 +1964,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "aggiorna WeeChat senza disconnettere dai server" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<path_del_binario>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1982,7 +1986,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "path_del_binario: path del binario di WeeChat (di default è il corrente)\n" "\n" @@ -9019,6 +9035,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: chat con %s (%d.%d.%d.%d) chiusa" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: annullamento xfer attivo: \"%s\" da %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: memoria non sufficiente per nuovo xfer" @@ -9104,10 +9124,6 @@ msgstr "" "trasferimento" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: annullamento xfer attivo: \"%s\" da %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: errore nell'invio dei dati a \"%s\" via chat xfer" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" @@ -1939,11 +1939,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "サーバとの接続を維持して WeeChat をアップグレード" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<path_to_binary>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1957,7 +1961,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ)\n" "\n" @@ -8889,6 +8905,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: %s (%d.%d.%d.%d) とのチャットを終了" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: アクティブな xfer を中断しています: \"%s\" %s から" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: 新しい xfer 用のメモリ不足" @@ -8975,10 +8995,6 @@ msgstr "" "置: %llu): xfer が見つからないか、転送準備が整っていません" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: アクティブな xfer を中断しています: \"%s\" %s から" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: xfer チャットで \"%s\" にデータ転送中のエラー" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:42+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1974,11 +1974,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "uaktualnia WeeChat bez rozłączania z serwerami" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<ścieżka_do_binarki>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1992,7 +1996,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "ścieżka_do_binarki: ścieżka do pliku binarnego WeeChat (domyślnie jest to " "obecny plik)\n" @@ -8948,6 +8964,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: rozmowa zakończona z %s (%d.%d.%d.%d)" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: przerywam aktywny xfer: \"%s\" od %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: za mało pamięci na nowy xfer" @@ -9032,10 +9052,6 @@ msgstr "" "startowa: %llu): xfer nie znaleziony lub nie gotowy do transferu" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: przerywam aktywny xfer: \"%s\" od %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: błąd podczas wysyłania danych do \"%s\" przez rozmowę xfer" diff --git a/po/pt_BR.po b/po/pt_BR.po index 22e4ef13e..228ecc38e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:43+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1938,11 +1938,15 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "atualiza o WeeChat sem desconectar dos servidores" -msgid "[<path_to_binary>]" +#, fuzzy +msgid "[<path_to_binary>|-quit]" msgstr "[<caminho_para_o_binário>]" +#, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1956,7 +1960,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "caminho_para_o_binário: caminho para o binário do WeeChat (padrão é o " "binário atual\n" @@ -8377,6 +8393,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "%s: chat terminado com %s (%d.%d.%d.%d)" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "%s%s: abortando transferência ativa: \"%s\" de %s" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s%s: memória insuficiente para nova transferência" @@ -8466,10 +8486,6 @@ msgstr "" "transferir" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "%s%s: abortando transferência ativa: \"%s\" de %s" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s%s: erro ao enviar dados para \"%s\" via chat de transferência" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: 2012-09-29 11:43+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1626,12 +1626,14 @@ msgid "upgrade WeeChat without disconnecting from servers" msgstr "обновить WeeChat не отключаясь от серверов" #, fuzzy -msgid "[<path_to_binary>]" +msgid "[<path_to_binary>|-quit]" msgstr "[путь_к_исполняемому_файлу]" #, fuzzy msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1645,7 +1647,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" "путь_к_файлу: путь к исполняемому файлу WeeChat (по-умолчанию используется " "текущий файл)\n" @@ -8256,6 +8270,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "DCC-чат закончен с %s%s %s(%s%d.%d.%d.%d%s)\n" #, fuzzy, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "Отменяю активное DCC-сединение: \"%s\" от %s\n" + +#, fuzzy, c-format msgid "%s%s: not enough memory for new xfer" msgstr "%s недостаточно памяти для нового DCC\n" @@ -8337,10 +8355,6 @@ msgstr "" "найден или завершён\n" #, fuzzy, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "Отменяю активное DCC-сединение: \"%s\" от %s\n" - -#, fuzzy, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "%s ошибка при отправке данных \"%s\" через DCC-чат\n" diff --git a/po/weechat.pot b/po/weechat.pot index a7776906a..90fc6b549 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-10-16 13:26+0200\n" +"POT-Creation-Date: 2012-10-18 20:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1424,11 +1424,13 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "" -msgid "[<path_to_binary>]" +msgid "[<path_to_binary>|-quit]" msgstr "" msgid "" "path_to_binary: path to WeeChat binary (default is current binary)\n" +" -quit: close *ALL* connections, save session and quit WeeChat, " +"which makes possible a delayed restoration (see below)\n" "\n" "This command upgrades and reloads a running WeeChat session. The new WeeChat " "binary must have been compiled or installed with a package manager before " @@ -1442,7 +1444,19 @@ msgid "" " 1. save session into files for core and plugins (buffers, history, ..)\n" " 2. unload all plugins (configuration files (*.conf) are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" -" 4. execute new WeeChat binary and reload session." +" 4. execute new WeeChat binary and reload session.\n" +"\n" +"With option \"-quit\", the process is slightly different:\n" +" 1. close *ALL* connections (irc, xfer, relay, ...)\n" +" 2. save session into files (*.upgrade)\n" +" 3. unload all plugins\n" +" 4. save WeeChat configuration\n" +" 5. quit WeeChat\n" +"Then later you can restore session with command: weechat-curses --upgrade\n" +"IMPORTANT: you must restore the session with exactly same configuration " +"(files *.conf).\n" +"It is possible to restore WeeChat session on another machine if you copy the " +"content of directory \"~/.weechat\"" msgstr "" msgid "show WeeChat uptime" @@ -7267,6 +7281,10 @@ msgid "%s: chat closed with %s (%d.%d.%d.%d)" msgstr "" #, c-format +msgid "%s%s: aborting active xfer: \"%s\" from %s" +msgstr "" + +#, c-format msgid "%s%s: not enough memory for new xfer" msgstr "" @@ -7343,10 +7361,6 @@ msgid "" msgstr "" #, c-format -msgid "%s%s: aborting active xfer: \"%s\" from %s" -msgstr "" - -#, c-format msgid "%s%s: error sending data to \"%s\" via xfer chat" msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 4518f273f..99e26d7a4 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -4622,12 +4622,11 @@ COMMAND_CALLBACK(upgrade) char *ptr_binary; char *exec_args[7] = { NULL, "-a", "--dir", NULL, "--upgrade", NULL }; struct stat stat_buf; - int rc; + int rc, quit; /* make C compiler happy */ (void) data; (void) buffer; - (void) argv; /* * it is forbidden to upgrade while there are some background process @@ -4642,40 +4641,48 @@ COMMAND_CALLBACK(upgrade) return WEECHAT_RC_OK; } + ptr_binary = NULL; + quit = 0; + if (argc > 1) { - ptr_binary = string_expand_home (argv_eol[1]); - if (ptr_binary) + if (string_strcasecmp (argv[1], "-quit") == 0) + quit = 1; + else { - /* check if weechat binary is here and executable by user */ - rc = stat (ptr_binary, &stat_buf); - if ((rc != 0) || (!S_ISREG(stat_buf.st_mode))) - { - gui_chat_printf (NULL, - _("%sCan't upgrade: WeeChat binary \"%s\" " - "does not exist"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - ptr_binary); - free (ptr_binary); - return WEECHAT_RC_OK; - } - if ((!(stat_buf.st_mode & S_IXUSR)) && (!(stat_buf.st_mode & S_IXGRP)) - && (!(stat_buf.st_mode & S_IXOTH))) + ptr_binary = string_expand_home (argv_eol[1]); + if (ptr_binary) { - gui_chat_printf (NULL, - _("%sCan't upgrade: WeeChat binary \"%s\" " - "does not have execute permissions"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - ptr_binary); - free (ptr_binary); - return WEECHAT_RC_OK; + /* check if weechat binary is here and executable by user */ + rc = stat (ptr_binary, &stat_buf); + if ((rc != 0) || (!S_ISREG(stat_buf.st_mode))) + { + gui_chat_printf (NULL, + _("%sCan't upgrade: WeeChat binary \"%s\" " + "does not exist"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + ptr_binary); + free (ptr_binary); + return WEECHAT_RC_OK; + } + if ((!(stat_buf.st_mode & S_IXUSR)) && (!(stat_buf.st_mode & S_IXGRP)) + && (!(stat_buf.st_mode & S_IXOTH))) + { + gui_chat_printf (NULL, + _("%sCan't upgrade: WeeChat binary \"%s\" " + "does not have execute permissions"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + ptr_binary); + free (ptr_binary); + return WEECHAT_RC_OK; + } } } } - else + if (!ptr_binary && !quit) ptr_binary = strdup (weechat_argv0); - if (!ptr_binary) + if (!ptr_binary && !quit) { gui_chat_printf (NULL, _("%sNot enough memory"), @@ -4683,25 +4690,27 @@ COMMAND_CALLBACK(upgrade) return WEECHAT_RC_OK; } - gui_chat_printf (NULL, - _("Upgrading WeeChat with binary file: \"%s\"..."), - ptr_binary); + if (ptr_binary) + { + gui_chat_printf (NULL, + _("Upgrading WeeChat with binary file: \"%s\"..."), + ptr_binary); + } /* send "upgrade" signal to plugins */ - hook_signal_send ("upgrade", WEECHAT_HOOK_SIGNAL_STRING, NULL); + hook_signal_send ("upgrade", WEECHAT_HOOK_SIGNAL_STRING, + (quit) ? "quit" : NULL); if (!upgrade_weechat_save ()) { gui_chat_printf (NULL, _("%sError: unable to save session in file"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - free (ptr_binary); + if (ptr_binary) + free (ptr_binary); return WEECHAT_RC_OK; } - exec_args[0] = ptr_binary; - exec_args[3] = strdup (weechat_home); - weechat_quit = 1; weechat_upgrading = 1; @@ -4713,6 +4722,14 @@ COMMAND_CALLBACK(upgrade) gui_main_end (1); log_close (); + if (quit) + { + exit (0); + return WEECHAT_RC_OK; + } + + exec_args[0] = ptr_binary; + exec_args[3] = strdup (weechat_home); execvp (exec_args[0], exec_args); /* this code should not be reached if execvp is ok */ @@ -6116,9 +6133,12 @@ command_init () &command_unset, NULL); hook_command (NULL, "upgrade", N_("upgrade WeeChat without disconnecting from servers"), - N_("[<path_to_binary>]"), + N_("[<path_to_binary>|-quit]"), N_("path_to_binary: path to WeeChat binary (default is " - "current binary)\n\n" + "current binary)\n" + " -quit: close *ALL* connections, save session " + "and quit WeeChat, which makes possible a delayed " + "restoration (see below)\n\n" "This command upgrades and reloads a running WeeChat " "session. The new WeeChat binary must have been compiled " "or installed with a package manager before running this " @@ -6133,7 +6153,20 @@ command_init () " 2. unload all plugins (configuration files (*.conf) " "are written on disk)\n" " 3. save WeeChat configuration (weechat.conf)\n" - " 4. execute new WeeChat binary and reload session."), + " 4. execute new WeeChat binary and reload session.\n\n" + "With option \"-quit\", the process is slightly " + "different:\n" + " 1. close *ALL* connections (irc, xfer, relay, ...)\n" + " 2. save session into files (*.upgrade)\n" + " 3. unload all plugins\n" + " 4. save WeeChat configuration\n" + " 5. quit WeeChat\n" + "Then later you can restore session with command: " + "weechat-curses --upgrade\n" + "IMPORTANT: you must restore the session with exactly " + "same configuration (files *.conf).\n" + "It is possible to restore WeeChat session on another " + "machine if you copy the content of directory \"~/.weechat\""), "%(filename)", &command_upgrade, NULL); hook_command (NULL, "uptime", diff --git a/src/plugins/irc/irc.c b/src/plugins/irc/irc.c index 0c85293e7..730eed169 100644 --- a/src/plugins/irc/irc.c +++ b/src/plugins/irc/irc.c @@ -96,33 +96,37 @@ irc_signal_upgrade_cb (void *data, const char *signal, const char *type_data, void *signal_data) { struct t_irc_server *ptr_server; - int disconnected; + int quit, ssl_disconnected; /* make C compiler happy */ (void) data; (void) signal; (void) type_data; - (void) signal_data; irc_signal_upgrade_received = 1; - /* - * FIXME: it's not possible to upgrade with SSL servers connected (GnuTLS - * lib can't reload data after upgrade), so we close connection for - * all SSL servers currently connected - */ - disconnected = 0; + quit = (signal_data && (strcmp (signal_data, "quit") == 0)); + ssl_disconnected = 0; + for (ptr_server = irc_servers; ptr_server; ptr_server = ptr_server->next_server) { - if (ptr_server->is_connected && ptr_server->ssl_connected) + /* + * FIXME: it's not possible to upgrade with SSL servers connected (GnuTLS + * lib can't reload data after upgrade), so we close connection for + * all SSL servers currently connected + */ + if (ptr_server->is_connected && (ptr_server->ssl_connected || quit)) { - disconnected++; - weechat_printf (ptr_server->buffer, - _("%s%s: disconnecting from server because upgrade " - "can't work for servers connected via SSL"), - weechat_prefix ("error"), - IRC_PLUGIN_NAME); + if (!quit) + { + ssl_disconnected++; + weechat_printf (ptr_server->buffer, + _("%s%s: disconnecting from server because upgrade " + "can't work for servers connected via SSL"), + weechat_prefix ("error"), + IRC_PLUGIN_NAME); + } irc_server_disconnect (ptr_server, 0, 0); /* * schedule reconnection: WeeChat will reconnect to this server @@ -133,15 +137,15 @@ irc_signal_upgrade_cb (void *data, const char *signal, const char *type_data, ptr_server->reconnect_start = time (NULL) - ptr_server->reconnect_delay - 1; } } - if (disconnected > 0) + if (ssl_disconnected > 0) { weechat_printf (NULL, /* TRANSLATORS: "%s" after "%d" is "server" or "servers" */ _("%s%s: disconnected from %d %s (SSL connection " "not supported with upgrade)"), weechat_prefix ("error"), IRC_PLUGIN_NAME, - disconnected, - NG_("server", "servers", disconnected)); + ssl_disconnected, + NG_("server", "servers", ssl_disconnected)); } return WEECHAT_RC_OK; diff --git a/src/plugins/relay/relay.c b/src/plugins/relay/relay.c index 5fa70ae7a..a60be6d04 100644 --- a/src/plugins/relay/relay.c +++ b/src/plugins/relay/relay.c @@ -84,7 +84,7 @@ relay_signal_upgrade_cb (void *data, const char *signal, const char *type_data, { struct t_relay_server *ptr_server; struct t_relay_client *ptr_client; - int disconnected; + int quit, ssl_disconnected; /* make C compiler happy */ (void) data; @@ -101,38 +101,43 @@ relay_signal_upgrade_cb (void *data, const char *signal, const char *type_data, relay_server_close_socket (ptr_server); } - /* - * FIXME: it's not possible to upgrade with SSL clients connected (GnuTLS - * lib can't reload data after upgrade), so we close connection for - * all SSL clients currently connected - */ - disconnected = 0; + quit = (signal_data && (strcmp (signal_data, "quit") == 0)); + ssl_disconnected = 0; + for (ptr_client = relay_clients; ptr_client; ptr_client = ptr_client->next_client) { - if ((ptr_client->sock >= 0) && ptr_client->ssl) + /* + * FIXME: it's not possible to upgrade with SSL clients connected (GnuTLS + * lib can't reload data after upgrade), so we close connection for + * all SSL clients currently connected + */ + if ((ptr_client->sock >= 0) && (ptr_client->ssl || quit)) { - disconnected++; - weechat_printf (NULL, - _("%s%s: disconnecting from client %s%s%s because " - "upgrade can't work for clients connected via SSL"), - weechat_prefix ("error"), - RELAY_PLUGIN_NAME, - RELAY_COLOR_CHAT_CLIENT, - ptr_client->desc, - RELAY_COLOR_CHAT); + if (!quit) + { + ssl_disconnected++; + weechat_printf (NULL, + _("%s%s: disconnecting from client %s%s%s because " + "upgrade can't work for clients connected via SSL"), + weechat_prefix ("error"), + RELAY_PLUGIN_NAME, + RELAY_COLOR_CHAT_CLIENT, + ptr_client->desc, + RELAY_COLOR_CHAT); + } relay_client_set_status (ptr_client, RELAY_STATUS_DISCONNECTED); } } - if (disconnected > 0) + if (ssl_disconnected > 0) { weechat_printf (NULL, /* TRANSLATORS: "%s" after "%d" is "client" or "clients" */ _("%s%s: disconnected from %d %s (SSL connection " "not supported with upgrade)"), weechat_prefix ("error"), RELAY_PLUGIN_NAME, - disconnected, - NG_("client", "clients", disconnected)); + ssl_disconnected, + NG_("client", "clients", ssl_disconnected)); } return WEECHAT_RC_OK; diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c index aa9e2fecb..371390293 100644 --- a/src/plugins/xfer/xfer.c +++ b/src/plugins/xfer/xfer.c @@ -74,6 +74,9 @@ int xfer_count = 0; /* number of xfer */ int xfer_signal_upgrade_received = 0; /* signal "upgrade" received ? */ +void xfer_disconnect_all (); + + /* * xfer_valid: check if a xfer pointer exists * return 1 if xfer exists @@ -111,10 +114,12 @@ xfer_signal_upgrade_cb (void *data, const char *signal, const char *type_data, (void) data; (void) signal; (void) type_data; - (void) signal_data; xfer_signal_upgrade_received = 1; + if (signal_data && (strcmp (signal_data, "quit") == 0)) + xfer_disconnect_all (); + return WEECHAT_RC_OK; } @@ -341,6 +346,35 @@ xfer_close (struct t_xfer *xfer, enum t_xfer_status status) } /* + * xfer_disconnect_all: disconnect all active xfer (with a socket) + */ + +void +xfer_disconnect_all () +{ + struct t_xfer *ptr_xfer; + + for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer) + { + if (ptr_xfer->sock >= 0) + { + if (ptr_xfer->status == XFER_STATUS_ACTIVE) + { + weechat_printf (NULL, + _("%s%s: aborting active xfer: \"%s\" from %s"), + weechat_prefix ("error"), XFER_PLUGIN_NAME, + ptr_xfer->filename, ptr_xfer->remote_nick); + weechat_log_printf (_("%s%s: aborting active xfer: \"%s\" from %s"), + "", XFER_PLUGIN_NAME, + ptr_xfer->filename, + ptr_xfer->remote_nick); + } + xfer_close (ptr_xfer, XFER_STATUS_FAILED); + } + } +} + +/* * xfer_port_in_use: return 1 if a port is in used * (by an active or connecting xfer) */ @@ -1486,8 +1520,6 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) int weechat_plugin_end (struct t_weechat_plugin *plugin) { - struct t_xfer *ptr_xfer; - /* make C compiler happy */ (void) plugin; @@ -1496,26 +1528,7 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) if (xfer_signal_upgrade_received) xfer_upgrade_save (); else - { - for (ptr_xfer = xfer_list; ptr_xfer; ptr_xfer = ptr_xfer->next_xfer) - { - if (ptr_xfer->sock >= 0) - { - if (ptr_xfer->status == XFER_STATUS_ACTIVE) - { - weechat_printf (NULL, - _("%s%s: aborting active xfer: \"%s\" from %s"), - weechat_prefix ("error"), XFER_PLUGIN_NAME, - ptr_xfer->filename, ptr_xfer->remote_nick); - weechat_log_printf (_("%s%s: aborting active xfer: \"%s\" from %s"), - "", XFER_PLUGIN_NAME, - ptr_xfer->filename, - ptr_xfer->remote_nick); - } - xfer_close (ptr_xfer, XFER_STATUS_FAILED); - } - } - } + xfer_disconnect_all (); return WEECHAT_RC_OK; } |