diff options
76 files changed, 441 insertions, 418 deletions
diff --git a/.gitignore b/.gitignore index 2f8d3011c..e0e5754e9 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,4 @@ weechat.pc *stamp stamp* -src/gui/curses/weechat-curses +src/gui/curses/weechat diff --git a/CMakeLists.txt b/CMakeLists.txt index ab023296b..06ee1d5f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/" "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/" "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$" "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$" - "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$" + "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$" ) INCLUDE(CPack) @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.4.2-dev, 2013-07-31 +v0.4.2-dev, 2013-08-02 This document lists all changes for each version. @@ -14,6 +14,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] Version 0.4.2 (under dev!) -------------------------- +* core: rename binary and man page from "weechat-curses" to "weechat" + (task #11027) * core: disable build of doc by default, add cmake option ENABLE_MAN to compile man page (off by default) * core: add option "-o" for command /color @@ -1,7 +1,7 @@ WeeChat Release Notes ===================== Sébastien Helleu <flashcode@flashtux.org> -v0.4.2-dev, 2013-07-31 +v0.4.2-dev, 2013-08-02 This document lists important changes for each version, that require manual @@ -16,6 +16,23 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] Version 0.4.2 (under dev!) -------------------------- +=== Binary and man page === + +WeeChat binary and man page have been renamed from `weechat-curses` to +`weechat`. + +A symbolic link has been added for binary: `weechat-curses` -> `weechat` +(so that the /upgrade from a old version will still work). + +If you upgrade from an old version, it is recommended to force the use of the +new binary name with the command: `/upgrade /path/to/weechat` (replace the path +accordingly). + +[NOTE] +For packagers: you should create the link `weechat-curses` -> `weechat` if it's +not automatically created in the package (both cmake and configure are creating +this link on make install). + === Man page / documentation === Documentation is not built by default any more, you have to use option diff --git a/configure.ac b/configure.ac index 0f9cf18f7..ac3755f7f 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ LICENSE="GPL3" AC_PROG_CC AC_PROG_MAKE_SET AC_GNU_SOURCE +AC_PROG_LN_S AM_PROG_LIBTOOL # Files to generate diff --git a/debian/rules b/debian/rules index f9af7b743..284373bd4 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,13 @@ $(BUILDDIR)/Makefile: override_dh_auto_build: $(BUILDDIR)/Makefile dh_auto_build +# Create a symbolic link weechat -> weechat-curses +# This link is created for compatibility with old versions on /upgrade. +# It may be removed in future. +override_dh_auto_install: + dh_auto_install + ln -s weechat $(CURDIR)/debian/weechat-curses/usr/bin/weechat-curses + override_dh_auto_configure: # the package also has autotools buildsys and # debhelper try to use it but that's not needed diff --git a/debian/weechat-curses.install b/debian/weechat-curses.install index a9c211f8b..9ca632180 100644 --- a/debian/weechat-curses.install +++ b/debian/weechat-curses.install @@ -1,4 +1,4 @@ -usr/bin/weechat-curses +usr/bin/weechat debian/weechat.xpm usr/share/pixmaps -usr/share/man/man1/weechat-curses.1 -usr/share/man/*/man1/weechat-curses.1 +usr/share/man/man1/weechat.1 +usr/share/man/*/man1/weechat.1 diff --git a/debian/weechat-curses.lintian-overrides b/debian/weechat-curses.lintian-overrides deleted file mode 100644 index b1c6ca402..000000000 --- a/debian/weechat-curses.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 65: warning [p 1, 9.7i]: cannot adjust line diff --git a/debian/weechat-curses.menu b/debian/weechat-curses.menu index 5c5f5f994..0cd91687c 100644 --- a/debian/weechat-curses.menu +++ b/debian/weechat-curses.menu @@ -1,4 +1,4 @@ ?package(weechat-curses):needs="text" section="Applications/Network/Communication" \ - title="weechat-curses" \ + title="weechat" \ icon="/usr/share/pixmaps/weechat.xpm" \ - command="/usr/bin/weechat-curses" + command="/usr/bin/weechat" diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt index 8d6c8de63..583a1ef48 100644 --- a/doc/de/CMakeLists.txt +++ b/doc/de/CMakeLists.txt @@ -20,15 +20,15 @@ IF (ENABLE_MAN) # man page ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 - COMMAND ${A2X_EXECUTABLE} ARGS -a lang=de -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.de.txt + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 + COMMAND ${A2X_EXECUTABLE} ARGS -a lang=de -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.de.txt + ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt - COMMENT "Building weechat-curses.1 (de)" + COMMENT "Building weechat.1 (de)" ) - ADD_CUSTOM_TARGET(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/de/man1) + ADD_CUSTOM_TARGET(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1) ENDIF (ENABLE_MAN) IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index 2edef5dc9..712128de3 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -21,7 +21,7 @@ docdir = $(datadir)/doc/$(PACKAGE) EXTRA_DIST = CMakeLists.txt \ - weechat-curses.1.de.txt \ + weechat.1.de.txt \ cmdline_options.de.txt \ weechat_user.de.txt \ weechat_scripting.de.txt \ @@ -31,7 +31,7 @@ EXTRA_DIST = CMakeLists.txt \ $(wildcard autogen/user/*.txt) if MAN - man_targets = weechat-curses.1 + man_targets = weechat.1 man_install = install-man man_uninstall = uninstall-man endif @@ -47,8 +47,8 @@ endif all-local: $(man_targets) $(doc_targets) # man page -weechat-curses.1: weechat-curses.1.de.txt cmdline_options.de.txt - $(A2X) -a lang=de -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/de/weechat-curses.1.de.txt +weechat.1: weechat.1.de.txt cmdline_options.de.txt + $(A2X) -a lang=de -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/de/weechat.1.de.txt # user's guide weechat_user.de.html: weechat_user.de.txt cmdline_options.de.txt $(wildcard autogen/user/*.txt) @@ -87,7 +87,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/de/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/de/man1 uninstall-doc: @@ -97,5 +97,5 @@ uninstall-doc: # clean clean-local: - -rm -f weechat-curses.1 + -rm -f weechat.1 -rm -f *.html diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index b32d2ca48..e7412527e 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -680,7 +680,7 @@ With option "-quit", the process is slightly different: 3. unload all plugins 4. save WeeChat configuration 5. quit WeeChat -Then later you can restore session with command: weechat-curses --upgrade +Then later you can restore session with command: weechat --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". ........................................ diff --git a/doc/de/weechat-curses.1.de.txt b/doc/de/weechat.1.de.txt index 17aab157e..c3f28ccf8 100644 --- a/doc/de/weechat-curses.1.de.txt +++ b/doc/de/weechat.1.de.txt @@ -1,22 +1,22 @@ -WEECHAT-CURSES(1) -================= +WEECHAT(1) +========== :doctype: manpage NAME ---- -weechat-curses - der erweiterbare Chat Client (Curses Version) +weechat - der erweiterbare Chat Client SYNOPSIS -------- [verse] -'weechat-curses' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] -'weechat-curses' [-c|--colors] -'weechat-curses' [-h|--help] -'weechat-curses' [-k|--keys] -'weechat-curses' [-l|--license] -'weechat-curses' [-v|--version] +'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] +'weechat' [-c|--colors] +'weechat' [-h|--help] +'weechat' [-k|--keys] +'weechat' [-l|--license] +'weechat' [-v|--version] BESCHREIBUNG ------------ diff --git a/doc/de/weechat_faq.de.txt b/doc/de/weechat_faq.de.txt index 32b5df5fd..c269d3743 100644 --- a/doc/de/weechat_faq.de.txt +++ b/doc/de/weechat_faq.de.txt @@ -87,8 +87,8 @@ Dies ist ein bekanntes Problem. Aus diesem Grund sollten die folgenden Punkte sorgfältig durchgelesen und *alle* aufgezeigten Lösungsmöglichkeiten überprüft werden: -* überprüfe, ob weechat-curses mit libncursesw verlinkt ist (Warnung: Dies ist bei den - meisten Distributionen nötig - jedoch nicht bei allen): `ldd /path/to/weechat-curses` +* überprüfe, ob weechat mit libncursesw verlinkt ist (Warnung: Dies ist bei den + meisten Distributionen nötig - jedoch nicht bei allen): `ldd /path/to/weechat` * prüfe mit dem Befehl `/plugin`, ob die "Charset" Erweiterung geladen ist (falls dies nicht der Fall sein sollte benötigst Du wahrscheinlich noch das Paket "weechat-plugins") * überprüfe die Ausgabe des `/charset` Befehls (im Server-Buffer). Du solltest @@ -788,7 +788,7 @@ Wenn man WeeChat in gdb startet kann ein Thread-Fehler auftreten. Was beudeutet Falls man WeeChat in gdb ausführt kann folgende Fehlermeldung erscheinen: ---------------------------------------- -$ gdb /Pfad/zu/weechat-curses +$ gdb /Pfad/zu/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -798,7 +798,7 @@ Um diesen Fehler zu beheben sollte man gdb wie folgt aufrufen (der Pfad zu libpthread und WeeChat muss natürlich an das eigene System angepasst werden): ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat (gdb) run ---------------------------------------- diff --git a/doc/de/weechat_quickstart.de.txt b/doc/de/weechat_quickstart.de.txt index 2eae6acf7..b4219fcb0 100644 --- a/doc/de/weechat_quickstart.de.txt +++ b/doc/de/weechat_quickstart.de.txt @@ -14,7 +14,7 @@ Probleme mit der Standard Tastaturbelegung). Starte aus Deiner shell: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/de/weechat_tester.de.txt b/doc/de/weechat_tester.de.txt index 4224e1ea0..224757303 100644 --- a/doc/de/weechat_tester.de.txt +++ b/doc/de/weechat_tester.de.txt @@ -41,7 +41,9 @@ zu lokalisieren. Falls Du die 'bash' als shell benutzt, dann ergänze Deine `~/.bashrc` durch folgende Zeile: - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -64,47 +66,47 @@ Beschaffe und baue die Quellen Erstelle zuerst einen neuen Ordner, z.B. 'weechat-git': ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- Falls Du git installiert hast, clone das git Repository (empfohlen): --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- NOTE: Um auf den aktuellen Stand zu kommen verwendest Du z.B. "`git pull`" in diesem Ordner. Ansonsten kannst Du das 'Entwickler-Paket' herunterladen und entpacken: ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- Um die Quellen zu übersetzen, wird cmake empfohlen: --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- Falls Du cmake nicht hast, ist es auch möglich die autotools zu nutzen: ----------------------------------------------------------- +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ----------------------------------------------------------- +---------------------------------------- [[install_binary_package]] Installieren des Programm-Paketes @@ -126,7 +128,9 @@ starten (nicht mit dem Ordner der stabilen Version). Die Befehlszeile lautet: - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- Immer noch munter? Dann solltest Du jetzt das bekannte Interface sehen und nun prahle vor Anderen, dass Du die neueste WeeChat-Version verwendest :) diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 9eeb01c88..e050fa052 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -372,16 +372,16 @@ Falls WeeChat abstürzen sollte wird auf Ihrem System eine 'core' bzw. 'core.123 Diese Datei wird in dem Verzeichnis erzeugt aus welchem Sie WeeChat gestartet haben (dies ist *nicht* das Verzeichnis in welchem sich WeeChat befindet!). -Beispiel: 'weechat-curses' ist installiert in '/usr/bin/' und die 'core' Datei befindet sich +Beispiel: 'weechat' ist installiert in '/usr/bin/' und die 'core' Datei befindet sich in '/home/xxx/'. Nun wird gdb mit folgendem Befehl aufgerufen: ---------------------------------------- -gdb /usr/bin/weechat-curses /home/xxx/core +gdb /usr/bin/weechat /home/xxx/core ---------------------------------------- [NOTE] Ist das Binärpaket 'weechat-dbg' (z.B. Debian) installiert dann sollte dieser Pfad zum -starten von WeeChat genutzt werden: '/usr/lib/debug/usr/bin/weechat-curses' +starten von WeeChat genutzt werden: '/usr/lib/debug/usr/bin/weechat' Nun startet man 'gdb' und führt den Befehl `bt full` innerhalb gdb aus um die Fehlermeldung auszugeben. Eine Fehlermeldung von gdb sieht z.B. wie folgt aus: @@ -422,10 +422,10 @@ Eine laufende Session von WeeChat debuggen Um eine laufende Session von WeeChat zu debuggen (zum Beispiel wenn WeeChat nicht mehr reagieren sollte) sollte man gdb mit der Prozess-ID starten ('12345' muss durch -die PID des laufenden weechat-curses Prozesses ersetzt werden): +die PID des laufenden weechat Prozesses ersetzt werden): ---------------------------------------- -gdb /usr/bin/weechat-curses 12345 +gdb /usr/bin/weechat 12345 ---------------------------------------- Sollte WeeChat abgestürzt sein, muss der Befehl `bt full` genutzt werden: @@ -449,7 +449,7 @@ include::cmdline_options.de.txt[] Um WeeChat zu starten muss folgender Befehl ausgeführt werden: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- Wird WeeChat zum ersten mal gestartet wird eine Konfigurationsdatei @@ -1364,7 +1364,7 @@ was die Farbdarstellung in WeeChat betrifft: können lediglich 256 Farbpaare durch WeeChat genutzt werden, dies ist eine Einschränkung von ncurses. -Mittels `weechat-curses --colors` oder dem internen WeeChat-Befehl `/color` kann man sich +Mittels `weechat --colors` oder dem internen WeeChat-Befehl `/color` kann man sich die Einschränkungen für die jeweilige Umgebungsvariable anzeigen lassen. Folgende Werte sind für die 'TERM'-Umgebungsvariable zu empfehlen, sofern man 256 Farben @@ -1840,7 +1840,7 @@ Beispiel: Anmelden beim Server 'irc.freenode.net' mit dem Nick 'nono' und betret der Channels '#weechat' und '#toto' (Standardport (6667) wird genutzt): ---------------------------------------- -$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto +$ weechat irc://nono@irc.freenode.net/#weechat,#toto ---------------------------------------- [[irc_options]] diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index ae9a03d15..dd310de53 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -20,15 +20,15 @@ IF(ENABLE_MAN) # man page ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.en.txt + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 + COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.txt DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.en.txt + ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.txt ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.txt - COMMENT "Building weechat-curses.1 (en)" + COMMENT "Building weechat.1 (en)" ) - ADD_CUSTOM_TARGET(doc-man-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/man1) + ADD_CUSTOM_TARGET(doc-man-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/man1) ENDIF(ENABLE_MAN) IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 836b6c2d4..d219e9954 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -21,7 +21,7 @@ docdir = $(datadir)/doc/$(PACKAGE) EXTRA_DIST = CMakeLists.txt \ - weechat-curses.1.en.txt \ + weechat.1.en.txt \ cmdline_options.en.txt \ weechat_user.en.txt \ weechat_plugin_api.en.txt \ @@ -35,7 +35,7 @@ EXTRA_DIST = CMakeLists.txt \ $(wildcard autogen/plugin_api/*.txt) if MAN - man_targets = weechat-curses.1 + man_targets = weechat.1 man_install = install-man man_uninstall = uninstall-man endif @@ -54,8 +54,8 @@ endif all-local: $(man_targets) $(doc_targets) # man page -weechat-curses.1: weechat-curses.1.en.txt cmdline_options.en.txt - $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/en/weechat-curses.1.en.txt +weechat.1: weechat.1.en.txt cmdline_options.en.txt + $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/en/weechat.1.en.txt # user's guide weechat_user.en.html: weechat_user.en.txt cmdline_options.en.txt $(wildcard autogen/user/*.txt) @@ -106,7 +106,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/man1 uninstall-doc: @@ -116,5 +116,5 @@ uninstall-doc: # clean clean-local: - -rm -f weechat-curses.1 + -rm -f weechat.1 -rm -f *.html diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index bff3a5d01..3b6a3e8f2 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -680,7 +680,7 @@ With option "-quit", the process is slightly different: 3. unload all plugins 4. save WeeChat configuration 5. quit WeeChat -Then later you can restore session with command: weechat-curses --upgrade +Then later you can restore session with command: weechat --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". ........................................ diff --git a/doc/en/weechat-curses.1.en.txt b/doc/en/weechat.1.en.txt index ca7d7740e..e608fed2f 100644 --- a/doc/en/weechat-curses.1.en.txt +++ b/doc/en/weechat.1.en.txt @@ -1,22 +1,22 @@ -WEECHAT-CURSES(1) -================= +WEECHAT(1) +========== :doctype: manpage NAME ---- -weechat-curses - the extensible chat client (Curses version) +weechat - the extensible chat client SYNOPSIS -------- [verse] -'weechat-curses' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] -'weechat-curses' [-c|--colors] -'weechat-curses' [-h|--help] -'weechat-curses' [-k|--keys] -'weechat-curses' [-l|--license] -'weechat-curses' [-v|--version] +'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] +'weechat' [-c|--colors] +'weechat' [-h|--help] +'weechat' [-k|--keys] +'weechat' [-l|--license] +'weechat' [-v|--version] DESCRIPTION ----------- diff --git a/doc/en/weechat_dev.en.txt b/doc/en/weechat_dev.en.txt index dc55acb99..e05032e06 100644 --- a/doc/en/weechat_dev.en.txt +++ b/doc/en/weechat_dev.en.txt @@ -289,9 +289,8 @@ Documentation files: | asciidoc.conf | Asciidoc configuration file (some macros) | asciidoc.css | Asciidoc style | docgen.py | Python script to build files in "autogen/" directory (see below) -| weechat-curses.1 | Weechat man page | XX/ | Documentation for language XX (languages: en, fr, de, it, ...) -| weechat-curses.1.XX.txt | Man page +| weechat.1.XX.txt | Man page | weechat_quickstart.XX.txt | Quickstart guide | weechat_user.XX.txt | User's guide | weechat_faq.XX.txt | FAQ diff --git a/doc/en/weechat_faq.en.txt b/doc/en/weechat_faq.en.txt index 3990db171..7a20cba64 100644 --- a/doc/en/weechat_faq.en.txt +++ b/doc/en/weechat_faq.en.txt @@ -79,8 +79,8 @@ I don't see some chars with accents, what can I do? It's common issue, please read carefully and check *ALL* solutions below: -* check that weechat-curses is linked to libncursesw (warning: needed on most - distributions but not all): `ldd /path/to/weechat-curses` +* check that weechat is linked to libncursesw (warning: needed on most + distributions but not all): `ldd /path/to/weechat` * check that the "Charset" plugin is loaded with `/plugin` command (if it is not, then you probably need the "weechat-plugins" package) * check the output of command `/charset` (on core buffer). You should see @@ -748,7 +748,7 @@ When I run WeeChat under gdb, there is error about threads, what can I do? When you run WeeChat under gdb, you may have this error: ---------------------------------------- -$ gdb /path/to/weechat-curses +$ gdb /path/to/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -758,7 +758,7 @@ To fix that, you can run gdb with this command (replace path to libpthread and WeeChat with paths on your system): ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat (gdb) run ---------------------------------------- diff --git a/doc/en/weechat_quickstart.en.txt b/doc/en/weechat_quickstart.en.txt index c2166e7c6..d556d3c8e 100644 --- a/doc/en/weechat_quickstart.en.txt +++ b/doc/en/weechat_quickstart.en.txt @@ -13,7 +13,7 @@ A recommended terminal emulator for X (but not mandatory) is rxvt-unicode Run from your shell: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/en/weechat_tester.en.txt b/doc/en/weechat_tester.en.txt index d50ba61e2..fff8f2377 100644 --- a/doc/en/weechat_tester.en.txt +++ b/doc/en/weechat_tester.en.txt @@ -36,7 +36,9 @@ info, to know exactly where is problem in WeeChat. If you're using the 'bash' shell, add following line to your `~/.bashrc`: - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -57,48 +59,48 @@ Get and build sources First create a directory, for example 'weechat-git': ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- If you have git installed, you can just clone the git repository (recommended way): --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- NOTE: Later, you can run "`git pull`" in this directory, to get deltas with the latest updates. Otherwise you can download and unpack 'devel' package: ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- To build sources, cmake is recommended: --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- If you don't have cmake, it's still possible to use autotools: ----------------------------------------------------------- +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ----------------------------------------------------------- +---------------------------------------- [[install_binary_package]] Install binary package @@ -121,7 +123,9 @@ version), with option `--dir`. Command is: - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- If you're still awake you should see the familiar interface and brag about having the newest possible version of WeeChat. ;) diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index dc1e404c8..9279eb3d9 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -368,16 +368,16 @@ When WeeChat crashes, your system will create a file 'core' or 'core.12345' This file is created in directory where you have run WeeChat (this is *not* directory where WeeChat is installed!). -For example if 'weechat-curses' is installed in '/usr/bin/' and 'core' file is +For example if 'weechat' is installed in '/usr/bin/' and 'core' file is in '/home/xxx/', then run gdb with this command: ---------------------------------------- -gdb /usr/bin/weechat-curses /home/xxx/core +gdb /usr/bin/weechat /home/xxx/core ---------------------------------------- [NOTE] If you installed binary package 'weechat-dbg' (for example under Debian), then -you can use this path for WeeChat binary: '/usr/lib/debug/usr/bin/weechat-curses' +you can use this path for WeeChat binary: '/usr/lib/debug/usr/bin/weechat' Then under gdb, use command `bt full` to display backtrace. You will see something like that: @@ -418,10 +418,10 @@ Debug a running WeeChat ^^^^^^^^^^^^^^^^^^^^^^^ To debug a running WeeChat (for example if WeeChat seems blocked), you can use -gdb with process id (replace '12345' with PID of weechat-curses process): +gdb with process id (replace '12345' with PID of weechat process): ---------------------------------------- -gdb /usr/bin/weechat-curses 12345 +gdb /usr/bin/weechat 12345 ---------------------------------------- Then like for a crash, use command `bt full`: @@ -445,7 +445,7 @@ include::cmdline_options.en.txt[] To start WeeChat, issue this command: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- When you run WeeChat for the first time, a default configuration file is @@ -1344,7 +1344,7 @@ for colors in WeeChat: ^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be used in WeeChat, because of a ncurses limitation. -You can run `weechat-curses --colors` or use command `/color` in WeeChat to +You can run `weechat --colors` or use command `/color` in WeeChat to display limits for your environment. Some recommended values for 'TERM' if you want 256 colors: @@ -1806,7 +1806,7 @@ Example to join '#weechat' and '#toto' on server 'irc.freenode.net' server, default port (6667), with nick 'nono': ---------------------------------------- -$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto +$ weechat irc://nono@irc.freenode.net/#weechat,#toto ---------------------------------------- [[irc_options]] diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am index 03132317e..c57d3e634 100644 --- a/doc/es/Makefile.am +++ b/doc/es/Makefile.am @@ -55,7 +55,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/es/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/es/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/es/man1 uninstall-doc: diff --git a/doc/es/weechat_quickstart.es.txt b/doc/es/weechat_quickstart.es.txt index 7934f28e9..b5dde3980 100644 --- a/doc/es/weechat_quickstart.es.txt +++ b/doc/es/weechat_quickstart.es.txt @@ -15,7 +15,7 @@ los atajas de teclados predeterminados). Run from your shell: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt index 06f0ef151..0fe4f734a 100644 --- a/doc/fr/CMakeLists.txt +++ b/doc/fr/CMakeLists.txt @@ -20,15 +20,15 @@ IF (ENABLE_MAN) # man page ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 - COMMAND ${A2X_EXECUTABLE} ARGS -a lang=fr -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.fr.txt + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 + COMMAND ${A2X_EXECUTABLE} ARGS -a lang=fr -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.txt DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.fr.txt + ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.txt ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.txt - COMMENT "Building weechat-curses.1 (fr)" + COMMENT "Building weechat.1 (fr)" ) - ADD_CUSTOM_TARGET(doc-man-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/fr/man1) + ADD_CUSTOM_TARGET(doc-man-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/fr/man1) ENDIF (ENABLE_MAN) IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 3dfc3cd75..5a2e62913 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -21,7 +21,7 @@ docdir = $(datadir)/doc/$(PACKAGE) EXTRA_DIST = CMakeLists.txt \ - weechat-curses.1.fr.txt \ + weechat.1.fr.txt \ cmdline_options.fr.txt \ weechat_user.fr.txt \ weechat_plugin_api.fr.txt \ @@ -33,7 +33,7 @@ EXTRA_DIST = CMakeLists.txt \ $(wildcard autogen/plugin_api/*.txt) if MAN - man_targets = weechat-curses.1 + man_targets = weechat.1 man_install = install-man man_uninstall = uninstall-man endif @@ -50,8 +50,8 @@ endif all-local: $(man_targets) $(doc_targets) # man page -weechat-curses.1: weechat-curses.1.fr.txt cmdline_options.fr.txt - $(A2X) -a lang=fr -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/fr/weechat-curses.1.fr.txt +weechat.1: weechat.1.fr.txt cmdline_options.fr.txt + $(A2X) -a lang=fr -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/fr/weechat.1.fr.txt # user's guide weechat_user.fr.html: weechat_user.fr.txt cmdline_options.fr.txt $(wildcard autogen/user/*.txt) @@ -94,7 +94,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/fr/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/fr/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/fr/man1 uninstall-doc: @@ -104,5 +104,5 @@ uninstall-doc: # clean clean-local: - -rm -f weechat-curses.1 + -rm -f weechat.1 -rm -f *.html diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 7427a605b..cfa39c47b 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -680,7 +680,7 @@ Avec l'option "-quit", le processus est légèrement différent : 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 +Et plus tard vous pouvez restaurer la session avec la commande: weechat --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". ........................................ diff --git a/doc/fr/weechat-curses.1.fr.txt b/doc/fr/weechat.1.fr.txt index 0bb2cd3ac..fa3626f4b 100644 --- a/doc/fr/weechat-curses.1.fr.txt +++ b/doc/fr/weechat.1.fr.txt @@ -1,22 +1,22 @@ -WEECHAT-CURSES(1) -================= +WEECHAT(1) +========== :doctype: manpage NOM --- -weechat-curses - le client de discussion extensible (version Curses) +weechat - le client de discussion extensible SYNOPSIS -------- [verse] -'weechat-curses' [-a|--no-connect] [-d|--dir <répertoire>] [-p|--no-plugin] [-r|--run-command <commande>] [-s|--no-script] [--upgrade] [extension:option...] -'weechat-curses' [-c|--colors] -'weechat-curses' [-h|--help] -'weechat-curses' [-k|--keys] -'weechat-curses' [-l|--license] -'weechat-curses' [-v|--version] +'weechat' [-a|--no-connect] [-d|--dir <répertoire>] [-p|--no-plugin] [-r|--run-command <commande>] [-s|--no-script] [--upgrade] [extension:option...] +'weechat' [-c|--colors] +'weechat' [-h|--help] +'weechat' [-k|--keys] +'weechat' [-l|--license] +'weechat' [-v|--version] DESCRIPTION ----------- diff --git a/doc/fr/weechat_faq.fr.txt b/doc/fr/weechat_faq.fr.txt index b1e5b7fc4..721825074 100644 --- a/doc/fr/weechat_faq.fr.txt +++ b/doc/fr/weechat_faq.fr.txt @@ -80,9 +80,9 @@ Je ne vois pas bien certains accents dans WeeChat, que faire ? C'est un problème courant, merci de lire attentivement et vérifier *TOUS* les points ci-dessous : -* vérifiez que weechat-curses est lié avec libncursesw (attention : nécessaire +* vérifiez que weechat est lié avec libncursesw (attention : nécessaire sur beaucoup de distributions, mais pas toutes) : - `ldd /chemin/vers/weechat-curses` + `ldd /chemin/vers/weechat` * vérifiez que l'extension "Charset" est chargée avec la commande `/plugin` (s'il ne l'est pas, vous devez peut-être installer le paquet "weechat-plugins") @@ -777,7 +777,7 @@ Quand je lance WeeChat sous gdb, il y a une erreur à propos des threads, que pu Quand vous lancez WeeChat sous gdb, vous pouvez avoir cette erreur : ---------------------------------------- -$ gdb /path/to/weechat-curses +$ gdb /path/to/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -787,7 +787,7 @@ Pour corriger ça, vous pouvez lancer gdb avec cette commande (remplacez le chemin vers libpthread et WeeChat avec les chemins sur votre système) : ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat (gdb) run ---------------------------------------- diff --git a/doc/fr/weechat_quickstart.fr.txt b/doc/fr/weechat_quickstart.fr.txt index 6a5dc7df9..cc4c37456 100644 --- a/doc/fr/weechat_quickstart.fr.txt +++ b/doc/fr/weechat_quickstart.fr.txt @@ -14,7 +14,7 @@ touches par défaut). Lancer depuis votre shell : ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/fr/weechat_tester.fr.txt b/doc/fr/weechat_tester.fr.txt index bb61af071..fcfe0d15d 100644 --- a/doc/fr/weechat_tester.fr.txt +++ b/doc/fr/weechat_tester.fr.txt @@ -39,7 +39,9 @@ se situe dans WeeChat). Si vous utilisez le shell 'bash', ajoutez cette ligne dans votre `~/.bashrc` : - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -62,47 +64,47 @@ Obtenir et compiler les sources Créez tout d'abord un répertoire, par exemple 'weechat-git' : ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- Si vous avez git installé, vous pouvez cloner la base GIT (recommandé) : --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- NOTE: Plus tard, vous pourrez utiliser la commande "`git pull`" dans ce répertoire pour obtenir juste les deltas avec la version d'aujourd'hui. Sinon vous pouvez installer le paquet 'devel' : ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- Pour compiler les sources, cmake est recommandé : --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- Si vous n'avez pas cmake, il est toujours possible d'utiliser les autotools : ------------------------------------------------------------------ +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ------------------------------------------------------------------ +---------------------------------------- [[install_binary_package]] Obtenir un paquet binaire @@ -125,7 +127,9 @@ stable, avec l'option `--dir`. La commande est : - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- Si vous êtes encore éveillé, vous devriez voir une interface familière et pouvoir vous vanter d'utiliser la version la plus récente possible de WeeChat ;) diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 3df3d8df3..a8f1175cd 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -375,17 +375,17 @@ Lorsque WeeChat se plante, votre système génère un fichier 'core' ou Ce fichier est créé dans le répertoire où vous avez lancé WeeChat (ce n'est *pas* le répertoire où WeeChat est installé !). -Par exemple si 'weechat-curses' est installé dans '/usr/bin/' et que le fichier +Par exemple si 'weechat' est installé dans '/usr/bin/' et que le fichier 'core' est dans '/home/xxx/', alors lancez gdb avec cette commande : ---------------------------------------- -gdb /usr/bin/weechat-curses /home/xxx/core +gdb /usr/bin/weechat /home/xxx/core ---------------------------------------- [NOTE] Si vous avez installé le paquet binaire 'weechat-dbg' (par exemple sous Debian), alors vous pouvez utiliser ce chemin pour l'exécutable WeeChat : -'/usr/lib/debug/usr/bin/weechat-curses' +'/usr/lib/debug/usr/bin/weechat' Puis sous gdb, utilisez la commande `bt full` pour afficher la trace. Vous verrez quelque chose comme ceci : @@ -427,10 +427,10 @@ Debug de WeeChat qui tourne Pour déboguer WeeChat qui tourne (par exemple si WeeChat semble bloqué), vous pouvez utiliser gdb avec l'identifiant du processus (remplacez '12345' par le -PID du processus weechat-curses) : +PID du processus weechat) : ---------------------------------------- -gdb /usr/bin/weechat-curses 12345 +gdb /usr/bin/weechat 12345 ---------------------------------------- Ensuite comme pour un crash, utilisez la commande `bt full` : @@ -454,7 +454,7 @@ include::cmdline_options.fr.txt[] Pour lancer WeeChat, tapez cette commande : ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- Lorsque vous lancez WeeChat pour la première fois, un fichier de configuration @@ -1380,7 +1380,7 @@ limites suivantes pour les couleurs dans WeeChat : ^(1)^ Même si votre terminal supporte plus de 256 paires, seules 256 paires peuvent être utilisées dans WeeChat, en raison d'une limitation de ncurses. -Vous pouvez lancer `weechat-curses --colors` ou utiliser la commande `/color` +Vous pouvez lancer `weechat --colors` ou utiliser la commande `/color` dans WeeChat pour afficher les limites de votre environnement. Quelques valeurs recommandées pour 'TERM' si vous voulez 256 couleurs : @@ -1863,7 +1863,7 @@ Exemple pour rejoindre '#weechat' et '#toto' sur le serveur 'irc.freenode.net', port par défaut (6667), avec le pseudo 'nono' : ---------------------------------------- -$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto +$ weechat irc://nono@irc.freenode.net/#weechat,#toto ---------------------------------------- [[irc_options]] diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt index 76aaf5b4e..a99492def 100644 --- a/doc/it/CMakeLists.txt +++ b/doc/it/CMakeLists.txt @@ -20,15 +20,15 @@ IF (ENABLE_MAN) # man page ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 - COMMAND ${A2X_EXECUTABLE} ARGS -a lang=it -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.it.txt + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 + COMMAND ${A2X_EXECUTABLE} ARGS -a lang=it -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.txt DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.it.txt + ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.txt ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.txt - COMMENT "Building weechat-curses.1 (it)" + COMMENT "Building weechat.1 (it)" ) - ADD_CUSTOM_TARGET(doc-man-it ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/it/man1) + ADD_CUSTOM_TARGET(doc-man-it ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/it/man1) ENDIF (ENABLE_MAN) IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am index 0c1bfb660..b8f6fdcea 100644 --- a/doc/it/Makefile.am +++ b/doc/it/Makefile.am @@ -20,7 +20,7 @@ docdir = $(datadir)/doc/$(PACKAGE) EXTRA_DIST = CMakeLists.txt \ - weechat-curses.1.it.txt \ + weechat.1.it.txt \ cmdline_options.it.txt \ weechat_user.it.txt \ weechat_plugin_api.it.txt \ @@ -32,7 +32,7 @@ EXTRA_DIST = CMakeLists.txt \ $(wildcard autogen/plugin_api/*.txt) if MAN - man_targets = weechat-curses.1 + man_targets = weechat.1 man_install = install-man man_uninstall = uninstall-man endif @@ -49,8 +49,8 @@ endif all-local: $(man_targets) $(doc_targets) # man page -weechat-curses.1: weechat-curses.1.it.txt cmdline_options.it.txt - $(A2X) -a lang=it -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/it/weechat-curses.1.it.txt +weechat.1: weechat.1.it.txt cmdline_options.it.txt + $(A2X) -a lang=it -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/it/weechat.1.it.txt # user's guide weechat_user.it.html: weechat_user.it.txt cmdline_options.it.txt $(wildcard autogen/user/*.txt) @@ -93,7 +93,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/it/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/it/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/it/man1 uninstall-doc: @@ -103,5 +103,5 @@ uninstall-doc: # clean clean-local: - -rm -f weechat-curses.1 + -rm -f weechat.1 -rm -f *.html diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index a0d608254..7ae9e44b7 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -680,7 +680,7 @@ With option "-quit", the process is slightly different: 3. unload all plugins 4. save WeeChat configuration 5. quit WeeChat -Then later you can restore session with command: weechat-curses --upgrade +Then later you can restore session with command: weechat --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". ........................................ diff --git a/doc/it/weechat-curses.1.it.txt b/doc/it/weechat.1.it.txt index f08dad3da..abd0a912f 100644 --- a/doc/it/weechat-curses.1.it.txt +++ b/doc/it/weechat.1.it.txt @@ -1,23 +1,23 @@ // TRANSLATION MISSING (WHOLE FILE) -WEECHAT-CURSES(1) -================= +WEECHAT(1) +========== :doctype: manpage NAME ---- -weechat-curses - the extensible chat client (Curses version) +weechat - the extensible chat client SYNOPSIS -------- [verse] -'weechat-curses' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] -'weechat-curses' [-c|--colors] -'weechat-curses' [-h|--help] -'weechat-curses' [-k|--keys] -'weechat-curses' [-l|--license] -'weechat-curses' [-v|--version] +'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] +'weechat' [-c|--colors] +'weechat' [-h|--help] +'weechat' [-k|--keys] +'weechat' [-l|--license] +'weechat' [-v|--version] DESCRIPTION ----------- diff --git a/doc/it/weechat_faq.it.txt b/doc/it/weechat_faq.it.txt index 0e34d8101..9344d135a 100644 --- a/doc/it/weechat_faq.it.txt +++ b/doc/it/weechat_faq.it.txt @@ -83,8 +83,8 @@ Non riesco a vedere alcuni caratteri con gli accenti, cosa posso fare? È un problema noto, per favore leggere con attenzione e verificare *OGNI* soluzione tra quelle elencate: -* verificare che weechat-curses abbia un link con libncursesw (attenzione: - necessario su molte distribuzioni ma non tutte): `ldd /path/di/weechat-curses` +* verificare che weechat abbia un link con libncursesw (attenzione: + necessario su molte distribuzioni ma non tutte): `ldd /path/di/weechat` * verificare che il plugin "charset" sia caricato con il comando `plugin` (se non lo è, probabilmente è necessario il pacchetto "weechat-plugins") * verificare l'output del comando `/charset` (sul buffer core). Dovrebbero essere @@ -774,7 +774,7 @@ Quando viene eseguito WeeChat all'interno di gdb, potrebbe verificarsi questo errore: ---------------------------------------- -$ gdb /path/to/weechat-curses +$ gdb /path/to/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -784,7 +784,7 @@ Per correggerlo, è possibile eseguire gdb con questo comando (sostituire il path di libpthread e WeeChat con i path del proprio sistema): ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat (gdb) run ---------------------------------------- diff --git a/doc/it/weechat_quickstart.it.txt b/doc/it/weechat_quickstart.it.txt index c2ea099d0..b7f9369ff 100644 --- a/doc/it/weechat_quickstart.it.txt +++ b/doc/it/weechat_quickstart.it.txt @@ -14,7 +14,7 @@ le scorciatoie da tastiera predefinite). Avviare dalla propria shell: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/it/weechat_tester.it.txt b/doc/it/weechat_tester.it.txt index b37c32abb..c56eb2365 100644 --- a/doc/it/weechat_tester.it.txt +++ b/doc/it/weechat_tester.it.txt @@ -39,7 +39,9 @@ esattamente dove sia il problema in WeeChat. Se si utilizza la shell 'bash', aggiungere la seguente riga al file `~/.bashrc`: - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -61,47 +63,47 @@ Ottenere e compilare i sorgenti Per prima cosa creare una directory, per esempio 'weechat-git': ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- Se si ha git installato, si può clonare il deposito git (raccomandato): --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- NOTA: In seguito, si può eseguire "`git pull`" in questa directory per ricevere gli ultimi aggiornamenti. Altrimenti si può scaricare ed estrarre il pacchetto 'devel': ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- Per compilare i sorgenti, si raccomanda cmake: --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- Se cmake non è installato, è ancora possibile usare gli autotools: ----------------------------------------------------------- +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ----------------------------------------------------------- +---------------------------------------- [[install_binary_package]] Installazione del pacchetto binario @@ -124,7 +126,9 @@ stabile), con l'opzione `--dir`. Il comando è: - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- Se siete ancora svegli dovreste vedere un'interfaccia familiare e vantarvi del fatto di avere la versione più nuova possibile di WeeChat. ;) diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index ae693ac8c..9452b7a26 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -386,17 +386,17 @@ In caso di errore di WeeChat, il sistema creerà un file 'core' oppure 'core.123 Questo file viene creato nella directory in cui è in esecuzione WeeChat (e *non* la directory dove WeeChat è installato!). -Ad esempio, se 'weechat-curses' è installato in '/usr/bin/' ed il file 'core' +Ad esempio, se 'weechat' è installato in '/usr/bin/' ed il file 'core' si trova in '/home/xxx/', allora eseguire gdb con questo comando: ---------------------------------------- -gdb /usr/bin/weechat-curses /home/xxx/core +gdb /usr/bin/weechat /home/xxx/core ---------------------------------------- [NOTE] Se è stato installato il pacchetto binario 'weechat-dbg' (ad esempio in Debian), è possibile usare questo path per il binario di WeeChat: -'/usr/lib/debug/usr/bin/weechat-curses' +'/usr/lib/debug/usr/bin/weechat' All'interno di gdb, usare il comando `bt full` per visualizzare il backtrace. Verrà mostrato qualcosa di simile a questo: @@ -438,10 +438,10 @@ Debug di WeeChat durante l'esecuzione Per eseguire il debug di un'istanza di WeeChat in esecuzione (ad esempio se WeeChat sembra sia bloccato), è possibile usare gdb con l'id del processo -(sostituire '12345' con il PID del processo weechat-curses): +(sostituire '12345' con il PID del processo weechat): ---------------------------------------- -gdb /usr/bin/weechat-curses 12345 +gdb /usr/bin/weechat 12345 ---------------------------------------- Poi, come per un crash, usare il comando `bt full`: @@ -465,7 +465,7 @@ include::cmdline_options.it.txt[] Per avviare WeeChat, digitare questo comando: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- Alla prima esecuzione di WeeChat, viene creato un file di configurazione @@ -1378,7 +1378,7 @@ seguenti limiti per i colori in WeeChat: ^(1)^ Anche se il terminale supporta più di 256 coppie, possono essere utilizzate solo 256 coppie in WeeChat, a causa di una limitazione di ncurses. -È possibile eseguire `weechat-curses --colors` o utilizzare il comando `/color` in +È possibile eseguire `weechat --colors` o utilizzare il comando `/color` in WeeChat per visualizzare i limiti del proprio ambiente. Alcuni valori raccomandati per 'TERM' se si desiderano 256 colori: @@ -1852,7 +1852,7 @@ Esempio per entrare in '#weechat' e '#tizio' sul server 'irc.freenode.net', porta predefinita (6667), con il nick 'caio': ---------------------------------------- -$ weechat-curses irc://caio@irc.freenode.net/#weechat,#tizio +$ weechat irc://caio@irc.freenode.net/#weechat,#tizio ---------------------------------------- [[irc_options]] diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt index 6f821d792..2fcf2f427 100644 --- a/doc/ja/CMakeLists.txt +++ b/doc/ja/CMakeLists.txt @@ -20,15 +20,15 @@ IF (ENABLE_MAN) # man page ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 - COMMAND ${A2X_EXECUTABLE} ARGS -a lang=ja -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.ja.txt + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 + COMMAND ${A2X_EXECUTABLE} ARGS -a lang=ja -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.txt DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1.ja.txt + ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.txt ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.txt - COMMENT "Building weechat-curses.1 (ja)" + COMMENT "Building weechat.1 (ja)" ) - ADD_CUSTOM_TARGET(doc-man-ja ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/ja/man1) + ADD_CUSTOM_TARGET(doc-man-ja ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/ja/man1) ENDIF (ENABLE_MAN) IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am index 67ba8bb53..37a4e32a3 100644 --- a/doc/ja/Makefile.am +++ b/doc/ja/Makefile.am @@ -20,7 +20,7 @@ docdir = $(datadir)/doc/$(PACKAGE) EXTRA_DIST = CMakeLists.txt \ - weechat-curses.1.ja.txt \ + weechat.1.ja.txt \ cmdline_options.ja.txt \ weechat_user.ja.txt \ weechat_scripting.ja.txt \ @@ -31,7 +31,7 @@ EXTRA_DIST = CMakeLists.txt \ $(wildcard autogen/plugin_api/*.txt) if MAN - man_targets = weechat-curses.1 + man_targets = weechat.1 man_install = install-man man_uninstall = uninstall-man endif @@ -47,8 +47,8 @@ endif all-local: $(man_targets) $(doc_targets) # man page -weechat-curses.1: weechat-curses.1.ja.txt cmdline_options.ja.txt - $(A2X) -a lang=ja -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/ja/weechat-curses.1.ja.txt +weechat.1: weechat.1.ja.txt cmdline_options.ja.txt + $(A2X) -a lang=ja -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/ja/weechat.1.ja.txt # user's guide weechat_user.ja.html: weechat_user.ja.txt cmdline_options.ja.txt $(wildcard autogen/user/*.txt) @@ -87,7 +87,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/ja/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/ja/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/ja/man1 uninstall-doc: @@ -97,5 +97,5 @@ uninstall-doc: # clean clean-local: - -rm -f weechat-curses.1 + -rm -f weechat.1 -rm -f *.html diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt index 9210f13a5..bec5df1b3 100644 --- a/doc/ja/autogen/user/weechat_commands.txt +++ b/doc/ja/autogen/user/weechat_commands.txt @@ -680,7 +680,7 @@ With option "-quit", the process is slightly different: 3. unload all plugins 4. save WeeChat configuration 5. quit WeeChat -Then later you can restore session with command: weechat-curses --upgrade +Then later you can restore session with command: weechat --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". ........................................ diff --git a/doc/ja/weechat-curses.1.ja.txt b/doc/ja/weechat.1.ja.txt index b4622baa9..635578294 100644 --- a/doc/ja/weechat-curses.1.ja.txt +++ b/doc/ja/weechat.1.ja.txt @@ -1,23 +1,23 @@ // TRANSLATION MISSING (WHOLE FILE) -WEECHAT-CURSES(1) -================= +WEECHAT(1) +========== :doctype: manpage NAME ---- -weechat-curses - the extensible chat client (Curses version) +weechat - the extensible chat client SYNOPSIS -------- [verse] -'weechat-curses' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] -'weechat-curses' [-c|--colors] -'weechat-curses' [-h|--help] -'weechat-curses' [-k|--keys] -'weechat-curses' [-l|--license] -'weechat-curses' [-v|--version] +'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...] +'weechat' [-c|--colors] +'weechat' [-h|--help] +'weechat' [-k|--keys] +'weechat' [-l|--license] +'weechat' [-v|--version] DESCRIPTION ----------- diff --git a/doc/ja/weechat_faq.ja.txt b/doc/ja/weechat_faq.ja.txt index a601d74c8..85e98e0ed 100644 --- a/doc/ja/weechat_faq.ja.txt +++ b/doc/ja/weechat_faq.ja.txt @@ -71,8 +71,8 @@ autotools を使って (cmake を使わずに) コンパイルする場合、 これは良くある問題です。以下の内容をよく読んで、*全ての* 解決策をチェックしてください: -* weechat-curses が libncursesw にリンクされていることの確認 (警告: 全てではありませんが、 - ほとんどのディストリビューションで必要です): `ldd /path/to/weechat-curses` +* weechat が libncursesw にリンクされていることの確認 (警告: 全てではありませんが、 + ほとんどのディストリビューションで必要です): `ldd /path/to/weechat` * `/plugin` コマンドで "Charset" プラグインがロード済みであることの確認 (ロードされていない場合、"weechat-plugins" パッケージが必要かもしれません) 。 * `/charset` コマンドの出力を確認 (core バッファ上で)。 @@ -698,7 +698,7 @@ OpenBSD では、プラグインファイル名の末尾が ".so.0.0" です (Li gdb で WeeChat を実行する場合、以下のエラーが出るかもしれません: ---------------------------------------- -$ gdb /path/to/weechat-curses +$ gdb /path/to/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -708,7 +708,7 @@ Cannot find new threads: generic error (システム上の libpthread と WeeChat へのパスを変更): ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat (gdb) run ---------------------------------------- diff --git a/doc/ja/weechat_quickstart.ja.txt b/doc/ja/weechat_quickstart.ja.txt index 8bd3106b1..59d294052 100644 --- a/doc/ja/weechat_quickstart.ja.txt +++ b/doc/ja/weechat_quickstart.ja.txt @@ -11,7 +11,7 @@ X 用ターミナルエミュレータは rxvt-unicode を推奨します (UTF-8 シェルから起動するには: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/ja/weechat_tester.ja.txt b/doc/ja/weechat_tester.ja.txt index b491cf27f..6bd3aa0fa 100644 --- a/doc/ja/weechat_tester.ja.txt +++ b/doc/ja/weechat_tester.ja.txt @@ -33,7 +33,9 @@ Linux の 'core' ファイルを有効にすることはとても役に立ちま 'bash' シェルを使っている場合、以下の行を `~/.bashrc` に追記してください: - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -52,48 +54,48 @@ Linux の 'core' ファイルを有効にすることはとても役に立ちま 最初にディレクトリを作ってください、ここでは 'weechat-git': ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- git がインストール済みの場合、git リポジトリを clone してください (推奨): --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- 注意: clone の後、このディレクトリ内で "`git pull`" を実行すれば、最新のアップデートとの差分が更新されます。 他の方法として 'devel' パッケージをダウンロードして展開する方法があります: ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- ソースをビルドするには cmake を使うことを推奨します: --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- cmake が無い場合は autotools を使うことも可能です: ----------------------------------------------------------- +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ----------------------------------------------------------- +---------------------------------------- [[install_binary_package]] === バイナリパッケージのインストール === @@ -114,7 +116,9 @@ Linux ディストリビューション別に: コマンド: - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- より万全を期すなら、上の方法を使って WeeChat の最新バージョンを使っていることを確認するべきです ;) diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index 3688f0afc..805c14748 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -361,16 +361,16 @@ WeeChat がクラッシュすると、'core' または 'core.12345' ファイル このファイルは WeeChat を起動したディレクトリに作られます (これは WeeChat がインストールされているディレクトリでは*ありません*!)。 -例えば、'weechat-curses' が '/usr/bin/' にインストールされ、'core' ファイルが +例えば、'weechat' が '/usr/bin/' にインストールされ、'core' ファイルが '/home/xxx/' にある場合、以下のコマンドで gdb を起動してください: ---------------------------------------- -gdb /usr/bin/weechat-curses /home/xxx/core +gdb /usr/bin/weechat /home/xxx/core ---------------------------------------- [NOTE] バイナリパッケージ 'weechat-dbg' をインストールした場合 (例えば Debian で)、WeeChat -バイナリへのパスは '/usr/lib/debug/usr/bin/weechat-curses' のようになります。 +バイナリへのパスは '/usr/lib/debug/usr/bin/weechat' のようになります。 gdb の中で `bt full` コマンドを実行するとバックトレースが表示されます。 以下のような出力が得られるはずです: @@ -410,10 +410,10 @@ Copying output to /tmp/crash.txt. ==== 起動した WeeChat のデバッグ ==== 起動している WeeChat をデバッグするには (例えば WeeChat がフリーズしているような場合)、gdb -の引数にプロセス番号を与えて起動します ('12345' は weechat-curses プロセスの PID に変更してください): +の引数にプロセス番号を与えて起動します ('12345' は weechat プロセスの PID に変更してください): ---------------------------------------- -gdb /usr/bin/weechat-curses 12345 +gdb /usr/bin/weechat 12345 ---------------------------------------- クラッシュが起きた場合と同様に、`bt full` コマンドを使ってください: @@ -435,7 +435,7 @@ include::cmdline_options.ja.txt[] WeeChat を起動させるには、以下コマンドを実行: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- 初めて WeeChat を起動する場合、デフォルトのオプションで設定ファイルが作成されます。 @@ -1314,7 +1314,7 @@ WeeChat ではバーやチャットエリアにおけるテキスト表示に 25 ^(1)^ 端末が 256 ペア以上の表示をサポートしていても、WeeChat では ncurses の制限により 256 ペア以上の表示は行えません。 -`weechat-curses --colors` を実行するか、`/color` コマンドをin WeeChat +`weechat --colors` を実行するか、`/color` コマンドをin WeeChat の中で実行することで、色表示の制限を確認できます。 256 色を利用したい場合に推奨される 'TERM' 環境変数の値は: @@ -1753,7 +1753,7 @@ irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]] で稼働中の IRC サーバ上の '#weechat' と '#toto' チャンネルに参加する例: ---------------------------------------- -$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto +$ weechat irc://nono@irc.freenode.net/#weechat,#toto ---------------------------------------- [[irc_options]] diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am index 636a1b987..458c45fe2 100644 --- a/doc/pl/Makefile.am +++ b/doc/pl/Makefile.am @@ -74,7 +74,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/pl/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/pl/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/pl/man1 uninstall-doc: diff --git a/doc/pl/weechat_faq.pl.txt b/doc/pl/weechat_faq.pl.txt index 52a8c8658..5dc96685a 100644 --- a/doc/pl/weechat_faq.pl.txt +++ b/doc/pl/weechat_faq.pl.txt @@ -81,8 +81,8 @@ Nie widzę niektórych znaków diakrytycznych, co mogę zrobić? Jest to częsty problem, przeczytaj i sprawdź *WSZYSTKIE* poniższe rozwiązania: -* sprawdź czy weechat-curses jest zlinkowany z libncursesw (uwaga: wymagane na - większości dystrybucji ale nie wszystkich): `ldd /ścieżka/do/weechat-curses` +* sprawdź czy weechat jest zlinkowany z libncursesw (uwaga: wymagane na + większości dystrybucji ale nie wszystkich): `ldd /ścieżka/do/weechat` * sprawdź czy wtyczka "Charset" jest załadowana za pomocą komendy `/plugin` (jeśli nie jest, to najprawdopodobniej potrzebujesz pakietu "weechat-plugins") * sprawdź wyjście komendy `/charset` (w głównym buforze). Powinieneś zobaczyć @@ -754,7 +754,7 @@ Kiedy uruchamiam WeeChat pod gdb dostaję komunikat o wątkach, co mogę z tym z Podczas uruchamiania WeeChat pod gdb, można spotkać się z takim błędem: ---------------------------------------- -$ gdb /scieżka/do/weechat-curses +$ gdb /scieżka/do/weechat (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error @@ -764,7 +764,7 @@ Cannot find new threads: generic error WeeChat na właściwe dla naszego systemu): ---------------------------------------- -$ LD_PRELOAD=/lib/libpthread.so.0 gdb /ścieżka/do/weechat-curses +$ LD_PRELOAD=/lib/libpthread.so.0 gdb /ścieżka/do/weechat (gdb) run ---------------------------------------- diff --git a/doc/pl/weechat_quickstart.pl.txt b/doc/pl/weechat_quickstart.pl.txt index 8c56b3b16..657a0ec2c 100644 --- a/doc/pl/weechat_quickstart.pl.txt +++ b/doc/pl/weechat_quickstart.pl.txt @@ -14,7 +14,7 @@ klawiszowymi). Wywołaj z terminala: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- diff --git a/doc/pl/weechat_tester.pl.txt b/doc/pl/weechat_tester.pl.txt index acca3e8d8..6ec412941 100644 --- a/doc/pl/weechat_tester.pl.txt +++ b/doc/pl/weechat_tester.pl.txt @@ -36,7 +36,9 @@ pozwalające dokładnie zlokalizować błąd w WeeChat. Jeśli korzystasz z powłoki 'bash', dodaj następującą linijkę do `~/.bashrc`: - ulimit -c unlimited +---------------------------------------- +ulimit -c unlimited +---------------------------------------- [[download]] @@ -57,48 +59,48 @@ Pobierz i zbuduj źródła Najpierw stwórz katalog, na przykład 'weechat-git': ---------------------- +---------------------------------------- $ mkdir ~/weechat-git $ cd ~/weechat-git ---------------------- +---------------------------------------- Jeśli masz zainstalowanego gita, po prostu sklonuj repozytorium (zalecana metoda): --------------------------------------------- +---------------------------------------- $ git clone git://git.sv.gnu.org/weechat.git $ cd weechat --------------------------------------------- +---------------------------------------- UWAGA: Później możesz wykonać w tym katalogu "`git pull`", aby pobrać najnowsze poprawki. Oczywiście możesz pobrać paczkę oznaczoną jako 'devel': ------------------------------------------------------------------ +---------------------------------------- $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2 $ tar xvjf weechat-devel.tar.bz2 $ cd weechat-devel ------------------------------------------------------------------ +---------------------------------------- Do zbudowania źródeł zaleca się cmake: --------------------------------------------------------------- +---------------------------------------- $ mkdir build $ cd build -$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug +$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug $ make $ make install --------------------------------------------------------------- +---------------------------------------- Jeśli nie posiadasz cmake, nadal jest możliwe użycie autotools: ----------------------------------------------------------- +---------------------------------------- $ ./autogen.sh -$ ./configure --prefix=$HOME/weechat-git +$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev $ make $ make install ----------------------------------------------------------- +---------------------------------------- [[install_binary_package]] Instalowanie pakietów binarnych @@ -121,7 +123,9 @@ za pomocą opcji `--dir`. Komenda to: - ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev +---------------------------------------- +$ ~/weechat-git/bin/weechat +---------------------------------------- Jeśli nadal nie śpisz powinieneś ujrzeć znajomy interfejs i chwalić się z posiadania najnowszej możliwej wersji WeeChat. ;) diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am index 3b7f72830..daf5c968e 100644 --- a/doc/ru/Makefile.am +++ b/doc/ru/Makefile.am @@ -55,7 +55,7 @@ install-doc: uninstall-hook: $(man_uninstall) $(doc_uninstall) uninstall-man: - $(RM) $(DESTDIR)$(mandir)/ru/man1/weechat-curses.1 + $(RM) $(DESTDIR)$(mandir)/ru/man1/weechat.1 -rmdir $(DESTDIR)$(mandir)/ru/man1 uninstall-doc: diff --git a/doc/ru/weechat_quickstart.ru.txt b/doc/ru/weechat_quickstart.ru.txt index 8daec2fc8..d96053e42 100644 --- a/doc/ru/weechat_quickstart.ru.txt +++ b/doc/ru/weechat_quickstart.ru.txt @@ -13,7 +13,7 @@ Sébastien Helleu <flashcode@flashtux.org> Run from your shell: ---------------------------------------- -$ weechat-curses +$ weechat ---------------------------------------- @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -57,7 +57,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect vypne automatické připojení k serverům při startu\n" " -c, --colors zobrazí výchozí barvy v terminálu\n" @@ -2028,7 +2028,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" -"PO-Revision-Date: 2013-07-31 18:41+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" +"PO-Revision-Date: 2013-08-01 19:57+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" "Language: de_DE\n" @@ -48,6 +48,7 @@ msgstr "" msgid "Usage: %s [option...] [plugin:option...]\n" msgstr "Aufruf: %s [Option...] [Erweiterung:Option...]\n" +#, fuzzy msgid "" " -a, --no-connect disable auto-connect to servers at startup\n" " -c, --colors display default colors in terminal\n" @@ -61,24 +62,20 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" -" -a, --no-connect deaktiviert das automatische Verbinden mit den Servern, " -"beim Start von WeeChat\n" +" -a, --no-connect deaktiviert das automatische Verbinden mit den Servern, beim Start von WeeChat\n" " -c, --colors zeigt die Standardfarben des Terminals an\n" -" -d, --dir <Pfad> legt den Konfigurationsordner für WeeChat fest " -"(Voreinstellung: ~/.weechat)\n" +" -d, --dir <Pfad> legt den Konfigurationsordner für WeeChat fest (Voreinstellung: ~/.weechat)\n" " -h, --help zeigt diese Hilfe an\n" " -l, --license zeigt die Lizenz von WeeChat an\n" -" -p, --no-plugin unterbindet das Laden der Erweiterungen, beim " -"Programmstart\n" +" -p, --no-plugin unterbindet das Laden der Erweiterungen, beim Programmstart\n" " -r, --run-command führt einen oder mehrere Befehle nach dem Start aus\n" " (mehrere Befehle werden durch ein Semikolon getrennt)\n" " -s, --no-script Skripten werden beim Programmstart nicht geladen\n" -" --upgrade führt ein WeeChat Upgrade mittels Sitzungsdateien, die " -"mit dem Befehl `/upgrade -quit` erstellt wurden, durch\n" +" --upgrade führt ein WeeChat Upgrade mittels Sitzungsdateien, die mit dem Befehl `/upgrade -quit` erstellt wurden, durch\n" " -v, --version zeigt die Version von WeeChat an\n" -" plugin:option Option für Erweiterungen (siehe man weechat-curses)\n" +" plugin:option Option für Erweiterungen (siehe man weechat)\n" #, c-format msgid "Error: missing argument for \"%s\" option\n" @@ -2253,36 +2250,24 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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" -" -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung " -"und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe " -"unten)\n" +"path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei)\n" +" -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe unten)\n" "\n" -"Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende " -"Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version " -"von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager " -"installiert worden sein.\n" +"Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein.\n" "\n" -"Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da " -"diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach " -"einem erfolgten Upgrade findet eine automatische Verbindung zu diesen " -"Servern statt.\n" +"Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt.\n" "\n" "Der Upgrade Vorgang besteht aus vier Schritten:\n" -" 1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, " -"history, ..)\n" -" 2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden " -"gesichert)\n" +" 1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, history, ..)\n" +" 2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert)\n" " 3. Sicherung der WeeChat Konfiguration (weechat.conf)\n" -" 4. ausführen der neuen Version von WeeChat und wiederherstellen der " -"Sitzung.\n" +" 4. ausführen der neuen Version von WeeChat und wiederherstellen der Sitzung.\n" "\n" "Nutzt man die \"-quit\" Funktion ist die Abfolge geringfügig anders:\n" " 1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...)\n" @@ -2290,13 +2275,9 @@ msgstr "" " 3. alle Erweiterungen werden ausgeschaltet\n" " 4. die WeeChat Konfiguration wird gesichert\n" " 5. WeeChat wird beendet\n" -"Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: " -"weechat-curses --upgrade\n" -"WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien " -"wiederhergestellt werden (*.conf)\n" -"Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner " -"wiederherzustellen, sofern man den Inhalt des \"~/.weechat\" Verzeichnisses " -"dorthin kopiert." +"Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat --upgrade\n" +"WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien wiederhergestellt werden (*.conf)\n" +"Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen, sofern man den Inhalt des \"~/.weechat\" Verzeichnisses dorthin kopiert." msgid "show WeeChat uptime" msgstr "Zeigt die Uptime von Weechat an" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -59,7 +59,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect desactivar la autoconexión de los servidores al inicio\n" " -c, --colors muestra los colores predeterminados en la terminal\n" @@ -2137,7 +2137,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" -"PO-Revision-Date: 2013-07-31 18:41+0200\n" +"POT-Creation-Date: 2013-08-01 17:59+0200\n" +"PO-Revision-Date: 2013-08-01 17:19+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -57,7 +57,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect désactiver l'auto-connexion aux serveurs au " "démarrage\n" @@ -74,8 +74,7 @@ msgstr "" " --upgrade mettre à jour WeeChat en utilisant les fichiers " "de session (voir /help upgrade dans WeeChat)\n" " -v, --version afficher la version de WeeChat\n" -" extension:option option pour une extension (voir man weechat-" -"curses)\n" +" extension:option option pour une extension (voir man weechat)\n" #, c-format msgid "Error: missing argument for \"%s\" option\n" @@ -2198,7 +2197,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -2233,8 +2232,8 @@ msgstr "" " 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" +"Et plus tard vous pouvez restaurer la session avec la commande: weechat --" +"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 " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -57,7 +57,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect automatikus csatlakozás a szerverekhez tiltása\n" " -c, --config beállítófájl opcióinak mutatása\n" @@ -1747,7 +1747,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -57,7 +57,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect disabilita la connessione automatica all'avvio\n" " -c, --colors mostra i colori predefiniti nel terminale\n" @@ -2179,7 +2179,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" -"PO-Revision-Date: 2013-07-31 18:41+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" +"PO-Revision-Date: 2013-08-02 08:50+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" "Language: ja\n" @@ -57,7 +57,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect 起動時にサーバに自動接続しない\n" " -c, --colors ターミナルにデフォルトの色を表示\n" @@ -2149,28 +2149,22 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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" -" -quit: *すべての*接続を閉じ、セッションを保存して WeeChat を終了。遅" -"延復帰 (詳しくは後述) が可能になります。\n" +" -quit: *すべての*接続を閉じ、セッションを保存して WeeChat を終了。遅延復帰 (詳しくは後述) が可能になります。\n" "\n" -"このコマンドは起動中の WeeChat セッションのアップグレードと再読み込みを行いま" -"す。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、" -"パッケージマネージャでインストールしなければいけません。\n" +"このコマンドは起動中の WeeChat セッションのアップグレードと再読み込みを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。\n" "\n" -"注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では " -"SSL セッションのリロードができないからです。アップグレードの後に自動的に再接" -"続されます。\n" +"注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。\n" "\n" "アップグレードは 4 つの手順を踏みます:\n" " 1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存\n" -" 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込ま" -"れます)\n" +" 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます)\n" " 3. WeeChat 設定を保存 (weechat.conf)\n" " 4. 新しい WeeChat バイナリを実行してセッションをリロード。<\n" "\n" @@ -2180,12 +2174,9 @@ msgstr "" " 3. すべてのプラグインをアンロード\n" " 4. WeeChat 設定を保存\n" " 5. WeeChat を終了\n" -"この後、セッションを回復させるには weechat-curses --upgrade を使ってくださ" -"い。\n" -"重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてくださ" -"い。\n" -"\"~/.weechat\" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッ" -"ションを回復することも可能です。" +"この後、セッションを回復させるには weechat --upgrade を使ってください。\n" +"重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてください。\n" +"\"~/.weechat\" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッションを回復することも可能です。" msgid "show WeeChat uptime" msgstr "WeeChat 連続稼働時間の表示" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" -"PO-Revision-Date: 2013-07-31 18:42+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" +"PO-Revision-Date: 2013-08-02 08:50+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: pl\n" @@ -60,7 +60,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect wyłącza automatyczne łączenie się z serwerem przy " "uruchomieniu\n" @@ -2195,29 +2195,22 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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" -" -quit: zamyka *WSZYSTKIE* połączenia, zapisuje sesję i wyłącza " -"WeeChat, umożliwia to późniejsze przywrócenie (zobacz niżej)\n" +"ścieżka_do_binarki: ścieżka do pliku binarnego WeeChat (domyślnie jest to obecny plik)\n" +" -quit: zamyka *WSZYSTKIE* połączenia, zapisuje sesję i wyłącza WeeChat, umożliwia to późniejsze przywrócenie (zobacz niżej)\n" "\n" -"Ta komenda ponownie uruchamia plik binarny WeeChat, zatem powinna zostać " -"skompilowana lub zainstalowana za pomocą managera pakietów przed " -"uruchomieniem tej komendy.\n" +"Ta komenda ponownie uruchamia plik binarny WeeChat, zatem powinna zostać skompilowana lub zainstalowana za pomocą managera pakietów przed uruchomieniem tej komendy.\n" "\n" -"Uwaga: połączenia SSL są przerywane podczas uaktualniania, ponieważ " -"przeładowanie sesji SSL nie jest obecnie możliwe za pomocą GnuTLS. Po " -"uaktualnieniu nastąpi ponowne ich połączenie.\n" +"Uwaga: połączenia SSL są przerywane podczas uaktualniania, ponieważ przeładowanie sesji SSL nie jest obecnie możliwe za pomocą GnuTLS. Po uaktualnieniu nastąpi ponowne ich połączenie.\n" "\n" "Proces uaktualnienia składa się z 4 kroków:\n" " 1. zapisania sesji do plików dla rdzenia i wtyczek (bufory, historia, ..)\n" -" 2. wyładowanie wszystkich wtyczek (zapisanie plików konfiguracyjnych *." -"conf)\n" +" 2. wyładowanie wszystkich wtyczek (zapisanie plików konfiguracyjnych *.conf)\n" " 3. zapisanie konfiguracji WeeChat (weechat.conf)\n" " 4. uruchomienie nowego pliku binarnego WeeChat i przeładowanie sesji.\n" "\n" @@ -2227,11 +2220,9 @@ msgstr "" " 3. wyładowanie wszystkich wtyczek\n" " 4. zapisanie konfiguracji WeeChat\n" " 5. wyłączenie WeeChat\n" -"Następnie można przywrócić sesję za pomocą komendy: weechat-curses --" -"upgrade\n" +"Następnie można przywrócić sesję za pomocą komendy: weechat --upgrade\n" "WAŻNE: należy przywracać sesję z identyczną konfiguracją (pliki *.conf).\n" -"Jest możliwe przywrócenie sesji WeeChat na innej maszynie, jeśli skopiujemy " -"zawartość katalogu \"~/.weechat\"." +"Jest możliwe przywrócenie sesji WeeChat na innej maszynie, jeśli skopiujemy zawartość katalogu \"~/.weechat\"." msgid "show WeeChat uptime" msgstr "pokazuje czas pracy WeeChat" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2922effb9..ac8869fa6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -81,7 +81,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect desabilita a auto-conexão a servidores durante a " "inicialização\n" @@ -2094,7 +2094,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -60,7 +60,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" " -a, --no-connect не подключаться автоматически при запуске\n" " -c, --config отобразить параметры конфигурации\n" @@ -1769,7 +1769,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -55,7 +55,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" #, c-format @@ -1571,7 +1571,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " diff --git a/po/weechat.pot b/po/weechat.pot index 1a21b91d6..c93a8ff63 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-07-31 18:40+0200\n" +"POT-Creation-Date: 2013-08-01 17:18+0200\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" @@ -55,7 +55,7 @@ msgid "" " --upgrade upgrade WeeChat using session files (see /help " "upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" -" plugin:option option for plugin (see man weechat-curses)\n" +" plugin:option option for plugin (see man weechat)\n" msgstr "" #, c-format @@ -1577,7 +1577,7 @@ msgid "" " 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" +"Then later you can restore session with command: weechat --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 " diff --git a/src/core/wee-command.c b/src/core/wee-command.c index c5f88cbca..6f8577488 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -6708,7 +6708,7 @@ command_init () " 4. save WeeChat configuration\n" " 5. quit WeeChat\n" "Then later you can restore session with command: " - "weechat-curses --upgrade\n" + "weechat --upgrade\n" "IMPORTANT: you must restore the session with exactly " "same configuration (files *.conf).\n" "It is possible to restore WeeChat session on another " diff --git a/src/core/wee-debug.c b/src/core/wee-debug.c index 6d3cb05e0..cf8770d24 100644 --- a/src/core/wee-debug.c +++ b/src/core/wee-debug.c @@ -156,7 +156,7 @@ debug_sigsegv () weechat_home); string_iconv_fprintf (stderr, "***\n"); string_iconv_fprintf (stderr, "*** Please help WeeChat developers to fix this bug:\n"); - string_iconv_fprintf (stderr, "*** 1. If you have a core file, please run: gdb weechat-curses core\n"); + string_iconv_fprintf (stderr, "*** 1. If you have a core file, please run: gdb /path/to/weechat core\n"); string_iconv_fprintf (stderr, "*** then issue \"bt\" command and send result to developers\n"); string_iconv_fprintf (stderr, "*** To enable core files with bash shell: ulimit -c 10000\n"); string_iconv_fprintf (stderr, "*** 2. Otherwise send backtrace (below) and weechat.log\n"); diff --git a/src/core/weechat.c b/src/core/weechat.c index bb6e82d4f..984477cc7 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -143,7 +143,7 @@ weechat_display_usage (char *exec_name) " -s, --no-script don't load any script at startup\n" " --upgrade upgrade WeeChat using session files (see /help upgrade in WeeChat)\n" " -v, --version display WeeChat version\n" - " plugin:option option for plugin (see man weechat-curses)\n")); + " plugin:option option for plugin (see man weechat)\n")); string_iconv_fprintf(stdout, "\n"); } diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index b3424fbd5..24efc07fe 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -30,7 +30,7 @@ gui-curses-mouse.c gui-curses-term.c gui-curses-window.c) -SET(EXECUTABLE weechat-curses) +SET(EXECUTABLE weechat) FIND_PACKAGE(Ncurses) IF(NCURSES_FOUND) @@ -77,3 +77,9 @@ INCLUDE_DIRECTORIES(.. ../../core ../../plugins) TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS} ${STATIC_LIBS}) INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) + +# Create a symbolic link weechat -> weechat-curses +# This link is created for compatibility with old versions on /upgrade. +# It may be removed in future. +INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove -f \"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses\")") +INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink weechat \"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses\")") diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 6cfd5268d..d3982d1ab 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -19,29 +19,35 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(NCURSES_CFLAGS) -bin_PROGRAMS = weechat-curses +bin_PROGRAMS = weechat # Because of a linker bug, we have to link 2 times with lib_weechat_core.a # (and it must be 2 different path/names to be kept by linker) -weechat_curses_LDADD = ./../../core/lib_weechat_core.a \ - ../../plugins/lib_weechat_plugins.a \ - ../lib_weechat_gui_common.a \ - ../../core/lib_weechat_core.a \ - $(PLUGINS_LFLAGS) \ - $(NCURSES_LFLAGS) \ - $(GCRYPT_LFLAGS) \ - $(GNUTLS_LFLAGS) \ - $(CURL_LFLAGS) \ - -lm +weechat_LDADD = ./../../core/lib_weechat_core.a \ + ../../plugins/lib_weechat_plugins.a \ + ../lib_weechat_gui_common.a \ + ../../core/lib_weechat_core.a \ + $(PLUGINS_LFLAGS) \ + $(NCURSES_LFLAGS) \ + $(GCRYPT_LFLAGS) \ + $(GNUTLS_LFLAGS) \ + $(CURL_LFLAGS) \ + -lm -weechat_curses_SOURCES = gui-curses-bar-window.c \ - gui-curses-chat.c \ - gui-curses-color.c \ - gui-curses-key.c \ - gui-curses-main.c \ - gui-curses-mouse.c \ - gui-curses-term.c \ - gui-curses-window.c \ - gui-curses.h +weechat_SOURCES = gui-curses-bar-window.c \ + gui-curses-chat.c \ + gui-curses-color.c \ + gui-curses-key.c \ + gui-curses-main.c \ + gui-curses-mouse.c \ + gui-curses-term.c \ + gui-curses-window.c \ + gui-curses.h EXTRA_DIST = CMakeLists.txt + +# Create a symbolic link weechat -> weechat-curses +# This link is created for compatibility with old versions on /upgrade. +# It may be removed in future. +install-exec-hook: + (cd $(DESTDIR)$(bindir) && rm -f weechat-curses && $(LN_S) weechat weechat-curses) diff --git a/test/weercd.py b/test/weercd.py index 7f3f8d60f..80db7fe8e 100755 --- a/test/weercd.py +++ b/test/weercd.py @@ -30,7 +30,7 @@ # # It is *STRONGLY RECOMMENDED* to connect this server with a client in a test # environment: -# - for WeeChat, another home with: `weechat-curses --dir /tmp/weechat` +# - for WeeChat, another home with: `weechat --dir /tmp/weechat` # - on a test machine, because CPU will be used a lot by client to display # messages from weercd # - if possible locally (ie server and client on same machine), to speed up data @@ -40,7 +40,7 @@ # 1. open a terminal and run server: # python weercd.py # 2. open another terminal and run WeeChat with home in /tmp: -# weechat-curses --dir /tmp/weechat +# weechat --dir /tmp/weechat # 3. optional: install script(s) in /tmp/weechat/<language>/autoload/ # 4. add server and connect to it: # /server add weercd 127.0.0.1/7777 |