diff options
-rw-r--r-- | ChangeLog.adoc | 26 | ||||
-rw-r--r-- | README.adoc | 2 | ||||
-rw-r--r-- | doc/de/weechat_faq.de.adoc | 8 | ||||
-rw-r--r-- | doc/de/weechat_user.de.adoc | 4 | ||||
-rw-r--r-- | doc/en/weechat_faq.en.adoc | 8 | ||||
-rw-r--r-- | doc/en/weechat_relay_protocol.en.adoc | 2 | ||||
-rw-r--r-- | doc/en/weechat_user.en.adoc | 4 | ||||
-rw-r--r-- | doc/fr/weechat_faq.fr.adoc | 8 | ||||
-rw-r--r-- | doc/fr/weechat_relay_protocol.fr.adoc | 2 | ||||
-rw-r--r-- | doc/fr/weechat_user.fr.adoc | 4 | ||||
-rw-r--r-- | doc/it/weechat_faq.it.adoc | 10 | ||||
-rw-r--r-- | doc/it/weechat_user.it.adoc | 4 | ||||
-rw-r--r-- | doc/ja/weechat_faq.ja.adoc | 8 | ||||
-rw-r--r-- | doc/ja/weechat_relay_protocol.ja.adoc | 2 | ||||
-rw-r--r-- | doc/ja/weechat_user.ja.adoc | 4 | ||||
-rw-r--r-- | doc/pl/weechat_faq.pl.adoc | 8 | ||||
-rw-r--r-- | doc/pl/weechat_user.pl.adoc | 4 | ||||
-rw-r--r-- | src/core/wee-network.c | 10 | ||||
-rw-r--r-- | src/gui/curses/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/irc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/perl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/xfer/CMakeLists.txt | 2 |
22 files changed, 66 insertions, 60 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index bf1233847..da5a02254 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -359,7 +359,7 @@ Bug fixes:: Build:: - * core, irc, xfer: fix compilation on Mac OS X (add link with resolv) (issue #276) + * core, irc, xfer: fix compilation on macOS (add link with resolv) (issue #276) * core: add build of xz package with make dist (cmake) * tests: fix compilation of tests on FreeBSD 11.0 @@ -812,7 +812,7 @@ Bug fixes:: * core: fix reset of attributes in bars when "resetcolor" is used (issue #41) * core: fix alignment of lines in merged buffers when options weechat.look.prefix_align and weechat.look.prefix_buffer_align are set to "none" (issue #43) * core: quit WeeChat on signal SIGHUP, remove signal "signal_sighup" - * core: fix add of filter on OS X when regex for message is empty (filter regex ending with "\t") + * core: fix add of filter on macOS when regex for message is empty (filter regex ending with "\t") * core: check validity of buffer pointer when data is sent to a buffer (command/text from user and API function command()) * core: fix crash when buffer is closed during execution of multiple commands (issue #27) * core: fix compilation on SmartOS (bug #40981, issue #23) @@ -872,13 +872,13 @@ Bug fixes:: * scripts: fix crash when a signal is received with type "int" and NULL pointer in signal_data * xfer: fix problem with option xfer.file.auto_accept_nicks when the server name contains dots * xfer: fix freeze/problems when sending empty files with DCC (issue #53) - * xfer: fix connection to remote host in DCC receive on Mac OS X (issue #25) + * xfer: fix connection to remote host in DCC receive on macOS (issue #25) * xfer: remove bind on xfer.network.own_ip (issue #5) Build:: * core: fix cmake warning CMP0007 on "make uninstall" (bug #41528) - * core: use glibtoolize on Mac OS X (autotools) (issue #22) + * core: use glibtoolize on macOS (autotools) (issue #22) * ruby: add detection of Ruby 2.1 Tests:: @@ -1113,7 +1113,7 @@ Bug fixes:: * core: fix hidden lines for messages without date when option weechat.history.max_buffer_lines_minutes is set (bug #38197) * core: use default hash/comparison callback for keys of type integer/pointer/time in hashtable * api: do not display a warning by default when loading a script with a license different from GPL - * api: fix connection to servers with hook_connect() on OS X (bug #38496) + * api: fix connection to servers with hook_connect() on macOS (bug #38496) * api: fix bug in function string_match() when mask begins and ends with "*" * api: allow hashtable with keys that are not strings in function hashtable_add_to_infolist() * api: fix function string_mask_to_regex(): escape all special chars used in regex (bug #38398) @@ -1149,7 +1149,7 @@ Bug fixes:: Build:: * core: install icon file (patch #7972) - * core: fix detection of iconv with cmake on OS X (bug #38321) + * core: fix detection of iconv with cmake on macOS (bug #38321) * guile: fix compilation with Guile 2.0 * python: fix detection of Python on Ubuntu Raring * script: fix compilation on GNU/Hurd (patch #7977) @@ -1239,7 +1239,7 @@ Build:: * core: add git version in build, display it in "weechat-curses --help" and /version * core: stop cmake if gcrypt lib is not found (bug #37671) * guile: fix detection of Guile in configure - * script: fix compilation on OS X + * script: fix compilation on macOS [[v0.3.9.2]] == Version 0.3.9.2 (2012-11-18) @@ -1395,7 +1395,7 @@ Bug fixes:: * irc: close server buffer when server is deleted * irc: add search for lower case nicks in option irc.look.nick_color_force * logger: fix charset of lines displayed in backlog when terminal charset is different from UTF-8 (bug #36379) - * perl: fix crash on quit on OS X + * perl: fix crash on quit on macOS * relay: keep spaces in beginning of "input" received from client (WeeChat protocol) * relay: fix crash on /upgrade when client is connected using WeeChat protocol * relay: redirect some irc messages from clients to hide output (messages: mode, ison, list, names, topic, who, whois, whowas, time, userhost) (bug #33516) @@ -1408,7 +1408,7 @@ Documentation:: Build:: - * perl: fix compilation on OS X (bug #30701) + * perl: fix compilation on macOS (bug #30701) [[v0.3.7]] == Version 0.3.7 (2012-02-26) @@ -1492,7 +1492,7 @@ Build:: * core: add library "pthread" in cmake file for link on OpenBSD * core: add WEECHAT_HOME option in cmake and configure to setup default WeeChat home (default is "~/.weechat") (task #11266) * core: fix compilation under OpenBSD 5.0 (lib utf8 not needed any more) (bug #34727) - * core: fix compilation error with "pid_t" on Mac OS X (bug #34639) + * core: fix compilation error with "pid_t" on macOS (bug #34639) [[v0.3.6]] == Version 0.3.6 (2011-10-22) @@ -1584,7 +1584,7 @@ Bug fixes:: Build:: - * core: fix compilation error (INSTALLPREFIX undeclared) on OS X and when compiling with included gettext (bug #26690) + * core: fix compilation error (INSTALLPREFIX undeclared) on macOS and when compiling with included gettext (bug #26690) [[v0.3.5]] == Version 0.3.5 (2011-05-15) @@ -1884,7 +1884,7 @@ New features:: Bug fixes:: - * core: fix bug with script installation on BSD/OSX (patch #6980) + * core: fix bug with script installation on BSD/macOS (patch #6980) * core: fix compilation under Cygwin (patch #6916) * core: fix plural form in translation files (bug #27430) * core: fix terminal title bug: do not reset it when option weechat.look.set_title is off (bug #27399) @@ -2531,7 +2531,7 @@ Bug fixes:: Build:: - * WeeChat now OK under *BSD and Mac OS X + * WeeChat now OK under *BSD and macOS [[v0.1.1]] == Version 0.1.1 (2005-03-20) diff --git a/README.adoc b/README.adoc index 85548b38c..9f9a9f982 100644 --- a/README.adoc +++ b/README.adoc @@ -21,7 +21,7 @@ Homepage: https://weechat.org/ == Features * *Modular chat client*: WeeChat has a lightweight core and optional https://weechat.org/files/doc/stable/weechat_user.en.html#plugins[plugins]. All plugins (including https://weechat.org/files/doc/stable/weechat_user.en.html#irc_plugin[IRC]) are independent and can be unloaded. -* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Mac OS X and Windows (Bash/Ubuntu and Cygwin). +* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, macOS and Windows (Bash/Ubuntu and Cygwin). * *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC. * *Standards-compliant*: the IRC plugin is compliant with RFCs https://tools.ietf.org/html/rfc1459[1459], https://tools.ietf.org/html/rfc2810[2810], https://tools.ietf.org/html/rfc2811[2811], https://tools.ietf.org/html/rfc2812[2812] and https://tools.ietf.org/html/rfc2813[2813]. * *Small, fast and very light*: the core is and should stay as light and fast as possible. diff --git a/doc/de/weechat_faq.de.adoc b/doc/de/weechat_faq.de.adoc index 218b5a4aa..25369fe2a 100644 --- a/doc/de/weechat_faq.de.adoc +++ b/doc/de/weechat_faq.de.adoc @@ -67,8 +67,8 @@ Beachte, dass dieses Paket nicht immer exakt mit dem git Repository übereinstim und daher auch weniger brauchbar sein kann. Im Gegensatz zu der Möglichkeit, dass man selbst das Repository klont und daraus Updates installiert. -[[compile_osx]] -=== Wie installiere ich WeeChat auf OS X? +[[compile_macos]] +=== Wie installiere ich WeeChat auf macOS? Wir empfehlen, dass zur Installation http://brew.sh/[Homebrew] genutzt wird. Hilfe erhält man mittels: @@ -174,8 +174,8 @@ Falls notwendig korrigiere den Wert Deiner TERM-Variable: `export TERM="xxx"`. Wird das gnome-terminal genutzt sollte unter Bearbeiten/Profileinstellungen/Kompatibilität die Option "Zeichen mit unbekannter Breite" auf `schmal` stehen. -[[osx_display_broken]] -=== Ich habe WeeChat unter OS X kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief? +[[macos_display_broken]] +=== Ich habe WeeChat unter macOS kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief? Wenn Du ncursesw selber kompiliert haben solltest dann probiere einmal die Standard ncurses aus, welche mit dem System ausgeliefert wird. diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index bac79f80e..b2b865dcd 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -43,7 +43,7 @@ wesentliche Merkmale: http://tools.ietf.org/html/rfc2812[2812] und http://tools.ietf.org/html/rfc2813[2813] * IRC proxy und relay für remote Schnittstellen -* Betriebssystemunabhängig (GNU/Linux, *BSD, MacOS X, Windows und weitere) +* Betriebssystemunabhängig (GNU/Linux, *BSD, macOS, Windows und weitere) * 100% GPL, freie Software Die WeeChat Homepage findet man unter: https://weechat.org/ @@ -88,7 +88,7 @@ wie man Pakete installiert. WeeChat kann mittels cmake oder autotools kompiliert werden (cmake sollte dabei die bevorzugte Methode sein). [NOTE] -Unter OS X kann http://brew.sh/[Homebrew] verwendet werden: +Unter macOS kann http://brew.sh/[Homebrew] verwendet werden: `brew install weechat --with-python --with-perl` (für Hilfe: `brew info weechat`). diff --git a/doc/en/weechat_faq.en.adoc b/doc/en/weechat_faq.en.adoc index 07b580c3c..9f728b9fe 100644 --- a/doc/en/weechat_faq.en.adoc +++ b/doc/en/weechat_faq.en.adoc @@ -57,8 +57,8 @@ This package is built almost every day using git repository. Note that this package may not correspond exactly to git base and that it's less convenient than git cloning for installing updates. -[[compile_osx]] -=== How can I install WeeChat on OS X? +[[compile_macos]] +=== How can I install WeeChat on macOS? It is recommended to use http://brew.sh/[Homebrew], you can get help with: @@ -159,8 +159,8 @@ If you are using gnome-terminal, check that the option "Ambiguous-width characters" in menu Preferences/Profile/Compatibility is set to `narrow`. -[[osx_display_broken]] -=== I compiled WeeChat under OS X, and I see "(null)" everywhere on screen, what's wrong? +[[macos_display_broken]] +=== I compiled WeeChat under macOS, and I see "(null)" everywhere on screen, what's wrong? If you compiled ncursesw yourself, try to use standard ncurses (that comes with system). diff --git a/doc/en/weechat_relay_protocol.en.adoc b/doc/en/weechat_relay_protocol.en.adoc index ac6999471..ef2a9293b 100644 --- a/doc/en/weechat_relay_protocol.en.adoc +++ b/doc/en/weechat_relay_protocol.en.adoc @@ -32,7 +32,7 @@ The _clients_ are connected to _relay_ like shown in this diagram: .... ┌──────────┐ Workstation ┌────────┐ ┌───┤ client 1 │ (Linux, Windows, - │ irc │◄──┐ ╔═══════════╤═══════╗ │ └──────────┘ BSD, Mac OS X ...) + │ irc │◄──┐ ╔═══════════╤═══════╗ │ └──────────┘ BSD, macOS ...) └────────┘ └──╢ │ ║◄───┘ ┌──────────┐ ...... ║ WeeChat │ Relay ║◄───────┤ client 2 │ Mobile device ┌────────┐ ┌──╢ │ ║◄───┐ └──────────┘ (Android, iPhone ...) diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index c78159737..479fdca0b 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -37,7 +37,7 @@ Main features are: http://tools.ietf.org/html/rfc2812[2812] and http://tools.ietf.org/html/rfc2813[2813] * IRC proxy and relay for remote interfaces -* multi-platform (GNU/Linux, *BSD, MacOS X, Windows and other) +* multi-platform (GNU/Linux, *BSD, macOS, Windows and other) * 100% GPL, free software WeeChat homepage is here: https://weechat.org/ @@ -82,7 +82,7 @@ instructions. WeeChat can be compiled with cmake or autotools (cmake is recommended way). [NOTE] -On OS X, you can use http://brew.sh/[Homebrew]: +On macOS, you can use http://brew.sh/[Homebrew]: `brew install weechat --with-python --with-perl` (for help: `brew info weechat`). diff --git a/doc/fr/weechat_faq.fr.adoc b/doc/fr/weechat_faq.fr.adoc index 4556e6990..321d7b19a 100644 --- a/doc/fr/weechat_faq.fr.adoc +++ b/doc/fr/weechat_faq.fr.adoc @@ -60,8 +60,8 @@ base git. Notez que ce paquet peut ne pas correspondre exactement à la base git et qu'il est moins pratique que de cloner la base git pour installer des mises à jour. -[[compile_osx]] -=== Comment puis-je installer WeeChat sous OS X ? +[[compile_macos]] +=== Comment puis-je installer WeeChat sous macOS ? Il est recommandé d'utiliser http://brew.sh/[Homebrew], vous pouvez avoir de l'aide avec : @@ -168,8 +168,8 @@ Si vous utilisez gnome-terminal, vérifiez que l'option "Ambiguous-width characters" dans le menu Preferences/Profile/Compatibility est positionnée à `narrow`. -[[osx_display_broken]] -=== J'ai compilé WeeChat sous OS X, et je vois des "(null)" partout sur l'écran, pourquoi ? +[[macos_display_broken]] +=== J'ai compilé WeeChat sous macOS, et je vois des "(null)" partout sur l'écran, pourquoi ? Si vous avez compilé ncursesw vous-même, essayez avec le ncurses standard (celui fourni avec le système). diff --git a/doc/fr/weechat_relay_protocol.fr.adoc b/doc/fr/weechat_relay_protocol.fr.adoc index cb1800d45..110db6be9 100644 --- a/doc/fr/weechat_relay_protocol.fr.adoc +++ b/doc/fr/weechat_relay_protocol.fr.adoc @@ -36,7 +36,7 @@ Les _clients_ sont connectés au _relay_ comme dans le diagramme ci-dessous : .... ┌──────────┐ Station de travail ┌────────┐ ┌───┤ client 1 │ (Linux, Windows, - │ irc │◄──┐ ╔═══════════╤═══════╗ │ └──────────┘ BSD, Mac OS X ...) + │ irc │◄──┐ ╔═══════════╤═══════╗ │ └──────────┘ BSD, macOS ...) └────────┘ └──╢ │ ║◄───┘ ┌──────────┐ ...... ║ WeeChat │ Relay ║◄───────┤ client 2 │ Appareil mobile ┌────────┐ ┌──╢ │ ║◄───┐ └──────────┘ (Android, iPhone ...) diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index 1b4f42372..e5e457151 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -39,7 +39,7 @@ Ses principales fonctionnalités sont les suivantes : http://tools.ietf.org/html/rfc2812[2812] et http://tools.ietf.org/html/rfc2813[2813] * proxy IRC et relai pour interfaces distantes -* multi plates-formes (GNU/Linux, *BSD, MacOS X, Windows et d'autres systèmes) +* multi plates-formes (GNU/Linux, *BSD, macOS, Windows et d'autres systèmes) * 100% GPL, logiciel libre La page d'accueil de WeeChat est ici : https://weechat.org/ @@ -85,7 +85,7 @@ WeeChat peut être compilé avec cmake ou les autotools (cmake est la méthode recommandée). [NOTE] -Sous OS X, vous pouvez utiliser http://brew.sh/[Homebrew] : +Sous macOS, vous pouvez utiliser http://brew.sh/[Homebrew] : `brew install weechat --with-python --with-perl` (pour l'aide : `brew info weechat`). diff --git a/doc/it/weechat_faq.it.adoc b/doc/it/weechat_faq.it.adoc index e885d69bb..8afd95ad4 100644 --- a/doc/it/weechat_faq.it.adoc +++ b/doc/it/weechat_faq.it.adoc @@ -69,8 +69,8 @@ esattamente alla base git ed è meno conveniente rispetto al clone di git per l'installazione degli aggiornamenti. // TRANSLATION MISSING -[[compile_osx]] -=== How can I install WeeChat on OS X? +[[compile_macos]] +=== How can I install WeeChat on macOS? // TRANSLATION MISSING It is recommended to use http://brew.sh/[Homebrew], you can get help with: @@ -186,8 +186,8 @@ If you are using gnome-terminal, check that the option "Ambiguous-width characters" in menu Preferences/Profile/Compatibility is set to `narrow`. -[[osx_display_broken]] -=== Ho compilato WeeChat su OS X, e vedo "(null)" dovunque sullo schermo, cosa non va? +[[macos_display_broken]] +=== Ho compilato WeeChat su macOS, e vedo "(null)" dovunque sullo schermo, cosa non va? Se ncursesw è stato compilato manualmente, utilizzare ncurses standard (incluse col sistema). @@ -705,7 +705,7 @@ Impostare l'opzione _weechat.network.gnutls_ca_file_ con il file dei certificati ---- // TRANSLATION MISSING -Note: if you are running OS X with homebrew openssl installed, you can do: +Note: if you are running macOS with homebrew openssl installed, you can do: ---- /set weechat.network.gnutls_ca_file "/usr/local/etc/openssl/cert.pem" diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index afff4e5b6..bcd8a6c71 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -47,7 +47,7 @@ Le principali caratteristiche: http://tools.ietf.org/html/rfc2813[2813] // TRANSLATION MISSING * IRC proxy and relay for remote interfaces -* multi-piattaforma (GNU/Linux, *BSD, MacOS X, Windows ed altre) +* multi-piattaforma (GNU/Linux, *BSD, macOS, Windows ed altre) * 100% GPL, software libero La home page di WeeChat si trova qui: https://weechat.org/ @@ -98,7 +98,7 @@ WeeChat può essere compilato con cmake oppure autotools // TRANSLATION MISSING [NOTE] -On OS X, you can use http://brew.sh/[Homebrew]: +On macOS, you can use http://brew.sh/[Homebrew]: `brew install weechat --with-python --with-perl` (for help: `brew info weechat`). diff --git a/doc/ja/weechat_faq.ja.adoc b/doc/ja/weechat_faq.ja.adoc index 6958cf9e8..04f9d8028 100644 --- a/doc/ja/weechat_faq.ja.adoc +++ b/doc/ja/weechat_faq.ja.adoc @@ -63,8 +63,8 @@ git リポジトリからほぼ毎日ビルドされます。このパッケー git ベースではなく、アップデートをインストールする場合には git をクローンする方法よりも不便であることに注意してください。 -[[compile_osx]] -=== どうすれば OS X に WeeChat をインストールできますか? +[[compile_macos]] +=== どうすれば macOS に WeeChat をインストールできますか? http://brew.sh/[Homebrew] を使うことをお勧めします、ヘルプを見るには: @@ -164,8 +164,8 @@ gnome-terminal を使っている場合、設定/プロファイル/互換性メニュー内にある「曖昧幅の文字」を `半角` にしてください。 -[[osx_display_broken]] -=== OS X 上で WeeChat をコンパイルした場合、"(null)" という文字列が至る所に表示されます。 +[[macos_display_broken]] +=== macOS 上で WeeChat をコンパイルした場合、"(null)" という文字列が至る所に表示されます。 ncursesw を自分でコンパイルした場合は、標準の (システムに元から存在する) ncurses を使ってみてください。 diff --git a/doc/ja/weechat_relay_protocol.ja.adoc b/doc/ja/weechat_relay_protocol.ja.adoc index 172eedfc9..d64a7cc6a 100644 --- a/doc/ja/weechat_relay_protocol.ja.adoc +++ b/doc/ja/weechat_relay_protocol.ja.adoc @@ -39,7 +39,7 @@ .... ┌────────────────┐ ワークステーション ┌────────┐ ┌───┤ クライアント 1 │ (Linux、Windows、 - │ irc │◄──┐ ╔═══════════╤════════╗ │ └────────────────┘ BSD、Mac OS X ...) + │ irc │◄──┐ ╔═══════════╤════════╗ │ └────────────────┘ BSD、macOS ...) └────────┘ └──╢ │ ║◄───┘ ┌────────────────┐ ...... ║ WeeChat │ リレー ║◄───────┤ クライアント 2 │ 携帯デバイス ┌────────┐ ┌──╢ │ ║◄───┐ └────────────────┘ (Android、iPhone ...) diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index 13b30af70..31477803e 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -43,7 +43,7 @@ WeeChat (Wee Enhanced Environment for Chat) http://tools.ietf.org/html/rfc2812[2812]、 http://tools.ietf.org/html/rfc2813[2813]。 * リモートインターフェース用の IRC プロキシとリレー -* マルチプラットフォーム (GNU/Linux、*BSD、MacOS X、Windows 等) +* マルチプラットフォーム (GNU/Linux、*BSD、macOS、Windows 等) * 完全な GPL、フリーソフトウェア WeeChat のホームページ: https://weechat.org/ @@ -87,7 +87,7 @@ WeeChat をインストールするには、以下のものが必要です: WeeChat は cmake または autotools を使ってコンパイルできます (cmake を使うことが推奨されています)。 [NOTE] -OS X では http://brew.sh/[Homebrew] を使ってください: +macOS では http://brew.sh/[Homebrew] を使ってください: `brew install weechat --with-python --with-perl` (ヘルプを見るには: `brew info weechat`)。 diff --git a/doc/pl/weechat_faq.pl.adoc b/doc/pl/weechat_faq.pl.adoc index 5e92e1b2e..cb3328b8e 100644 --- a/doc/pl/weechat_faq.pl.adoc +++ b/doc/pl/weechat_faq.pl.adoc @@ -63,8 +63,8 @@ zależności. Ten pakiet jest budowany prawie codziennie z użyciem repozytorium git. Ten pakiet może odpowiadać dokładnie wersji z gita i jest mniej wygodny przy aktualizowaniu jak klonowanie z gita. -[[compile_osx]] -=== Jak zainstalować WeeChat na OS X? +[[compile_macos]] +=== Jak zainstalować WeeChat na macOS? Zaleca się użycie http://brew.sh/[Homebrew], pomoc uzyskasz za pomocą komendy: @@ -166,8 +166,8 @@ W razie potrzeby, popraw zmienna TERM: `export TERM="xxx"`. Jeśli używasz gnome-terminal, sprawdź czy opcja "Ambigous-width chracters" w menu Preferencje/Profile/Kompatybilność jest ustawiona na `narrow`. -[[osx_display_broken]] -=== Skompilowałem WeeChat pod OS X i wszędzie na ekranie widzę "(null)", co jest nie tak? +[[macos_display_broken]] +=== Skompilowałem WeeChat pod macOS i wszędzie na ekranie widzę "(null)", co jest nie tak? Jeśli samodzielnie skompilowałeś ncursesw, spróbuj użyć domyślnej wersji (dostarczanej z systemem). diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 8ee7798a1..7fea4beb9 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -43,7 +43,7 @@ Główne cechy to: http://tools.ietf.org/html/rfc2812[2812] i http://tools.ietf.org/html/rfc2813[2813] * proxy IRC i pośrednik dla zdalnych interfejsów -* wielo-platformowy (GNU/Linux, *BSD, MacOS X, Windows i inne) +* wielo-platformowy (GNU/Linux, *BSD, macOS, Windows i inne) * 100% GPL, darmowe oprogramowanie Strona domowa WeeChat: https://weechat.org/ @@ -88,7 +88,7 @@ pakietów. WeeChat może być kompilowany za pomocą cmake lub autotools (cmake jest zalecany). [NOTE] -Na OS X możesz użyć http://brew.sh/[Homebrew]: +Na macOS możesz użyć http://brew.sh/[Homebrew]: `brew install weechat --with-python --with-perl` (pomoc można uzyskać za pomocą komendy: `brew info weechat`). diff --git a/src/core/wee-network.c b/src/core/wee-network.c index 8fd45d690..46e882208 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -1198,7 +1198,10 @@ network_connect_child (struct t_hook *hook_connect) msg.msg_control = msg_buf; msg.msg_controllen = sizeof (msg_buf); - /* send 1 byte of data (not required on Linux, required by BSD/OSX) */ + /* + * send 1 byte of data + * (not required on Linux, required by BSD/macOS) + */ memset (iov, 0, sizeof (iov)); iov[0].iov_base = iov_data; iov[0].iov_len = 1; @@ -1459,7 +1462,10 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd) msg.msg_control = msg_buf; msg.msg_controllen = sizeof (msg_buf); - /* recv 1 byte of data (not required on Linux, required by BSD/OSX) */ + /* + * recv 1 byte of data + * (not required on Linux, required by BSD/macOS) + */ memset (iov, 0, sizeof (iov)); iov[0].iov_base = iov_data; iov[0].iov_len = 1; diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index b2ef51417..2116bc6ea 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -42,7 +42,7 @@ list(APPEND EXTRA_LIBS "m") list(APPEND EXTRA_LIBS ${CURL_LIBRARIES}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # link with resolv lib on Mac OS X + # link with resolv lib on macOS list(APPEND EXTRA_LIBS "resolv") endif() diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt index f205adbc5..e5a0dcb5a 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt @@ -55,7 +55,7 @@ endif() list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # link with resolv lib on Mac OS X + # link with resolv lib on macOS list(APPEND LINK_LIBS "resolv") endif() diff --git a/src/plugins/perl/CMakeLists.txt b/src/plugins/perl/CMakeLists.txt index 18eec779f..5da058fd9 100644 --- a/src/plugins/perl/CMakeLists.txt +++ b/src/plugins/perl/CMakeLists.txt @@ -24,7 +24,7 @@ set_target_properties(perl PROPERTIES PREFIX "") if(PERL_FOUND) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # remove "-arch xxx" on Mac OS X + # remove "-arch xxx" on macOS STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_CFLAGS "${PERL_CFLAGS}") STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_LFLAGS "${PERL_LFLAGS}") endif() diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt index 2988ee55a..3cea48e50 100644 --- a/src/plugins/xfer/CMakeLists.txt +++ b/src/plugins/xfer/CMakeLists.txt @@ -36,7 +36,7 @@ set(LINK_LIBS) list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # link with resolv lib on Mac OS X + # link with resolv lib on macOS list(APPEND LINK_LIBS "resolv") endif() |