Commit 66aeaf4d authored by Cool Fire's avatar Cool Fire

Merge remote-tracking branch 'upstream/master'

parents 2637ae46 3871fbaa
Pipeline #2178 passed with stage
in 15 minutes and 45 seconds
name: Ubuntu Build
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libnotify-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
- name: Configure
run: meson build -Dwith-text=true -Dwith-theme-manager=true
- name: Build
run: ninja -C build
- name: Test
run: ninja -C build test
- name: Install
run: sudo ninja -C build install
sudo: required
services: docker
before_install:
- docker pull ubuntu:16.04
- docker run --privileged --cidfile=/tmp/cid ubuntu:16.04 /bin/sh -c 'apt-get update && apt-get install -y meson/xenial-backports libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libnotify-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils'
- docker commit `cat /tmp/cid` hexchat/ubuntu-ci
- rm -f /tmp/cid
install:
- docker run -d --privileged --cidfile=/tmp/cid --volume=${PWD}:/opt/hexchat hexchat/ubuntu-ci /bin/systemd --system
script:
- docker exec `cat /tmp/cid` /bin/sh -c 'meson /opt/hexchat /opt/hexchat-build -Dwith-text=true -Dwith-theme-manager=true && ninja -C /opt/hexchat-build install && ninja -C /opt/hexchat-build test'
after_script:
- docker kill `cat /tmp/cid`
notifications:
irc:
channels: "chat.freenode.net#hexchat-devel"
template: "Build %{build_url} (%{commit} in %{branch}) by %{author}: %{message}"
on_success: change
matrix:
fast_finish: true
......@@ -26,6 +26,19 @@
<id>hexchat.desktop</id>
</provides>
<releases>
<release date="2019-12-20" version="2.14.3">
<description>
<p>This is a bug-fix release:</p>
<ul>
<li>Fix various incorrect parsing of IRC messages relating to trailing parameters</li>
<li>Fix SASL negotiation combined with multi-line cap</li>
<li>Fix input box theming with Yaru theme</li>
<li>python: Work around Python 3.7 regression causing crash on unload</li>
<li>sysinfo: Add support for /etc/os-release</li>
<li>sysinfo: Ignore irrelevant mounts when calculating storage size</li>
</ul>
</description>
</release>
<release date="2018-08-29" version="2.14.2">
<description>
<p>This is a minor release:</p>
......@@ -101,5 +114,8 @@
<kudo>HiDpiIcon</kudo>
<kudo>Notifications</kudo>
</kudos>
<content_rating type="oars-1.1">
<content_attribute id="social-chat">intense</content_attribute>
</content_rating>
<update_contact>tingping_at_fedoraproject.org</update_contact>
</component>
project('hexchat', 'c',
version: '2.14.2',
version: '2.14.3',
meson_version: '>= 0.40.0',
default_options: [
'c_std=gnu89',
......@@ -91,8 +91,6 @@ endif
global_cflags = []
test_cflags = [
'-pipe',
'-fPIE',
'-funsigned-char',
'-Wno-conversion',
'-Wno-pointer-sign',
......
python_opt = get_option('with-python')
if python_opt.startswith('python3')
python_dep = dependency(python_opt, version: '>= 3.3')
# Python 3.8 introduced a new -embed variant
if not python_opt.endswith('-embed')
python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false)
if not python_dep.found()
python_dep = dependency(python_opt, version: '>= 3.3')
endif
else
python_dep = dependency(python_opt, version: '>= 3.3')
endif
else
python_dep = dependency(python_opt, version: '>= 2.7')
endif
......
......@@ -13,13 +13,13 @@ sysinfo_includes = []
sysinfo_cargs = []
system = host_machine.system()
if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin'
if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd'
sysinfo_includes += 'shared'
sysinfo_sources += [
'shared/df.c'
]
if system == 'linux' or system == 'gnu' or system.startswith('gnu/')
if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd'
libpci = dependency('libpci', required: false, method: 'pkg-config')
if libpci.found()
sysinfo_deps += libpci
......
......@@ -26,7 +26,7 @@ int xs_parse_df(gint64 *out_total, gint64 *out_free)
FILE *pipe;
char buffer[bsize];
pipe = popen("df -k -l -P", "r");
pipe = popen("df -k -l -P --exclude-type=squashfs --exclude-type=devtmpfs --exclude-type=tmpfs", "r");
if(pipe==NULL)
return 1;
......
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the hexchat package.
#
#
# Translators:
# Petri Jooste <rkwjpj@puk.ac.za>, 2004
msgid ""
msgstr ""
"Project-Id-Version: HexChat\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-03 16:11-0400\n"
"PO-Revision-Date: 2017-09-19 14:16+0000\n"
"POT-Creation-Date: 2018-04-03 16:10-0400\n"
"PO-Revision-Date: 2018-04-03 20:10+0000\n"
"Last-Translator: TingPing <tingping@tingping.se>\n"
"Language-Team: Afrikaans (http://www.transifex.com/hexchat/hexchat/language/"
"af/)\n"
"Language: af\n"
"Language-Team: Afrikaans (http://www.transifex.com/hexchat/hexchat/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: data/misc/io.github.Hexchat.appdata.xml.in:4
......@@ -298,9 +297,7 @@ msgstr ""
msgid ""
"* Running IRC as root is stupid! You should\n"
" create a User Account and use that to login.\n"
msgstr ""
"* Om IRC as root te loop is onnosel! Jy moet\n"
" 'n gebruiker-ID skep en dit gebruik om aan te teken.\n"
msgstr "* Om IRC as root te loop is onnosel! Jy moet\n 'n gebruiker-ID skep en dit gebruik om aan te teken.\n"
#: src/common/ignore.c:127 src/common/ignore.c:131 src/common/ignore.c:135
#: src/common/ignore.c:139 src/common/ignore.c:143 src/common/ignore.c:147
......@@ -460,7 +457,8 @@ msgstr ""
#: src/common/outbound.c:3945
msgid ""
"CHARSET [<encoding>], get or set the encoding used for the current connection"
"CHARSET [<encoding>], get or set the encoding used for the current "
"connection"
msgstr ""
#: src/common/outbound.c:3946
......@@ -487,7 +485,8 @@ msgstr ""
#: src/common/outbound.c:3954
msgid ""
"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
"CYCLE [<channel>], parts the current or given channel and immediately "
"rejoins"
msgstr ""
#: src/common/outbound.c:3956
......@@ -629,8 +628,7 @@ msgid ""
" Use -h to highlight the found string(s)\n"
" Use -m to match case\n"
" Use -r when string is a Regular Expression\n"
" Use -- (double hyphen) to end options when searching for, say, the "
"string '-r'"
" Use -- (double hyphen) to end options when searching for, say, the string '-r'"
msgstr ""
#: src/common/outbound.c:4034
......@@ -648,8 +646,8 @@ msgstr ""
#: src/common/outbound.c:4041
msgid ""
"ME <action>, sends the action to the current channel (actions are written in "
"the 3rd person, like /me jumps)"
"ME <action>, sends the action to the current channel (actions are written in"
" the 3rd person, like /me jumps)"
msgstr ""
#: src/common/outbound.c:4045
......@@ -667,8 +665,8 @@ msgstr ""
#: src/common/outbound.c:4051
msgid ""
"MSG <nick> <message>, sends a private message, message \".\" to send to last "
"nick or prefix with \"=\" for dcc chat"
"MSG <nick> <message>, sends a private message, message \".\" to send to last"
" nick or prefix with \"=\" for dcc chat"
msgstr ""
#: src/common/outbound.c:4054
......@@ -732,8 +730,8 @@ msgstr ""
#: src/common/outbound.c:4080
msgid ""
"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as /"
"RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
"/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
"reconnect to all the open servers"
msgstr ""
......@@ -800,7 +798,8 @@ msgstr ""
#: src/common/outbound.c:4110
msgid ""
"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
"TOPIC [<topic>], sets the topic if one is given, else shows the current "
"topic"
msgstr ""
#: src/common/outbound.c:4112
......@@ -827,8 +826,8 @@ msgstr ""
#: src/common/outbound.c:4123
msgid ""
"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
"server."
"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
" server."
msgstr ""
#: src/common/outbound.c:4124
......@@ -837,7 +836,8 @@ msgstr ""
#: src/common/outbound.c:4126
msgid ""
"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
"userlist"
msgstr ""
#: src/common/outbound.c:4129
......@@ -1111,7 +1111,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
msgstr ""
#: src/common/textevents.h:145
msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:148
......@@ -1145,8 +1146,8 @@ msgstr ""
#: src/common/textevents.h:169
msgid ""
"%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O"
"$tContents of packet: %C23$2%O"
"%C20*%O$tReceived a malformed DCC request from "
"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
msgstr ""
#: src/common/textevents.h:172
......@@ -1167,7 +1168,8 @@ msgid ""
msgstr ""
#: src/common/textevents.h:184
msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:187
......@@ -1180,7 +1182,8 @@ msgstr ""
#: src/common/textevents.h:193
msgid ""
"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
"instead."
msgstr ""
#: src/common/textevents.h:196
......@@ -1197,7 +1200,8 @@ msgid ""
msgstr ""
#: src/common/textevents.h:205
msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:208
......@@ -3502,18 +3506,18 @@ msgstr ""
#: src/fe-gtk/fkeys.c:141
msgid ""
"The Run Command action runs the data in Data 1 as if it had been typed into "
"the entry box where you pressed the key sequence. Thus it can contain text "
"(which will be sent to the channel/person), commands or user commands. When "
"run all \\n characters in Data 1 are used to deliminate separate commands so "
"it is possible to run more than one command. If you want a \\ in the actual "
"text run then enter \\\\"
"The Run Command action runs the data in Data 1 as if it had been typed "
"into the entry box where you pressed the key sequence. Thus it can contain "
"text (which will be sent to the channel/person), commands or user commands. "
"When run all \\n characters in Data 1 are used to deliminate separate "
"commands so it is possible to run more than one command. If you want a \\ "
"in the actual text run then enter \\\\"
msgstr ""
#: src/fe-gtk/fkeys.c:143
msgid ""
"The Change Page command switches between pages in the notebook. Set Data 1 "
"to the page you want to switch to. If Data 2 is set to anything then the "
"The Change Page command switches between pages in the notebook. Set Data 1"
" to the page you want to switch to. If Data 2 is set to anything then the "
"switch will be relative to the current position. Set Data 1 to auto to "
"switch to the page with the most recent and important activity (queries "
"first, then channels with hilight, channels with dialogue, channels with "
......@@ -3528,39 +3532,39 @@ msgstr ""
#: src/fe-gtk/fkeys.c:147
msgid ""
"The Scroll Page command scrolls the text widget up or down one page or one "
"line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
"The Scroll Page command scrolls the text widget up or down one page or one"
" line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
msgstr ""
#: src/fe-gtk/fkeys.c:149
msgid ""
"The Set Buffer command sets the entry where the key sequence was entered to "
"the contents of Data 1"
"The Set Buffer command sets the entry where the key sequence was entered "
"to the contents of Data 1"
msgstr ""
#: src/fe-gtk/fkeys.c:151
msgid ""
"The Last Command command sets the entry to contain the last command entered "
"- the same as pressing up in a shell"
"The Last Command command sets the entry to contain the last command "
"entered - the same as pressing up in a shell"
msgstr ""
#: src/fe-gtk/fkeys.c:153
msgid ""
"The Next Command command sets the entry to contain the next command entered "
"- the same as pressing down in a shell"
"The Next Command command sets the entry to contain the next command "
"entered - the same as pressing down in a shell"
msgstr ""
#: src/fe-gtk/fkeys.c:155
msgid ""
"This command changes the text in the entry to finish an incomplete nickname "
"or command. If Data 1 is set then double-tabbing in a string will select the "
"last nick, not the next"
"or command. If Data 1 is set then double-tabbing in a string will select the"
" last nick, not the next"
msgstr ""
#: src/fe-gtk/fkeys.c:157
msgid ""
"This command scrolls up and down through the list of nicks. If Data 1 is set "
"to anything it will scroll up, else it scrolls down"
"This command scrolls up and down through the list of nicks. If Data 1 is set"
" to anything it will scroll up, else it scrolls down"
msgstr ""
#: src/fe-gtk/fkeys.c:159
......@@ -5694,8 +5698,8 @@ msgstr ""
#: src/fe-gtk/setup.c:562
msgid ""
"Automatically include timestamps in copied lines of text. Otherwise, include "
"timestamps if the Shift key is held down while selecting."
"Automatically include timestamps in copied lines of text. Otherwise, include"
" timestamps if the Shift key is held down while selecting."
msgstr ""
#: src/fe-gtk/setup.c:564
......@@ -5704,8 +5708,8 @@ msgstr ""
#: src/fe-gtk/setup.c:565
msgid ""
"Automatically include color information in copied lines of text. Otherwise, "
"include color information if the Ctrl key is held down while selecting."
"Automatically include color information in copied lines of text. Otherwise,"
" include color information if the Ctrl key is held down while selecting."
msgstr ""
#: src/fe-gtk/setup.c:570
......@@ -5756,7 +5760,8 @@ msgstr ""
#: src/fe-gtk/setup.c:579
msgid ""
"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
"Attempt to use this banmask when banning or quieting. (requires "
"irc_who_join)"
msgstr ""
#: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
......@@ -5866,8 +5871,8 @@ msgstr ""
#: src/fe-gtk/setup.c:639
msgid ""
"Asks the IRC server for your real address. Use this if you have a 192.168.*."
"* address!"
"Asks the IRC server for your real address. Use this if you have a "
"192.168.*.* address!"
msgstr ""
#: src/fe-gtk/setup.c:640
......@@ -6103,8 +6108,7 @@ msgid ""
msgstr ""
#: src/fe-gtk/setup.c:2254
msgid ""
"The Real name option cannot be left blank. Falling back to \"realname\"."
msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
msgstr ""
#: src/fe-gtk/setup.c:2261
......@@ -6231,8 +6235,8 @@ msgstr ""
#: plugins/sysinfo/sysinfo.c:168
msgid ""
"Sysinfo: Valid settings are: announce and hide_* for each piece of "
"information. e.g. hide_os. Without a value it will show current (or default) "
"setting.\n"
"information. e.g. hide_os. Without a value it will show current (or default)"
" setting.\n"
msgstr ""
#: plugins/sysinfo/sysinfo.c:190
......
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the hexchat package.
#
#
# Translators:
# Ge'ez Frontier Foundation <locales@geez.org>, 2002
msgid ""
msgstr ""
"Project-Id-Version: HexChat\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-03 16:11-0400\n"
"PO-Revision-Date: 2017-09-19 14:16+0000\n"
"POT-Creation-Date: 2018-04-03 16:10-0400\n"
"PO-Revision-Date: 2018-04-03 20:10+0000\n"
"Last-Translator: TingPing <tingping@tingping.se>\n"
"Language-Team: Amharic (http://www.transifex.com/hexchat/hexchat/language/"
"am/)\n"
"Language: am\n"
"Language-Team: Amharic (http://www.transifex.com/hexchat/hexchat/language/am/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: am\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: data/misc/io.github.Hexchat.appdata.xml.in:4
......@@ -458,7 +457,8 @@ msgstr ""
#: src/common/outbound.c:3945
msgid ""
"CHARSET [<encoding>], get or set the encoding used for the current connection"
"CHARSET [<encoding>], get or set the encoding used for the current "
"connection"
msgstr ""
#: src/common/outbound.c:3946
......@@ -485,7 +485,8 @@ msgstr ""
#: src/common/outbound.c:3954
msgid ""
"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
"CYCLE [<channel>], parts the current or given channel and immediately "
"rejoins"
msgstr ""
#: src/common/outbound.c:3956
......@@ -627,8 +628,7 @@ msgid ""
" Use -h to highlight the found string(s)\n"
" Use -m to match case\n"
" Use -r when string is a Regular Expression\n"
" Use -- (double hyphen) to end options when searching for, say, the "
"string '-r'"
" Use -- (double hyphen) to end options when searching for, say, the string '-r'"
msgstr ""
#: src/common/outbound.c:4034
......@@ -646,8 +646,8 @@ msgstr ""
#: src/common/outbound.c:4041
msgid ""
"ME <action>, sends the action to the current channel (actions are written in "
"the 3rd person, like /me jumps)"
"ME <action>, sends the action to the current channel (actions are written in"
" the 3rd person, like /me jumps)"
msgstr ""
#: src/common/outbound.c:4045
......@@ -665,8 +665,8 @@ msgstr ""
#: src/common/outbound.c:4051
msgid ""
"MSG <nick> <message>, sends a private message, message \".\" to send to last "
"nick or prefix with \"=\" for dcc chat"
"MSG <nick> <message>, sends a private message, message \".\" to send to last"
" nick or prefix with \"=\" for dcc chat"
msgstr ""
#: src/common/outbound.c:4054
......@@ -730,8 +730,8 @@ msgstr ""
#: src/common/outbound.c:4080
msgid ""
"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as /"
"RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
"RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
"/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
"reconnect to all the open servers"
msgstr ""
......@@ -798,7 +798,8 @@ msgstr ""
#: src/common/outbound.c:4110
msgid ""
"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
"TOPIC [<topic>], sets the topic if one is given, else shows the current "
"topic"
msgstr ""
#: src/common/outbound.c:4112
......@@ -825,8 +826,8 @@ msgstr ""
#: src/common/outbound.c:4123
msgid ""
"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
"server."
"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
" server."
msgstr ""
#: src/common/outbound.c:4124
......@@ -835,7 +836,8 @@ msgstr ""
#: src/common/outbound.c:4126
msgid ""
"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
"userlist"
msgstr ""
#: src/common/outbound.c:4129
......@@ -1109,7 +1111,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
msgstr ""
#: src/common/textevents.h:145
msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:148
......@@ -1143,8 +1146,8 @@ msgstr ""
#: src/common/textevents.h:169
msgid ""
"%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O"
"$tContents of packet: %C23$2%O"
"%C20*%O$tReceived a malformed DCC request from "
"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
msgstr ""
#: src/common/textevents.h:172
......@@ -1165,7 +1168,8 @@ msgid ""
msgstr ""
#: src/common/textevents.h:184
msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:187
......@@ -1178,7 +1182,8 @@ msgstr ""
#: src/common/textevents.h:193
msgid ""
"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
"instead."
msgstr ""
#: src/common/textevents.h:196
......@@ -1195,7 +1200,8 @@ msgid ""
msgstr ""
#: src/common/textevents.h:205
msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgid ""
"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
msgstr ""
#: src/common/textevents.h:208
......@@ -3500,18 +3506,18 @@ msgstr ""
#: src/fe-gtk/fkeys.c:141
msgid ""
"The Run Command action runs the data in Data 1 as if it had been typed into "
"the entry box where you pressed the key sequence. Thus it can contain text "
"(which will be sent to the channel/person), commands or user commands. When "
"run all \\n characters in Data 1 are used to deliminate separate commands so "
"it is possible to run more than one command. If you want a \\ in the actual "
"text run then enter \\\\"
"The Run Command action runs the data in Data 1 as if it had been typed "
"into the entry box where you pressed the key sequence. Thus it can contain "
"text (which will be sent to the channel/person), commands or user commands. "
"When run all \\n characters in Data 1 are used to deliminate separate "
"commands so it is possible to run more than one command. If you want a \\ "
"in the actual text run then enter \\\\"
msgstr ""
#: src/fe-gtk/fkeys.c:143
msgid ""
"The Change Page command switches between pages in the notebook. Set Data 1 "
"to the page you want to switch to. If Data 2 is set to anything then the "
"The Change Page command switches between pages in the notebook. Set Data 1"
" to the page you want to switch to. If Data 2 is set to anything then the "
"switch will be relative to the current position. Set Data 1 to auto to "
"switch to the page with the most recent and important activity (queries "
"first, then channels with hilight, channels with dialogue, channels with "
......@@ -3526,39 +3532,39 @@ msgstr ""
#: src/fe-gtk/fkeys.c:147
msgid ""
"The Scroll Page command scrolls the text widget up or down one page or one "
"line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
"The Scroll Page command scrolls the text widget up or down one page or one"
" line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
msgstr ""
#: src/fe-gtk/fkeys.c:149
msgid ""
"The Set Buffer command sets the entry where the key sequence was entered to "
"the contents of Data 1"
"The Set Buffer command sets the entry where the key sequence was entered "
"to the contents of Data 1"
msgstr ""
#: src/fe-gtk/fkeys.c:151
msgid ""
"The Last Command command sets the entry to contain the last command entered "
"- the same as pressing up in a shell"
"The Last Command command sets the entry to contain the last command "
"entered - the same as pressing up in a shell"
msgstr ""
#: src/fe-gtk/fkeys.c:153