Update Russian language

This is updated when a user receives a new message but would have
not been updated when a user sent a CHGHOST.

.github/workflows/flatpak-build.yml

@@ -0,0 +1,17 @@
+name: Flatpak Build
+on: [push, pull_request]
+jobs:
+  flatpak_build:
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+      with:
+        bundle: hexchat.flatpak
+        manifest-path: flatpak/io.github.Hexchat.json

.github/workflows/msys-build.yml

@@ -0,0 +1,41 @@
+name: MSYS2 Build
+on: [push, pull_request]
+
+jobs:
+  msys2_build:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          install: >-
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-pkg-config
+            mingw-w64-x86_64-python3-cffi
+            mingw-w64-x86_64-meson
+            mingw-w64-x86_64-gtk2
+            mingw-w64-x86_64-gtk-update-icon-cache
+            mingw-w64-x86_64-luajit
+            mingw-w64-x86_64-desktop-file-utils
+
+      - name: Configure
+        run: >-
+          meson build
+          -Dtext-frontend=true
+          -Ddbus=disabled
+          -Dwith-upd=false
+          -Dwith-perl=false
+
+      - name: Build
+        run: ninja -C build
+
+      - name: Test
+        run: ninja -C build test
+
+      - name: Install
+        run: ninja -C build install

.github/workflows/ubuntu-build.yml

@@ -0,0 +1,25 @@
+name: Ubuntu Build
+on: [push, pull_request]
+jobs:
+  ubuntu_build:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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 libpci-dev libperl-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
+
+      - name: Configure
+        run: meson build -Dtext=true -Dtheme-manager=true -Dauto_features=enabled
+
+      - name: Build
+        run: ninja -C build
+
+      - name: Test
+        run: ninja -C build test
+
+      - name: Install
+        run: sudo ninja -C build install

.github/workflows/windows-build.yml

@@ -0,0 +1,72 @@
+name: Windows Build
+on: [push, pull_request]
+
+jobs:
+  windows_build:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        platform: [x64, win32]
+        arch: [x64, x86]
+        exclude:
+          - platform: x64
+            arch: x86
+          - platform: win32
+            arch: x64
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Dependencies
+        run: |
+          New-Item -Name "deps" -ItemType "Directory"
+
+          Invoke-WebRequest http://files.jrsoftware.org/is/5/innosetup-5.5.9-unicode.exe -OutFile deps\innosetup-unicode.exe
+          & deps\innosetup-unicode.exe /VERYSILENT | Out-Null
+
+          Invoke-WebRequest https://dl.hexchat.net/misc/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe
+          & deps\idpsetup.exe /VERYSILENT
+
+          Invoke-WebRequest https://dl.hexchat.net/gtk/gtk-${{ matrix.platform }}-2018-08-29-openssl1.1.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
+          & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk
+
+          Invoke-WebRequest https://dl.hexchat.net/gtk-win32/gendef-20111031.7z -OutFile deps\gendef.7z
+          & 7z.exe x deps\gendef.7z -oC:\gtk-build
+
+          Invoke-WebRequest https://dl.hexchat.net/gtk-win32/WinSparkle-20151011.7z -OutFile deps\WinSparkle.7z
+          & 7z.exe x deps\WinSparkle.7z -oC:\gtk-build\WinSparkle
+
+          Invoke-WebRequest https://dl.hexchat.net/misc/perl/perl-5.20.0-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z
+          & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }}
+
+          New-Item -Path "c:\gtk-build" -Name "python-2.7" -ItemType "Directory"
+          New-Item -Path "c:\gtk-build" -Name "python-3.8" -ItemType "Directory"
+          New-Item -Path "c:\gtk-build\python-2.7" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/2.7.18/${{ matrix.arch }}"
+          New-Item -Path "c:\gtk-build\python-3.8" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/3.8.10/${{ matrix.arch }}"
+
+          C:/hostedtoolcache/windows/Python/3.8.10/${{ matrix.arch }}/python.exe -m pip install cffi
+          C:/hostedtoolcache/windows/Python/2.7.18/${{ matrix.arch }}/python.exe -m pip install -qq cffi
+        shell: powershell
+
+      - name: Build
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+          msbuild win32\hexchat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
+        shell: cmd
+
+      - name: Preparing Artifacts
+        run: |
+          move ..\hexchat-build\${{ matrix.platform }}\HexChat*.exe .\
+          move ..\hexchat-build .\
+        shell: cmd
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Installer ${{ matrix.arch }}
+          path: HexChat*.exe
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Build Files ${{ matrix.arch  }}
+          path: hexchat-build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "flatpak/shared-modules"]
+	path = flatpak/shared-modules
+	url = https://github.com/flathub/shared-modules.git

.lgtm.yml

@@ -0,0 +1,5 @@
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - python3-cffi

.travis.yml

@@ -1,20 +0,0 @@
-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 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

data/icons/meson.build

@@ -1,9 +1,11 @@
 icondir = join_paths(get_option('datadir'), 'icons/hicolor')
 install_data(
   'hexchat.png',
+  rename: 'io.github.Hexchat.png',
   install_dir: join_paths(icondir, '48x48/apps')
 )
 install_data(
   'hexchat.svg',
+  rename: 'io.github.Hexchat.svg',
   install_dir: join_paths(icondir, 'scalable/apps')
 )

data/meson.build

@@ -1,11 +1,11 @@
-if get_option('with-plugin')
+if get_option('plugin')
   subdir('pkgconfig')
 endif
 
-if get_option('with-gtk')
+if get_option('gtk-frontend')
   subdir('icons')
   subdir('misc')
   subdir('man')
-elif get_option('with-theme-manager')
+elif get_option('theme-manager')
   subdir('misc')
 endif

data/misc/io.github.Hexchat.Plugin.metainfo.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>io.github.Hexchat.Plugin.@NAME@</id>
-  <extends>io.github.Hexchat.desktop</extends>
+  <extends>io.github.Hexchat</extends>
   <name>@NAME@ Plugin</name>
   <summary>@SUMMARY@</summary>
   <url type="homepage">https://hexchat.github.io/</url>

data/misc/io.github.Hexchat.appdata.xml.in

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>io.github.Hexchat.desktop</id>
+<component type="desktop-application">
+  <id>io.github.Hexchat</id>
   <name>HexChat</name>
+  <launchable type="desktop-id">io.github.Hexchat.desktop</launchable>
   <developer_name>HexChat</developer_name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
@@ -26,6 +27,48 @@
     <id>hexchat.desktop</id>
   </provides>
   <releases>
+    <release date="2022-02-12" version="2.16.1">
+      <description>
+        <p>This is a minor release with mostly bug-fixes:</p>
+        <ul>
+          <li>Add `-NOOVERRIDE` flag to the `GUI COLOR` command</li>
+          <li>Add `-q` (quiet) flag to the `EXECWRITE` command</li>
+          <li>Rename installed icon to match app-id (Fixes notification icon)</li>
+          <li>Fix escaping already escaped URLs when opening them</li>
+          <li>Fix Python scripts not being opened as UTF-8</li>
+          <li>Fix `TIMER` command supporting decimals regardless of locale</li>
+        </ul>
+      </description>
+    </release>
+    <release date="2021-10-01" version="2.16.0">
+      <description>
+        <p>This is a feature release:</p>
+        <ul>
+          <li>Add support for IRCv3 SETNAME, invite-notify, account-tag, standard replies, and UTF8ONLY</li>
+          <li>Add support for strikethrough formatting</li>
+          <li>Fix text clipping issues by respecting font line height</li>
+          <li>Fix URLs not being escaped when opened</li>
+          <li>Fix possible hang when showing notifications</li>
+          <li>Print ChanServ notices in the front tab by default</li>
+          <li>Update network list</li>
+          <li>python: Rewrite plugin improving memory usage and compatibility</li>
+          <li>fishlim: Add support for CBC and other improvements</li>
+        </ul>
+      </description>
+    </release>
+    <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 +144,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>

data/misc/io.github.Hexchat.desktop.in.in

@@ -4,7 +4,7 @@ GenericName=IRC Client
 Comment=Chat with other people online
 Keywords=IM;Chat;
 Exec=@exec_command@
-Icon=hexchat
+Icon=io.github.Hexchat
 Terminal=false
 Type=Application
 Categories=GTK;Network;IRCClient;

data/misc/meson.build

@@ -2,8 +2,8 @@ appdir = join_paths(get_option('datadir'), 'applications')
 metainfodir = join_paths(get_option('datadir'), 'metainfo')
 desktop_utils = find_program('desktop-file-validate', required: false)
 
-if get_option('with-gtk')
-  if get_option('with-appdata')
+if get_option('gtk-frontend')
+  if get_option('install-appdata')
     hexchat_appdata = i18n.merge_file(
       input: 'io.github.Hexchat.appdata.xml.in',
       output: 'io.github.Hexchat.appdata.xml',
@@ -21,7 +21,7 @@ if get_option('with-gtk')
   endif
 
   desktop_conf = configuration_data()
-  if get_option('with-dbus')
+  if dbus_glib_dep.found()
     desktop_conf.set('exec_command', 'hexchat --existing %U')
   else
     desktop_conf.set('exec_command', 'hexchat %U')
@@ -49,7 +49,7 @@ if get_option('with-gtk')
   endif
 endif
 
-if get_option('with-theme-manager')
+if get_option('theme-manager')
   htm_desktop = i18n.merge_file(
     input: 'io.github.Hexchat.ThemeManager.desktop.in',
     output: 'io.github.Hexchat.ThemeManager.desktop',
@@ -70,7 +70,7 @@ if get_option('with-theme-manager')
   )
 endif
 
-if get_option('with-plugin') and get_option('with-appdata')
+if get_option('plugin')
   plugin_metainfo = []
 
   # FIXME: These should all get translated somewhere
@@ -124,4 +124,4 @@ if get_option('with-plugin') and get_option('with-appdata')
       install_dir: get_option('install-plugin-metainfo') ? metainfodir : '',
     )
   endforeach
-endif
+endif

data/pkgconfig/meson.build

@@ -2,8 +2,8 @@ pkg_conf = configuration_data()
 prefix = get_option('prefix')
 pkg_conf.set('prefix', prefix)
 pkg_conf.set('VERSION', meson.project_version())
-pkg_conf.set('hexchatlibdir', join_paths(prefix, plugindir))
-pkg_conf.set('includedir', join_paths(prefix, get_option('includedir')))
+pkg_conf.set('hexchatlibdir', join_paths('${prefix}', plugindir))
+pkg_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
 
 configure_file(
   input: 'hexchat-plugin.pc.in',

flatpak/Load-plugins-from-Flatpak-extensions.patch

@@ -0,0 +1,25 @@
+From 918503d57c6740d20be68a6717158673a2a8b25f Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Sat, 17 Mar 2018 05:57:49 -0400
+Subject: [PATCH] Support loading Flatpak extensions
+
+---
+ src/common/plugin.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/plugin.c b/src/common/plugin.c
+index 3ad3c558..6addf962 100644
+--- a/src/common/plugin.c
++++ b/src/common/plugin.c
+@@ -450,6 +450,8 @@ plugin_auto_load (session *sess)
+ 	lib_dir = plugin_get_libdir ();
+ 	sub_dir = g_build_filename (get_xdir (), "addons", NULL);
+ 
++	for_files ("/app/extensions/lib/hexchat/plugins", "*.so", plugin_auto_load_cb);
++
+ #ifdef WIN32
+ 	/* a long list of bundled plugins that should be loaded automatically,
+ 	 * user plugins should go to <config>, leave Program Files alone! */
+-- 
+2.14.3
+

flatpak/io.github.Hexchat.json

@@ -0,0 +1,78 @@
+{
+  "app-id": "io.github.Hexchat",
+  "branch": "stable",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "40",
+  "sdk": "org.gnome.Sdk",
+  "command": "hexchat",
+  "finish-args": [
+    "--share=ipc",
+    "--socket=x11",
+    "--share=network",
+    "--socket=pulseaudio",
+    "--filesystem=xdg-download",
+
+    "--talk-name=org.freedesktop.Notifications",
+
+    "--talk-name=org.mpris.MediaPlayer2.*"
+  ],
+  "add-extensions": {
+    "io.github.Hexchat.Plugin": {
+      "version": "20.08",
+      "directory": "extensions",
+      "add-ld-path": "lib",
+      "merge-dirs": "lib/hexchat/plugins",
+      "subdirectories": true,
+      "no-autodownload": true,
+      "autodelete": true
+    }
+  },
+  "modules": [
+    "shared-modules/gtk2/gtk2.json",
+    "shared-modules/gtk2/gtk2-common-themes.json",
+    "shared-modules/dbus-glib/dbus-glib.json",
+    "shared-modules/lua5.3/lua-5.3.5.json",
+    "shared-modules/libcanberra/libcanberra.json",
+    "python3-cffi.json",
+    {
+      "name": "lgi",
+      "buildsystem": "meson",
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/pavouk/lgi.git",
+          "commit": "95418635aa8151a516d43166227ea2b9d4c4403f"
+        }
+      ]
+    },
+    {
+      "name": "hexchat",
+      "buildsystem": "meson",
+      "config-opts": [
+        "--buildtype=release",
+        "-Ddbus-service-use-appid=true",
+        "-Dwith-perl=false",
+        "-Dwith-lua=lua"
+      ],
+      "build-options": {
+        "cflags": "-Wno-error=missing-include-dirs"
+      },
+      "cleanup": [
+        "/share/man"
+      ],
+      "post-install": [
+        "install -d /app/extensions"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": ".."
+        },
+        {
+          "type": "patch",
+          "path": "Load-plugins-from-Flatpak-extensions.patch"
+        }
+      ]
+    }
+  ]
+}

flatpak/python3-cffi.json

@@ -0,0 +1,19 @@
+{
+    "name": "python3-cffi",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"cffi\" --no-build-isolation"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/0f/86/e19659527668d70be91d0369aeaa055b4eb396b0f387a4f92293a20035bd/pycparser-2.20.tar.gz",
+            "sha256": "2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438135918484fffaacfaddba776b374563/cffi-1.14.5.tar.gz",
+            "sha256": "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"
+        }
+    ]
+}

flatpak/shared-modules

@@ -0,0 +1 @@
+Subproject commit 2c2f8fef2e926ff03158c0b3341526cce1b405ac

meson.build

@@ -1,6 +1,6 @@
 project('hexchat', 'c',
-  version: '2.14.2',
-  meson_version: '>= 0.38.0',
+  version: '2.16.1',
+  meson_version: '>= 0.47.0',
   default_options: [
     'c_std=gnu89',
     'buildtype=debugoptimized',
@@ -15,12 +15,17 @@ cc = meson.get_compiler('c')
 
 libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
 libgmodule_dep = dependency('gmodule-2.0')
+
+libcanberra_dep = dependency('libcanberra', version: '>= 0.22',
+                             required: get_option('libcanberra'))
+dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus'))
+
 global_deps = []
 if cc.get_id() == 'msvc'
-  libssl_dep = cc.find_library('libeay32')
+  libssl_dep = cc.find_library('libssl')
 else
   libssl_dep = dependency('openssl', version: '>= 0.9.8',
-                          required: get_option('with-ssl'))
+                          required: get_option('tls'))
 endif
 
 config_h = configuration_data()
@@ -29,14 +34,14 @@ config_h.set_quoted('PACKAGE_NAME', meson.project_name())
 config_h.set_quoted('GETTEXT_PACKAGE', 'hexchat')
 config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
                                  get_option('datadir'), 'locale'))
+config_h.set_quoted('G_LOG_DOMAIN', 'hexchat')
 config_h.set10('ENABLE_NLS', true)
 
 # Optional features
-config_h.set('USE_OPENSSL', get_option('with-ssl'))
-config_h.set('USE_LIBPROXY', get_option('with-libproxy'))
-config_h.set('USE_LIBCANBERRA', get_option('with-libcanberra'))
-config_h.set('USE_DBUS', get_option('with-dbus'))
-config_h.set('USE_PLUGIN', get_option('with-plugin'))
+config_h.set('USE_OPENSSL', libssl_dep.found())
+config_h.set('USE_LIBCANBERRA', libcanberra_dep.found())
+config_h.set('USE_DBUS', dbus_glib_dep.found())
+config_h.set('USE_PLUGIN', get_option('plugin'))
 
 config_h.set('G_DISABLE_SINGLE_INCLUDES', true)
 config_h.set('GTK_DISABLE_DEPRECATED', true)
@@ -49,6 +54,10 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_34')
 config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))
 config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
 
+config_h.set_quoted('HEXCHATLIBDIR',
+  join_paths(get_option('prefix'), get_option('libdir'), 'hexchat/plugins')
+)
+
 if libssl_dep.found()
   config_h.set('HAVE_X509_GET_SIGNATURE_NID',
     cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)
@@ -87,8 +96,6 @@ endif
 
 global_cflags = []
 test_cflags = [
-  '-pipe',
-  '-fPIE',
   '-funsigned-char',
   '-Wno-conversion',
   '-Wno-pointer-sign',
@@ -132,18 +139,26 @@ test_ldflags = [
   '-Wl,-z,relro',
   '-Wl,-z,now',
   # mingw
-  '-Wl,--dynamicbase',
   '-Wl,--nxcompat',
 ]
+if not (host_machine.system() == 'windows' and get_option('debug'))
+ test_ldflags += '-Wl,--dynamicbase'
+endif
 foreach ldflag : test_ldflags
-  if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag)
+  if meson.version().version_compare('>= 0.46.0')
+    has_arg = cc.has_link_argument(ldflag)
+  else
+    has_arg = cc.has_argument(ldflag)
+  endif
+
+  if has_arg and cc.links('int main (void) { return 0; }', args: ldflag)
     global_ldflags += ldflag
   endif
 endforeach
 add_project_link_arguments(global_ldflags, language: 'c')
 
 subdir('src')
-if get_option('with-plugin')
+if get_option('plugin')
   subdir('plugins')
 endif
 if cc.get_id() != 'msvc'
@@ -151,6 +166,32 @@ if cc.get_id() != 'msvc'
   subdir('po') # FIXME: build xgettext
 
   meson.add_install_script('meson_post_install.py',
-    '@0@'.format(get_option('with-theme-manager'))
+    '@0@'.format(get_option('theme-manager'))
   )
 endif
+
+if meson.version().version_compare('>= 0.53.0')
+  summary({
+    'prefix': get_option('prefix'),
+    'bindir': get_option('bindir'),
+    'libdir': get_option('libdir'),
+    'datadir': get_option('datadir'),
+  }, section: 'Directories')
+
+  summary({
+    'TLS (openssl)': libssl_dep.found(),
+    'Plugin Support': get_option('plugin'),
+    'DBus Support': dbus_glib_dep.found(),
+    'libcanberra': libcanberra_dep.found(),
+  }, section: 'Features')
+
+  summary({
+    'Lua': get_option('with-lua'),
+    'Python': get_option('with-python'),
+    'Perl': get_option('with-perl'),
+    'Perl Legacy API': get_option('with-perl-legacy-api'),
+    'FiSH': get_option('with-fishlim'),
+    'Sysinfo': get_option('with-sysinfo'),
+    'DCC Checksum': get_option('with-checksum'),
+  }, section: 'Plugins')
+endif

meson_options.txt

@@ -1,36 +1,38 @@
-option('with-gtk', type: 'boolean',
+# Applications
+option('gtk-frontend', type: 'boolean',
   description: 'Main graphical interface'
 )
-option('with-text', type: 'boolean', value: false,
+option('text-frontend', type: 'boolean', value: false,
   description: 'Text interface (not generally useful)'
 )
-option('with-ssl', type: 'boolean',
-  description: 'Support for TLS connections, requires openssl'
-)
-option('with-plugin', type: 'boolean',
-  description: 'Support for loadable plugins'
-)
-option('with-dbus', type: 'boolean',
-  description: 'Support used for single-instance and scripting interface, Unix only'
-)
-option('with-libproxy', type: 'boolean',
-  description: 'Support for getting proxy information, Unix only'
-)
-option('with-libnotify', type: 'boolean',
-  description: 'Support for freedesktop notifications, Unix only'
-)
-option('with-libcanberra', type: 'boolean',
-  description: 'Support for sound alerts, Unix only'
-)
-option('with-theme-manager', type: 'boolean', value: false,
+option('theme-manager', type: 'boolean', value: false,
   description: 'Utility to help manage themes, requires mono/.net'
 )
+
+# Features
+option('tls', type: 'feature', value: 'enabled',
+  description: 'Support for TLS connections, requires openssl'
+)
+option('plugin', type: 'boolean',
+  description: 'Support for loadable plugins'
+)
+option('dbus', type: 'feature', value: 'auto',
+  description: 'Support used for single-instance and scripting interface, Unix only'
+)
+option('libcanberra', type: 'feature', value: 'auto',
+  description: 'Support for sound alerts, Unix only'
+)
+
+# Install options
 option('dbus-service-use-appid', type: 'boolean', value: false,
   description: 'Rename dbus service to match app-id, required for Flatpak'
 )
-option('with-appdata', type: 'boolean',
+option('install-appdata', type: 'boolean',
   description: 'Install appdata files for app stores'
 )
+option('install-plugin-metainfo', type: 'boolean', value: false,
+  description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
+)
 
 # Plugins
 option('with-checksum', type: 'boolean',
@@ -60,9 +62,6 @@ option('with-upd', type: 'boolean',
 option('with-winamp', type: 'boolean',
   description: 'Winamp plugin, Windows only'
 )
-option('install-plugin-metainfo', type: 'boolean', value: false,
-  description: 'Installs metainfo files for enabled plugins, useful when distros create split packages'
-)
 option('with-perl-legacy-api', type: 'boolean', value: false,
   description: 'Enables the legacy IRC perl module for compatibility with old scripts'
 )

plugins/checksum/checksum.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

plugins/checksum/meson.build

@@ -3,4 +3,5 @@ shared_module('checksum', 'checksum.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'checksum.def',
 )

plugins/exec/exec.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

plugins/exec/meson.build

@@ -1,5 +1,6 @@
 shared_module('exec', 'exec.c',
   dependencies: hexchat_plugin_dep,
   install: true,
-  install_dir: plugindir
+  install_dir: plugindir,
+  vs_module_defs: 'exec.def',
 )

plugins/fishlim/fish.c

@@ -1,6 +1,7 @@
 /*
 
   Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
+  Copyright (c) 2019-2020 <bakasura@protonmail.ch>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -27,15 +28,22 @@
 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
 #endif
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <openssl/evp.h>
 #include <openssl/blowfish.h>
+#include <openssl/rand.h>
 
 #include "keystore.h"
 #include "fish.h"
+#include "utils.h"
 
 #define IB 64
-static const char fish_base64[64] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+/* rfc 2812; 512 - CR-LF = 510 */
+static const int MAX_COMMAND_LENGTH = 510;
+static const char fish_base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+static const char base64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 static const signed char fish_unbase64[256] = {
     IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB,IB,IB,
     IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB,IB,IB,
@@ -53,6 +61,12 @@ static const signed char fish_unbase64[256] = {
     27,28,29,30,31,32,33,34,  35,36,37,IB,IB,IB,IB,IB,
 };
 
+/**
+ * Convert Int to 4 Bytes (Big-endian)
+ * 
+ * @param int   source
+ * @param char* dest
+ */
 #define GET_BYTES(dest, source) do { \
     *((dest)++) = ((source) >> 24) & 0xFF; \
     *((dest)++) = ((source) >> 16) & 0xFF; \
@@ -60,135 +74,488 @@ static const signed char fish_unbase64[256] = {
     *((dest)++) = (source) & 0xFF; \
 } while (0);
 
+/**
+ * Convert 4 Bytes to Int (Big-endian)
+ * 
+ * @param char* source
+ * @param int   dest
+ */
+#define GET_LONG(dest, source) do { \
+    dest = ((uint8_t)*((source)++) << 24); \
+    dest |= ((uint8_t)*((source)++) << 16); \
+    dest |= ((uint8_t)*((source)++) << 8); \
+    dest |= (uint8_t)*((source)++); \
+} while (0);
 
-char *fish_encrypt(const char *key, size_t keylen, const char *message) {
-    BF_KEY bfkey;
-    size_t messagelen;
-    size_t i;
-    int j;
-    char *encrypted;
-    char *end;
-    unsigned char bit;
-    unsigned char word;
-    unsigned char d;
-    BF_set_key(&bfkey, keylen, (const unsigned char*)key);
-    
-    messagelen = strlen(message);
-    if (messagelen == 0) return NULL;
-    encrypted = g_malloc(((messagelen - 1) / 8) * 12 + 12 + 1); /* each 8-byte block becomes 12 bytes */
-    end = encrypted;
-     
-    while (*message) {
-        /* Read 8 bytes (a Blowfish block) */
-        BF_LONG binary[2] = { 0, 0 };
-        unsigned char c;
-        for (i = 0; i < 8; i++) {
-            c = message[i];
-            binary[i >> 2] |= c << 8*(3 - (i&3));
-            if (c == '\0') break;
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+#include <openssl/provider.h>
+static OSSL_PROVIDER *legacy_provider;
+static OSSL_PROVIDER *default_provider;
+static OSSL_LIB_CTX *ossl_ctx;
+#endif
+
+int fish_init(void)
+{
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    ossl_ctx = OSSL_LIB_CTX_new();
+    if (!ossl_ctx)
+        return 0;
+
+    legacy_provider = OSSL_PROVIDER_load(ossl_ctx, "legacy");
+    if (!legacy_provider) {
+        fish_deinit();
+        return 0;
+    }
+
+    default_provider = OSSL_PROVIDER_load(ossl_ctx, "default");
+    if (!default_provider) {
+        fish_deinit();
+        return 0;
+    }
+#endif
+    return 1;
+}
+
+void fish_deinit(void)
+{
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    if (legacy_provider) {
+        OSSL_PROVIDER_unload(legacy_provider);
+        legacy_provider = NULL;
+    }
+
+    if (default_provider) {
+        OSSL_PROVIDER_unload(default_provider);
+        default_provider = NULL;
+    }
+
+    if (ossl_ctx) {
+        OSSL_LIB_CTX_free(ossl_ctx);
+        ossl_ctx = NULL;
+    }
+#endif
+}
+
+/**
+ * Encode ECB FiSH Base64
+ *
+ * @param [in] message      Bytes to encode
+ * @param [in] message_len  Size of bytes to encode
+ * @return Array of char with encoded string
+ */
+char *fish_base64_encode(const char *message, size_t message_len) {
+    BF_LONG left = 0, right = 0;
+    int i, j;
+    char *encoded = NULL;
+    char *end = NULL;
+    char *msg = NULL;
+
+    if (message_len == 0)
+        return NULL;
+
+    /* Each 8-byte block becomes 12 bytes (fish base64 format) and add 1 byte for \0 */
+    encoded = g_malloc(((message_len - 1) / 8) * 12 + 12 + 1);
+    end = encoded;
+
+    /* Iterate over each 8-byte block (Blowfish block size) */
+    for (j = 0; j < message_len; j += 8) {
+        msg = (char *) message;
+
+        /* Set left and right longs */
+        GET_LONG(left, msg);
+        GET_LONG(right, msg);
+
+        for (i = 0; i < 6; ++i) {
+            *end++ = fish_base64[right & 0x3fu];
+            right = (right >> 6u);
         }
+
+        for (i = 0; i < 6; ++i) {
+            *end++ = fish_base64[left & 0x3fu];
+            left = (left >> 6u);
+        }
+
+        /* The previous for'd ensure fill all bytes of encoded, we don't need will with zeros */
         message += 8;
-        
-        /* Encrypt block */
-        BF_encrypt(binary, &bfkey);
-        
-        /* Emit FiSH-BASE64 */
-        bit = 0;
-        word = 1;
-        for (j = 0; j < 12; j++) {
-            d = fish_base64[(binary[word] >> bit) & 63];
-            *(end++) = d;
-            bit += 6;
-            if (j == 5) {
-                bit = 0;
-                word = 0;
-            }
-        }
-        
-        /* Stop if a null terminator was found */
-        if (c == '\0') break;
     }
-    *end = '\0';
-    return encrypted;
-}
 
-
-char *fish_decrypt(const char *key, size_t keylen, const char *data) {
-    BF_KEY bfkey;
-    size_t i;
-    char *decrypted;
-    char *end;
-    unsigned char bit;
-    unsigned char word;
-    unsigned char d;
-    BF_set_key(&bfkey, keylen, (const unsigned char*)key);
-    
-    decrypted = g_malloc(strlen(data) + 1);
-    end = decrypted;
-    
-    while (*data) {
-        /* Convert from FiSH-BASE64 */
-        BF_LONG binary[2] = { 0, 0 };
-        bit = 0;
-        word = 1;
-        for (i = 0; i < 12; i++) {
-            d = fish_unbase64[(const unsigned char)*(data++)];
-            if (d == IB) goto decrypt_end;
-            binary[word] |= (unsigned long)d << bit;
-            bit += 6;
-            if (i == 5) {
-                bit = 0;
-                word = 0;
-            }
-        }
-        
-        /* Decrypt block */
-        BF_decrypt(binary, &bfkey);
-        
-        /* Copy to buffer */
-        GET_BYTES(end, binary[0]);
-        GET_BYTES(end, binary[1]);
-    }
-    
-  decrypt_end:
     *end = '\0';
-    return decrypted;
+    return encoded;
 }
 
 /**
- * Encrypts a message (see fish_decrypt). The key is searched for in the
- * key store.
+ * Decode ECB FiSH Base64
+ *
+ * @param [in]  message    Base64 encoded string
+ * @param [out] final_len  Real length of message
+ * @return Array of char with decoded message
  */
-char *fish_encrypt_for_nick(const char *nick, const char *data) {
-    char *key;
-    char *encrypted;
+char *fish_base64_decode(const char *message, size_t *final_len) {
+    BF_LONG left, right;
+    int i;
+    char *bytes = NULL;
+    char *msg = NULL;
+    char *byt = NULL;
+    size_t message_len;
 
-    /* Look for key */
-    key = keystore_get_key(nick);
-    if (!key) return NULL;
-    
-    /* Encrypt */
-    encrypted = fish_encrypt(key, strlen(key), data);
-    
-    g_free(key);
-    return encrypted;
+    message_len = strlen(message);
+
+    /* Ensure blocks of 12 bytes each one and valid characters */
+    if (message_len == 0 || message_len % 12 != 0 || strspn(message, fish_base64) != message_len)
+        return NULL;
+
+    /* Each 12 bytes becomes 8-byte block and add 1 byte for \0 */
+    *final_len = ((message_len - 1) / 12) * 8 + 8 + 1;
+    (*final_len)--; /* We support binary data */
+    bytes = (char *) g_malloc0(*final_len);
+    byt = bytes;
+
+    msg = (char *) message;
+
+    while (*msg) {
+        right = 0;
+        left = 0;
+        for (i = 0; i < 6; i++) right |= (uint8_t) fish_unbase64[(int)*msg++] << (i * 6u);
+        for (i = 0; i < 6; i++) left |= (uint8_t) fish_unbase64[(int)*msg++] << (i * 6u);
+        GET_BYTES(byt, left);
+        GET_BYTES(byt, right);
+    }
+
+    return bytes;
 }
 
 /**
- * Decrypts a message (see fish_decrypt). The key is searched for in the
- * key store.
+ * Encrypt or decrypt data with Blowfish cipher, support binary data.
+ *
+ * Good documentation for EVP:
+ *
+ * - https://wiki.openssl.org/index.php/EVP_Symmetric_Encryption_and_Decryption
+ *
+ * - https://stackoverflow.com/questions/5727646/what-is-the-length-parameter-of-aes-evp-decrypt
+ *
+ * - https://stackoverflow.com/questions/26345175/correct-way-to-free-allocate-the-context-in-the-openssl
+ *
+ * - https://stackoverflow.com/questions/29874150/working-with-evp-and-openssl-coding-in-c
+ *
+ * @param [in] plaintext        Bytes to encrypt or decrypt
+ * @param [in] plaintext_len    Size of plaintext
+ * @param [in] key              Bytes of key
+ * @param [in] keylen           Size of key
+ * @param [in] encode           1 or encrypt 0 for decrypt
+ * @param [in] mode             EVP_CIPH_ECB_MODE or EVP_CIPH_CBC_MODE
+ * @param [out] ciphertext_len  The bytes written
+ * @return Array of char with data encrypted or decrypted
  */
-char *fish_decrypt_from_nick(const char *nick, const char *data) {
+char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key, size_t keylen, int encode, int mode, size_t *ciphertext_len) {
+    EVP_CIPHER_CTX *ctx;
+    EVP_CIPHER *cipher = NULL;
+    int bytes_written = 0;
+    unsigned char *ciphertext = NULL;
+    unsigned char *iv_ciphertext = NULL;
+    unsigned char *iv = NULL;
+    size_t block_size = 0;
+
+    *ciphertext_len = 0;
+
+    if (plaintext_len == 0 || keylen == 0 || encode < 0 || encode > 1)
+        return NULL;
+
+    block_size = plaintext_len;
+
+    if (mode == EVP_CIPH_CBC_MODE) {
+        if (encode == 1) {
+            iv = (unsigned char *) g_malloc0(8);
+            RAND_bytes(iv, 8);
+        } else {
+            if (plaintext_len <= 8) /* IV + DATA */
+                return NULL;
+
+            iv = (unsigned char *) plaintext;
+            block_size -= 8;
+            plaintext += 8;
+            plaintext_len -= 8;
+        }
+
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-CBC", NULL);
+#else
+        cipher = (EVP_CIPHER *) EVP_bf_cbc();
+#endif
+
+    } else if (mode == EVP_CIPH_ECB_MODE) {
+
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-ECB", NULL);
+#else
+        cipher = (EVP_CIPHER *) EVP_bf_ecb();
+#endif
+    }
+
+    /* Zero Padding */
+    if (block_size % 8 != 0) {
+        block_size = block_size + 8 - (block_size % 8);
+    }
+
+    ciphertext = (unsigned char *) g_malloc0(block_size);
+    memcpy(ciphertext, plaintext, plaintext_len);
+
+    /* Create and initialise the context */
+    if (!(ctx = EVP_CIPHER_CTX_new()))
+        return NULL;
+
+    /* Initialise the cipher operation only with mode */
+    if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, encode))
+        return NULL;
+
+    /* Set custom key length */
+    if (!EVP_CIPHER_CTX_set_key_length(ctx, keylen))
+        return NULL;
+
+    /* Finish the initiation the cipher operation */
+    if (1 != EVP_CipherInit_ex(ctx, NULL, NULL, (const unsigned char *) key, iv, encode))
+        return NULL;
+
+    /* We will manage this */
+    EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+    /* Do cipher operation */
+    if (1 != EVP_CipherUpdate(ctx, ciphertext, &bytes_written, ciphertext, block_size))
+        return NULL;
+
+    *ciphertext_len = bytes_written;
+
+    /* Finalise the cipher. Further ciphertext bytes may be written at this stage */
+    if (1 != EVP_CipherFinal_ex(ctx, ciphertext + bytes_written, &bytes_written))
+        return NULL;
+
+    *ciphertext_len += bytes_written;
+
+    /* Clean up */
+    EVP_CIPHER_CTX_free(ctx);
+
+
+    if (mode == EVP_CIPH_CBC_MODE && encode == 1) {
+        /* Join IV + DATA */
+        iv_ciphertext = g_malloc0(8 + *ciphertext_len);
+
+        memcpy(iv_ciphertext, iv, 8);
+        memcpy(&iv_ciphertext[8], ciphertext, *ciphertext_len);
+        *ciphertext_len += 8;
+
+        g_free(ciphertext);
+        g_free(iv);
+
+        return (char *) iv_ciphertext;
+    } else {
+        return (char *) ciphertext;
+    }
+}
+
+/**
+ * Return a fish or standard Base64 encoded string with data encrypted
+ * is binary safe
+ * 
+ * @param [in] key          Bytes of key
+ * @param [in] keylen       Size of key
+ * @param [in] message      Bytes to encrypt
+ * @param [in] message_len  Size of message
+ * @param [in] mode         Chiper mode
+ * @return Array of char with data encrypted
+ */
+char *fish_encrypt(const char *key, size_t keylen, const char *message, size_t message_len, enum fish_mode mode) {
+    size_t ciphertext_len = 0;
+    char *ciphertext = NULL;
+    char *b64 = NULL;
+
+    if (keylen == 0 || message_len == 0)
+        return NULL;
+
+    ciphertext = fish_cipher(message, message_len, key, keylen, 1, mode, &ciphertext_len);
+
+    if (ciphertext == NULL || ciphertext_len == 0)
+        return NULL;
+
+    switch (mode) {
+        case FISH_CBC_MODE:
+            b64 = g_base64_encode((const unsigned char *) ciphertext, ciphertext_len);
+            break;
+
+        case FISH_ECB_MODE:
+            b64 = fish_base64_encode((const char *) ciphertext, ciphertext_len);
+    }
+
+    g_free(ciphertext);
+
+    if (b64 == NULL)
+        return NULL;
+
+    return b64;
+}
+
+/**
+ * Return an array of bytes with data decrypted
+ * is binary safe
+ * 
+ * @param [in] key         Bytes of key
+ * @param [in] keylen      Size of key
+ * @param [in] data        Fish or standard Base64 encoded string
+ * @param [in] mode        Chiper mode
+ * @param [out] final_len  Length of returned array
+ * @return Array of char with data decrypted
+ */
+char *fish_decrypt(const char *key, size_t keylen, const char *data, enum fish_mode mode, size_t *final_len) {
+    size_t ciphertext_len = 0;
+    char *ciphertext = NULL;
+    char *plaintext = NULL;
+
+    *final_len = 0;
+
+    if (keylen == 0 || strlen(data) == 0)
+        return NULL;
+
+    switch (mode) {
+        case FISH_CBC_MODE:
+            if (strspn(data, base64_chars) != strlen(data))
+                return NULL;
+            ciphertext = (char *) g_base64_decode(data, &ciphertext_len);
+            break;
+
+        case FISH_ECB_MODE:
+            ciphertext = fish_base64_decode(data, &ciphertext_len);
+    }
+
+    if (ciphertext == NULL || ciphertext_len == 0)
+        return NULL;
+
+    plaintext = fish_cipher(ciphertext, ciphertext_len, key, keylen, 0, mode, final_len);
+    g_free(ciphertext);
+
+    if (*final_len == 0)
+        return NULL;
+
+    return plaintext;
+}
+
+/**
+ * Similar to fish_decrypt, but pad with zeros any after the first zero in the decrypted data
+ * 
+ * @param [in] key         Bytes of key
+ * @param [in] keylen      Size of key
+ * @param [in] data        Fish or standard Base64 encoded string
+ * @param [in] mode        Chiper mode
+ * @return Array of char with data decrypted
+ */
+char *fish_decrypt_str(const char *key, size_t keylen, const char *data, enum fish_mode mode) {
+    char *decrypted = NULL;
+    char *plaintext_str = NULL;
+    size_t decrypted_len = 0;
+
+    decrypted = fish_decrypt(key, strlen(key), data, mode, &decrypted_len);
+
+    if (decrypted == NULL || decrypted_len == 0)
+        return NULL;
+
+    plaintext_str = g_strndup(decrypted, decrypted_len);
+    g_free(decrypted);
+
+    return plaintext_str;
+}
+
+/**
+ * Determine if a nick have a key
+ *
+ * @param [in] nick  Nickname
+ * @return TRUE if have a key or FALSE if not
+ */
+gboolean fish_nick_has_key(const char *nick) {
+    gboolean has_key = FALSE;
+    char *key;
+    enum fish_mode mode;
+
+    key = keystore_get_key(nick, &mode);
+    if (key) {
+        has_key = TRUE;
+        g_free(key);
+    };
+
+    return has_key;
+}
+
+/**
+ * Encrypts a message (see fish_encrypt). The key is searched for in the key store
+ *
+ * @param [in] nick         Nickname
+ * @param [in] data         Plaintext to encrypt
+ * @param [out] omode       Mode of encryption
+ * @param [in] command_len  Length of command to use without the message part
+ * @return A list of encoded strings with the message encrypted or NULL if any error occurred
+ */
+GSList *fish_encrypt_for_nick(const char *nick, const char *data, enum fish_mode *omode, size_t command_len) {
+    char *key;
+    GSList *encrypted_list = NULL;
+    char *encrypted = NULL;
+    enum fish_mode mode;
+    int max_len, max_chunks_len, chunks_len;
+
+    /* Look for key */
+    key = keystore_get_key(nick, &mode);
+    if (!key) return NULL;
+
+    *omode = mode;
+
+    /* Calculate max length of each line */
+    max_len = MAX_COMMAND_LENGTH - command_len;
+    /* Add '*' */
+    if (mode == FISH_CBC_MODE) max_len--;
+
+    max_chunks_len = max_text_command_len(max_len, mode);
+
+    const char *data_chunk = data;
+
+    while(foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
+        encrypted = fish_encrypt(key, strlen(key), data_chunk, chunks_len, mode);
+
+        if (mode == FISH_CBC_MODE) {
+            /* Add '*' for CBC */
+            encrypted_list = g_slist_append(encrypted_list, g_strdup_printf("*%s", encrypted));
+            g_free(encrypted);
+        } else {
+            encrypted_list = g_slist_append(encrypted_list, encrypted);
+        }
+
+        /* Next chunk */
+        data_chunk += chunks_len;
+    }
+
+    return encrypted_list;
+}
+
+/**
+ * Decrypts a message (see fish_decrypt). The key is searched for in the key store
+ *
+ * @param [in] nick     Nickname
+ * @param [in] data     Plaintext to encrypt
+ * @param [out] omode   Mode of encryption
+ * @return Plaintext message or NULL if any error occurred
+ */
+char *fish_decrypt_from_nick(const char *nick, const char *data, enum fish_mode *omode) {
     char *key;
     char *decrypted;
+    enum fish_mode mode;
+
     /* Look for key */
-    key = keystore_get_key(nick);
+    key = keystore_get_key(nick, &mode);
     if (!key) return NULL;
-    
+
+    *omode = mode;
+
+    if (mode == FISH_CBC_MODE)
+        ++data;
+
     /* Decrypt */
-    decrypted = fish_decrypt(key, strlen(key), data);
-    
+    decrypted = fish_decrypt_str(key, strlen(key), data, mode);
     g_free(key);
+
     return decrypted;
 }
 

plugins/fishlim/fish.h

@@ -1,6 +1,7 @@
 /*
 
   Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
+  Copyright (c) 2019-2020 <bakasura@protonmail.ch>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -29,10 +30,21 @@
 
 #include <glib.h>
 
-char *fish_encrypt(const char *key, size_t keylen, const char *message);
-char *fish_decrypt(const char *key, size_t keylen, const char *data);
-char *fish_encrypt_for_nick(const char *nick, const char *data);
-char *fish_decrypt_from_nick(const char *nick, const char *data);
+enum fish_mode {
+  FISH_ECB_MODE = 0x1,
+  FISH_CBC_MODE = 0x2
+};
+
+int fish_init(void);
+void fish_deinit(void);
+char *fish_base64_encode(const char *message, size_t message_len);
+char *fish_base64_decode(const char *message, size_t *final_len);
+char *fish_encrypt(const char *key, size_t keylen, const char *message, size_t message_len, enum fish_mode mode);
+char *fish_decrypt(const char *key, size_t keylen, const char *data, enum fish_mode mode, size_t *final_len);
+char *fish_decrypt_str(const char *key, size_t keylen, const char *data, enum fish_mode mode);
+gboolean fish_nick_has_key(const char *nick);
+GSList *fish_encrypt_for_nick(const char *nick, const char *data, enum fish_mode *omode, size_t command_len);
+char *fish_decrypt_from_nick(const char *nick, const char *data, enum fish_mode *omode);
 
 #endif
 

plugins/fishlim/fishlim.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;HAVE_DH_SET0_PQG;HAVE_DH_GET0_KEY;HAVE_DH_SET0_KEY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -40,7 +40,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;HAVE_DH_SET0_PQG;HAVE_DH_GET0_KEY;HAVE_DH_SET0_KEY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -55,6 +55,7 @@
   <ItemGroup>
     <ClInclude Include="dh1080.h" />
     <ClInclude Include="fish.h" />
+    <ClInclude Include="utils.h" />
     <ClInclude Include="irc.h" />
     <ClInclude Include="keystore.h" />
     <ClInclude Include="plugin_hexchat.h" />
@@ -62,6 +63,7 @@
   <ItemGroup>
     <ClCompile Include="dh1080.c" />
     <ClCompile Include="fish.c" />
+    <ClCompile Include="utils.c" />
     <ClCompile Include="irc.c" />
     <ClCompile Include="keystore.c" />
     <ClCompile Include="plugin_hexchat.c" />

plugins/fishlim/fishlim.vcxproj.filters

@@ -23,9 +23,15 @@
     <ClInclude Include="bool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="dh1080.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="fish.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="utils.h">
+          <Filter>Header Files</Filter>
+        </ClInclude>
     <ClInclude Include="irc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -37,9 +43,15 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="dh1080.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="fish.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="utils.c">
+          <Filter>Source Files</Filter>
+        </ClCompile>
     <ClCompile Include="irc.c">
       <Filter>Source Files</Filter>
     </ClCompile>

plugins/fishlim/keystore.c

@@ -103,27 +103,55 @@ static gchar *get_nick_value(GKeyFile *keyfile, const char *nick, const char *it
 /**
  * Extracts a key from the key store file.
  */
-char *keystore_get_key(const char *nick) {
+char *keystore_get_key(const char *nick, enum fish_mode *mode) {
+    GKeyFile *keyfile;
+    char *escaped_nick;
+    gchar *value, *key_mode;
+    int encrypted_mode;
+    char *password;
+    char *encrypted;
+    char *decrypted;
+
     /* Get the key */
-    GKeyFile *keyfile = getConfigFile();
-    char *escaped_nick = escape_nickname(nick);
-    gchar *value = get_nick_value(keyfile, escaped_nick, "key");
+    keyfile = getConfigFile();
+    escaped_nick = escape_nickname(nick);
+    value = get_nick_value(keyfile, escaped_nick, "key");
+    key_mode = get_nick_value(keyfile, escaped_nick, "mode");
     g_key_file_free(keyfile);
     g_free(escaped_nick);
 
+    /* Determine cipher mode */
+    *mode = FISH_ECB_MODE;
+    if (key_mode) {
+        if (*key_mode == '1')
+            *mode = FISH_ECB_MODE;
+        else if (*key_mode == '2')
+            *mode = FISH_CBC_MODE;
+        g_free(key_mode);
+    }
+
     if (!value)
         return NULL;
-    
-    if (strncmp(value, "+OK ", 4) != 0) {
-        /* Key is stored in plaintext */
-        return value;
-    } else {
+
+    if (strncmp(value, "+OK ", 4) == 0) {
         /* Key is encrypted */
-        const char *encrypted = value+4;
-        const char *password = get_keystore_password();
-        char *decrypted = fish_decrypt(password, strlen(password), encrypted);
+        encrypted = (char *) value;
+        encrypted += 4;
+
+        encrypted_mode = FISH_ECB_MODE;
+
+        if (*encrypted == '*') {
+            ++encrypted;
+            encrypted_mode = FISH_CBC_MODE;
+        }
+
+        password = (char *) get_keystore_password();
+        decrypted = fish_decrypt_str((const char *) password, strlen(password), (const char *) encrypted, encrypted_mode);
         g_free(value);
         return decrypted;
+    } else {
+        /* Key is stored in plaintext */
+        return value;
     }
 }
 
@@ -189,7 +217,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 /**
  * Sets a key in the key store file.
  */
-gboolean keystore_store_key(const char *nick, const char *key) {
+gboolean keystore_store_key(const char *nick, const char *key, enum fish_mode mode) {
     const char *password;
     char *encrypted;
     char *wrapped;
@@ -204,11 +232,11 @@ gboolean keystore_store_key(const char *nick, const char *key) {
     password = get_keystore_password();
     if (password) {
         /* Encrypt the password */
-        encrypted = fish_encrypt(password, strlen(password), key);
+        encrypted = fish_encrypt(password, strlen(password), key, strlen(key), FISH_CBC_MODE);
         if (!encrypted) goto end;
         
         /* Prepend "+OK " */
-        wrapped = g_strconcat("+OK ", encrypted, NULL);
+        wrapped = g_strconcat("+OK *", encrypted, NULL);
         g_free(encrypted);
         
         /* Store encrypted in file */
@@ -218,6 +246,9 @@ gboolean keystore_store_key(const char *nick, const char *key) {
         /* Store unencrypted in file */
         g_key_file_set_string(keyfile, escaped_nick, "key", key);
     }
+
+    /* Store cipher mode */
+    g_key_file_set_integer(keyfile, escaped_nick, "mode", mode);
     
     /* Save key store file */
     ok = save_keystore(keyfile);

plugins/fishlim/keystore.h

@@ -28,9 +28,10 @@
 #include <stddef.h>
 
 #include <glib.h>
+#include "fish.h"
 
-char *keystore_get_key(const char *nick);
-gboolean keystore_store_key(const char *nick, const char *key);
+char *keystore_get_key(const char *nick, enum fish_mode *mode);
+gboolean keystore_store_key(const char *nick, const char *key, enum fish_mode mode);
 gboolean keystore_delete_nick(const char *nick);
 
 #endif

plugins/fishlim/meson.build

@@ -2,9 +2,13 @@ if not libssl_dep.found()
   error('fish plugin requires openssl')
 endif
 
+# Run tests
+subdir('tests')
+
 fishlim_sources = [
   'dh1080.c',
   'fish.c',
+  'utils.c',
   'irc.c',
   'keystore.c',
   'plugin_hexchat.c'
@@ -15,4 +19,5 @@ shared_module('fishlim', fishlim_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'fishlim.def',
 )

plugins/fishlim/plugin_hexchat.c

@@ -2,6 +2,7 @@
 
   Copyright (c) 2010-2011 Samuel Lidén Borell <samuel@kodafritt.se>
   Copyright (c) 2015 <the.cypher@gmail.com>
+  Copyright (c) 2019-2020 <bakasura@protonmail.ch>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -28,21 +29,21 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
-
 #include "hexchat-plugin.h"
-#define HEXCHAT_MAX_WORDS 32
 
 #include "fish.h"
 #include "dh1080.h"
 #include "keystore.h"
 #include "irc.h"
 
+static const char *fish_modes[] = {"", "ECB", "CBC", NULL};
+
 static const char plugin_name[] = "FiSHLiM";
 static const char plugin_desc[] = "Encryption plugin for the FiSH protocol. Less is More!";
-static const char plugin_version[] = "0.1.0";
+static const char plugin_version[] = "1.0.0";
 
-static const char usage_setkey[] = "Usage: SETKEY [<nick or #channel>] <password>, sets the key for a channel or nick";
-static const char usage_delkey[] = "Usage: DELKEY <nick or #channel>, deletes the key for a channel or nick";
+static const char usage_setkey[] = "Usage: SETKEY [<nick or #channel>] [<mode>:]<password>, sets the key for a channel or nick. Modes: ECB, CBC";
+static const char usage_delkey[] = "Usage: DELKEY [<nick or #channel>], deletes the key for a channel or nick";
 static const char usage_keyx[] = "Usage: KEYX [<nick>], performs DH1080 key-exchange with <nick>";
 static const char usage_topic[] = "Usage: TOPIC+ <topic>, sets a new encrypted topic for the current channel";
 static const char usage_notice[] = "Usage: NOTICE+ <nick or #channel> <notice>";
@@ -53,6 +54,13 @@ static hexchat_plugin *ph;
 static GHashTable *pending_exchanges;
 
 
+/**
+ * Compare two nicks using the current plugin
+ */
+int irc_nick_cmp(const char *a, const char *b) {
+    return hexchat_nickcmp (ph, a, b);
+}
+
 /**
  * Returns the path to the key store file.
  */
@@ -88,7 +96,7 @@ static hexchat_context *find_context_on_network (const char *name) {
         int chan_id = hexchat_list_int(ph, channels, "id");
         const char *chan_name = hexchat_list_str(ph, channels, "channel");
 
-        if (chan_id == id && chan_name && hexchat_nickcmp (ph, chan_name, name) == 0) {
+        if (chan_id == id && chan_name && irc_nick_cmp (chan_name, name) == 0) {
             ret = (hexchat_context*)hexchat_list_str(ph, channels, "context");
             break;
         }
@@ -98,8 +106,175 @@ static hexchat_context *find_context_on_network (const char *name) {
     return ret;
 }
 
-int irc_nick_cmp(const char *a, const char *b) {
-	return hexchat_nickcmp (ph, a, b);
+/**
+ * Retrive the field for own user in current context
+ * @return the field value
+ */
+char *get_my_info(const char *field, gboolean find_in_other_context) {
+    char *result = NULL;
+    const char *own_nick;
+    hexchat_list *list;
+    hexchat_context *ctx_current, *ctx_channel;
+
+    /* Display message */
+    own_nick = hexchat_get_info(ph, "nick");
+
+    if (!own_nick)
+        return NULL;
+
+    /* Get field for own nick if any */
+    list = hexchat_list_get(ph, "users");
+    if (list) {
+        while (hexchat_list_next(ph, list)) {
+            if (irc_nick_cmp(own_nick, hexchat_list_str(ph, list, "nick")) == 0)
+                result = g_strdup(hexchat_list_str(ph, list, field));
+        }
+        hexchat_list_free(ph, list);
+    }
+
+    if (result) {
+        return result;
+    }
+
+    /* Try to get from a channel (we are outside a channel)  */
+    if (!find_in_other_context) {
+        return NULL;
+    }
+
+    list = hexchat_list_get(ph, "channels");
+    if (list) {
+        ctx_current = hexchat_get_context(ph);
+        while (hexchat_list_next(ph, list)) {
+            ctx_channel = (hexchat_context *) hexchat_list_str(ph, list, "context");
+
+            hexchat_set_context(ph, ctx_channel);
+            result = get_my_info(field, FALSE);
+            hexchat_set_context(ph, ctx_current);
+
+            if (result) {
+                break;
+            }
+        }
+        hexchat_list_free(ph, list);
+    }
+
+    return result;
+}
+
+/**
+ * Retrive the prefix character for own nick in current context
+ * @return @ or + or NULL
+ */
+char *get_my_own_prefix(void) {
+    return get_my_info("prefix", FALSE);
+}
+
+/**
+ * Retrive the mask for own nick in current context
+ * @return Host name in the form: user@host (or NULL if not known)
+ */
+char *get_my_own_host(void) {
+    return get_my_info("host", TRUE);
+}
+
+/**
+ * Calculate the length of prefix for current user in current context
+ *
+ * @return Length of prefix
+ */
+int get_prefix_length(void) {
+    char *own_host;
+    int prefix_len = 0;
+
+    /* ':! ' + 'nick' + 'ident@host', e.g. ':user!~name@mynet.com ' */
+    prefix_len = 3 + strlen(hexchat_get_info(ph, "nick"));
+    own_host = get_my_own_host();
+    if (own_host) {
+        prefix_len += strlen(own_host);
+    } else {
+        /* https://stackoverflow.com/questions/8724954/what-is-the-maximum-number-of-characters-for-a-host-name-in-unix */
+        prefix_len += 64;
+    }
+    g_free(own_host);
+
+    return prefix_len;
+}
+
+/**
+ * Try to decrypt the first occurrence of fish message
+ * 
+ * @param message  Message to decrypt
+ * @param key     Key of message
+ * @return Array of char with decrypted message or NULL. The returned string 
+ * should be freed with g_free() when no longer needed.
+ */
+char *decrypt_raw_message(const char *message, const char *key) {
+    const char *prefixes[] = {"+OK ", "mcps ", NULL};
+    char *start = NULL, *end = NULL;
+    char *left = NULL, *right = NULL;
+    char *encrypted = NULL, *decrypted = NULL;
+    int length = 0;
+    int index_prefix;
+    enum fish_mode mode;
+    GString *message_decrypted;
+    char *result = NULL;
+
+    if (message == NULL || key == NULL)
+        return NULL;
+
+    for (index_prefix = 0; index_prefix < 2; index_prefix++) {
+        start = g_strstr_len(message, strlen(message), prefixes[index_prefix]);
+        if (start) {
+            /* Length ALWAYS will be less that original message
+             * add '[CBC] ' length */
+            message_decrypted = g_string_sized_new(strlen(message) + 6);
+
+            /* Left part of message */
+            left = g_strndup(message, start - message);
+            g_string_append(message_decrypted, left);
+            g_free(left);
+
+            /* Encrypted part */
+            start += strlen(prefixes[index_prefix]);
+            end = g_strstr_len(start, strlen(message), " ");
+            if (end) {
+                length = end - start;
+                right = end;
+            }
+
+            if (length > 0) {
+                encrypted = g_strndup(start, length);
+            } else {
+                encrypted = g_strdup(start);
+            }
+            decrypted = fish_decrypt_from_nick(key, encrypted, &mode);
+            g_free(encrypted);
+
+            if (decrypted == NULL) {
+                g_string_free(message_decrypted, TRUE);
+                return NULL;
+            }
+
+            /* Add encrypted flag */
+            g_string_append(message_decrypted, "[");
+            g_string_append(message_decrypted, fish_modes[mode]);
+            g_string_append(message_decrypted, "] ");
+            /* Decrypted message */
+            g_string_append(message_decrypted, decrypted);
+            g_free(decrypted);
+
+            /* Right part of message */
+            if (right) {
+                g_string_append(message_decrypted, right);
+            }
+
+            result = message_decrypted->str;
+            g_string_free(message_decrypted, FALSE);
+            return result;
+        }
+    }
+
+    return NULL;
 }
 
 /*static int handle_debug(char *word[], char *word_eol[], void *userdata) {
@@ -115,20 +290,49 @@ int irc_nick_cmp(const char *a, const char *b) {
  * Called when a message is to be sent.
  */
 static int handle_outgoing(char *word[], char *word_eol[], void *userdata) {
-    const char *own_nick;
-    /* Encrypt the message if possible */
+    char *prefix;
+    enum fish_mode mode;
+    char *message;
+    GString *command;
+    GSList *encrypted_list, *encrypted_item;
+
     const char *channel = hexchat_get_info(ph, "channel");
-    char *encrypted = fish_encrypt_for_nick(channel, word_eol[1]);
-    if (!encrypted) return HEXCHAT_EAT_NONE;
-    
+
+    /* Check if we can encrypt */
+    if (!fish_nick_has_key(channel)) return HEXCHAT_EAT_NONE;
+
+    command = g_string_new("");
+    g_string_printf(command, "PRIVMSG %s :+OK ", channel);
+
+    encrypted_list = fish_encrypt_for_nick(channel, word_eol[1], &mode, get_prefix_length() + command->len);
+    if (!encrypted_list) {
+        g_string_free(command, TRUE);
+        return HEXCHAT_EAT_NONE;
+    }
+
+    /* Get prefix for own nick if any */
+    prefix = get_my_own_prefix();
+
+    /* Add encrypted flag */
+    message = g_strconcat("[", fish_modes[mode], "] ", word_eol[1], NULL);
+
     /* Display message */
-    own_nick = hexchat_get_info(ph, "nick");
-    hexchat_emit_print(ph, "Your Message", own_nick, word_eol[1], NULL);
-    
-    /* Send message */
-    hexchat_commandf(ph, "PRIVMSG %s :+OK %s", channel, encrypted);
-    
-    g_free(encrypted);
+    hexchat_emit_print(ph, "Your Message", hexchat_get_info(ph, "nick"), message, prefix, NULL);
+    g_free(message);
+
+    /* Send encrypted messages */
+    encrypted_item = encrypted_list;
+    while (encrypted_item)
+    {
+        hexchat_commandf(ph, "%s%s", command->str, (char *)encrypted_item->data);
+
+        encrypted_item = encrypted_item->next;
+    }
+
+    g_free(prefix);
+    g_string_free(command, TRUE);
+    g_slist_free_full(encrypted_list, g_free);
+
     return HEXCHAT_EAT_HEXCHAT;
 }
 
@@ -139,96 +343,59 @@ static int handle_incoming(char *word[], char *word_eol[], hexchat_event_attrs *
     const char *prefix;
     const char *command;
     const char *recipient;
-    const char *encrypted;
-    const char *peice;
+    const char *raw_message = word_eol[1];
     char *sender_nick;
     char *decrypted;
-    size_t w;
-    size_t ew;
-    size_t uw;
-    char prefix_char = 0;
+    size_t parameters_offset;
     GString *message;
 
-    if (!irc_parse_message((const char **)word, &prefix, &command, &w))
+    if (!irc_parse_message((const char **)word, &prefix, &command, &parameters_offset))
         return HEXCHAT_EAT_NONE;
-    
+
     /* Topic (command 332) has an extra parameter */
-    if (!strcmp(command, "332")) w++;
-    
-    /* Look for encrypted data */
-    for (ew = w+1; ew < HEXCHAT_MAX_WORDS-1; ew++) {
-        const char *s = (ew == w+1 ? word[ew]+1 : word[ew]);
-        if (*s && (s[1] == '+' || s[1] == 'm')) { prefix_char = *(s++); }
-        else { prefix_char = 0; }
-        if (strcmp(s, "+OK") == 0 || strcmp(s, "mcps") == 0) goto has_encrypted_data;
+    if (!strcmp(command, "332"))
+        parameters_offset++;
+
+    /* Extract sender nick and recipient nick/channel and try to decrypt */
+    recipient = word[parameters_offset];
+    decrypted = decrypt_raw_message(raw_message, recipient);
+    if (decrypted == NULL) {
+        sender_nick = irc_prefix_get_nick(prefix);
+        decrypted = decrypt_raw_message(raw_message, sender_nick);
+        g_free(sender_nick);
     }
-    return HEXCHAT_EAT_NONE;
-  has_encrypted_data: ;
-    /* Extract sender nick and recipient nick/channel */
-    sender_nick = irc_prefix_get_nick(prefix);
-    recipient = word[w];
-    
-    /* Try to decrypt with these (the keys are searched for in the key store) */
-    encrypted = word[ew+1];
-    decrypted = fish_decrypt_from_nick(recipient, encrypted);
-    if (!decrypted) decrypted = fish_decrypt_from_nick(sender_nick, encrypted);
-    
-    /* Check for error */
-    if (!decrypted) goto decrypt_error;
-    
-    /* Build unecrypted message */
-    message = g_string_sized_new (100); /* TODO: more accurate estimation of size */
-    g_string_append (message, "RECV");
+
+    /* Nothing to decrypt */
+    if (decrypted == NULL)
+        return HEXCHAT_EAT_NONE;
+
+    /* Build decrypted message */
+
+    /* decrypted + 'RECV ' + '@time=YYYY-MM-DDTHH:MM:SS.fffffZ ' */
+    message = g_string_sized_new (strlen(decrypted) + 5 + 33);
+    g_string_append (message, "RECV ");
 
     if (attrs->server_time_utc)
     {
         GTimeVal tv = { (glong)attrs->server_time_utc, 0 };
         char *timestamp = g_time_val_to_iso8601 (&tv);
 
-       g_string_append (message, " @time=");
+       g_string_append (message, "@time=");
        g_string_append (message, timestamp);
+       g_string_append (message, " ");
        g_free (timestamp);
     }
 
-    for (uw = 1; uw < HEXCHAT_MAX_WORDS; uw++) {
-        if (word[uw][0] != '\0')
-            g_string_append_c (message, ' ');
-        
-        if (uw == ew) {
-            /* Add the encrypted data */
-            peice = decrypted;
-            uw++; /* Skip "OK+" */
-            
-            if (ew == w+1) {
-                /* Prefix with colon, which gets stripped out otherwise */
-                g_string_append_c (message, ':');
-            }
-
-            if (prefix_char) {
-                g_string_append_c (message, prefix_char);
-            }
-
-        } else {
-            /* Add unencrypted data (for example, a prefix from a bouncer or bot) */
-            peice = word[uw];
-        }
-
-        g_string_append (message, peice);
-    }
+    g_string_append (message, decrypted);
     g_free(decrypted);
 
-    /* Simulate unencrypted message */
-    /* hexchat_printf(ph, "simulating: %s\n", message->str); */
+    /* Fake server message
+     * RECV command will throw this function again, if message have multiple
+     * encrypted data, we will decrypt all */
     hexchat_command(ph, message->str);
-
     g_string_free (message, TRUE);
-    g_free(sender_nick);
-    return HEXCHAT_EAT_HEXCHAT;
 
-  decrypt_error:
-    g_free(decrypted);
-    g_free(sender_nick);
-    return HEXCHAT_EAT_NONE;
+    return HEXCHAT_EAT_HEXCHAT;
 }
 
 static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
@@ -236,8 +403,8 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
     const char *dh_pubkey = word[5];
     hexchat_context *query_ctx;
     const char *prefix;
-    gboolean cbc;
     char *sender, *secret_key, *priv_key = NULL;
+    enum fish_mode mode = FISH_ECB_MODE;
 
     if (!*dh_message || !*dh_pubkey || strlen(dh_pubkey) != 181)
         return HEXCHAT_EAT_NONE;
@@ -248,25 +415,19 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
     sender = irc_prefix_get_nick(prefix);
     query_ctx = find_context_on_network(sender);
     if (query_ctx)
-        hexchat_set_context(ph, query_ctx);
+        g_assert(hexchat_set_context(ph, query_ctx) == 1);
 
     dh_message++; /* : prefix */
-    if (*dh_message == '+' || *dh_message == '-')
-        dh_message++; /* identify-msg */
 
-    cbc = g_strcmp0 (word[6], "CBC") == 0;
+    if (g_strcmp0 (word[6], "CBC") == 0)
+        mode = FISH_CBC_MODE;
 
     if (!strcmp(dh_message, "DH1080_INIT")) {
         char *pub_key;
 
-        if (cbc) {
-            hexchat_print(ph, "Received key exchange for CBC mode which is not supported.");
-            goto cleanup;
-        }
-
-        hexchat_printf(ph, "Received public key from %s, sending mine...", sender);
+        hexchat_printf(ph, "Received public key from %s (%s), sending mine...", sender, fish_modes[mode]);
         if (dh1080_generate_key(&priv_key, &pub_key)) {
-            hexchat_commandf(ph, "quote NOTICE %s :DH1080_FINISH %s", sender, pub_key);
+            hexchat_commandf(ph, "quote NOTICE %s :DH1080_FINISH %s%s", sender, pub_key, (mode == FISH_CBC_MODE) ? " CBC" : "");
             g_free(pub_key);
         } else {
             hexchat_print(ph, "Failed to generate keys");
@@ -279,11 +440,6 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
         g_hash_table_steal(pending_exchanges, sender_lower);
         g_free(sender_lower);
 
-        if (cbc) {
-            hexchat_print(ph, "Received key exchange for CBC mode which is not supported.");
-            goto cleanup;
-        }
-
         if (!priv_key) {
             hexchat_printf(ph, "Received a key exchange response for unknown user: %s", sender);
             goto cleanup;
@@ -295,8 +451,8 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
     }
 
     if (dh1080_compute_key(priv_key, dh_pubkey, &secret_key)) {
-        keystore_store_key(sender, secret_key);
-        hexchat_printf(ph, "Stored new key for %s", sender);
+        keystore_store_key(sender, secret_key, mode);
+        hexchat_printf(ph, "Stored new key for %s (%s)", sender, fish_modes[mode]);
         g_free(secret_key);
     } else {
         hexchat_print(ph, "Failed to create secret key!");
@@ -314,6 +470,7 @@ cleanup:
 static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
     const char *nick;
     const char *key;
+    enum fish_mode mode;
 
     /* Check syntax */
     if (*word[2] == '\0') {
@@ -331,9 +488,17 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
         key = word_eol[3];
     }
 
+    mode = FISH_ECB_MODE;
+    if (g_ascii_strncasecmp("cbc:", key, 4) == 0) {
+        key = key+4;
+        mode = FISH_CBC_MODE;
+    } else if (g_ascii_strncasecmp("ecb:", key, 4) == 0) {
+        key = key+4;
+    }
+
     /* Set password */
-    if (keystore_store_key(nick, key)) {
-        hexchat_printf(ph, "Stored key for %s\n", nick);
+    if (keystore_store_key(nick, key, mode)) {
+        hexchat_printf(ph, "Stored key for %s (%s)\n", nick, fish_modes[mode]);
     } else {
         hexchat_printf(ph, "\00305Failed to store key in addon_fishlim.conf\n");
     }
@@ -345,22 +510,30 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
  * Command handler for /delkey
  */
 static int handle_delkey(char *word[], char *word_eol[], void *userdata) {
-    const char *nick;
+    char *nick = NULL;
+    int ctx_type = 0;
 
-    /* Check syntax */
-    if (*word[2] == '\0' || *word[3] != '\0') {
-        hexchat_printf(ph, "%s\n", usage_delkey);
-        return HEXCHAT_EAT_HEXCHAT;
+    /* Delete key from input */
+    if (*word[2] != '\0') {
+        nick = g_strstrip(g_strdup(word_eol[2]));
+    } else { /* Delete key from current context */
+        nick = g_strdup(hexchat_get_info(ph, "channel"));
+        ctx_type = hexchat_list_int(ph, NULL, "type");
+
+        /* Only allow channel or dialog */
+        if (ctx_type < 2 || ctx_type > 3) {
+            hexchat_printf(ph, "%s\n", usage_delkey);
+            return HEXCHAT_EAT_HEXCHAT;
+        }
     }
 
-    nick = g_strstrip (word_eol[2]);
-
     /* Delete the given nick from the key store */
     if (keystore_delete_nick(nick)) {
         hexchat_printf(ph, "Deleted key for %s\n", nick);
     } else {
         hexchat_printf(ph, "\00305Failed to delete key in addon_fishlim.conf!\n");
     }
+    g_free(nick);
 
     return HEXCHAT_EAT_HEXCHAT;
 }
@@ -379,7 +552,7 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
     }
 
     if (query_ctx) {
-        hexchat_set_context(ph, query_ctx);
+        g_assert(hexchat_set_context(ph, query_ctx) == 1);
         ctx_type = hexchat_list_int(ph, NULL, "type");
     }
 
@@ -391,8 +564,8 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
     if (dh1080_generate_key(&priv_key, &pub_key)) {
         g_hash_table_replace (pending_exchanges, g_ascii_strdown(target, -1), priv_key);
 
-        hexchat_commandf(ph, "quote NOTICE %s :DH1080_INIT %s", target, pub_key);
-        hexchat_printf(ph, "Sent public key to %s, waiting for reply...", target);
+        hexchat_commandf(ph, "quote NOTICE %s :DH1080_INIT %s CBC", target, pub_key);
+        hexchat_printf(ph, "Sent public key to %s (CBC), waiting for reply...", target);
 
         g_free(pub_key);
     } else {
@@ -408,7 +581,9 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
 static int handle_crypt_topic(char *word[], char *word_eol[], void *userdata) {
     const char *target;
     const char *topic = word_eol[2];
-    char *buf;
+    enum fish_mode mode;
+    GString *command;
+    GSList *encrypted_list;
 
     if (!*topic) {
         hexchat_print(ph, usage_topic);
@@ -421,40 +596,77 @@ static int handle_crypt_topic(char *word[], char *word_eol[], void *userdata) {
     }
 
     target = hexchat_get_info(ph, "channel");
-    buf = fish_encrypt_for_nick(target, topic);
-    if (buf == NULL) {
+
+    /* Check if we can encrypt */
+    if (!fish_nick_has_key(target)) {
         hexchat_printf(ph, "/topic+ error, no key found for %s", target);
         return HEXCHAT_EAT_ALL;
     }
 
-    hexchat_commandf(ph, "TOPIC %s +OK %s", target, buf);
-    g_free(buf);
-    return HEXCHAT_EAT_ALL;
+    command = g_string_new("");
+    g_string_printf(command, "TOPIC %s +OK ", target);
+
+    encrypted_list = fish_encrypt_for_nick(target, topic, &mode, get_prefix_length() + command->len);
+    if (!encrypted_list) {
+        g_string_free(command, TRUE);
+        hexchat_printf(ph, "/topic+ error, can't encrypt %s", target);
+        return HEXCHAT_EAT_ALL;
     }
 
+    hexchat_commandf(ph, "%s%s", command->str, (char *) encrypted_list->data);
+
+    g_string_free(command, TRUE);
+    g_slist_free_full(encrypted_list, g_free);
+
+    return HEXCHAT_EAT_ALL;
+}
+
 /**
  * Command handler for /notice+
  */
-static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata)
-{
+static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata) {
     const char *target = word[2];
     const char *notice = word_eol[3];
-    char *buf;
+    char *notice_flag;
+    enum fish_mode mode;
+    GString *command;
+    GSList *encrypted_list, *encrypted_item;
 
     if (!*target || !*notice) {
         hexchat_print(ph, usage_notice);
         return HEXCHAT_EAT_ALL;
     }
 
-    buf = fish_encrypt_for_nick(target, notice);
-    if (buf == NULL) {
+    /* Check if we can encrypt */
+    if (!fish_nick_has_key(target)) {
         hexchat_printf(ph, "/notice+ error, no key found for %s.", target);
         return HEXCHAT_EAT_ALL;
     }
 
-    hexchat_commandf(ph, "quote NOTICE %s :+OK %s", target, buf);
-    hexchat_emit_print(ph, "Notice Sent", target, notice);
-    g_free(buf);
+    command = g_string_new("");
+    g_string_printf(command, "quote NOTICE %s :+OK ", target);
+
+    encrypted_list = fish_encrypt_for_nick(target, notice, &mode, get_prefix_length() + command->len);
+    if (!encrypted_list) {
+        g_string_free(command, TRUE);
+        hexchat_printf(ph, "/notice+ error, can't encrypt %s", target);
+        return HEXCHAT_EAT_ALL;
+    }
+
+    notice_flag = g_strconcat("[", fish_modes[mode], "] ", notice, NULL);
+    hexchat_emit_print(ph, "Notice Send", target, notice_flag);
+
+    /* Send encrypted messages */
+    encrypted_item = encrypted_list;
+    while (encrypted_item) {
+        hexchat_commandf(ph, "%s%s", command->str, (char *) encrypted_item->data);
+
+        encrypted_item = encrypted_item->next;
+    }
+
+    g_free(notice_flag);
+    g_string_free(command, TRUE);
+    g_slist_free_full(encrypted_list, g_free);
 
     return HEXCHAT_EAT_ALL;
 }
@@ -462,56 +674,102 @@ static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata)
 /**
  * Command handler for /msg+
  */
-static int handle_crypt_msg(char *word[], char *word_eol[], void *userdata)
-{
+static int handle_crypt_msg(char *word[], char *word_eol[], void *userdata) {
     const char *target = word[2];
     const char *message = word_eol[3];
+    char *message_flag;
+    char *prefix;
     hexchat_context *query_ctx;
-    char *buf;
+    enum fish_mode mode;
+    GString *command;
+    GSList *encrypted_list, *encrypted_item;
 
     if (!*target || !*message) {
         hexchat_print(ph, usage_msg);
         return HEXCHAT_EAT_ALL;
     }
 
-    buf = fish_encrypt_for_nick(target, message);
-    if (buf == NULL) {
+    /* Check if we can encrypt */
+    if (!fish_nick_has_key(target)) {
         hexchat_printf(ph, "/msg+ error, no key found for %s", target);
         return HEXCHAT_EAT_ALL;
     }
 
-    hexchat_commandf(ph, "PRIVMSG %s :+OK %s", target, buf);
+    command = g_string_new("");
+    g_string_printf(command, "PRIVMSG %s :+OK ", target);
+
+    encrypted_list = fish_encrypt_for_nick(target, message, &mode, get_prefix_length() + command->len);
+    if (!encrypted_list) {
+        g_string_free(command, TRUE);
+        hexchat_printf(ph, "/msg+ error, can't encrypt %s", target);
+        return HEXCHAT_EAT_ALL;
+    }
+
+    /* Send encrypted messages */
+    encrypted_item = encrypted_list;
+    while (encrypted_item) {
+        hexchat_commandf(ph, "%s%s", command->str, (char *) encrypted_item->data);
+
+        encrypted_item = encrypted_item->next;
+    }
+
+    g_string_free(command, TRUE);
+    g_slist_free_full(encrypted_list, g_free);
 
     query_ctx = find_context_on_network(target);
     if (query_ctx) {
-	    hexchat_set_context(ph, query_ctx);
+        g_assert(hexchat_set_context(ph, query_ctx) == 1);
 
-        /* FIXME: Mode char */
-        hexchat_emit_print(ph, "Your Message", hexchat_get_info(ph, "nick"),
-                           message, "", "");
-    }
-    else {
+        prefix = get_my_own_prefix();
+
+        /* Add encrypted flag */
+        message_flag = g_strconcat("[", fish_modes[mode], "] ", message, NULL);
+        hexchat_emit_print(ph, "Your Message", hexchat_get_info(ph, "nick"), message_flag, prefix, NULL);
+        g_free(prefix);
+        g_free(message_flag);
+    } else {
         hexchat_emit_print(ph, "Message Send", target, message);
     }
 
-    g_free(buf);
     return HEXCHAT_EAT_ALL;
 }
 
 static int handle_crypt_me(char *word[], char *word_eol[], void *userdata) {
-	const char *channel = hexchat_get_info(ph, "channel");
-	char *buf;
+    const char *channel = hexchat_get_info(ph, "channel");
+    enum fish_mode mode;
+    GString *command;
+    GSList *encrypted_list, *encrypted_item;
 
-    buf = fish_encrypt_for_nick(channel, word_eol[2]);
-	if (!buf)
+    /* Check if we can encrypt */
+    if (!fish_nick_has_key(channel)) {
         return HEXCHAT_EAT_NONE;
+    }
 
-	hexchat_commandf(ph, "PRIVMSG %s :\001ACTION +OK %s \001", channel, buf);
-	hexchat_emit_print(ph, "Your Action", hexchat_get_info(ph, "nick"),
-                       word_eol[2], NULL);
+    command = g_string_new("");
+    g_string_printf(command, "PRIVMSG %s :\001ACTION +OK ", channel);
 
-	g_free(buf);
-	return HEXCHAT_EAT_ALL;
+    /* 2 = ' \001' */
+    encrypted_list = fish_encrypt_for_nick(channel, word_eol[2], &mode, get_prefix_length() + command->len + 2);
+    if (!encrypted_list) {
+        g_string_free(command, TRUE);
+        hexchat_printf(ph, "/me error, can't encrypt %s", channel);
+        return HEXCHAT_EAT_ALL;
+    }
+
+    hexchat_emit_print(ph, "Your Action", hexchat_get_info(ph, "nick"), word_eol[2], NULL);
+
+    /* Send encrypted messages */
+    encrypted_item = encrypted_list;
+    while (encrypted_item) {
+        hexchat_commandf(ph, "%s%s \001", command->str, (char *) encrypted_item->data);
+
+        encrypted_item = encrypted_item->next;
+    }
+
+    g_string_free(command, TRUE);
+    g_slist_free_full(encrypted_list, g_free);
+
+    return HEXCHAT_EAT_ALL;
 }
 
 /**
@@ -557,6 +815,9 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
     hexchat_hook_server_attrs(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
     hexchat_hook_server_attrs(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
 
+    if (!fish_init())
+        return 0;
+
     if (!dh1080_init())
         return 0;
 
@@ -570,6 +831,7 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
 int hexchat_plugin_deinit(void) {
     g_clear_pointer(&pending_exchanges, g_hash_table_destroy);
     dh1080_deinit();
+    fish_deinit();
 
     hexchat_printf(ph, "%s plugin unloaded\n", plugin_name);
     return 1;

plugins/fishlim/tests/meson.build

@@ -0,0 +1,16 @@
+fishlim_test_sources = [
+  'tests.c',
+  'mock-keystore.c',
+  '../fish.c',
+  '../utils.c',
+]
+
+fishlim_tests = executable('fishlim_tests', fishlim_test_sources,
+  dependencies: [libgio_dep, libssl_dep, hexchat_plugin_dep],
+  include_directories: include_directories('..'),
+)
+
+test('Fishlim Tests', fishlim_tests,
+  protocol: 'tap',
+  timeout: 600,
+)

plugins/fishlim/tests/mock-keystore.c

@@ -0,0 +1,51 @@
+/*
+  Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#include "fish.h"
+
+/**
+ * Extracts a key from the key store file.
+ */
+char *
+keystore_get_key(const char *nick, enum fish_mode *mode)
+{
+    return NULL;
+}
+
+/**
+ * Sets a key in the key store file.
+ */
+gboolean
+keystore_store_key(const char *nick, const char *key, enum fish_mode mode)
+{
+    return TRUE;
+}
+
+/**
+ * Deletes a nick from the key store.
+ */
+gboolean
+keystore_delete_nick(const char *nick)
+{
+    return TRUE;
+}

plugins/fishlim/tests/tests.c

@@ -0,0 +1,285 @@
+/*
+  Copyright (c) 2020 <bakasura@protonmail.ch>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#include <string.h>
+#include <glib.h>
+
+#include "fish.h"
+#include "utils.h"
+
+/**
+ * Auxiliary function: Generate a random string
+ * @param out Preallocated string to fill
+ * @param len Size of bytes to fill
+ */
+static void
+random_string(char *out, size_t len)
+{
+    GRand *rand = NULL;
+    int i = 0;
+
+    rand = g_rand_new();
+    for (i = 0; i < len; ++i) {
+        out[i] = g_rand_int_range(rand, 1, 256);
+    }
+
+    out[len] = 0;
+
+    g_rand_free(rand);
+}
+
+/**
+ * Check encrypt and decrypt in ECB mode
+ */
+static void
+test_ecb(void)
+{
+    char *b64 = NULL;
+    char *de = NULL;
+    int key_len, message_len = 0;
+    char key[57];
+    char message[1000];
+
+    /* Generate key 32–448 bits (Yes, I start with 8 bits) */
+    for (key_len = 1; key_len < 57; ++key_len) {
+
+        random_string(key, key_len);
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+
+            /* Encrypt */
+            b64 = fish_encrypt(key, key_len, message, message_len, FISH_ECB_MODE);
+            g_assert_nonnull(b64);
+
+            /* Decrypt */
+            /* Linear */
+            de = fish_decrypt_str(key, key_len, b64, FISH_ECB_MODE);
+			g_assert_cmpstr (de, ==, message);
+            g_free(de);
+	
+            /* Mixed */
+            de = fish_decrypt_str(key, key_len, b64, FISH_ECB_MODE);
+			g_assert_cmpstr (de, ==, message);
+            g_free(de);
+
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check encrypt and decrypt in CBC mode
+ */
+static void
+test_cbc(void)
+{
+    char *b64 = NULL;
+    char *de = NULL;
+    int key_len, message_len = 0;
+    char key[57];
+    char message[1000];
+
+    /* Generate key 32–448 bits (Yes, I start with 8 bits) */
+    for (key_len = 1; key_len < 57; ++key_len) {
+
+        random_string(key, key_len);
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+
+            /* Encrypt */
+            b64 = fish_encrypt(key, key_len, message, message_len, FISH_CBC_MODE);
+            g_assert_nonnull(b64);
+
+            /* Decrypt */
+            /* Linear */
+            de = fish_decrypt_str(key, key_len, b64, FISH_CBC_MODE);
+            g_assert_cmpstr (de, ==, message);
+            g_free(de);
+
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check the calculation of final length from an encoded string in Base64
+ */
+static void
+test_base64_len (void)
+{
+    char *b64 = NULL;
+    char message[1000];
+    int message_end = sizeof (message) - 1;
+
+    random_string(message, message_end);
+
+    for (; message_end >= 0; --message_end) {
+        message[message_end] = '\0'; /* Truncate instead of generating new strings */
+        b64 = g_base64_encode((const unsigned char *) message, message_end);
+        g_assert_nonnull(b64);
+        g_assert_cmpuint(strlen(b64), == , base64_len(message_end));
+        g_free(b64);
+    }
+}
+
+/**
+ * Check the calculation of final length from an encoded string in BlowcryptBase64
+ */
+static void
+test_base64_fish_len (void)
+{
+    char *b64 = NULL;
+    int message_len = 0;
+    char message[1000];
+
+    for (message_len = 1; message_len < 1000; ++message_len) {
+        random_string(message, message_len);
+        b64 = fish_base64_encode(message, message_len);
+        g_assert_nonnull(b64);
+        g_assert_cmpuint(strlen(b64), == , base64_fish_len(message_len));
+        g_free(b64);
+    }
+}
+
+/**
+ * Check the calculation of final length from an encrypted string in ECB mode
+ */
+static void
+test_base64_ecb_len(void)
+{
+    char *b64 = NULL;
+    int key_len, message_len = 0;
+    char key[57];
+    char message[1000];
+
+    /* Generate key 32–448 bits (Yes, I start with 8 bits) */
+    for (key_len = 1; key_len < 57; ++key_len) {
+
+        random_string(key, key_len);
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = fish_encrypt(key, key_len, message, message_len, FISH_ECB_MODE);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , ecb_len(message_len));
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check the calculation of final length from an encrypted string in CBC mode
+ */
+static void
+test_base64_cbc_len(void)
+{
+    char *b64 = NULL;
+    int key_len, message_len = 0;
+    char key[57];
+    char message[1000];
+
+    /* Generate key 32–448 bits (Yes, I start with 8 bits) */
+    for (key_len = 1; key_len < 57; ++key_len) {
+
+        random_string(key, key_len);
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = fish_encrypt(key, key_len, message, message_len, FISH_CBC_MODE);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , cbc_len(message_len));
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check the calculation of length limit for a plaintext in each encryption mode
+ */
+static void
+test_max_text_command_len(void)
+{
+    int max_encoded_len, plaintext_len;
+    enum fish_mode mode;
+
+    for (max_encoded_len = 0; max_encoded_len < 10000; ++max_encoded_len) {
+        for (mode = FISH_ECB_MODE; mode <= FISH_CBC_MODE; ++mode) {
+            plaintext_len = max_text_command_len(max_encoded_len, mode);
+            g_assert_cmpuint(encoded_len(plaintext_len, mode), <= , max_encoded_len);
+        }
+    }
+}
+
+/**
+ * Check the calculation of length limit for a plaintext in each encryption mode
+ */
+static void
+test_foreach_utf8_data_chunks(void)
+{
+    GRand *rand = NULL;
+    GString *chunks = NULL;
+    int  max_chunks_len, chunks_len;
+    char ascii_message[1001];
+    char *data_chunk = NULL;
+
+    rand = g_rand_new();
+    max_chunks_len = g_rand_int_range(rand, 2, 301);
+    random_string(ascii_message, 1000);
+
+    data_chunk = ascii_message;
+
+    chunks = g_string_new(NULL);
+
+    while (foreach_utf8_data_chunks(data_chunk, max_chunks_len, &chunks_len)) {
+        g_string_append(chunks, g_strndup(data_chunk, chunks_len));
+        /* Next chunk */
+        data_chunk += chunks_len;
+    }
+    /* Check data loss */
+    g_assert_cmpstr(chunks->str, == , ascii_message);
+
+    g_string_free(chunks, TRUE);
+    g_rand_free (rand);
+}
+
+int
+main(int argc, char *argv[]) {
+
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/fishlim/ecb", test_ecb);
+    g_test_add_func("/fishlim/cbc", test_cbc);
+    g_test_add_func("/fishlim/base64_len", test_base64_len);
+    g_test_add_func("/fishlim/base64_fish_len", test_base64_fish_len);
+    g_test_add_func("/fishlim/base64_ecb_len", test_base64_ecb_len);
+    g_test_add_func("/fishlim/base64_cbc_len", test_base64_cbc_len);
+    g_test_add_func("/fishlim/max_text_command_len", test_max_text_command_len);
+    g_test_add_func("/fishlim/foreach_utf8_data_chunks", test_foreach_utf8_data_chunks);
+
+    fish_init();
+    int ret = g_test_run();
+    fish_deinit();
+    return ret;
+}

plugins/fishlim/utils.c

@@ -0,0 +1,151 @@
+/*
+
+  Copyright (c) 2020 <bakasura@protonmail.ch>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#include <string.h>
+
+#include "utils.h"
+#include "fish.h"
+
+/**
+ * Calculate the length of Base64-encoded string
+ *
+ * @param plaintext_len Size of clear text to encode
+ * @return Size of encoded string
+ */
+unsigned long base64_len(size_t plaintext_len) {
+    int length_unpadded = (4 * plaintext_len) / 3;
+    /* Add padding */
+    return length_unpadded % 4 != 0 ? length_unpadded + (4 - length_unpadded % 4) : length_unpadded;
+}
+
+/**
+ * Calculate the length of BlowcryptBase64-encoded string
+ *
+ * @param plaintext_len Size of clear text to encode
+ * @return Size of encoded string
+ */
+unsigned long base64_fish_len(size_t plaintext_len) {
+    int length_unpadded = (12 * plaintext_len) / 8;
+    /* Add padding */
+    return length_unpadded % 12 != 0 ? length_unpadded + (12 - length_unpadded % 12) : length_unpadded;
+}
+
+/**
+ * Calculate the length of fish-encrypted string in CBC mode
+ *
+ * @param plaintext_len  Size of clear text to encode
+ * @return Size of encoded string
+ */
+unsigned long cbc_len(size_t plaintext_len) {
+    /*IV + DATA + Zero Padding */
+    return base64_len(8 + (plaintext_len % 8 != 0 ? plaintext_len + 8 - (plaintext_len % 8) : plaintext_len));
+}
+
+/**
+ * Calculate the length of fish-encrypted string in ECB mode
+ *
+ * @param plaintext_len  Size of clear text to encode
+ * @return Size of encoded string
+ */
+unsigned long ecb_len(size_t plaintext_len) {
+    return base64_fish_len(plaintext_len);
+}
+
+/**
+ * Calculate the length of encrypted string in 'mode' mode
+ *
+ * @param plaintext_len Length of plaintext
+ * @param mode          Encryption mode
+ * @return Size of encoded string
+ */
+unsigned long encoded_len(size_t plaintext_len, enum fish_mode mode) {
+    switch (mode) {
+
+        case FISH_CBC_MODE:
+            return cbc_len(plaintext_len);
+            break;
+
+        case FISH_ECB_MODE:
+            return ecb_len(plaintext_len);
+    }
+
+    return 0;
+}
+
+/**
+ * Determine the maximum length of plaintext for a 'max_len' limit taking care the overload of encryption
+ *
+ * @param max_len   Limit for plaintext
+ * @param mode      Encryption mode
+ * @return Maximum allowed plaintext length
+ */
+int max_text_command_len(size_t max_len, enum fish_mode mode) {
+    int len;
+
+    for (len = max_len; encoded_len(len, mode) > max_len; --len);
+    return len;
+}
+
+/**
+ * Iterate over 'data' in chunks of 'max_chunk_len' taking care the UTF-8 characters
+ *
+ * @param data              Data to iterate
+ * @param max_chunk_len     Size of biggest chunk
+ * @param [out] chunk_len   Current chunk length
+ * @return Pointer to current chunk position or NULL if not have more chunks
+ */
+const char *foreach_utf8_data_chunks(const char *data, int max_chunk_len, int *chunk_len) {
+    int data_len, last_chunk_len = 0;
+
+    if (!*data) {
+        return NULL;
+    }
+
+    /* Last chunk of data */
+    data_len = strlen(data);
+    if (data_len <= max_chunk_len) {
+        *chunk_len = data_len;
+        return data;
+    }
+
+    *chunk_len = 0;
+    const char *utf8_character = data;
+
+    /* Not valid UTF-8, but maybe valid text, just split into max length */
+    if (!g_utf8_validate(data, -1, NULL)) {
+        *chunk_len = max_chunk_len;
+        return utf8_character;
+    }
+
+    while (*utf8_character && *chunk_len <= max_chunk_len) {
+        last_chunk_len = *chunk_len;
+        *chunk_len = (g_utf8_next_char(utf8_character) - data) * sizeof(*utf8_character);
+        utf8_character = g_utf8_next_char(utf8_character);
+    }
+
+    /* We need the previous length before overflow the limit */
+    *chunk_len = last_chunk_len;
+
+    return utf8_character;
+}

plugins/fishlim/utils.h

@@ -0,0 +1,39 @@
+/*
+
+  Copyright (c) 2020 <bakasura@protonmail.ch>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#ifndef PLUGIN_HEXCHAT_FISHLIM_UTILS_H
+#define PLUGIN_HEXCHAT_FISHLIM_UTILS_H
+
+#include <stddef.h>
+#include "fish.h"
+
+unsigned long base64_len(size_t plaintext_len);
+unsigned long base64_fish_len(size_t plaintext_len);
+unsigned long cbc_len(size_t plaintext_len);
+unsigned long ecb_len(size_t plaintext_len);
+unsigned long encoded_len(size_t plaintext_len, enum fish_mode mode);
+int max_text_command_len(size_t max_len, enum fish_mode mode);
+const char *foreach_utf8_data_chunks(const char *data, int max_chunk_len, int *chunk_len);
+
+#endif

plugins/lua/lua.c

@@ -35,6 +35,8 @@
 
 #include <hexchat-plugin.h>
 
+#define WORD_ARRAY_LEN 32
+
 static char plugin_name[] = "Lua";
 static char plugin_description[] = "Lua scripting interface";
 static char plugin_version[16] = "1.3";
@@ -275,13 +277,13 @@ static int api_command_closure(char *word[], char *word_eol[], void *udata)
 	base = lua_gettop(L);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, info->ref);
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word[i]);
 		lua_rawseti(L, -2, i);
 	}
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word_eol[i]);
 		lua_rawseti(L, -2, i);
@@ -462,13 +464,13 @@ static int api_server_closure(char *word[], char *word_eol[], void *udata)
 	base = lua_gettop(L);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, info->ref);
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word[i]);
 		lua_rawseti(L, -2, i);
 	}
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word_eol[i]);
 		lua_rawseti(L, -2, i);
@@ -521,13 +523,13 @@ static int api_server_attrs_closure(char *word[], char *word_eol[], hexchat_even
 	base = lua_gettop(L);
 	lua_rawgeti(L, LUA_REGISTRYINDEX, info->ref);
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word[i]);
 		lua_rawseti(L, -2, i);
 	}
 	lua_newtable(L);
-	for(i = 1; i < 32 && *word_eol[i]; i++)
+	for(i = 1; i < WORD_ARRAY_LEN && *word_eol[i]; i++)
 	{
 		lua_pushstring(L, word_eol[i]);
 		lua_rawseti(L, -2, i);
@@ -955,16 +957,21 @@ static int api_hexchat_pluginprefs_meta_pairs(lua_State *L)
 	hexchat_plugin *h;
 
 	if(!script->name)
+
 		return luaL_error(L, "cannot use hexchat.pluginprefs before registering with hexchat.register");
 
 	dest = lua_newuserdata(L, 4096);
+
 	h = script->handle;
 	if(!hexchat_pluginpref_list(h, dest))
 		strcpy(dest, "");
 	lua_pushlightuserdata(L, dest);
 	lua_pushlightuserdata(L, dest);
 	lua_pushcclosure(L, api_hexchat_pluginprefs_meta_pairs_closure, 2);
-	return 1;
+	lua_insert(L, -2); // Return the userdata (second return value from pairs),
+						// even though it's not used by the closure (first return
+						// value from pairs), so that Lua knows not to GC it.
+	return 2;
 }
 
 static int api_attrs_meta_index(lua_State *L)
@@ -1187,11 +1194,11 @@ static void patch_clibs(lua_State *L)
 		if(lua_type(L, -2) == LUA_TLIGHTUSERDATA && lua_type(L, -1) == LUA_TTABLE)
 		{
 			lua_setfield(L, LUA_REGISTRYINDEX, "_CLIBS");
+			lua_pop(L, 1);
 			break;
 		}
 		lua_pop(L, 1);
 	}
-	lua_pop(L, 1);
 }
 
 static GPtrArray *scripts;
@@ -1762,4 +1769,3 @@ G_MODULE_EXPORT int hexchat_plugin_deinit(hexchat_plugin *plugin_handle)
 	g_clear_pointer(&expand_buffer, g_free);
 	return 1;
 }
-

plugins/lua/lua.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

plugins/perl/meson.build

@@ -88,4 +88,5 @@ shared_module('perl',
   install_dir: plugindir,
   install_rpath: perl_rpath,
   name_prefix: '',
+  vs_module_defs: 'perl.def',
 )

plugins/perl/perl.c

@@ -283,6 +283,8 @@ list_item_to_sv ( hexchat_list *list, const char *const *fields )
 	return sv_2mortal (newRV_noinc ((SV *) hash));
 }
 
+#define WORD_ARRAY_LEN 32
+
 static AV *
 array2av (char *array[])
 {
@@ -293,7 +295,7 @@ array2av (char *array[])
 
 	for (
 		count = 1;
-		count < 32 && array[count] != NULL && array[count][0] != 0;
+		count < WORD_ARRAY_LEN && array[count] != NULL && array[count][0] != 0;
 		count++
 	) {
 		temp = newSVpv (array[count], 0);

plugins/perl/perl.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

plugins/python/_hexchat.py

@@ -0,0 +1,386 @@
+import inspect
+import sys
+from contextlib import contextmanager
+
+from _hexchat_embedded import ffi, lib
+
+__all__ = [
+    'EAT_ALL', 'EAT_HEXCHAT', 'EAT_NONE', 'EAT_PLUGIN', 'EAT_XCHAT',
+    'PRI_HIGH', 'PRI_HIGHEST', 'PRI_LOW', 'PRI_LOWEST', 'PRI_NORM',
+    '__doc__', '__version__', 'command', 'del_pluginpref', 'emit_print',
+    'find_context', 'get_context', 'get_info',
+    'get_list', 'get_lists', 'get_pluginpref', 'get_prefs', 'hook_command',
+    'hook_print', 'hook_print_attrs', 'hook_server', 'hook_server_attrs',
+    'hook_timer', 'hook_unload', 'list_pluginpref', 'nickcmp', 'prnt',
+    'set_pluginpref', 'strip', 'unhook',
+]
+
+__doc__ = 'HexChat Scripting Interface'
+__version__ = (2, 0)
+__license__ = 'GPL-2.0+'
+
+EAT_NONE = 0
+EAT_HEXCHAT = 1
+EAT_XCHAT = EAT_HEXCHAT
+EAT_PLUGIN = 2
+EAT_ALL = EAT_HEXCHAT | EAT_PLUGIN
+
+PRI_LOWEST = -128
+PRI_LOW = -64
+PRI_NORM = 0
+PRI_HIGH = 64
+PRI_HIGHEST = 127
+
+
+# We need each module to be able to reference their parent plugin
+# which is a bit tricky since they all share the exact same module.
+# Simply navigating up to what module called it seems to actually
+# be a fairly reliable and simple method of doing so if ugly.
+def __get_current_plugin():
+    frame = inspect.stack()[1][0]
+    while '__plugin' not in frame.f_globals:
+        frame = frame.f_back
+        assert frame is not None
+
+    return frame.f_globals['__plugin']
+
+
+# Keeping API compat
+if sys.version_info[0] == 2:
+    def __decode(string):
+        return string
+
+else:
+    def __decode(string):
+        return string.decode()
+
+
+# ------------ API ------------
+def prnt(string):
+    lib.hexchat_print(lib.ph, string.encode())
+
+
+def emit_print(event_name, *args, **kwargs):
+    time = kwargs.pop('time', 0)  # For py2 compat
+    cargs = []
+    for i in range(4):
+        arg = args[i].encode() if len(args) > i else b''
+        cstring = ffi.new('char[]', arg)
+        cargs.append(cstring)
+
+    if time == 0:
+        return lib.hexchat_emit_print(lib.ph, event_name.encode(), *cargs)
+
+    attrs = lib.hexchat_event_attrs_create(lib.ph)
+    attrs.server_time_utc = time
+    ret = lib.hexchat_emit_print_attrs(lib.ph, attrs, event_name.encode(), *cargs)
+    lib.hexchat_event_attrs_free(lib.ph, attrs)
+    return ret
+
+
+# TODO: this shadows itself. command should be changed to cmd
+def command(command):
+    lib.hexchat_command(lib.ph, command.encode())
+
+
+def nickcmp(string1, string2):
+    return lib.hexchat_nickcmp(lib.ph, string1.encode(), string2.encode())
+
+
+def strip(text, length=-1, flags=3):
+    stripped = lib.hexchat_strip(lib.ph, text.encode(), length, flags)
+    ret = __decode(ffi.string(stripped))
+    lib.hexchat_free(lib.ph, stripped)
+    return ret
+
+
+def get_info(name):
+    ret = lib.hexchat_get_info(lib.ph, name.encode())
+    if ret == ffi.NULL:
+        return None
+    if name in ('gtkwin_ptr', 'win_ptr'):
+        # Surely there is a less dumb way?
+        ptr = repr(ret).rsplit(' ', 1)[1][:-1]
+        return ptr
+
+    return __decode(ffi.string(ret))
+
+
+def get_prefs(name):
+    string_out = ffi.new('char**')
+    int_out = ffi.new('int*')
+    _type = lib.hexchat_get_prefs(lib.ph, name.encode(), string_out, int_out)
+    if _type == 0:
+        return None
+
+    if _type == 1:
+        return __decode(ffi.string(string_out[0]))
+
+    if _type in (2, 3):  # XXX: 3 should be a bool, but keeps API
+        return int_out[0]
+
+    raise AssertionError('Out of bounds pref storage')
+
+
+def __cstrarray_to_list(arr):
+    i = 0
+    ret = []
+    while arr[i] != ffi.NULL:
+        ret.append(ffi.string(arr[i]))
+        i += 1
+
+    return ret
+
+
+__FIELD_CACHE = {}
+
+
+def __get_fields(name):
+    return __FIELD_CACHE.setdefault(name, __cstrarray_to_list(lib.hexchat_list_fields(lib.ph, name)))
+
+
+__FIELD_PROPERTY_CACHE = {}
+
+
+def __cached_decoded_str(string):
+    return __FIELD_PROPERTY_CACHE.setdefault(string, __decode(string))
+
+
+def get_lists():
+    return [__cached_decoded_str(field) for field in __get_fields(b'lists')]
+
+
+class ListItem:
+    def __init__(self, name):
+        self._listname = name
+
+    def __repr__(self):
+        return '<{} list item at {}>'.format(self._listname, id(self))
+
+
+# done this way for speed
+if sys.version_info[0] == 2:
+    def get_getter(name):
+        return ord(name[0])
+
+else:
+    def get_getter(name):
+        return name[0]
+
+
+def get_list(name):
+    # XXX: This function is extremely inefficient and could be interators and
+    # lazily loaded properties, but for API compat we stay slow
+    orig_name = name
+    name = name.encode()
+
+    if name not in __get_fields(b'lists'):
+        raise KeyError('list not available')
+
+    list_ = lib.hexchat_list_get(lib.ph, name)
+    if list_ == ffi.NULL:
+        return None
+
+    ret = []
+    fields = __get_fields(name)
+
+    def string_getter(field):
+        string = lib.hexchat_list_str(lib.ph, list_, field)
+        if string != ffi.NULL:
+            return __decode(ffi.string(string))
+
+        return ''
+
+    def ptr_getter(field):
+        if field == b'context':
+            ptr = lib.hexchat_list_str(lib.ph, list_, field)
+            ctx = ffi.cast('hexchat_context*', ptr)
+            return Context(ctx)
+
+        return None
+
+    getters = {
+        ord('s'): string_getter,
+        ord('i'): lambda field: lib.hexchat_list_int(lib.ph, list_, field),
+        ord('t'): lambda field: lib.hexchat_list_time(lib.ph, list_, field),
+        ord('p'): ptr_getter,
+    }
+
+    while lib.hexchat_list_next(lib.ph, list_) == 1:
+        item = ListItem(orig_name)
+        for _field in fields:
+            getter = getters.get(get_getter(_field))
+            if getter is not None:
+                field_name = _field[1:]
+                setattr(item, __cached_decoded_str(field_name), getter(field_name))
+
+        ret.append(item)
+
+    lib.hexchat_list_free(lib.ph, list_)
+    return ret
+
+
+# TODO: 'command' here shadows command above, and should be renamed to cmd
+def hook_command(command, callback, userdata=None, priority=PRI_NORM, help=None):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_command(lib.ph, command.encode(), priority, lib._on_command_hook,
+                                      help.encode() if help is not None else ffi.NULL, hook.handle)
+
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_print(name, callback, userdata=None, priority=PRI_NORM):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_print(lib.ph, name.encode(), priority, lib._on_print_hook, hook.handle)
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_print_attrs(name, callback, userdata=None, priority=PRI_NORM):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_print_attrs(lib.ph, name.encode(), priority, lib._on_print_attrs_hook, hook.handle)
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_server(name, callback, userdata=None, priority=PRI_NORM):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_server(lib.ph, name.encode(), priority, lib._on_server_hook, hook.handle)
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_server_attrs(name, callback, userdata=None, priority=PRI_NORM):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_server_attrs(lib.ph, name.encode(), priority, lib._on_server_attrs_hook, hook.handle)
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_timer(timeout, callback, userdata=None):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata)
+    handle = lib.hexchat_hook_timer(lib.ph, timeout, lib._on_timer_hook, hook.handle)
+    hook.hexchat_hook = handle
+    return id(hook)
+
+
+def hook_unload(callback, userdata=None):
+    plugin = __get_current_plugin()
+    hook = plugin.add_hook(callback, userdata, is_unload=True)
+    return id(hook)
+
+
+def unhook(handle):
+    plugin = __get_current_plugin()
+    return plugin.remove_hook(handle)
+
+
+def set_pluginpref(name, value):
+    if isinstance(value, str):
+        return bool(lib.hexchat_pluginpref_set_str(lib.ph, name.encode(), value.encode()))
+
+    if isinstance(value, int):
+        return bool(lib.hexchat_pluginpref_set_int(lib.ph, name.encode(), value))
+
+    # XXX: This should probably raise but this keeps API
+    return False
+
+
+def get_pluginpref(name):
+    name = name.encode()
+    string_out = ffi.new('char[512]')
+    if lib.hexchat_pluginpref_get_str(lib.ph, name, string_out) != 1:
+        return None
+
+    string = ffi.string(string_out)
+    # This API stores everything as a string so we have to figure out what
+    # its actual type was supposed to be.
+    if len(string) > 12:  # Can't be a number
+        return __decode(string)
+
+    number = lib.hexchat_pluginpref_get_int(lib.ph, name)
+    if number == -1 and string != b'-1':
+        return __decode(string)
+
+    return number
+
+
+def del_pluginpref(name):
+    return bool(lib.hexchat_pluginpref_delete(lib.ph, name.encode()))
+
+
+def list_pluginpref():
+    prefs_str = ffi.new('char[4096]')
+    if lib.hexchat_pluginpref_list(lib.ph, prefs_str) == 1:
+        return __decode(ffi.string(prefs_str)).split(',')
+
+    return []
+
+
+class Context:
+    def __init__(self, ctx):
+        self._ctx = ctx
+
+    def __eq__(self, value):
+        if not isinstance(value, Context):
+            return False
+
+        return self._ctx == value._ctx
+
+    @contextmanager
+    def __change_context(self):
+        old_ctx = lib.hexchat_get_context(lib.ph)
+        if not self.set():
+            # XXX: Behavior change, previously used wrong context
+            lib.hexchat_print(lib.ph, b'Context object refers to closed context, ignoring call')
+            return
+
+        yield
+        lib.hexchat_set_context(lib.ph, old_ctx)
+
+    def set(self):
+        # XXX: API addition, C plugin silently ignored failure
+        return bool(lib.hexchat_set_context(lib.ph, self._ctx))
+
+    def prnt(self, string):
+        with self.__change_context():
+            prnt(string)
+
+    def emit_print(self, event_name, *args, **kwargs):
+        time = kwargs.pop('time', 0)  # For py2 compat
+        with self.__change_context():
+            return emit_print(event_name, *args, time=time)
+
+    def command(self, string):
+        with self.__change_context():
+            command(string)
+
+    def get_info(self, name):
+        with self.__change_context():
+            return get_info(name)
+
+    def get_list(self, name):
+        with self.__change_context():
+            return get_list(name)
+
+
+def get_context():
+    ctx = lib.hexchat_get_context(lib.ph)
+    return Context(ctx)
+
+
+def find_context(server=None, channel=None):
+    server = server.encode() if server is not None else ffi.NULL
+    channel = channel.encode() if channel is not None else ffi.NULL
+    ctx = lib.hexchat_find_context(lib.ph, server, channel)
+    if ctx == ffi.NULL:
+        return None
+
+    return Context(ctx)

plugins/python/generate_plugin.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+
+import sys
+import cffi
+
+builder = cffi.FFI()
+
+# hexchat-plugin.h
+with open(sys.argv[1]) as f:
+    output = []
+    eat_until_endif = 0
+    # This is very specific to hexchat-plugin.h, it is not a cpp
+    for line in f:
+        if line.startswith('#define'):
+            continue
+        elif line.endswith('HEXCHAT_PLUGIN_H\n'):
+            continue
+        elif 'time.h' in line:
+            output.append('typedef int... time_t;')
+        elif line.startswith('#if'):
+            eat_until_endif += 1
+        elif line.startswith('#endif'):
+            eat_until_endif -= 1
+        elif eat_until_endif and '_hexchat_context' not in line:
+            continue
+        else:
+            output.append(line)
+    builder.cdef(''.join(output))
+
+builder.embedding_api('''
+extern "Python" int _on_py_command(char **, char **, void *);
+extern "Python" int _on_load_command(char **, char **, void *);
+extern "Python" int _on_unload_command(char **, char **, void *);
+extern "Python" int _on_reload_command(char **, char **, void *);
+extern "Python" int _on_say_command(char **, char **, void *);
+
+extern "Python" int _on_command_hook(char **, char **, void *);
+extern "Python" int _on_print_hook(char **, void *);
+extern "Python" int _on_print_attrs_hook(char **, hexchat_event_attrs *, void *);
+extern "Python" int _on_server_hook(char **, char **, void *);
+extern "Python" int _on_server_attrs_hook(char **, char **, hexchat_event_attrs *, void *);
+extern "Python" int _on_timer_hook(void *);
+
+extern "Python" int _on_plugin_init(char **, char **, char **, char *, char *);
+extern "Python" int _on_plugin_deinit(void);
+
+static hexchat_plugin *ph;
+''')
+
+builder.set_source('_hexchat_embedded', '''
+/* Python's header defines these.. */
+#undef HAVE_MEMRCHR
+#undef HAVE_STRINGS_H
+
+#include "config.h"
+#include "hexchat-plugin.h"
+
+static hexchat_plugin *ph;
+CFFI_DLLEXPORT int _on_plugin_init(char **, char **, char **, char *, char *);
+CFFI_DLLEXPORT int _on_plugin_deinit(void);
+
+int hexchat_plugin_init(hexchat_plugin *plugin_handle,
+                        char **name_out, char **description_out,
+                        char **version_out, char *arg)
+{
+    if (ph != NULL)
+    {
+        puts ("Python plugin already loaded\\n");
+        return 0; /* Prevent loading twice */
+    }
+
+    ph = plugin_handle;
+    return _on_plugin_init(name_out, description_out, version_out, arg, HEXCHATLIBDIR);
+}
+
+int hexchat_plugin_deinit(void)
+{
+    int ret = _on_plugin_deinit();
+    ph = NULL;
+    return ret;
+}
+''')
+
+# python.py
+with open(sys.argv[2]) as f:
+    builder.embedding_init_code(f.read())
+
+# python.c
+builder.emit_c_code(sys.argv[3])

plugins/python/hexchat.py

@@ -0,0 +1 @@
+from _hexchat import *

plugins/python/meson.build

@@ -1,13 +1,32 @@
 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
 
-shared_module('python', 'python.c',
-  dependencies: [libgio_dep, hexchat_plugin_dep, python_dep],
+python3_source = custom_target('python-bindings',
+  input: ['../../src/common/hexchat-plugin.h', 'python.py'],
+  output: 'python.c',
+  command: [find_program('generate_plugin.py'), '@INPUT@', '@OUTPUT@']
+)
+
+install_data(['_hexchat.py', 'hexchat.py', 'xchat.py'],
+  install_dir: join_paths(get_option('libdir'), 'hexchat/python')
+)
+
+shared_module('python', python3_source,
+  dependencies: [hexchat_plugin_dep, python_dep],
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'python.def'
 )

plugins/python/python.def

@@ -1,4 +1,3 @@
 EXPORTS 
 hexchat_plugin_init 
 hexchat_plugin_deinit 
-hexchat_plugin_get_info 

plugins/python/python.py

@@ -0,0 +1,554 @@
+from __future__ import print_function
+
+import importlib
+import os
+import pydoc
+import signal
+import sys
+import traceback
+import weakref
+from contextlib import contextmanager
+
+from _hexchat_embedded import ffi, lib
+
+if sys.version_info < (3, 0):
+    from io import BytesIO as HelpEater
+else:
+    from io import StringIO as HelpEater
+
+if not hasattr(sys, 'argv'):
+    sys.argv = ['<hexchat>']
+
+VERSION = b'2.0'  # Sync with hexchat.__version__
+PLUGIN_NAME = ffi.new('char[]', b'Python')
+PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
+PLUGIN_VERSION = ffi.new('char[]', VERSION)
+
+# TODO: Constants should be screaming snake case
+hexchat = None
+local_interp = None
+hexchat_stdout = None
+plugins = set()
+
+
+@contextmanager
+def redirected_stdout():
+    sys.stdout = sys.__stdout__
+    sys.stderr = sys.__stderr__
+    yield
+    sys.stdout = hexchat_stdout
+    sys.stderr = hexchat_stdout
+
+
+if os.getenv('HEXCHAT_LOG_PYTHON'):
+    def log(*args):
+        with redirected_stdout():
+            print(*args)
+
+else:
+    def log(*args):
+        pass
+
+
+class Stdout:
+    def __init__(self):
+        self.buffer = bytearray()
+
+    def write(self, string):
+        string = string.encode()
+        idx = string.rfind(b'\n')
+        if idx != -1:
+            self.buffer += string[:idx]
+            lib.hexchat_print(lib.ph, bytes(self.buffer))
+            self.buffer = bytearray(string[idx + 1:])
+        else:
+            self.buffer += string
+
+    def isatty(self):
+        return False
+
+
+class Attribute:
+    def __init__(self):
+        self.time = 0
+
+    def __repr__(self):
+        return '<Attribute object at {}>'.format(id(self))
+
+
+class Hook:
+    def __init__(self, plugin, callback, userdata, is_unload):
+        self.is_unload = is_unload
+        self.plugin = weakref.proxy(plugin)
+        self.callback = callback
+        self.userdata = userdata
+        self.hexchat_hook = None
+        self.handle = ffi.new_handle(weakref.proxy(self))
+
+    def __del__(self):
+        log('Removing hook', id(self))
+        if self.is_unload is False:
+            assert self.hexchat_hook is not None
+            lib.hexchat_unhook(lib.ph, self.hexchat_hook)
+
+
+if sys.version_info[0] == 2:
+    def compile_file(data, filename):
+        return compile(data, filename, 'exec', dont_inherit=True)
+
+
+    def compile_line(string):
+        try:
+            return compile(string, '<string>', 'eval', dont_inherit=True)
+
+        except SyntaxError:
+            # For some reason `print` is invalid for eval
+            # This will hide any return value though
+            return compile(string, '<string>', 'exec', dont_inherit=True)
+else:
+    def compile_file(data, filename):
+        return compile(data, filename, 'exec', optimize=2, dont_inherit=True)
+
+
+    def compile_line(string):
+        # newline appended to solve unexpected EOF issues
+        return compile(string + '\n', '<string>', 'single', optimize=2, dont_inherit=True)
+
+
+class Plugin:
+    def __init__(self):
+        self.ph = None
+        self.name = ''
+        self.filename = ''
+        self.version = ''
+        self.description = ''
+        self.hooks = set()
+        self.globals = {
+            '__plugin': weakref.proxy(self),
+            '__name__': '__main__',
+        }
+
+    def add_hook(self, callback, userdata, is_unload=False):
+        hook = Hook(self, callback, userdata, is_unload=is_unload)
+        self.hooks.add(hook)
+        return hook
+
+    def remove_hook(self, hook):
+        for h in self.hooks:
+            if id(h) == hook:
+                ud = h.userdata
+                self.hooks.remove(h)
+                return ud
+
+        log('Hook not found')
+        return None
+
+    def loadfile(self, filename):
+        try:
+            self.filename = filename
+            with open(filename, 'rb') as f:
+                data = f.read().decode('utf-8')
+            compiled = compile_file(data, filename)
+            exec(compiled, self.globals)
+
+            try:
+                self.name = self.globals['__module_name__']
+
+            except KeyError:
+                lib.hexchat_print(lib.ph, b'Failed to load module: __module_name__ must be set')
+
+                return False
+
+            self.version = self.globals.get('__module_version__', '')
+            self.description = self.globals.get('__module_description__', '')
+            self.ph = lib.hexchat_plugingui_add(lib.ph, filename.encode(), self.name.encode(),
+                                                self.description.encode(), self.version.encode(), ffi.NULL)
+
+        except Exception as e:
+            lib.hexchat_print(lib.ph, 'Failed to load module: {}'.format(e).encode())
+            traceback.print_exc()
+            return False
+
+        return True
+
+    def __del__(self):
+        log('unloading', self.filename)
+        for hook in self.hooks:
+            if hook.is_unload is True:
+                try:
+                    hook.callback(hook.userdata)
+
+                except Exception as e:
+                    log('Failed to run hook:', e)
+                    traceback.print_exc()
+
+        del self.hooks
+        if self.ph is not None:
+            lib.hexchat_plugingui_remove(lib.ph, self.ph)
+
+
+if sys.version_info[0] == 2:
+    def __decode(string):
+        return string
+
+else:
+    def __decode(string):
+        return string.decode()
+
+
+# There can be empty entries between non-empty ones so find the actual last value
+def wordlist_len(words):
+    for i in range(31, 0, -1):
+        if ffi.string(words[i]):
+            return i
+
+    return 0
+
+
+def create_wordlist(words):
+    size = wordlist_len(words)
+    return [__decode(ffi.string(words[i])) for i in range(1, size + 1)]
+
+
+# This function only exists for compat reasons with the C plugin
+# It turns the word list from print hooks into a word_eol list
+# This makes no sense to do...
+def create_wordeollist(words):
+    words = reversed(words)
+    accum = None
+    ret = []
+    for word in words:
+        if accum is None:
+            accum = word
+
+        elif word:
+            last = accum
+            accum = ' '.join((word, last))
+
+        ret.insert(0, accum)
+
+    return ret
+
+
+def to_cb_ret(value):
+    if value is None:
+        return 0
+
+    return int(value)
+
+
+@ffi.def_extern()
+def _on_command_hook(word, word_eol, userdata):
+    hook = ffi.from_handle(userdata)
+    word = create_wordlist(word)
+    word_eol = create_wordlist(word_eol)
+    return to_cb_ret(hook.callback(word, word_eol, hook.userdata))
+
+
+@ffi.def_extern()
+def _on_print_hook(word, userdata):
+    hook = ffi.from_handle(userdata)
+    word = create_wordlist(word)
+    word_eol = create_wordeollist(word)
+    return to_cb_ret(hook.callback(word, word_eol, hook.userdata))
+
+
+@ffi.def_extern()
+def _on_print_attrs_hook(word, attrs, userdata):
+    hook = ffi.from_handle(userdata)
+    word = create_wordlist(word)
+    word_eol = create_wordeollist(word)
+    attr = Attribute()
+    attr.time = attrs.server_time_utc
+    return to_cb_ret(hook.callback(word, word_eol, hook.userdata, attr))
+
+
+@ffi.def_extern()
+def _on_server_hook(word, word_eol, userdata):
+    hook = ffi.from_handle(userdata)
+    word = create_wordlist(word)
+    word_eol = create_wordlist(word_eol)
+    return to_cb_ret(hook.callback(word, word_eol, hook.userdata))
+
+
+@ffi.def_extern()
+def _on_server_attrs_hook(word, word_eol, attrs, userdata):
+    hook = ffi.from_handle(userdata)
+    word = create_wordlist(word)
+    word_eol = create_wordlist(word_eol)
+    attr = Attribute()
+    attr.time = attrs.server_time_utc
+    return to_cb_ret(hook.callback(word, word_eol, hook.userdata, attr))
+
+
+@ffi.def_extern()
+def _on_timer_hook(userdata):
+    hook = ffi.from_handle(userdata)
+    if hook.callback(hook.userdata) == True:
+        return 1
+
+    hook.is_unload = True  # Don't unhook
+    for h in hook.plugin.hooks:
+        if h == hook:
+            hook.plugin.hooks.remove(h)
+            break
+
+    return 0
+
+
+@ffi.def_extern(error=3)
+def _on_say_command(word, word_eol, userdata):
+    channel = ffi.string(lib.hexchat_get_info(lib.ph, b'channel'))
+    if channel == b'>>python<<':
+        python = ffi.string(word_eol[1])
+        lib.hexchat_print(lib.ph, b'>>> ' + python)
+        exec_in_interp(__decode(python))
+        return 1
+
+    return 0
+
+
+def load_filename(filename):
+    filename = os.path.expanduser(filename)
+    if not os.path.isabs(filename):
+        configdir = __decode(ffi.string(lib.hexchat_get_info(lib.ph, b'configdir')))
+
+        filename = os.path.join(configdir, 'addons', filename)
+
+    if filename and not any(plugin.filename == filename for plugin in plugins):
+        plugin = Plugin()
+        if plugin.loadfile(filename):
+            plugins.add(plugin)
+            return True
+
+    return False
+
+
+def unload_name(name):
+    if name:
+        for plugin in plugins:
+            if name in (plugin.name, plugin.filename, os.path.basename(plugin.filename)):
+                plugins.remove(plugin)
+                return True
+
+    return False
+
+
+def reload_name(name):
+    if name:
+        for plugin in plugins:
+            if name in (plugin.name, plugin.filename, os.path.basename(plugin.filename)):
+                filename = plugin.filename
+                plugins.remove(plugin)
+                return load_filename(filename)
+
+    return False
+
+
+@contextmanager
+def change_cwd(path):
+    old_cwd = os.getcwd()
+    os.chdir(path)
+    yield
+    os.chdir(old_cwd)
+
+
+def autoload():
+    configdir = __decode(ffi.string(lib.hexchat_get_info(lib.ph, b'configdir')))
+    addondir = os.path.join(configdir, 'addons')
+    try:
+        with change_cwd(addondir):  # Maintaining old behavior
+            for f in os.listdir(addondir):
+                if f.endswith('.py'):
+                    log('Autoloading', f)
+                    # TODO: Set cwd
+                    load_filename(os.path.join(addondir, f))
+
+    except FileNotFoundError as e:
+        log('Autoload failed', e)
+
+
+def list_plugins():
+    if not plugins:
+        lib.hexchat_print(lib.ph, b'No python modules loaded')
+        return
+
+    tbl_headers = [b'Name', b'Version', b'Filename', b'Description']
+    tbl = [
+        tbl_headers,
+        [(b'-' * len(s)) for s in tbl_headers]
+    ]
+
+    for plugin in plugins:
+        basename = os.path.basename(plugin.filename).encode()
+        name = plugin.name.encode()
+        version = plugin.version.encode() if plugin.version else b'<none>'
+        description = plugin.description.encode() if plugin.description else b'<none>'
+        tbl.append((name, version, basename, description))
+
+    column_sizes = [
+        max(len(item) for item in column)
+        for column in zip(*tbl)
+    ]
+
+    for row in tbl:
+        lib.hexchat_print(lib.ph, b' '.join(item.ljust(column_sizes[i])
+                                            for i, item in enumerate(row)))
+    lib.hexchat_print(lib.ph, b'')
+
+
+def exec_in_interp(python):
+    global local_interp
+
+    if not python:
+        return
+
+    if local_interp is None:
+        local_interp = Plugin()
+        local_interp.locals = {}
+        local_interp.globals['hexchat'] = hexchat
+
+    code = compile_line(python)
+    try:
+        ret = eval(code, local_interp.globals, local_interp.locals)
+        if ret is not None:
+            lib.hexchat_print(lib.ph, '{}'.format(ret).encode())
+
+    except Exception as e:
+        traceback.print_exc(file=hexchat_stdout)
+
+
+@ffi.def_extern()
+def _on_load_command(word, word_eol, userdata):
+    filename = ffi.string(word[2])
+    if filename.endswith(b'.py'):
+        load_filename(__decode(filename))
+        return 3
+
+    return 0
+
+
+@ffi.def_extern()
+def _on_unload_command(word, word_eol, userdata):
+    filename = ffi.string(word[2])
+    if filename.endswith(b'.py'):
+        unload_name(__decode(filename))
+        return 3
+
+    return 0
+
+
+@ffi.def_extern()
+def _on_reload_command(word, word_eol, userdata):
+    filename = ffi.string(word[2])
+    if filename.endswith(b'.py'):
+        reload_name(__decode(filename))
+        return 3
+
+    return 0
+
+
+@ffi.def_extern(error=3)
+def _on_py_command(word, word_eol, userdata):
+    subcmd = __decode(ffi.string(word[2])).lower()
+
+    if subcmd == 'exec':
+        python = __decode(ffi.string(word_eol[3]))
+        exec_in_interp(python)
+
+    elif subcmd == 'load':
+        filename = __decode(ffi.string(word[3]))
+        load_filename(filename)
+
+    elif subcmd == 'unload':
+        name = __decode(ffi.string(word[3]))
+        if not unload_name(name):
+            lib.hexchat_print(lib.ph, b'Can\'t find a python plugin with that name')
+
+    elif subcmd == 'reload':
+        name = __decode(ffi.string(word[3]))
+        if not reload_name(name):
+            lib.hexchat_print(lib.ph, b'Can\'t find a python plugin with that name')
+
+    elif subcmd == 'console':
+        lib.hexchat_command(lib.ph, b'QUERY >>python<<')
+
+    elif subcmd == 'list':
+        list_plugins()
+
+    elif subcmd == 'about':
+        lib.hexchat_print(lib.ph, b'HexChat Python interface version ' + VERSION)
+
+    else:
+        lib.hexchat_command(lib.ph, b'HELP PY')
+
+    return 3
+
+
+@ffi.def_extern()
+def _on_plugin_init(plugin_name, plugin_desc, plugin_version, arg, libdir):
+    global hexchat
+    global hexchat_stdout
+
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+    plugin_name[0] = PLUGIN_NAME
+    plugin_desc[0] = PLUGIN_DESC
+    plugin_version[0] = PLUGIN_VERSION
+
+    try:
+        libdir = __decode(ffi.string(libdir))
+        modpath = os.path.join(libdir, '..', 'python')
+        sys.path.append(os.path.abspath(modpath))
+        hexchat = importlib.import_module('hexchat')
+
+    except (UnicodeDecodeError, ImportError) as e:
+        lib.hexchat_print(lib.ph, b'Failed to import module: ' + repr(e).encode())
+
+        return 0
+
+    hexchat_stdout = Stdout()
+    sys.stdout = hexchat_stdout
+    sys.stderr = hexchat_stdout
+    pydoc.help = pydoc.Helper(HelpEater(), HelpEater())
+
+    lib.hexchat_hook_command(lib.ph, b'', 0, lib._on_say_command, ffi.NULL, ffi.NULL)
+    lib.hexchat_hook_command(lib.ph, b'LOAD', 0, lib._on_load_command, ffi.NULL, ffi.NULL)
+    lib.hexchat_hook_command(lib.ph, b'UNLOAD', 0, lib._on_unload_command, ffi.NULL, ffi.NULL)
+    lib.hexchat_hook_command(lib.ph, b'RELOAD', 0, lib._on_reload_command, ffi.NULL, ffi.NULL)
+    lib.hexchat_hook_command(lib.ph, b'PY', 0, lib._on_py_command, b'''Usage: /PY LOAD   <filename>
+           UNLOAD <filename|name>
+           RELOAD <filename|name>
+           LIST
+           EXEC <command>
+           CONSOLE
+           ABOUT''', ffi.NULL)
+
+    lib.hexchat_print(lib.ph, b'Python interface loaded')
+    autoload()
+    return 1
+
+
+@ffi.def_extern()
+def _on_plugin_deinit():
+    global local_interp
+    global hexchat
+    global hexchat_stdout
+    global plugins
+
+    plugins = set()
+    local_interp = None
+    hexchat = None
+    hexchat_stdout = None
+    sys.stdout = sys.__stdout__
+    sys.stderr = sys.__stderr__
+    pydoc.help = pydoc.Helper()
+
+    for mod in ('_hexchat', 'hexchat', 'xchat', '_hexchat_embedded'):
+        try:
+            del sys.modules[mod]
+
+        except KeyError:
+            pass
+
+    return 1

plugins/python/python2.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
@@ -37,6 +37,9 @@
       <AdditionalDependencies>"$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python2Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>"$(Python3Path)\python.exe" generate_plugin.py ..\..\src\common\hexchat-plugin.h python.py "$(IntDir)python.c"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -48,12 +51,15 @@
       <AdditionalDependencies>"$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python2Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>"$(Python3Path)\python.exe" generate_plugin.py ..\..\src\common\hexchat-plugin.h python.py "$(IntDir)python.c"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="python.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="python.c" />
+    <ClCompile Include="$(IntDir)python.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

plugins/python/python3.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
@@ -37,6 +37,9 @@
       <AdditionalDependencies>"$(Python3Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python3Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>"$(Python3Path)\python.exe" generate_plugin.py ..\..\src\common\hexchat-plugin.h python.py "$(IntDir)python.c"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -48,12 +51,20 @@
       <AdditionalDependencies>"$(Python3Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(Python3Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>"$(Python3Path)\python.exe" generate_plugin.py ..\..\src\common\hexchat-plugin.h python.py "$(IntDir)python.c"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="generate_plugin.py" />
+    <None Include="hexchat.py" />
     <None Include="python.def" />
+    <None Include="python.py" />
+    <None Include="xchat.py" />
+    <None Include="_hexchat.py" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="python.c" />
+    <ClCompile Include="$(IntDir)python.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

plugins/python/python3.vcxproj.filters

@@ -9,13 +9,26 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="python.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="$(IntDir)python.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="python.def">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="_hexchat.py">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="generate_plugin.py">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="hexchat.py">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="python.py">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="xchat.py">
+      <Filter>Source Files</Filter>
+    </None>
   </ItemGroup>
 </Project>

plugins/python/python_style_guide.md

@@ -0,0 +1,26 @@
+# HexChat Python Module Style Guide
+
+(This is a work in progress).
+
+## General rules
+
+- PEP8 as general fallback recommendations
+- Max line length: 120
+- Avoid overcomplex compound statements. i.e. dont do this: `somevar = x if x == y else z if a == b and c == b else x`
+
+## Indentation style
+
+### Multi-line functions
+
+```python
+foo(really_long_arg_1,
+    really_long_arg_2)
+```
+
+### Mutli-line lists/dicts
+
+```python
+foo = {
+    'bar': 'baz',
+}
+```

plugins/python/xchat.py

@@ -0,0 +1 @@
+from _hexchat import *

plugins/sysinfo/meson.build

@@ -13,13 +13,13 @@ sysinfo_includes = []
 sysinfo_cargs = []
 
 system = host_machine.system()
-if system == 'linux' 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'
+  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
@@ -57,4 +57,5 @@ shared_module('sysinfo', sysinfo_sources,
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'sysinfo.def',
 )

plugins/sysinfo/shared/df.c

@@ -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;
 

plugins/sysinfo/sysinfo.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

plugins/sysinfo/unix/parse.c

@@ -269,6 +269,16 @@ int xs_parse_meminfo(unsigned long long *mem_tot, unsigned long long *mem_free,
 	return 0;
 }
 
+static void strip_quotes(char *string)
+{
+	size_t len = strlen(string);
+	if (string[len - 1] == '"')
+		string[--len] = '\0';
+
+	if (string[0] == '"')
+		memmove(string, string + 1, len);
+}
+
 int xs_parse_distro(char *name)
 {
 	FILE *fp = NULL;
@@ -320,6 +330,20 @@ int xs_parse_distro(char *name)
 		else
 			g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
 	}
+	else if((fp = fopen("/etc/os-release", "r")) != NULL)
+	{
+		char name[bsize], version[bsize];
+		strcpy(name, "?");
+		strcpy(version, "?");
+		while(fgets(buffer, bsize, fp) != NULL)
+		{
+			find_match_char(buffer, "NAME=", name);
+			find_match_char(buffer, "VERSION=", version);
+		}
+		strip_quotes(name);
+		strip_quotes(version);
+		g_snprintf(buffer, bsize, "%s %s", name, version);
+	}
 	else
 		g_snprintf(buffer, bsize, "Unknown Distro");
 	if(fp != NULL)

plugins/sysinfo/unix/pci.c

@@ -142,7 +142,7 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
 		{
 			position = strstr(buffer, vendor);
 			position += 6;
-			strncpy(vendorname, position, bsize/2);
+			g_strlcpy(vendorname, position, sizeof (vendorname));
 			position = strstr(vendorname, "\n");
 			*(position) = '\0';
 			break;
@@ -154,7 +154,7 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
 		{
 			position = strstr(buffer, device);
 			position += 6;
-			strncpy(devicename, position, bsize/2);
+			g_strlcpy(devicename, position, sizeof (devicename));
 			position = strstr(devicename, " (");
 			if (position == NULL)
 				position = strstr(devicename, "\n");

plugins/upd/meson.build

@@ -5,4 +5,5 @@ shared_module('upd', 'upd.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'upd.def',
 )

plugins/upd/upd.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

plugins/winamp/meson.build

@@ -3,4 +3,5 @@ shared_module('winamp', 'winamp.c',
   install: true,
   install_dir: plugindir,
   name_prefix: '',
+  vs_module_defs: 'winamp.def',
 )

plugins/winamp/winamp.vcxproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">

po/af.po

@@ -1,22 +1,21 @@
 # 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

po/am.po

@@ -1,22 +1,21 @@
 # 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
 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
@@ -5692,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
@@ -5702,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
@@ -5754,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
@@ -5864,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
@@ -6101,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
@@ -6229,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

po/ast.po

@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Marcos <maacub@gmail.com>, 2008
+# Marcos <maacub@gmail.com>, 2008
 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: Asturian (http://www.transifex.com/hexchat/hexchat/language/"
-"ast/)\n"
-"Language: ast\n"
+"Language-Team: Asturian (http://www.transifex.com/hexchat/hexchat/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -298,9 +298,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* ¡Executar IRC como superusuariu ye de fatos! Tendríes\n"
-"  de crear una cuenta d'usuariu y usala pa coneutate.\n"
+msgstr "* ¡Executar IRC como superusuariu ye de fatos! Tendríes\n  de crear una cuenta d'usuariu y usala pa coneutate.\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
@@ -452,10 +450,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <mázcara> [<triba de vetu>], veta a toos aquellos que concasen cola "
-"mázcara de la canal actual. Si yá tán na canal esto nun los espulsa (ye "
-"necesario ser operador de la canal)"
+msgstr "BAN <mázcara> [<triba de vetu>], veta a toos aquellos que concasen cola mázcara de la canal actual. Si yá tán na canal esto nun los espulsa (ye necesario ser operador de la canal)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -463,7 +458,8 @@ msgstr "CHANOPT [-quiet] <variable> [<valor>]"
 
 #: 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
@@ -486,15 +482,13 @@ msgstr "COUNTRY <códigu|comodín>, gueta un códigu de país, ex: au = australi
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nomatu> <mensax>, unvia'l mensax CTCP al nomatu, los mensaxes comunes "
-"son VERSION y USERINFO"
+msgstr "CTCP <nomatu> <mensax>, unvia'l mensax CTCP al nomatu, los mensaxes comunes son VERSION y USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<canal>], marchaste de la canal actual y vuelves a entrar darréu"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canal>], marchaste de la canal actual y vuelves a entrar darréu"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -507,25 +501,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <nomatu> - recibe un ficheru ufríu\n"
-"DCC SEND [-maxcps=#] <nomatu> [ficheru] - unvia un ficheru a dalguien\n"
-"DCC PSEND [-maxcps=#] <nomatu> [ficheru] - unvia un ficheru a dalguien "
-"usando mou pasivu\n"
-"DCC LIST - amuesa la llista DCC\n"
-"DCC CHAT <nomatu> - ufierta'l DCC CHAT a dalguien\n"
-"DCC PCHAT <nomatu> - ufierta'l DCC CHAT a dalguien usando mou pasivu\n"
-"DCC CLOSE <triba> <nomatu> <ficheru> - exemplu:\n"
-"             /dcc close send xuancostales ficheru.tar.gz"
+msgstr "\nDCC GET <nomatu> - recibe un ficheru ufríu\nDCC SEND [-maxcps=#] <nomatu> [ficheru] - unvia un ficheru a dalguien\nDCC PSEND [-maxcps=#] <nomatu> [ficheru] - unvia un ficheru a dalguien usando mou pasivu\nDCC LIST - amuesa la llista DCC\nDCC CHAT <nomatu> - ufierta'l DCC CHAT a dalguien\nDCC PCHAT <nomatu> - ufierta'l DCC CHAT a dalguien usando mou pasivu\nDCC CLOSE <triba> <nomatu> <ficheru> - exemplu:\n             /dcc close send xuancostales ficheru.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nomatu>, quita l'estáu de semi-operador de la canal al nomatu na "
-"canal actual (necesites ser operador de la canal)"
+msgstr "DEHOP <nomatu>, quita l'estáu de semi-operador de la canal al nomatu na canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -535,17 +517,13 @@ msgstr "DELBUTTON <name>, desanicia un botón baxo la llista d'usuarios"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nomatu>, quita l'estáu d'operador al nomatu na canal actual (necesites "
-"ser operador de la canal)"
+msgstr "DEOP <nomatu>, quita l'estáu d'operador al nomatu na canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nomatu>, quita l'estáu de voz del nomatu na canal actual (necesites "
-"ser operador de la canal)"
+msgstr "DEVOICE <nomatu>, quita l'estáu de voz del nomatu na canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -567,9 +545,7 @@ msgstr "ECHO <testu>, Imprenta testu llocalmente"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <orde>, executa la orde. Si usaste la etiqueta -o entós la salida "
-"únviase a la canal actual, si non, impréntase na caxa de testu actual"
+msgstr "EXEC [-o] <orde>, executa la orde. Si usaste la etiqueta -o entós la salida únviase a la canal actual, si non, impréntase na caxa de testu actual"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -579,9 +555,7 @@ msgstr "EXECCONT, unvia al procesu la señal de siguir"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], mata un executable corriendo na sesión actual. Si s'indicase "
-"-9 el procesu mátase pola fuercia"
+msgstr "EXECKILL [-9], mata un executable corriendo na sesión actual. Si s'indicase -9 el procesu mátase pola fuercia"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -601,9 +575,7 @@ msgstr "FLUSHQ, desanicia la cola d'unvíu actual del sirvidor"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <agospiador> [<puertu>], usa un proxy a traviés d'un agospiador, el "
-"puertu predetermináu ye'l 23"
+msgstr "GATE <agospiador> [<puertu>], usa un proxy a traviés d'un agospiador, el puertu predetermináu ye'l 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -611,9 +583,7 @@ msgstr "GHOST <nomatu> [contraseña], desconeuta a un usuariu pantasma"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nomatu>, otorga estáu de semi-operador al nomatu (necesites ser "
-"operador de la canal)"
+msgstr "HOP <nomatu>, otorga estáu de semi-operador al nomatu (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -626,20 +596,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mázcara> <tribes..> <opciones..>\n"
-"    mázcara - mázcara d'anfitrión a inorar, ex: *!*@*.aol.com\n"
-"    tribes - tribes de datos a inorar, un o toos de:\n"
-"            PRIV, CHAN, NOTI, CTCP, INVI, ALL\n"
-"    opciones - NOSAVE, QUIET"
+msgstr "IGNORE <mázcara> <tribes..> <opciones..>\n    mázcara - mázcara d'anfitrión a inorar, ex: *!*@*.aol.com\n    tribes - tribes de datos a inorar, un o toos de:\n            PRIV, CHAN, NOTI, CTCP, INVI, ALL\n    opciones - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <nomatu> [<canal>], invita a dalguien a una canal, por omisión la "
-"canal actual (necesites ser operador de la canal)"
+msgstr "INVITE <nomatu> [<canal>], invita a dalguien a una canal, por omisión la canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -666,8 +629,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
@@ -677,23 +639,17 @@ msgstr "LOAD [-e] <ficheru>, carga una estensión (complementu) o script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, quita masivamente l'estáu de semi-operador na canal actual "
-"(necesites ser operador de la canal)"
+msgstr "MDEHOP, quita masivamente l'estáu de semi-operador na canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, quita masivamente l'estáu de operador na canal actual (necesites ser "
-"operador de la canal)"
+msgstr "MDEOP, quita masivamente l'estáu de operador na canal actual (necesites ser operador de la canal)"
 
 #: 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)"
-msgstr ""
-"ME <aición>, unvia l'aición a la canal actual (les aiciones tán escrites en "
-"tercer persona del inglés, como /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <aición>, unvia l'aición a la canal actual (les aiciones tán escrites en tercer persona del inglés, como /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -702,20 +658,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, espulsa masivamente a toos, sacante a ti, na canal actual (necesites "
-"ser operador de la canal)"
+msgstr "MKICK, espulsa masivamente a toos, sacante a ti, na canal actual (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, otorga masivamente l'estáu d'operador de la canal actual (necesites ser "
-"operador de la canal)"
+msgstr "MOP, otorga masivamente l'estáu d'operador de la canal actual (necesites ser operador de la canal)"
 
 #: 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
@@ -742,21 +694,16 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,…]][<nomatu>, llista la to llista de "
-"notificaciones o amiesta a dalguien a ella"
+msgstr "NOTIFY [-n network1[,network2,…]][<nomatu>, llista la to llista de notificaciones o amiesta a dalguien a ella"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nomatu>, otorga l'estáu d'operador de la canal al nomatu (necesites ser "
-"operador de la canal)"
+msgstr "OP <nomatu>, otorga l'estáu d'operador de la canal al nomatu (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<canal>] [<razón>], abandona la canal, por omisión de la canal actual"
+msgstr "PART [<canal>] [<razón>], abandona la canal, por omisión de la canal actual"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -784,23 +731,17 @@ msgstr "QUOTE <testu>, unvia'l testu en formatu planu pal sirvidor"
 
 #: 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 ""
-"RECONNECT [-ssl] [<agospiador>] [<puertu>] [<contraseña>], pue llamase sólo "
-"como /RECONNECT pa reconeutase al sirvidor actual o con /RECONNECT_ALL pa "
-"reconeutase a tolos sirvidores abiertos"
+msgstr "RECONNECT [-ssl] [<agospiador>] [<puertu>] [<contraseña>], pue llamase sólo como /RECONNECT pa reconeutase al sirvidor actual o con /RECONNECT_ALL pa reconeutase a tolos sirvidores abiertos"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<agospiador>] [<puertu>] [<contraseña>], pue llamase sólo como /"
-"RECONNECT pa reconeutase al sirvidor actual o con /RECONNECT ALL pa "
-"reconeutase a tolos sirvidores abiertos"
+msgstr "RECONNECT [<agospiador>] [<puertu>] [<contraseña>], pue llamase sólo como /RECONNECT pa reconeutase al sirvidor actual o con /RECONNECT ALL pa reconeutase a tolos sirvidores abiertos"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -822,8 +763,7 @@ msgstr "SEND <nomatu> [<ficheru>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <agospiador> <puertu> <canal>, conéutate y entra nuna canal"
+msgstr "SERVCHAN [-ssl] <agospiador> <puertu> <canal>, conéutate y entra nuna canal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -839,9 +779,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <agospiador> [<puertu>] [<contraseña>], conéutate a un sirvidor, el "
-"puertu predetermináu ye 6667"
+msgstr "SERVER <agospiador> [<puertu>] [<contraseña>], conéutate a un sirvidor, el puertu predetermináu ye 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -861,10 +799,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<asuntu>], afita l'asuntu si se provee ún, si non, amuesa l'asuntu "
-"actual"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<asuntu>], afita l'asuntu si se provee ún, si non, amuesa l'asuntu actual"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -874,16 +811,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <timeout> <ficheru1> [<ficheru2>] parpaguéu de la bandexa ente dos "
-"iconos.\n"
-"TRAY -f <ficheru>                             afitar la bandexa a un iconu "
-"fixu.\n"
-"TRAY -i <númberu>                          parpaguéu de la bandexa con un "
-"iconu internu .\n"
-"TRAY -t <testu>                           afitar l'iconu de la bandexa.\n"
-"TRAY -b <título> <testu>                  afitar la burbuxa de la bandexa."
+msgstr "\nTRAY -f <timeout> <ficheru1> [<ficheru2>] parpaguéu de la bandexa ente dos iconos.\nTRAY -f <ficheru>                             afitar la bandexa a un iconu fixu.\nTRAY -i <númberu>                          parpaguéu de la bandexa con un iconu internu .\nTRAY -t <testu>                           afitar l'iconu de la bandexa.\nTRAY -b <título> <testu>                  afitar la burbuxa de la bandexa."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -895,13 +823,12 @@ msgstr "UNIGNORE <mázcara> [QUIET]"
 
 #: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
-msgstr ""
-"UNLOAD <nome>, desactiva una estensión (complementu) o un guión (script)"
+msgstr "UNLOAD <nome>, desactiva una estensión (complementu) o un guión (script)"
 
 #: 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
@@ -910,16 +837,13 @@ msgstr "URL <url>, abre una URL nel to restolador"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nomatu1> <nomatu2> etc, resalta los nomatos na llista "
-"d'usuarios"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nomatu1> <nomatu2> etc, resalta los nomatos na llista d'usuarios"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <nomatu>, da l'estáu de voz a dalguien (necesites ser operador de la "
-"canal)"
+msgstr "VOICE <nomatu>, da l'estáu de voz a dalguien (necesites ser operador de la canal)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -928,9 +852,7 @@ msgstr "WALLCHAN <mensax>, escribe'l mensaxe en toles canales"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mensaxe>, unvia'l mensax a tolos operadores de la canal na canal "
-"actual"
+msgstr "WALLCHOP <mensaxe>, unvia'l mensax a tolos operadores de la canal na canal actual"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -946,9 +868,7 @@ msgstr "Usu: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Nun hai ayuda disponible pa esa orde.\n"
+msgstr "\nNun hai ayuda disponible pa esa orde.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1017,9 +937,7 @@ msgstr "¿Tas seguru que ye un sirvidor y puertu SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nun pudo resolvese'l nome d'agospiador %s\n"
-"¡Verifica la to configuración d'IP!\n"
+msgstr "Nun pudo resolvese'l nome d'agospiador %s\n¡Verifica la to configuración d'IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1035,9 +953,7 @@ msgstr "Intentando nel siguiente sirvidor en %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Avisu: el conxuntu de caráuteres \"%s\" desconozse. Nun s'aplicará "
-"conversión pa la rede %s."
+msgstr "Avisu: el conxuntu de caráuteres \"%s\" desconozse. Nun s'aplicará conversión pa la rede %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1196,7 +1112,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
@@ -1230,8 +1147,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
@@ -1252,7 +1169,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
@@ -1265,7 +1183,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
@@ -1282,7 +1201,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
@@ -1816,8 +1736,7 @@ msgstr ""
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
-msgstr ""
-"El nomatu de la persona a la que se-y quitó los permisos de semi-operador"
+msgstr "El nomatu de la persona a la que se-y quitó los permisos de semi-operador"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
@@ -2059,9 +1978,7 @@ msgstr "Tiempu de vetu"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nun puede lleese'l ficheru de soníu:\n"
-"%s"
+msgstr "Nun puede lleese'l ficheru de soníu:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3420,18 +3337,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Nun pudo accedese al ficheru: %s\n"
-"%s.\n"
-"Nun ye dable retomar."
+msgstr "Nun pudo accedese al ficheru: %s\n%s.\nNun ye dable retomar."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"El ficheru nel direutoriu de baxada ye más grande que'l ficheru ufríu. Nun "
-"ye dable retomar."
+msgstr "El ficheru nel direutoriu de baxada ye más grande que'l ficheru ufríu. Nun ye dable retomar."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3561,8 +3473,7 @@ msgstr ""
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Aniciar minimizáu. Nivel 0=Normal 1=Iconificáu 2=Estaya de Notificación"
+msgstr "Aniciar minimizáu. Nivel 0=Normal 1=Iconificáu 2=Estaya de Notificación"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3578,10 +3489,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"falló l'apertura de la fonte:\n"
-"\n"
-"%s"
+msgstr "falló l'apertura de la fonte:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3599,18 +3507,18 @@ msgstr "Unviar la cola de la rede: %d bytes"
 
 #: 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 "
@@ -3621,65 +3529,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"El comandu Insert in Buffer inxertará'l conteníu de Data 1 na entrada onde "
-"se calcó la secuencia de tecles na posición actual del cursor"
+msgstr "El comandu Insert in Buffer inxertará'l conteníu de Data 1 na entrada onde se calcó la secuencia de tecles na posición actual del cursor"
 
 #: 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"
-msgstr ""
-"El comandu Set Buffer afita la entrada au la secuencia de tecles s'introduxo "
-"a los conteníos de Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "El comandu Set Buffer afita la entrada au la secuencia de tecles s'introduxo a los conteníos de Data 1"
 
 #: 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"
-msgstr ""
-"El comandu Last Command afita la entrada pa caltener el caberu comandu "
-"ingresáu al igual que calcar la tecla p'arriba na llinia de comandos"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "El comandu Last Command afita la entrada pa caltener el caberu comandu ingresáu al igual que calcar la tecla p'arriba na llinia de comandos"
 
 #: 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"
-msgstr ""
-"El comandu Next Command afita la entrada pa que caltenga'l siguiente comandu "
-"ingresáu al igual qu'al calcar la tecla abaxo na llinia de comandos"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "El comandu Next Command afita la entrada pa que caltenga'l siguiente comandu ingresáu al igual qu'al calcar la tecla abaxo na llinia de comandos"
 
 #: 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"
-msgstr ""
-"Esti comandu camuda'l testu na entrada pa completar un nomatu incompletu o "
-"un comandu. Si Data 1 ta afitáu entós al calcar dos vegaes la tecla TAB "
-"sobro una cadena seleicionará'l caberu nomatu, non el siguiente."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Esti comandu camuda'l testu na entrada pa completar un nomatu incompletu o un comandu. Si Data 1 ta afitáu entós al calcar dos vegaes la tecla TAB sobro una cadena seleicionará'l caberu nomatu, non el siguiente."
 
 #: 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"
-msgstr ""
-"Esti comandu desplaza p'arriba y p'abaxo la llista de nomatos. Si Data 1 ta "
-"afitáu a cualesquiera entós desplazaráse p'arriba, sinon desplazaráse p'abaxo"
+"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 "Esti comandu desplaza p'arriba y p'abaxo la llista de nomatos. Si Data 1 ta afitáu a cualesquiera entós desplazaráse p'arriba, sinon desplazaráse p'abaxo"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Esti comandu comprueba la cabera pallabra introducida na entrada escontra la "
-"llista de reemplazos y trócala si alcuentra una coincidencia"
+msgstr "Esti comandu comprueba la cabera pallabra introducida na entrada escontra la llista de reemplazos y trócala si alcuentra una coincidencia"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3699,13 +3592,11 @@ msgstr "Esti comandu mueve la familia actual de llingüetes a mandrecha"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Colocar la llinia d'entrada nel hestorial pero ensin unviala al sirvidor"
+msgstr "Colocar la llinia d'entrada nel hestorial pero ensin unviala al sirvidor"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Ocurrió un fallu cargando la configuración de les combinaciones de tecles"
+msgstr "Ocurrió un fallu cargando la configuración de les combinaciones de tecles"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3856,9 +3747,7 @@ msgstr "Nun hai definíu dengún tema"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Esti sirvidor entá tien %d canales o diálogos asociaos con elli. ¿Quies "
-"zarralos toos?"
+msgstr "Esti sirvidor entá tien %d canales o diálogos asociaos con elli. ¿Quies zarralos toos?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4231,18 +4120,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Rempuestes CTCP - Códigos especiales:\n"
-"\n"
-"%d  =  datos (el ctcp completu)\n"
-"%m  =  información de la máquina\n"
-"%s  =  nomatu de quien unvió'l ctcp\n"
-"%t  =  hora/data\n"
-"%2  =  pallabra 2\n"
-"%3  =  pallabra 3\n"
-"&2  =  pallabra 2 fasta'l fin de llinia\n"
-"&3  =  pallabra 3 fasta'l fin de llinia\n"
-"\n"
+msgstr "Rempuestes CTCP - Códigos especiales:\n\n%d  =  datos (el ctcp completu)\n%m  =  información de la máquina\n%s  =  nomatu de quien unvió'l ctcp\n%t  =  hora/data\n%2  =  pallabra 2\n%3  =  pallabra 3\n&2  =  pallabra 2 fasta'l fin de llinia\n&3  =  pallabra 3 fasta'l fin de llinia\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5715,9 +5593,7 @@ msgstr "Nomatos que siempre van rescamplase:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Dixebrar multiples pallabres con comes.\n"
-"Comodines aceutaos."
+msgstr "Dixebrar multiples pallabres con comes.\nComodines aceutaos."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5823,8 +5699,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
@@ -5833,8 +5709,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
@@ -5885,7 +5761,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
@@ -5995,11 +5872,9 @@ msgstr "Obtener la mio IP del sirvidor IRC"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Entruga la to direición real al sirvidor IRC. ¡Úsalo si tienes una direición "
-"de la triba 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Entruga la to direición real al sirvidor IRC. ¡Úsalo si tienes una direición de la triba 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6231,14 +6106,10 @@ msgstr "Categoríes"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"¡Nun pues poner l'árbol arriba o abaxo!\n"
-"Por favor, camuda la disposición de les <b>Llingüetes</> nel menú <b>Ver</b> "
-"primero."
+msgstr "¡Nun pues poner l'árbol arriba o abaxo!\nPor favor, camuda la disposición de les <b>Llingüetes</> nel menú <b>Ver</b> primero."
 
 #: 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
@@ -6251,11 +6122,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*ALVERTENCIA*\n"
-"Aceutar automáticamente DCC haza'l to direutoriu d'aniciu\n"
-"pue ser peligroso y ye esplotable. Por exemplu: Dalguien \n"
-"pue unviate un ficheru .bash_profile"
+msgstr "*ALVERTENCIA*\nAceutar automáticamente DCC haza'l to direutoriu d'aniciu\npue ser peligroso y ye esplotable. Por exemplu: Dalguien \npue unviate un ficheru .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6369,8 +6236,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
@@ -6386,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/az.po

@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Metin Amiroff <metin@karegen.com>, 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: Azerbaijani (http://www.transifex.com/hexchat/hexchat/"
-"language/az/)\n"
-"Language: az\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/hexchat/hexchat/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: az\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 ""
-"IRC-ni Ali İstifadəçi olaraq işlətmək dəlilikdir.\n"
-"  Xahiş edirik istifadəçi hesabı yaradın.\n"
+msgstr "IRC-ni Ali İstifadəçi olaraq işlətmək dəlilikdir.\n  Xahiş edirik istifadəçi hesabı yaradın.\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
@@ -867,9 +867,7 @@ msgstr "İstifadə Qaydası: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Bu əmrlə əlaqəli yardım mövcud deyil.\n"
+msgstr "\nBu əmrlə əlaqəli yardım mövcud deyil.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -938,9 +936,7 @@ msgstr ""
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"%s qovşaq adı tapıla bilmir\n"
-"IP qurğularınızı yoxlayın!\n"
+msgstr "%s qovşaq adı tapıla bilmir\nIP qurğularınızı yoxlayın!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1115,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
@@ -1149,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
@@ -1171,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
@@ -1184,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
@@ -1201,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
@@ -3336,17 +3336,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Fayla yetişilə bilmir: %s\n"
-"%s.\n"
-"Davam etdirmə mümkün olmayacaqdır."
+msgstr "Fayla yetişilə bilmir: %s\n%s.\nDavam etdirmə mümkün olmayacaqdır."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Endirilən fayl təklif olunandan daha böyükdür. Davam etdirmə mümkün deyil."
+msgstr "Endirilən fayl təklif olunandan daha böyükdür. Davam etdirmə mümkün deyil."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3492,10 +3488,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Yazə növü açıla bilmədi:\n"
-"\n"
-"%s"
+msgstr "Yazə növü açıla bilmədi:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3513,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 "
@@ -3539,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
@@ -5404,9 +5397,7 @@ msgstr "Vasitələrin açılma şəkli:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"DCC Açılması, Rədd Etmə, Bildirişlər səkmələrdəmi yoxsa pəncərələrdəmi "
-"açılsın?"
+msgstr "DCC Açılması, Rədd Etmə, Bildirişlər səkmələrdəmi yoxsa pəncərələrdəmi açılsın?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5707,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
@@ -5717,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
@@ -5769,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
@@ -5879,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
@@ -6116,14 +6108,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Bə'zi seçimlərin tətbiq edilməsi üçün proqramı yenidən başlatmalısınız."
+msgstr "Bə'zi seçimlərin tətbiq edilməsi üçün proqramı yenidən başlatmalısınız."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6245,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
@@ -6262,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/be.po

@@ -1,24 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 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: Belarusian (http://www.transifex.com/hexchat/hexchat/language/"
-"be/)\n"
-"Language: be\n"
+"Language-Team: Belarusian (http://www.transifex.com/hexchat/hexchat/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -299,10 +296,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Выконваць IRC з-пад root'a - глупства.\n"
-"  Вы павінны стварыць карыстальніцкі\n"
-"  рахунак у сістэме і ўжываць яго\n"
+msgstr "* Выконваць IRC з-пад root'a - глупства.\n  Вы павінны стварыць карыстальніцкі\n  рахунак у сістэме і ўжываць яго\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
@@ -454,10 +448,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <маска> [<тыпзабароны>], забараняе доступ да канала кожнаму, хто "
-"адпавядае маске. Калі гэткія карыстальнікі ўжо на канале, яны не будуць "
-"выпхнутыя. (Трэба правы аператара)"
+msgstr "BAN <маска> [<тыпзабароны>], забараняе доступ да канала кожнаму, хто адпавядае маске. Калі гэткія карыстальнікі ўжо на канале, яны не будуць выпхнутыя. (Трэба правы аператара)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -465,7 +456,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
@@ -488,13 +480,12 @@ msgstr "COUNTRY [-s] <код|маска>, шукае код краіны, нап
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <мянушка> <паведамленне>, дасылае мянушцы CTCP-паведамленне, напрыклад, "
-"VERSION ці USERINFO"
+msgstr "CTCP <мянушка> <паведамленне>, дасылае мянушцы CTCP-паведамленне, напрыклад, VERSION ці USERINFO"
 
 #: 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
@@ -508,25 +499,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <мянушка>                      - дазволіць прапанаваны файл\n"
-"DCC SEND [-maxcps=#] <мянушка> [файл]  - даслаць файл камусьці\n"
-"DCC PSEND [-maxcps=#] <мянушка> [файл] - даслаць файл у пасіўным рэжыме\n"
-"DCC LIST                               - паказаць спіс DCC\n"
-"DCC CHAT <мянушка>                     - прапанаваць DCC CHAT камусьці\n"
-"DCC PCHAT <мянушка>                    - прапанаваць DCC CHAT у пасіўным "
-"рэжыме\n"
-"DCC CLOSE <тып> <мянушка> <файл>        напрыклад:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <мянушка>                      - дазволіць прапанаваны файл\nDCC SEND [-maxcps=#] <мянушка> [файл]  - даслаць файл камусьці\nDCC PSEND [-maxcps=#] <мянушка> [файл] - даслаць файл у пасіўным рэжыме\nDCC LIST                               - паказаць спіс DCC\nDCC CHAT <мянушка>                     - прапанаваць DCC CHAT камусьці\nDCC PCHAT <мянушка>                    - прапанаваць DCC CHAT у пасіўным рэжыме\nDCC CLOSE <тып> <мянушка> <файл>        напрыклад:\n         /dcc close send johnsmith file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <мянушка>, выдаляе статус паўаператара ў мянушкі на бягучым канале "
-"(патрэбен статус аператара)"
+msgstr "DEHOP <мянушка>, выдаляе статус паўаператара ў мянушкі на бягучым канале (патрэбен статус аператара)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -536,17 +515,13 @@ msgstr "DELBUTTON <імя>, выдаляе кнопку пад спісам ка
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <мянушка>, выдаляе статус аператара ў мянушкі на бягучым канале "
-"(патрэбен статус аператара)"
+msgstr "DEOP <мянушка>, выдаляе статус аператара ў мянушкі на бягучым канале (патрэбен статус аператара)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <мянушка>, выдаляе права голасу ў мянушкі на бягучым канале "
-"(патрэбен статус аператара)"
+msgstr "DEVOICE <мянушка>, выдаляе права голасу ў мянушкі на бягучым канале (патрэбен статус аператара)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -568,9 +543,7 @@ msgstr "ECHO <тэкст>, Выводзіць тэкст на лакальнай
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <каманда>, запускае каманду. Калі ўжыты параметр -o, вывад будзе "
-"дасланы ў бягучы канал, інакш у бягучае тэкставае акно"
+msgstr "EXEC [-o] <каманда>, запускае каманду. Калі ўжыты параметр -o, вывад будзе дасланы ў бягучы канал, інакш у бягучае тэкставае акно"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -580,9 +553,7 @@ msgstr "EXECCONT, дасылае працэсу сігнал SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], забівае выконваючуюся каманду ў бягучай сесіі. Калі адзначаны "
-"флаг -9, працэсу дасылается сігнал SIGKILL"
+msgstr "EXECKILL [-9], забівае выконваючуюся каманду ў бягучай сесіі. Калі адзначаны флаг -9, працэсу дасылается сігнал SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -610,9 +581,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <мянушка>, даць правы паў-аператара карыстальніку (патрэбна мець правы "
-"аператара)"
+msgstr "HOP <мянушка>, даць правы паў-аператара карыстальніку (патрэбна мець правы аператара)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -625,20 +594,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <маска> <тыпы..> <уласцівасці..>\n"
-"    маска - маска для ігнаравання, напрыклад: *!*@*.aol.com\n"
-"    тыпы - тыпы дадзеных для ігнаравання:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    уласцівасці - NOSAVE, QUIET"
+msgstr "IGNORE <маска> <тыпы..> <уласцівасці..>\n    маска - маска для ігнаравання, напрыклад: *!*@*.aol.com\n    тыпы - тыпы дадзеных для ігнаравання:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    уласцівасці - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <мянушка> [<канал>], запрасіць кагосьці на канал, калі назва канала "
-"не пазначана - на бягучы канал (патрэбен статус аператара)"
+msgstr "INVITE <мянушка> [<канал>], запрасіць кагосьці на канал, калі назва канала не пазначана - на бягучы канал (патрэбен статус аператара)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -665,8 +627,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
@@ -676,23 +637,17 @@ msgstr "LOAD [-e] <файл>, загрузіць плагін ці скрыпт"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Адабраць паў-аператара ва ўсіх карыстальнікаў бягучага канала "
-"(патрэбен статус аператара)"
+msgstr "MDEHOP, Адабраць паў-аператара ва ўсіх карыстальнікаў бягучага канала (патрэбен статус аператара)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Адабраць аператара ва ўсіх карыстальнікаў бягучага канала (патрабуе "
-"статус аператара)"
+msgstr "MDEOP, Адабраць аператара ва ўсіх карыстальнікаў бягучага канала (патрабуе статус аператара)"
 
 #: 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)"
-msgstr ""
-"ME <дзеянне>, дасылае дзеянне на бягучы канал (дзеянні пішуцца ад трэцяй "
-"асобы, напрыклад, /me скача)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <дзеянне>, дасылае дзеянне на бягучы канал (дзеянні пішуцца ад трэцяй асобы, напрыклад, /me скача)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -701,20 +656,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Выпхнуць усіх карыстальнікаў з бягучага канала, акрамя вас (патрэбен "
-"статус аператара)"
+msgstr "MKICK, Выпхнуць усіх карыстальнікаў з бягучага канала, акрамя вас (патрэбен статус аператара)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Надаць усім карыстальнікам бягучага канала статус аператара (патрэбен "
-"статус аператара)"
+msgstr "MOP, Надаць усім карыстальнікам бягучага канала статус аператара (патрэбен статус аператара)"
 
 #: 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
@@ -741,21 +692,16 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n сеціва1[,сеціва2]] [<мянушка>], пералічвае ваш спіс абвяшчэнняў "
-"ці дадае некага ў яго"
+msgstr "NOTIFY [-n сеціва1[,сеціва2]] [<мянушка>], пералічвае ваш спіс абвяшчэнняў ці дадае некага ў яго"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nick>, дае мянушцы статус аператара канала (патрэбен статус аператара)"
+msgstr "OP <nick>, дае мянушцы статус аператара канала (патрэбен статус аператара)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<канал>] [<прычына>], выйсці з канала, калі канал не вызначаны, то з "
-"бягучага"
+msgstr "PART [<канал>] [<прычына>], выйсці з канала, калі канал не вызначаны, то з бягучага"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -783,23 +729,17 @@ msgstr "QUOTE <тэкст>, даслаць тэкст у неапрацован
 
 #: 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 ""
-"RECONNECT [-ssl] [<вузел>] [<порт>] [<пароль>], Можа быць выклікана як /"
-"RECONNECT для перадалучэння да бягучага сервера ці /RECONNECT ALL для "
-"перадалучэння да ўсіх адкрытых сервераў"
+msgstr "RECONNECT [-ssl] [<вузел>] [<порт>] [<пароль>], Можа быць выклікана як /RECONNECT для перадалучэння да бягучага сервера ці /RECONNECT ALL для перадалучэння да ўсіх адкрытых сервераў"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [-ssl] [<вузел>] [<порт>] [<пароль>], Можа быць выклікана як /"
-"RECONNECT для перадалучэння да бягучага сервера ці /RECONNECT ALL для "
-"перадалучэння да ўсіх адкрытых сервераў"
+msgstr "RECONNECT [-ssl] [<вузел>] [<порт>] [<пароль>], Можа быць выклікана як /RECONNECT для перадалучэння да бягучага сервера ці /RECONNECT ALL для перадалучэння да ўсіх адкрытых сервераў"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -837,9 +777,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <вузел> [<порт>] [<пароль>], злучыцца з серверам, прадвызначаны порт "
-"6667"
+msgstr "SERVER <вузел> [<порт>] [<пароль>], злучыцца з серверам, прадвызначаны порт 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -859,10 +797,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<тэма>], усталяваць тэму, калі яна вызначана, інакш вывесці бягучую "
-"тэму"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<тэма>], усталяваць тэму, калі яна вызначана, інакш вывесці бягучую тэму"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -872,14 +809,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <timeout> <file1> [<file2>] Мірганне ў сподку між двума значкамі.\n"
-"TRAY -f <filename>                  Замацаваць значку ў сподкавым элеменце.\n"
-"TRAY -i <number>                    Мірганне ў сподку ўнутранай значкай.\n"
-"TRAY -t <text>                      Усталяваць тэкст сподкавага элемента.\n"
-"TRAY -b <title> <text>              Усталяваць выплыўны тэкст сподкавага "
-"элемента."
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] Мірганне ў сподку між двума значкамі.\nTRAY -f <filename>                  Замацаваць значку ў сподкавым элеменце.\nTRAY -i <number>                    Мірганне ў сподку ўнутранай значкай.\nTRAY -t <text>                      Усталяваць тэкст сподкавага элемента.\nTRAY -b <title> <text>              Усталяваць выплыўны тэкст сподкавага элемента."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -895,8 +825,8 @@ msgstr "UNLOAD <імя>, выгрузіць плагін ці скрыпт"
 
 #: 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
@@ -905,15 +835,13 @@ msgstr "URL <url>, адкрыць URL у вашым браўзеры"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <мянушка1> <мянушка2> і г.д., падсвечваць вызначаную(ыя) "
-"мянушку(і) ў спісе карыстальнікаў"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <мянушка1> <мянушка2> і г.д., падсвечваць вызначаную(ыя) мянушку(і) ў спісе карыстальнікаў"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <мянушка>, даць голас камусьці (патрэбен статус аператара канала)"
+msgstr "VOICE <мянушка>, даць голас камусьці (патрэбен статус аператара канала)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -922,8 +850,7 @@ msgstr "WALLCHAN <паведамленне>, напісаць паведамле
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <паведамленне>, даслаць паведамленне ўсім аператарам бягучага канала"
+msgstr "WALLCHOP <паведамленне>, даслаць паведамленне ўсім аператарам бягучага канала"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -939,9 +866,7 @@ msgstr "Карыстанне: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Ніякай даведкі не існуе для гэтай каманды.\n"
+msgstr "\nНіякай даведкі не існуе для гэтай каманды.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1010,9 +935,7 @@ msgstr "Ці вы ўпэўнены, што гэта сумяшчальны з SS
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Немагчыма знайсці імя %s\n"
-"Праверце вашыя наладкі IP!\n"
+msgstr "Немагчыма знайсці імя %s\nПраверце вашыя наладкі IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1028,9 +951,7 @@ msgstr "Спрабую іншы сервер %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Увага: \"%s\" знаказбор невядомы. Ніякага пераўтварэння знакаў для сеціва %s "
-"не будзе."
+msgstr "Увага: \"%s\" знаказбор невядомы. Ніякага пераўтварэння знакаў для сеціва %s не будзе."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1189,7 +1110,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
@@ -1223,8 +1145,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
@@ -1245,7 +1167,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
@@ -1258,7 +1181,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
@@ -1275,7 +1199,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
@@ -2051,9 +1976,7 @@ msgstr "Час забароны"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Немагчыма прачытаць гукавы файл:\n"
-"%s"
+msgstr "Немагчыма прачытаць гукавы файл:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3291,9 +3214,7 @@ msgstr "Дата"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Вы можаце адкрыць акно са спісам забаронаў толькі пры адкрытай укладцы "
-"канала."
+msgstr "Вы можаце адкрыць акно са спісам забаронаў толькі пры адкрытай укладцы канала."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3414,17 +3335,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Немагчыма атрымаць доступ да файла: %s\n"
-"%s.\n"
-"Працяг немагчымы."
+msgstr "Немагчыма атрымаць доступ да файла: %s\n%s.\nПрацяг немагчымы."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Файл у тэчцы спампоўванняў большы за прапанаваны файл. Працяг немагчымы."
+msgstr "Файл у тэчцы спампоўванняў большы за прапанаваны файл. Працяг немагчымы."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3570,10 +3487,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Памылка адкрыцця шрыфту:\n"
-"\n"
-"%s"
+msgstr "Памылка адкрыцця шрыфту:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3591,18 +3505,18 @@ msgstr "Сеціўная чарга дасылкі: %d байтаў"
 
 #: 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 "
@@ -3613,65 +3527,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Каманда Ўставіць у буфер уставіць змест Данніх 1 у поле, дзе была націснута "
-"камбінацыя клавішаў, у бягучую пазіцыю курсора"
+msgstr "Каманда Ўставіць у буфер уставіць змест Данніх 1 у поле, дзе была націснута камбінацыя клавішаў, у бягучую пазіцыю курсора"
 
 #: 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"
-msgstr ""
-"Каманда Усталяваць Буфер усталёўвае значэнне поля поля, дзе была націснута "
-"камбінацыя клавішаў, у значэнне Данніх 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Каманда Усталяваць Буфер усталёўвае значэнне поля поля, дзе была націснута камбінацыя клавішаў, у значэнне Данніх 1"
 
 #: 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"
-msgstr ""
-"Каманда Апошняя Каманда вяртае ў поле апошнюю каманду, гэтаксама ж, як у "
-"каманднай абалонцы націсканне кнопкі Ўверх"
+"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"
-msgstr ""
-"Каманда Наступная Каманда вяртае ў поле наступную каманду, гэтаксама ж, як у "
-"каманднай абалонцы націсканне кнопкі Ўніз"
+"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"
-msgstr ""
-"Гэта каманда змяняе тэкст у полі для дапаўнення нескончанай мянушкі ці "
-"каманы. Калі Данні 1 усталяваныя, двайны націск табуляцыі выбярэ не "
-"наступную, а апошнюю мянушку"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Гэта каманда змяняе тэкст у полі для дапаўнення нескончанай мянушкі ці каманы. Калі Данні 1 усталяваныя, двайны націск табуляцыі выбярэ не наступную, а апошнюю мянушку"
 
 #: 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"
-msgstr ""
-"Гэта каманда пракручвае ўніз і ўверх спіс карыстальнікаў. Калі Данні 1 "
-"усталяваны, будзе пракрутка ўверх, інакш - уніз"
+"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 "Гэта каманда пракручвае ўніз і ўверх спіс карыстальнікаў. Калі Данні 1 усталяваны, будзе пракрутка ўверх, інакш - уніз"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Гэта каманда правярае апошняе ўведзенае слова ў спіс заменаў і замяняе ў "
-"выпадку знаходжання адпаведнасці"
+msgstr "Гэта каманда правярае апошняе ўведзенае слова ў спіс заменаў і замяняе ў выпадку знаходжання адпаведнасці"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -4219,19 +4118,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Адказы CTCP - Спецыянальныя кады::\n"
-"\n"
-"%d  =  данні (ctcp цалкам)\n"
-"%e  =  назва бягучага сеціва\n"
-"%m  =  інфармацыя пра машыну\n"
-"%s  =  мянушка таго, хто даслаў ctcp\n"
-"%t  =  час/дата\n"
-"%2  =  слова 2\n"
-"%3  =  слова 3\n"
-"&2  =  слова 2 ад канцу радка\n"
-"&3  =  слова 3 ад канцу радка\n"
-"\n"
+msgstr "Адказы CTCP - Спецыянальныя кады::\n\n%d  =  данні (ctcp цалкам)\n%e  =  назва бягучага сеціва\n%m  =  інфармацыя пра машыну\n%s  =  мянушка таго, хто даслаў ctcp\n%t  =  час/дата\n%2  =  слова 2\n%3  =  слова 3\n&2  =  слова 2 ад канцу радка\n&3  =  слова 3 ад канцу радка\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5810,8 +5697,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
@@ -5820,8 +5707,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
@@ -5872,7 +5759,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
@@ -5982,11 +5870,9 @@ msgstr "Атрымаць мой адрас ад IRC-сервера"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Запытаць IRC-сервер аб вашым сапраўдным адрасе. Выкарыстоувайце, калі вы "
-"маеце адрас кшталту 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Запытаць IRC-сервер аб вашым сапраўдным адрасе. Выкарыстоувайце, калі вы маеце адрас кшталту 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6218,13 +6104,10 @@ msgstr "Катэгорыі"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"Вы не можаце размясціць дрэва ўверсе ці ўнізе!\n"
-"Спачатку змяніце Асяроддзе на <b>Ўкладкі</b> ў меню <b>Прагляд</b>."
+msgstr "Вы не можаце размясціць дрэва ўверсе ці ўнізе!\nСпачатку змяніце Асяроддзе на <b>Ўкладкі</b> ў меню <b>Прагляд</b>."
 
 #: 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
@@ -6237,11 +6120,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*УВАГА*\n"
-"Аўтапрыманне DCC у вашу хатнюю тэчку ёсць\n"
-"небяспечным і можа быць выкарыставана, напрыклад,\n"
-"нехта можа даслаць вам .bash_profile"
+msgstr "*УВАГА*\nАўтапрыманне DCC у вашу хатнюю тэчку ёсць\nнебяспечным і можа быць выкарыставана, напрыклад,\nнехта можа даслаць вам .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6355,8 +6234,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
@@ -6372,9 +6251,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/bg.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # n0kS Phr33d0m <shibam@v-gz.cz.cc>, 2012
 # Rostislav Raykov <zbrox@i-space.org>, 2005
@@ -10,15 +10,14 @@ 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: Bulgarian (http://www.transifex.com/hexchat/hexchat/language/"
-"bg/)\n"
-"Language: bg\n"
+"Language-Team: Bulgarian (http://www.transifex.com/hexchat/hexchat/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -300,9 +299,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Да влизате в IRC като root е ГЛУПАВО! Направете си\n"
-"  потребител и използвайте него.\n"
+msgstr "* Да влизате в IRC като root е ГЛУПАВО! Направете си\n  потребител и използвайте него.\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
@@ -439,8 +436,7 @@ msgstr ""
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <команда>, изпраща команда към всички сървъри, към които сте свързан"
+msgstr "ALLSERV <команда>, изпраща команда към всички сървъри, към които сте свързан"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -463,7 +459,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
@@ -490,7 +487,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
@@ -514,8 +512,7 @@ msgstr ""
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
-msgstr ""
-"DELBUTTON <име>, изтрива бутон от тези, които са под списъка с потребителите"
+msgstr "DELBUTTON <име>, изтрива бутон от тези, които са под списъка с потребителите"
 
 #: src/common/outbound.c:3972
 msgid ""
@@ -633,8 +630,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
@@ -652,11 +648,9 @@ 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)"
-msgstr ""
-"ME <действие>, изпраща действието към текущата стая (действията трябва да са "
-"в трето лице. пример: /me скача)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <действие>, изпраща действието към текущата стая (действията трябва да са в трето лице. пример: /me скача)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -669,14 +663,12 @@ msgstr ""
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, масово дава операторски статус на всички потребители в дадената стая "
-"(изисква същия статус)"
+msgstr "MOP, масово дава операторски статус на всички потребители в дадената стая (изисква същия статус)"
 
 #: 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
@@ -740,8 +732,8 @@ msgstr "QUOTE <текст>, праща текста в чиста форма к
 
 #: 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 ""
 
@@ -788,9 +780,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <хост> [<порт>] [<парола>], свързва се със сървър, стандартния порт е "
-"6667"
+msgstr "SERVER <хост> [<порт>] [<парола>], свързва се със сървър, стандартния порт е 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -810,10 +800,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<тема>], настройва темата ако е дадената такава, ако не-показва "
-"текущата"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<тема>], настройва темата ако е дадената такава, ако не-показва текущата"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -839,8 +828,8 @@ msgstr "UNLOAD <име>, отзарежда плъгин или скрипт"
 
 #: 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
@@ -849,14 +838,13 @@ msgstr "URL <url>, отваря URL-то в браузъра ви"
 
 #: 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
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <прякор>, дава статуса \"voice\" на някой (изисква операторски статус "
-"в стаята)"
+msgstr "VOICE <прякор>, дава статуса \"voice\" на някой (изисква операторски статус в стаята)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -865,8 +853,7 @@ msgstr "WALLCHAN <съобщение>, изпраща съобщението д
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <съобщение>, изпраща съобщение до всички оператори в текущата стая"
+msgstr "WALLCHOP <съобщение>, изпраща съобщение до всички оператори в текущата стая"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -882,9 +869,7 @@ msgstr "Употреба: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Няма налична помощ за тази команда.\n"
+msgstr "\nНяма налична помощ за тази команда.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -953,9 +938,7 @@ msgstr "Сигурни ли сте, че това е SSL сървър и пра
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Не може да се разбере името на хоста %s\n"
-"Проверете вашите IP настройки!\n"
+msgstr "Не може да се разбере името на хоста %s\nПроверете вашите IP настройки!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -971,9 +954,7 @@ msgstr "Минава се към следващия сървър в %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Внимание: Кодовата таблица \"%s\" е непозната. Няма да има преобразуване за "
-"мрежата %s."
+msgstr "Внимание: Кодовата таблица \"%s\" е непозната. Няма да има преобразуване за мрежата %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1132,7 +1113,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
@@ -1166,8 +1148,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
@@ -1188,7 +1170,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
@@ -1201,7 +1184,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
@@ -1218,7 +1202,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
@@ -1994,9 +1979,7 @@ msgstr "Време на забраната"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Звуковият файл не може да бъде прочетен:\n"
-"%s"
+msgstr "Звуковият файл не може да бъде прочетен:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3355,18 +3338,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Няма достъп до файл: %s\n"
-"%s.\n"
-"Продължаването не възможно."
+msgstr "Няма достъп до файл: %s\n%s.\nПродължаването не възможно."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Файлът в папката за сваляне и по-голям от предлагания файл. Продължаването "
-"не е възможно."
+msgstr "Файлът в папката за сваляне и по-голям от предлагания файл. Продължаването не е възможно."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3512,10 +3490,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Неуспех при отваряне на шрифта:\n"
-"\n"
-"%s"
+msgstr "Неуспех при отваряне на шрифта:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3533,18 +3508,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 "
@@ -3559,39 +3534,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
@@ -3618,9 +3593,7 @@ msgstr "Тази команда премества избраната група
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Внасяне на реда написан в полето за писане в историята, но без да се изпраща "
-"на сървъра"
+msgstr "Внасяне на реда написан в полето за писане в историята, но без да се изпраща на сървъра"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
@@ -5426,9 +5399,7 @@ msgstr "Отваряне на инструментите в:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"Отваряне на DCC, Игнориране, Списък с приятелчета и т.н. в отделни табове "
-"или прозорци?"
+msgstr "Отваряне на DCC, Игнориране, Списък с приятелчета и т.н. в отделни табове или прозорци?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5729,8 +5700,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
@@ -5739,8 +5710,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
@@ -5791,7 +5762,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
@@ -5821,9 +5793,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:594
 msgid "Insert timestamps in logs"
-msgstr ""
-"Вмъква времето на репликите\n"
-"в записаните разговори(логовете)"
+msgstr "Вмъква времето на репликите\nв записаните разговори(логовете)"
 
 #: src/fe-gtk/setup.c:595
 msgid "Log timestamp format:"
@@ -5903,11 +5873,9 @@ msgstr "Взимане на собствения адрес от IRC сървъ
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Пита IRC сървъра за истинския ви адрес. Използвайте това ако имате адрес от "
-"вида 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Пита IRC сървъра за истинския ви адрес. Използвайте това ако имате адрес от вида 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6142,15 +6110,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Някои от променените настройки изискват рестартиране на програмата преди да "
-"влезнат в действие."
+msgstr "Някои от променените настройки изискват рестартиране на програмата преди да влезнат в действие."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6158,11 +6123,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*ВНИМАНИЕ*\n"
-"Автоматично приемане на DCC във вашата домашна папка\n"
-"може да бъде опасно и използваемо от други. Пример:\n"
-"Някой може да ви прати .bash_profile"
+msgstr "*ВНИМАНИЕ*\nАвтоматично приемане на DCC във вашата домашна папка\nможе да бъде опасно и използваемо от други. Пример:\nНякой може да ви прати .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6276,8 +6237,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
@@ -6293,9 +6254,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/el.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2015,2017
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2015
@@ -10,20 +10,19 @@
 # txapollo243, 2013
 # Αλέξανδρος Καπετάνιος <alexandros@gnugr.org>, 2017
 # Γιάννης Ανθυμίδης, 2013,2015
-# Γιάννης Ανθυμίδης, 2013,2015
+# Yannis Anthymidis, 2013,2015
 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-04 23:28+0000\n"
 "Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Greek (http://www.transifex.com/hexchat/hexchat/language/"
-"el/)\n"
-"Language: el\n"
+"Language-Team: Greek (http://www.transifex.com/hexchat/hexchat/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -48,10 +47,7 @@ msgstr ""
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr ""
-"Το HexChat υποστηρίζει λειτουργίες όπως: DCC, SASL, διαμεσολαβητές, "
-"ορθογραφική διόρθωση, ειδοποιήσεις, logging, προσαρμοσμένα θέματα, και "
-"Python/Perl scripts."
+msgstr "Το HexChat υποστηρίζει λειτουργίες όπως: DCC, SASL, διαμεσολαβητές, ορθογραφική διόρθωση, ειδοποιήσεις, logging, προσαρμοσμένα θέματα, και Python/Perl scripts."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -302,18 +298,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Δεν έχετε πρόσβαση εγγραφής στο%s. Δεν μπορεί τίποτα να σωθεί από αυτή τη "
-"συνεδρία."
+msgstr "Δεν έχετε πρόσβαση εγγραφής στο%s. Δεν μπορεί τίποτα να σωθεί από αυτή τη συνεδρία."
 
 #: src/common/hexchat.c:1134
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Το να χρησιμοποιείτε το IRC ως root είναι ηλίθιο!\n"
-"  Πρέπει να δημιουργήσετε έναν λογαριασμό απλού χρήστη\n"
-"  και να χρησιμοποιείτε αυτόν.\n"
+msgstr "* Το να χρησιμοποιείτε το IRC ως root είναι ηλίθιο!\n  Πρέπει να δημιουργήσετε έναν λογαριασμό απλού χρήστη\n  και να χρησιμοποιείτε αυτόν.\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
@@ -410,8 +401,7 @@ msgstr "Εντολές ορισμένες από πρόσθετα:"
 
 #: src/common/outbound.c:2303
 msgid "Type /HELP <command> for more information, or /HELP -l"
-msgstr ""
-"Πληκτρολογείστε /HELP <εντολή> για περισσότερες πληροφορίες, ή /HELP -l"
+msgstr "Πληκτρολογείστε /HELP <εντολή> για περισσότερες πληροφορίες, ή /HELP -l"
 
 #: src/common/outbound.c:2390
 #, c-format
@@ -439,9 +429,7 @@ msgstr "ADDBUTTON <όνομα> <ενέργεια>, προσθέτει ένα κ
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ΠΡΟΣΘΗΚΗΔΙΑΚΟΜΙΣΤΗ <NewNetwork> <newserver/6667>, πρόσθεση ενός νέου δικτύου "
-"με ένα νέο διακομιστή στη λίστα δικτύου"
+msgstr "ΠΡΟΣΘΗΚΗΔΙΑΚΟΜΙΣΤΗ <NewNetwork> <newserver/6667>, πρόσθεση ενός νέου δικτύου με ένα νέο διακομιστή στη λίστα δικτύου"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -449,9 +437,7 @@ msgstr "ALLCHAN <εντολή>, στέλνει μια εντολή σε όλα
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <cmd>, στέλνει μια εντολή σε όλα τα κανάλια στον τρέχοντα "
-"εξυπηρετητή"
+msgstr "ALLCHANL <cmd>, στέλνει μια εντολή σε όλα τα κανάλια στον τρέχοντα εξυπηρετητή"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -459,8 +445,7 @@ msgstr "ALLSERV <εντολή>, στέλνει μια εντολή στους δ
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"ΑΠΟΥΣΙΑΖΕΙ [<reason>], η ρύθμισης σας για απουσία (χρήση/ΠΙΣΩ για αναίρεση)"
+msgstr "ΑΠΟΥΣΙΑΖΕΙ [<reason>], η ρύθμισης σας για απουσία (χρήση/ΠΙΣΩ για αναίρεση)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -471,10 +456,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <μάσκα> [<τύπος ban>], κάνει ban σε όποιον ταιριάζει στη μάσκα από το "
-"τρέχον κανάλι. Εάν είναι ήδη στο κανάλι δεν τους κάνει kick (χρειάζεται "
-"chanop)"
+msgstr "BAN <μάσκα> [<τύπος ban>], κάνει ban σε όποιον ταιριάζει στη μάσκα από το τρέχον κανάλι. Εάν είναι ήδη στο κανάλι δεν τους κάνει kick (χρειάζεται chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -482,27 +464,21 @@ msgstr "CHANOPT [-quiet] <μεταβλητή> [<τιμή>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<κωδικοποίηση>], ανακτήστε ή θέστε την κωδικοποίηση που "
-"χρησιμοποιείται για την τρέχουσα σύνδεση"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<κωδικοποίηση>], ανακτήστε ή θέστε την κωδικοποίηση που χρησιμοποιείται για την τρέχουσα σύνδεση"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"ΕΚΚΑΘΑΡΙΣΗ [ΟΛΟ ΤΟ ΣΤΟΡΙΚΟ[-]<amount>, Καθαρισμός του τρέχων παράθυρου "
-"κειμένου ή διαχείριση ιστορικού"
+msgstr "ΕΚΚΑΘΑΡΙΣΗ [ΟΛΟ ΤΟ ΣΤΟΡΙΚΟ[-]<amount>, Καθαρισμός του τρέχων παράθυρου κειμένου ή διαχείριση ιστορικού"
 
 #: src/common/outbound.c:3947
 msgid ""
 "CLOSE [-m], Closes the current tab, closing the window if this is the only "
 "open tab, or with the \"-m\" flag, closes all queries."
-msgstr ""
-"ΚΛΕΙΣΙΜΟ [-m], Κλείνει την τρέχουσα καρτέλα, το κλείσιμο του παραθύρου εάν "
-"αυτή είναι η μόνη ανοιχτή καρτέλα, ή με την σήμανση \"-m\" , κλείνει όλα τα "
-"ερωτήματα."
+msgstr "ΚΛΕΙΣΙΜΟ [-m], Κλείνει την τρέχουσα καρτέλα, το κλείσιμο του παραθύρου εάν αυτή είναι η μόνη ανοιχτή καρτέλα, ή με την σήμανση \"-m\" , κλείνει όλα τα ερωτήματα."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -512,15 +488,13 @@ msgstr "COUNTRY [-s] <κωδικός>, βρίσκει τον κωδικό μια
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <μήνυμα>, στέλνει ένα μήνυμα CTCP στο nick, συνηθέστερα μηνύματα "
-"είναι τα VERSION και USERINFO"
+msgstr "CTCP <nick> <μήνυμα>, στέλνει ένα μήνυμα CTCP στο nick, συνηθέστερα μηνύματα είναι τα VERSION και USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<κανάλι>], αποχωρεί το τρέχον ή ορισμένο κανάλι και ξαναμπένει αμέσως"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<κανάλι>], αποχωρεί το τρέχον ή ορισμένο κανάλι και ξαναμπένει αμέσως"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -533,26 +507,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <nick>                        - λήψη ενός προσφερθέντος αρχείου\n"
-"DCC SEND [-maxcps=#] <nick> [αρχείο]  - αποστολή ενός αρχείου σε κάποιον\n"
-"DCC PSEND [-maxcps=#] <nick> [αρχείο] - αποστολή ενός αρχείου σε παθητική "
-"κατάσταση λειτουργίας\n"
-"DCC LIST                              - εμφάνιση της λίστας DCC\n"
-"DCC CHAT <nick>                       - προσφορά συνομιλίας DCC σε κάποιον\n"
-"DCC PCHAT <nick>                      - προσφορά συνομιλίας DCC σε παθητική "
-"κατάσταση λειτουργίας\n"
-"DCC CLOSE <τύπος> <nick> <αρχείο>      παράδειγμα:\n"
-"         /dcc close send mixalhs file.tar.gz"
+msgstr "\nDCC GET <nick>                        - λήψη ενός προσφερθέντος αρχείου\nDCC SEND [-maxcps=#] <nick> [αρχείο]  - αποστολή ενός αρχείου σε κάποιον\nDCC PSEND [-maxcps=#] <nick> [αρχείο] - αποστολή ενός αρχείου σε παθητική κατάσταση λειτουργίας\nDCC LIST                              - εμφάνιση της λίστας DCC\nDCC CHAT <nick>                       - προσφορά συνομιλίας DCC σε κάποιον\nDCC PCHAT <nick>                      - προσφορά συνομιλίας DCC σε παθητική κατάσταση λειτουργίας\nDCC CLOSE <τύπος> <nick> <αρχείο>      παράδειγμα:\n         /dcc close send mixalhs file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nick>, αφαίρεση της κατάστασης chanhalf-op από το nick στο τρέχον "
-"κανάλι (χρειάζεται chanop)"
+msgstr "DEHOP <nick>, αφαίρεση της κατάστασης chanhalf-op από το nick στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -562,17 +523,13 @@ msgstr "DELBUTTON <όνομα>, διαγραφή ενός κουμπιού κά
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, αφαίρεση της κατάστασης chanop από το nick στο τρέχον κανάλι "
-"(χρειάζεται chanop)"
+msgstr "DEOP <nick>, αφαίρεση της κατάστασης chanop από το nick στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, αφαίρεση της κατάστασης voice από το nick στο τρέχον κανάλι "
-"(χρειάζεται chanop)"
+msgstr "DEVOICE <nick>, αφαίρεση της κατάστασης voice από το nick στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -594,9 +551,7 @@ msgstr "ECHO <κείμενο>, Τοπική εκτύπωση κειμένου"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <εντολή>, εκτελεί την εντολή. Εάν δοθεί το -o τότε η έξοδος θα "
-"σταλθεί στο τρέχον κανάλι, αλλιώς στέλνεται στο τρέχον κουτί κειμένου"
+msgstr "EXEC [-o] <εντολή>, εκτελεί την εντολή. Εάν δοθεί το -o τότε η έξοδος θα σταλθεί στο τρέχον κανάλι, αλλιώς στέλνεται στο τρέχον κουτί κειμένου"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -606,9 +561,7 @@ msgstr "EXECCONT, στέλνει στη διεργασία ένα σήμα SIGCO
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], σκοτώνει ένα εκτελούμενο exec στη τρέχουσα συνεδρία. Εάν "
-"δοθεί το -9 τότε στέλνει στη διεργασία ένα σήμα SIGKILL"
+msgstr "EXECKILL [-9], σκοτώνει ένα εκτελούμενο exec στη τρέχουσα συνεδρία. Εάν δοθεί το -9 τότε στέλνει στη διεργασία ένα σήμα SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -628,8 +581,7 @@ msgstr "FLUSHQ, καθαρίζει σειρά αποστολής του τρέχ
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <διακομιστής> [<θύρα>], θέτει proxy ένα διακομιστή, εξ'ορισμού θύρα 23"
+msgstr "GATE <διακομιστής> [<θύρα>], θέτει proxy ένα διακομιστή, εξ'ορισμού θύρα 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -650,20 +602,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <μάσκα> <τύποι..> <επιλογές..>\n"
-"   μάσκα - μάσκα διακομιστή για ignore πχ: *!*@*.otenet.gr\n"
-"   τύποι - τύποι δεδομένων για ignore, ένα από:\n"
-"           PRIV, CHAN, NOTI, CTCP, INVI, ALL\n"
-"   επιλογές - NOSAVE, QUIET"
+msgstr "IGNORE <μάσκα> <τύποι..> <επιλογές..>\n   μάσκα - μάσκα διακομιστή για ignore πχ: *!*@*.otenet.gr\n   τύποι - τύποι δεδομένων για ignore, ένα από:\n           PRIV, CHAN, NOTI, CTCP, INVI, ALL\n   επιλογές - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"/INVITE <nick> [<κανάλι>], καλεί κάποιον σε ένα κανάλι, εξ'ορισμού το "
-"τρέχον  κανάλι (χρειάζεται chanop)"
+msgstr "/INVITE <nick> [<κανάλι>], καλεί κάποιον σε ένα κανάλι, εξ'ορισμού το τρέχον  κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -672,17 +617,13 @@ msgstr "JOIN <κανάλι>, συνδέεται στο κανάλι"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <ψευδώνυμο> [λόγος], διώχνει το ψευδώνυμο από το τρέχον κανάλι "
-"(χρειάζεται chanop)"
+msgstr "KICK <ψευδώνυμο> [λόγος], διώχνει το ψευδώνυμο από το τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <ψευδώνυμο> [λόγος], κάνει αποκλεισμό και διώχνει το ψευδώνυμο από "
-"το τρέχον κανάλι (χρειάζεται chanop)"
+msgstr "KICKBAN <ψευδώνυμο> [λόγος], κάνει αποκλεισμό και διώχνει το ψευδώνυμο από το τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -694,8 +635,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
@@ -705,22 +645,17 @@ msgstr "LOAD [-e] <αρχείο>, φορτώνει ένα πρόσθετο ή έ
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Μαζικό deop όλων των chanhalf-ops στο τρέχον κανάλι (χρειάζεται "
-"chanop)"
+msgstr "MDEHOP, Μαζικό deop όλων των chanhalf-ops στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Μαζικό deop όλων των chanops στο τρέχον κανάλι (χρειάζεται chanop)"
+msgstr "MDEOP, Μαζικό deop όλων των chanops στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: 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)"
-msgstr ""
-"ME <δράση>, στέλνει τη δράση στο τρέχον κανάλι (οι δράσεις γράφονται στο "
-"τρίτο πρόσωπο, πχ. /me kanei mia toumpa)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <δράση>, στέλνει τη δράση στο τρέχον κανάλι (οι δράσεις γράφονται στο τρίτο πρόσωπο, πχ. /me kanei mia toumpa)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -729,19 +664,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Μαζικό kick όλων εκτός από εσένα στο τρέχον κανάλι (χρειάζεται chanop)"
+msgstr "MKICK, Μαζικό kick όλων εκτός από εσένα στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Δίνει μαζικά op σε όλους τους χρήστες στο τρέχον κανάλι (χρειάζεται "
-"chanop)"
+msgstr "MOP, Δίνει μαζικά op σε όλους τους χρήστες στο τρέχον κανάλι (χρειάζεται chanop)"
 
 #: 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
@@ -768,9 +700,7 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ <όνομα/κανάλι> <μήνυμα>, σ
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n δίκτυο1[,δίκτυο2,...]][ <ψευδώνυμο>], δείχνει τη λίστα "
-"ειδοποίησης ή προσθέτει κάποιον σε αυτήν"
+msgstr "NOTIFY [-n δίκτυο1[,δίκτυο2,...]][ <ψευδώνυμο>], δείχνει τη λίστα ειδοποίησης ή προσθέτει κάποιον σε αυτήν"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -789,9 +719,7 @@ msgstr "PING <nick | κανάλι>, κάνει ένα CTCP ping στο nick ή
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"ΕΡΩΤΗΜΑ [-nofocus] <όνομα> [μήνυμα], ανοίγει ένα νέο παράθυρο ιδιωτικού "
-"μηνύματος σε κάποιον και προαιρετικά στέλνει μήνυμα"
+msgstr "ΕΡΩΤΗΜΑ [-nofocus] <όνομα> [μήνυμα], ανοίγει ένα νέο παράθυρο ιδιωτικού μηνύματος σε κάποιον και προαιρετικά στέλνει μήνυμα"
 
 #: src/common/outbound.c:4073
 msgid ""
@@ -809,23 +737,17 @@ msgstr "QUOTE <κείμενο>, στέλνει ένα κείμενο σε ωμή
 
 #: 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 ""
-"RECONΝECT [-ssl] [<διακομιστής>] [<port>] [<password>] , Μπορεί να κληθεί "
-"απλά σαν /reconnect για επανασύνδεση στον τρέχοντα διακομιστή ή με /"
-"reconnect all για όλους τους ανοικτούς διακομιστές"
+msgstr "RECONΝECT [-ssl] [<διακομιστής>] [<port>] [<password>] , Μπορεί να κληθεί απλά σαν /reconnect για επανασύνδεση στον τρέχοντα διακομιστή ή με /reconnect all για όλους τους ανοικτούς διακομιστές"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONΝECT [<διακομιστής>] [<port>] [<password>], Μπορεί να κληθεί απλά σαν /"
-"reconnect για επανασύνδεση στον τρέχοντα διακομιστή ή με /reconnect all για "
-"όλους τους ανοικτούς διακομιστές"
+msgstr "RECONΝECT [<διακομιστής>] [<port>] [<password>], Μπορεί να κληθεί απλά σαν /reconnect για επανασύνδεση στον τρέχοντα διακομιστή ή με /reconnect all για όλους τους ανοικτούς διακομιστές"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -847,14 +769,11 @@ msgstr "SEND <ψευδώνυμο> [<αρχείο>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <διακομιστής> <port> <κανάλι>, σύνδεση σε διακομιστή και "
-"κανάλι"
+msgstr "SERVCHAN [-ssl] <διακομιστής> <port> <κανάλι>, σύνδεση σε διακομιστή και κανάλι"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <διακομιστής> <port> <κανάλι>, σύνδεση σε διακομιστή και κανάλι"
+msgstr "SERVCHAN <διακομιστής> <port> <κανάλι>, σύνδεση σε διακομιστή και κανάλι"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -866,9 +785,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"ΔΙΑΚΟΜΙΣΤΗΣ <host> [<port>] [<password>], συνδέεται σε ένα διακομιστή, η "
-"προεπιλεγμένη θύρα είναι η 6667"
+msgstr "ΔΙΑΚΟΜΙΣΤΗΣ <host> [<port>] [<password>], συνδέεται σε ένα διακομιστή, η προεπιλεγμένη θύρα είναι η 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -888,9 +805,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<θέμα>], θέτει το θέμα αν δοθεί κάποιο, αλλιώς δείχνει το τρέχον"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<θέμα>], θέτει το θέμα αν δοθεί κάποιο, αλλιώς δείχνει το τρέχον"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -900,14 +817,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <χρονικό όριο> <αρχείο1> [<αρχείο2>] Αναβόσβημα με τα 2 εικονίδια.\n"
-"TRAY -f <όνομα αρχείου>                      Ορισμός εικονιδίου συστήματος.\n"
-"TRAY -i <αριθμός>                            Αναβόσβημα με το προεπιλεγμένο\n"
-"                                             εικονίδιο.\n"
-"TRAY -t <κείμενο>                            Ορισμός αναδυόμενου κειμένου.\n"
-"TRAY -b <τίτλος> <κείμενο>                   Ορισμός του μπαλονιού."
+msgstr "\nTRAY -f <χρονικό όριο> <αρχείο1> [<αρχείο2>] Αναβόσβημα με τα 2 εικονίδια.\nTRAY -f <όνομα αρχείου>                      Ορισμός εικονιδίου συστήματος.\nTRAY -i <αριθμός>                            Αναβόσβημα με το προεπιλεγμένο\n                                             εικονίδιο.\nTRAY -t <κείμενο>                            Ορισμός αναδυόμενου κειμένου.\nTRAY -b <τίτλος> <κείμενο>                   Ορισμός του μπαλονιού."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -923,8 +833,8 @@ msgstr "UNLOAD <αρχείο>, αποφορτώνει ένα Perl script"
 
 #: 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
@@ -933,10 +843,9 @@ msgstr "URL <url>, ανοίγει ένα URL στον περιηγητή σας"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <χρήστης1> <χρήστης2> κλπ, επισημαίνει τον(ους) χρήστη(ες) "
-"στη λίστα χρηστών"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <χρήστης1> <χρήστης2> κλπ, επισημαίνει τον(ους) χρήστη(ες) στη λίστα χρηστών"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -949,9 +858,7 @@ msgstr "WALLCHAN <μήνυμα>, αποστολή του μηνύματος σε
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <μήνυμα>, αποστολή του μηνύματος σε όλους τους chanops στο τρέχον "
-"κανάλι"
+msgstr "WALLCHOP <μήνυμα>, αποστολή του μηνύματος σε όλους τους chanops στο τρέχον κανάλι"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -967,9 +874,7 @@ msgstr "Χρήση: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Δεν υπάρχει διαθέσιμη βοήθεια για αυτή την εντολή.\n"
+msgstr "\nΔεν υπάρχει διαθέσιμη βοήθεια για αυτή την εντολή.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -990,8 +895,7 @@ msgstr "Άγνωστη Εντολή %s. Δοκίμασε /βοήθεια\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Δεν υπάρχει το σύμβολο xchat_plugin_init· σίγουρα είναι πρόσθετο xchat;"
+msgstr "Δεν υπάρχει το σύμβολο xchat_plugin_init· σίγουρα είναι πρόσθετο xchat;"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1032,17 +936,14 @@ msgstr "%5d %8.1f %7d  %s\n"
 
 #: src/common/server.c:514
 msgid "Are you sure this is a SSL capable server and port?\n"
-msgstr ""
-"Είστε σίγουρος/η ότι αυτός ο διακομιστής και η θύρα είναι ικανά για SSL;\n"
+msgstr "Είστε σίγουρος/η ότι αυτός ο διακομιστής και η θύρα είναι ικανά για SSL;\n"
 
 #: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Δεν ήταν δυνατή η εύρεση του ονόματος διακομιστή %s\n"
-"Ελέγξτε τις ρυθμίσεις IP σας!\n"
+msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος διακομιστή %s\nΕλέγξτε τις ρυθμίσεις IP σας!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1058,9 +959,7 @@ msgstr "Μετάβαση στον επόμενο διακομιστή σε %s...
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Προειδοποίηση: Το σύνολο χαρακτήρων \"%s\" είναι άγνωστο. Δεν θα γίνει καμία "
-"μετατροπή για το δίκτυο %s."
+msgstr "Προειδοποίηση: Το σύνολο χαρακτήρων \"%s\" είναι άγνωστο. Δεν θα γίνει καμία μετατροπή για το δίκτυο %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1108,8 +1007,7 @@ msgstr "%C22*%O$t%C26$1%O αφαίρεση της κατάστασης half-oper
 
 #: src/common/textevents.h:49
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
-msgstr ""
-"%C22*%O$t%C26$1%O αφαίρεση της κατάστασης διαχειριστή καναλιού από %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O αφαίρεση της κατάστασης διαχειριστή καναλιού από %C18$2%O"
 
 #: src/common/textevents.h:52
 msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
@@ -1220,7 +1118,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
@@ -1254,8 +1153,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
@@ -1276,7 +1175,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
@@ -1289,7 +1189,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
@@ -1306,7 +1207,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
@@ -2082,9 +1984,7 @@ msgstr "Ώρα ban"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Αδυναμία ανάγνωσης του αρχείου ήχου:\n"
-"%s"
+msgstr "Αδυναμία ανάγνωσης του αρχείου ήχου:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3443,18 +3343,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Αδύνατη η πρόσβαση στο αρχείο: %s\n"
-"%s.\n"
-"Η συνέχιση είναι αδύνατη."
+msgstr "Αδύνατη η πρόσβαση στο αρχείο: %s\n%s.\nΗ συνέχιση είναι αδύνατη."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Το αρχείο στον κατάλογο ληφθέντων αρχείων είναι μεγαλύτερο από αυτό που "
-"προσφέρεται. Η συνέχιση είναι αδύνατη."
+msgstr "Το αρχείο στον κατάλογο ληφθέντων αρχείων είναι μεγαλύτερο από αυτό που προσφέρεται. Η συνέχιση είναι αδύνατη."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3600,10 +3495,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Αδυναμία ανοίγματος γραμματοσειράς:\n"
-"\n"
-"%s"
+msgstr "Αδυναμία ανοίγματος γραμματοσειράς:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3621,18 +3513,18 @@ msgstr "Ουρά αποστολής: %d bytes"
 
 #: 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 "
@@ -3643,65 +3535,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Η εντολή Εισαγωγή στη Προσωρινή Μνήμη θα εισάγει τα περιεχόμενα του Data 1 "
-"στην εγγραφή όπου η ακολουθία πλήκτρων πατήθηκε στη τρέχουσα θέση του κέρσορα"
+msgstr "Η εντολή Εισαγωγή στη Προσωρινή Μνήμη θα εισάγει τα περιεχόμενα του Data 1 στην εγγραφή όπου η ακολουθία πλήκτρων πατήθηκε στη τρέχουσα θέση του κέρσορα"
 
 #: 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"
-msgstr ""
-"Η εντολή Καθορισμός Προσωρινής Μνήμης θέτει την εγγραφή όπου η ακολουθία "
-"πλήκτρων πατήθηκε στα περιεχόμενα του Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Η εντολή Καθορισμός Προσωρινής Μνήμης θέτει την εγγραφή όπου η ακολουθία πλήκτρων πατήθηκε στα περιεχόμενα του Data 1"
 
 #: 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"
-msgstr ""
-"Η εντολή Περασμένη Εντολή θέτει την εγγραφή να περιέχει την τελευταία εντολή "
-"που εισήχθηκε - όμοιο σαν το πάνω βέλος στο κέλυφος"
+"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"
-msgstr ""
-"Η εντολή Επόμενη Εντολή θέτει την εγγραφή να περιέχει την επόμενη εντολή που "
-"εισήχθηκε - όμοιο σαν το κάτω βέλος στο κέλυφος"
+"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"
-msgstr ""
-"Αυτή η εντολή αλλάζει το κείμενο της εγγραφής να συμπληρώνει ένα μη πλήρες "
-"ψευδώνυμο ή εντολή. Αν το Data 1 είναι καθορισμένο τότε το διπλό-tab σε ένα "
-"κορδόνι (string) θα επιλέξει το τελευταίο nick και όχι το επόμενο"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Αυτή η εντολή αλλάζει το κείμενο της εγγραφής να συμπληρώνει ένα μη πλήρες ψευδώνυμο ή εντολή. Αν το Data 1 είναι καθορισμένο τότε το διπλό-tab σε ένα κορδόνι (string) θα επιλέξει το τελευταίο nick και όχι το επόμενο"
 
 #: 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"
-msgstr ""
-"Αυτή η εντολή μετακινεί πάνω και κάτω μέσα στη λίστα των ψευδωνύμων. Αν το "
-"Data 1 είναι καθορισμένο τότε μετακινεί πάνω αλλιώς κάτω"
+"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 "Αυτή η εντολή μετακινεί πάνω και κάτω μέσα στη λίστα των ψευδωνύμων. Αν το Data 1 είναι καθορισμένο τότε μετακινεί πάνω αλλιώς κάτω"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Αυτή η εντολή ελέγχει εάν υπάρχει η τελευταία λέξη που γράφτηκε στη λίστα "
-"αντικαταστάσεων και την αντικαθιστά εάν βρει ταίρι"
+msgstr "Αυτή η εντολή ελέγχει εάν υπάρχει η τελευταία λέξη που γράφτηκε στη λίστα αντικαταστάσεων και την αντικαθιστά εάν βρει ταίρι"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3721,8 +3598,7 @@ msgstr "Αυτή η εντολή μετακινεί την τρέχουσα ομ
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Προώθηση της γραμμής εισαγωγής στο ιστορικό αλλά όχι αποστολή στο διακομιστή"
+msgstr "Προώθηση της γραμμής εισαγωγής στο ιστορικό αλλά όχι αποστολή στο διακομιστή"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
@@ -3845,9 +3721,7 @@ msgstr "_Σύνδεση στο κανάλι:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Εάν γνωρίζετε το όνομα του καναλιού που θέλετε να συνδεθείτε, εισάγετε το "
-"εδώ."
+msgstr "Εάν γνωρίζετε το όνομα του καναλιού που θέλετε να συνδεθείτε, εισάγετε το εδώ."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3879,9 +3753,7 @@ msgstr "Δεν έχει οριστεί θέμα"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Αυτός ο διακομιστής έχει ακόμα %d κανάλια ή συνομιλίες ανοιχτά. Να κλείσουν "
-"όλα;"
+msgstr "Αυτός ο διακομιστής έχει ακόμα %d κανάλια ή συνομιλίες ανοιχτά. Να κλείσουν όλα;"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4254,19 +4126,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Απαντήσεις CTCP - Ειδικοί κώδικες:\n"
-"\n"
-"%d  =  δεδομένα (ολόκληρο το ctcp)\n"
-"%e = όνομα τρέχοντος δικτύου\n"
-"%m  =  πληροφορίες συστήματος\n"
-"%s  =  ψευδώνυμο αυτού που έστειλε το ctcp\n"
-"%t  =  ώρα/ημερομηνία\n"
-"%2  =  λέξη 2\n"
-"%3  =  λέξη 3\n"
-"&2  =  λέξη 2 μέχρι το τέλος της γραμμής\n"
-"&3  =  λέξη 3 μέχρι το τέλος της γραμμής\n"
-"\n"
+msgstr "Απαντήσεις CTCP - Ειδικοί κώδικες:\n\n%d  =  δεδομένα (ολόκληρο το ctcp)\n%e = όνομα τρέχοντος δικτύου\n%m  =  πληροφορίες συστήματος\n%s  =  ψευδώνυμο αυτού που έστειλε το ctcp\n%t  =  ώρα/ημερομηνία\n%2  =  λέξη 2\n%3  =  λέξη 3\n&2  =  λέξη 2 μέχρι το τέλος της γραμμής\n&3  =  λέξη 3 μέχρι το τέλος της γραμμής\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4832,11 +4692,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Ψευδώνυμο χρήστη\n"
-"%p=Κωδικός\n"
-"%r=Αληθινό όνομα\n"
-"%u=Όνομα χρήστη"
+msgstr "%n=Ψευδώνυμο χρήστη\n%p=Κωδικός\n%r=Αληθινό όνομα\n%u=Όνομα χρήστη"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5849,8 +5705,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
@@ -5859,8 +5715,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
@@ -5911,7 +5767,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
@@ -6021,12 +5878,9 @@ msgstr "Λήψη της διεύθυνσης IP από τον διακομιστ
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Ερώτηση στον διακομιστή IRC για την πραγματική σας διεύθυνση. "
-"Χρησιμοποιείστε το όταν έχετε διεύθυνση IP της μορφής 192.168.*.* ή 10.*.*."
-"* !"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Ερώτηση στον διακομιστή IRC για την πραγματική σας διεύθυνση. Χρησιμοποιείστε το όταν έχετε διεύθυνση IP της μορφής 192.168.*.* ή 10.*.*.* !"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6258,19 +6112,15 @@ msgstr "Κατηγορίες"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"Δε μπορείτε να τοποθετήσετε το δέντρο πάνω ή κάτω!\n"
-"Παρακαλώ αλλάξτε πρώτα σε διάταξη <b>καρτέλες</b> στο μενού <b>προβολή</b>."
+msgstr "Δε μπορείτε να τοποθετήσετε το δέντρο πάνω ή κάτω!\nΠαρακαλώ αλλάξτε πρώτα σε διάταξη <b>καρτέλες</b> στο μενού <b>προβολή</b>."
 
 #: 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Άλλαξαν ορισμένες ρυθμίσεις που απαιτούν επανεκκίνηση για να ενεργοποιηθούν."
+msgstr "Άλλαξαν ορισμένες ρυθμίσεις που απαιτούν επανεκκίνηση για να ενεργοποιηθούν."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6278,11 +6128,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*ΠΡΟΕΙΔΟΠΟΙΗΣΗ*\n"
-"Η αυτόματη αποδοχή DCC στο αρχικό κατάλογό σας\n"
-"είναι επικίνδυνη και εκμεταλλεύσιμη. Πχ:\n"
-"Κάποιος μπορεί να σας στείλει ένα .bash_profile"
+msgstr "*ΠΡΟΕΙΔΟΠΟΙΗΣΗ*\nΗ αυτόματη αποδοχή DCC στο αρχικό κατάλογό σας\nείναι επικίνδυνη και εκμεταλλεύσιμη. Πχ:\nΚάποιος μπορεί να σας στείλει ένα .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6396,8 +6242,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
@@ -6413,9 +6259,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/et.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Ekke Vasli <ekke@chamber.ee>, 2001
 # Ilmar Kerm <ikerm@hot.ee>, 2002
@@ -11,15 +11,14 @@ 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: Estonian (http://www.transifex.com/hexchat/hexchat/language/"
-"et/)\n"
-"Language: et\n"
+"Language-Team: Estonian (http://www.transifex.com/hexchat/hexchat/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -38,19 +37,13 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr ""
-"HexChat on lihtne ja paljude võimalustega IRC klient. See võimaldab "
-"turvaliselt ühenduda mitme võrguda samaaegselt ja suhelda inimestega "
-"privaatselt või liituda vestluskanalitega, kasutades selleks kohandatavat "
-"rakendust. Samuti on võimalus failivahetuseks."
+msgstr "HexChat on lihtne ja paljude võimalustega IRC klient. See võimaldab turvaliselt ühenduda mitme võrguda samaaegselt ja suhelda inimestega privaatselt või liituda vestluskanalitega, kasutades selleks kohandatavat rakendust. Samuti on võimalus failivahetuseks."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:12
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr ""
-"HexChat toetab kasutamiseks: DCC, SASL, hoiatusi, logide koguminst, "
-"kohandatud teemasid ja Python/Perl skripte."
+msgstr "HexChat toetab kasutamiseks: DCC, SASL, hoiatusi, logide koguminst, kohandatud teemasid ja Python/Perl skripte."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -301,17 +294,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Sul puuduvad kirjutamisõigused asukohta %s. Sellest sessioonist ei "
-"salvestata midagi."
+msgstr "Sul puuduvad kirjutamisõigused asukohta %s. Sellest sessioonist ei salvestata midagi."
 
 #: src/common/hexchat.c:1134
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* root-kasutajana IRCus istumine on lollus! Sa peaksid\n"
-"  looma tavakasutaja konto ja sellega sisse logima.\n"
+msgstr "* root-kasutajana IRCus istumine on lollus! Sa peaksid\n  looma tavakasutaja konto ja sellega sisse logima.\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
@@ -333,9 +322,7 @@ msgstr "%s ujutab sind CTCP päringutega üle, ignoreerin kasutajat %s\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"%s uputab sind üle massiliste sõnumitega, mistõttu lülitame "
-"gui_autoopen_dialog VÄLJA.\n"
+msgstr "%s uputab sind üle massiliste sõnumitega, mistõttu lülitame gui_autoopen_dialog VÄLJA.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -438,9 +425,7 @@ msgstr "ADDBUTTON <nimi> <tegevus>, lisab kasutajate nimekirja alla uue nupu"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <UusVõrk> <uusserver/6667> lisab uue võrgu koos uue serveriga "
-"võrguloendisse."
+msgstr "ADDSERVER <UusVõrk> <uusserver/6667> lisab uue võrgu koos uue serveriga võrguloendisse."
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -467,10 +452,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <mask> [<keelu tüüp>], keelab hosti maskiga sobivatel kasutajatel "
-"kanaliga liitumise. Kui mõni selline kasutaja on kanalis, siis see käsk ei "
-"viska neid automaatselt välja (selleks vajad chanop-õigusi)"
+msgstr "BAN <mask> [<keelu tüüp>], keelab hosti maskiga sobivatel kasutajatel kanaliga liitumise. Kui mõni selline kasutaja on kanalis, siis see käsk ei viska neid automaatselt välja (selleks vajad chanop-õigusi)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -478,7 +460,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
@@ -501,13 +484,12 @@ msgstr "COUNTRY [-s] <kood>, leiab koodi järgi riigi nime, näiteks ee = eesti"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <kasutaja> <teade>, saadab kasutajale CTCP teate. Levinud teateid on "
-"näiteks VERSION ja USERINFO"
+msgstr "CTCP <kasutaja> <teade>, saadab kasutajale CTCP teate. Levinud teateid on näiteks VERSION ja USERINFO"
 
 #: 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 "CYCLE [<kanal>], Lahkub aktiivsest või antud kanalist ja naaseb kohe"
 
 #: src/common/outbound.c:3956
@@ -521,27 +503,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <kasutaja>                      - võta kasutajalt pakutav fail "
-"vastu\n"
-"DCC SEND [-maxcps=#] <kasutaja> <fail>  - saada kasutajale fail\n"
-"DCC PSEND [-maxcps=#] <kasuatja> <fail> - saada fail passiivses režiimis\n"
-"DCC LIST                                - näita DCC'de nimekirja\n"
-"DCC CHAT <kasutaja>                     - paku kasutajale DCC vestlust\n"
-"DCC PCHAT <kasutaja>                    - paku kasutajale passivses "
-"režiimis\n"
-"                                          DCC vestlust\n"
-"DCC CLOSE <tüüp> <kasutaja> <fail>        näide:\n"
-"         /dcc close send toomas fail.tar.gz"
+msgstr "\nDCC GET <kasutaja>                      - võta kasutajalt pakutav fail vastu\nDCC SEND [-maxcps=#] <kasutaja> <fail>  - saada kasutajale fail\nDCC PSEND [-maxcps=#] <kasuatja> <fail> - saada fail passiivses režiimis\nDCC LIST                                - näita DCC'de nimekirja\nDCC CHAT <kasutaja>                     - paku kasutajale DCC vestlust\nDCC PCHAT <kasutaja>                    - paku kasutajale passivses režiimis\n                                          DCC vestlust\nDCC CLOSE <tüüp> <kasutaja> <fail>        näide:\n         /dcc close send toomas fail.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <kasutaja>, eemaldab aktiivse kanali kasutajalt chanhalf-op õiguse "
-"(vajab chanop õigust)"
+msgstr "DEHOP <kasutaja>, eemaldab aktiivse kanali kasutajalt chanhalf-op õiguse (vajab chanop õigust)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -551,9 +519,7 @@ msgstr "DELBUTTON <nimi>, kustutab kasutajate nimekirja aluse nupu"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <kasutaja>, eemaldab aktiivse kanali kasutajalt chanop õiguse (vajab "
-"chanop õigust)"
+msgstr "DEOP <kasutaja>, eemaldab aktiivse kanali kasutajalt chanop õiguse (vajab chanop õigust)"
 
 #: src/common/outbound.c:3974
 msgid ""
@@ -581,10 +547,7 @@ msgstr "ECHO <tekst>, väljastab teksti samas masinas"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <programm>, käivitab programmi. Kui -o lipp on kasutusel, siis "
-"saadetakse programmi väljund kanalisse, muul juhul näidatakse ainult sulle "
-"endale."
+msgstr "EXEC [-o] <programm>, käivitab programmi. Kui -o lipp on kasutusel, siis saadetakse programmi väljund kanalisse, muul juhul näidatakse ainult sulle endale."
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -594,9 +557,7 @@ msgstr "EXECCONT, saadab protsessile SIGCONT signaali"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], tapab EXEC käsuga käivitatud protsessi. Kui -9 võti on antud, "
-"saadetakse protsessile SIGKILL."
+msgstr "EXECKILL [-9], tapab EXEC käsuga käivitatud protsessi. Kui -9 võti on antud, saadetakse protsessile SIGKILL."
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -624,8 +585,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <kasutaja>, annab kasutajale chanhalf-op õiguse (vajab chanop õigust)"
+msgstr "HOP <kasutaja>, annab kasutajale chanhalf-op õiguse (vajab chanop õigust)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -638,20 +598,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mask> <tüübid..> <..>\n"
-"    mask - hostmask mida ignoreerida - näiteks: *!*@*.starman.ee\n"
-"    tüübid - andmete tüübid, mida eirata. võib valida ühe või rohkem:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <tüübid..> <..>\n    mask - hostmask mida ignoreerida - näiteks: *!*@*.starman.ee\n    tüübid - andmete tüübid, mida eirata. võib valida ühe või rohkem:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    options - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <kasutaja> [<kanal>], kutsub kasutaja kanalisse, vaikimisi "
-"aktiivsesse kanalisse (vajab chanop õigust)"
+msgstr "INVITE <kasutaja> [<kanal>], kutsub kasutaja kanalisse, vaikimisi aktiivsesse kanalisse (vajab chanop õigust)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -678,8 +631,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
@@ -689,23 +641,17 @@ msgstr "LOAD [-e] <fail>, laeb plugina või skripti"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, võtab kõigilt kanalis viibijatelt pool-operaatori õigused (vajab "
-"kanali operaatori õigusi)"
+msgstr "MDEHOP, võtab kõigilt kanalis viibijatelt pool-operaatori õigused (vajab kanali operaatori õigusi)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, võtab kõigilt kanalist viibijatelt operaatori õigused (vajab kanali "
-"operaatori õigusi)"
+msgstr "MDEOP, võtab kõigilt kanalist viibijatelt operaatori õigused (vajab kanali operaatori õigusi)"
 
 #: 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)"
-msgstr ""
-"ME <tegevus>, saadab tegevuse aktiivsesse kanalisse (tegevused kirjutatakse "
-"kolmandas isikus, näiteks /me hüppab)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <tegevus>, saadab tegevuse aktiivsesse kanalisse (tegevused kirjutatakse kolmandas isikus, näiteks /me hüppab)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -718,14 +664,12 @@ msgstr "MKICK, viskab kanalist välja kõik peale sinu (vajab chanop õigust)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, annab kõigile aktiivses kanalis olijatele chanop õigused (vajab chanop "
-"õigust)"
+msgstr "MOP, annab kõigile aktiivses kanalis olijatele chanop õigused (vajab chanop õigust)"
 
 #: 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
@@ -752,9 +696,7 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n võrk1[,võrk2,...]] [<hüüdnimi>], kuvab või täiendab "
-"märguandenimekirja"
+msgstr "NOTIFY [-n võrk1[,võrk2,...]] [<hüüdnimi>], kuvab või täiendab märguandenimekirja"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -763,8 +705,7 @@ msgstr "OP <kasutaja>, annab kasutajale chanop üigused (vajab chanop'i)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<põhjus>], lahkub kanalist. Vaikimisi hetkel avatud kanalist"
+msgstr "PART [<kanal>] [<põhjus>], lahkub kanalist. Vaikimisi hetkel avatud kanalist"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -792,23 +733,17 @@ msgstr "QUOTE <tekst>, saadab teksti toorel kujul serverisse"
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<port>] [<salasõna>], võib kasutada ka lihtsalt "
-"kujul /RECONNECT, et uuesti samasse serverisse ühenduda, või /RECONNECT ALL, "
-"et luua kõigisse serveritesse uuesti ühendus."
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<salasõna>], võib kasutada ka lihtsalt kujul /RECONNECT, et uuesti samasse serverisse ühenduda, või /RECONNECT ALL, et luua kõigisse serveritesse uuesti ühendus."
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<port>] [<salasõna>], võib kasutada ka lihtsalt kujul /"
-"RECONNECT, et uuesti samasse serverisse ühenduda, või /RECONNECT ALL, et "
-"luua kõigisse serveritesse uuesti ühendus."
+msgstr "RECONNECT [<host>] [<port>] [<salasõna>], võib kasutada ka lihtsalt kujul /RECONNECT, et uuesti samasse serverisse ühenduda, või /RECONNECT ALL, et luua kõigisse serveritesse uuesti ühendus."
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -830,8 +765,7 @@ msgstr "SEND <hüüdnimi> [<failinimi>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <port> <kanal>, ühendub serverisse ja liitub kanaliga."
+msgstr "SERVCHAN [-ssl] <host> <port> <kanal>, ühendub serverisse ja liitub kanaliga."
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -847,9 +781,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<salasõna>], loob serveriga ühenduse, vaikimisi port "
-"on 6667"
+msgstr "SERVER <host> [<port>] [<salasõna>], loob serveriga ühenduse, vaikimisi port on 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -869,7 +801,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 "TOPIC [<teema>]. määrab uue teema või näitab praegust"
 
 #: src/common/outbound.c:4112
@@ -880,13 +813,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <taimaut> <fail1> [<fail2>] Vaheta kahe salveikooni vahel.\n"
-"TRAY -f <filename>                  Määra üks kindel ikoon.\n"
-"TRAY -i <number>                    Vaheta salveikooni seesmise ikooniga.\n"
-"TRAY -t <text>                      Määra salveikooni abitekst.\n"
-"TRAY -b <peakliri> <tekst>          Määra salve mullike."
+msgstr "\nTRAY -f <taimaut> <fail1> [<fail2>] Vaheta kahe salveikooni vahel.\nTRAY -f <filename>                  Määra üks kindel ikoon.\nTRAY -i <number>                    Vaheta salveikooni seesmise ikooniga.\nTRAY -t <text>                      Määra salveikooni abitekst.\nTRAY -b <peakliri> <tekst>          Määra salve mullike."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -902,8 +829,8 @@ msgstr "UNLOAD <nimi>, eemaldab plugina või skripti"
 
 #: 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
@@ -912,15 +839,13 @@ msgstr "URL <url>, avab url'i brauseris"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <hüüdnimi1> <hüüdnimi2> jne, märgistab kasutajate "
-"nimekirjas hüüdnime(d)"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <hüüdnimi1> <hüüdnimi2> jne, märgistab kasutajate nimekirjas hüüdnime(d)"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <kasutaja>, annab kasutajale voice staatuse (vajab chanop õigust)"
+msgstr "VOICE <kasutaja>, annab kasutajale voice staatuse (vajab chanop õigust)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -945,9 +870,7 @@ msgstr "Kasutus: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Selle käsu kohta pole abimaterjale.\n"
+msgstr "\nSelle käsu kohta pole abimaterjale.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1016,9 +939,7 @@ msgstr "Oled sa kindel et selle serveri selles pordis töötab SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Ei saa lahendada hostinime %s\n"
-"Palun kontrolli oma IP sätteid!\n"
+msgstr "Ei saa lahendada hostinime %s\nPalun kontrolli oma IP sätteid!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1034,8 +955,7 @@ msgstr "Lähen võrgu %s järgmise serveri juurde...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Hoiatus: Tundmatu kooditabel \"%s\". Võrgu %s sõnumeid ei kodeerita ümber."
+msgstr "Hoiatus: Tundmatu kooditabel \"%s\". Võrgu %s sõnumeid ei kodeerita ümber."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1194,7 +1114,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
@@ -1228,8 +1149,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
@@ -1250,7 +1171,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
@@ -1263,7 +1185,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
@@ -1280,7 +1203,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
@@ -2056,9 +1980,7 @@ msgstr "Bänni aeg"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Helifaili lugemine nurjus:\n"
-"%s"
+msgstr "Helifaili lugemine nurjus:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3296,8 +3218,7 @@ msgstr "Kuupäev"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Bännitute nimekirja saab vaadata ainult siis, kui mõni kanal aktiivne on."
+msgstr "Bännitute nimekirja saab vaadata ainult siis, kui mõni kanal aktiivne on."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3418,18 +3339,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Ei pääse failile ligi: %s\n"
-"%s.\n"
-"Jätkamine on võimatu."
+msgstr "Ei pääse failile ligi: %s\n%s.\nJätkamine on võimatu."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Fail allalaadimiste kataloogis on suurem, kui pakutav fail. Jätkamine pole "
-"võimalik."
+msgstr "Fail allalaadimiste kataloogis on suurem, kui pakutav fail. Jätkamine pole võimalik."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3575,10 +3491,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Ei suuda avada fonti:\n"
-"\n"
-"%s"
+msgstr "Ei suuda avada fonti:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3596,18 +3509,18 @@ msgstr "Võrgu saatmisjärjekord: %d baiti"
 
 #: 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 "
@@ -3622,39 +3535,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
@@ -3836,8 +3749,7 @@ msgstr "Teemat ei ole määratud"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Selle serveriga on veel seotud %d kanalit või dialoogiakent. Sulgen kõik?"
+msgstr "Selle serveriga on veel seotud %d kanalit või dialoogiakent. Sulgen kõik?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4210,19 +4122,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP vastused - spetsiaalkoodid:\n"
-"\n"
-"%d  =  andmed (kogu CTCP)\n"
-"%e = aktiivse võrgu nimi\n"
-"%m  =  masina info\n"
-"%s  =  CTCP saatja hüüdnimi\n"
-"%t  =  kell/kuupäev\n"
-"%2  =  sõna 2\n"
-"%3  =  sõna 3\n"
-"&2  =  alates 2. sõnast kuni rea lõpuni\n"
-"&3  =  alates 3. sõnast kuni rea lõpuni\n"
-"\n"
+msgstr "CTCP vastused - spetsiaalkoodid:\n\n%d  =  andmed (kogu CTCP)\n%e = aktiivse võrgu nimi\n%m  =  masina info\n%s  =  CTCP saatja hüüdnimi\n%t  =  kell/kuupäev\n%2  =  sõna 2\n%3  =  sõna 3\n&2  =  alates 2. sõnast kuni rea lõpuni\n&3  =  alates 3. sõnast kuni rea lõpuni\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5801,8 +5701,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
@@ -5811,8 +5711,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
@@ -5863,7 +5763,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
@@ -5973,11 +5874,9 @@ msgstr "Võta mu IP aadress IRC serverilt"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Küsi serverilt oma tõeline aadressi. Kasuta seda juhul, kui sul on 192.168.*."
-"* aadress!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Küsi serverilt oma tõeline aadressi. Kasuta seda juhul, kui sul on 192.168.*.* aadress!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6209,19 +6108,15 @@ msgstr "Kategooriad"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"Puud ei saa paigutada akna ülemisse või alumisse äärde!\n"
-"Palun vali <b>Vaade</b> menüüst <b>Sakid</b>, kui seda teha soovid."
+msgstr "Puud ei saa paigutada akna ülemisse või alumisse äärde!\nPalun vali <b>Vaade</b> menüüst <b>Sakid</b>, kui seda teha soovid."
 
 #: 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Muudeti mõnesid seadeid, mis vajavad programmi taaskäivitust mõjumiseks."
+msgstr "Muudeti mõnesid seadeid, mis vajavad programmi taaskäivitust mõjumiseks."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6229,11 +6124,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*HOIATUS*\n"
-"DCC failide automaatne kodukataloogi salvestamine\n"
-"on ohtlik ja ära kasutatav. Näiteks võin keegi\n"
-"saata sulle faili .bash_profile"
+msgstr "*HOIATUS*\nDCC failide automaatne kodukataloogi salvestamine\non ohtlik ja ära kasutatav. Näiteks võin keegi\nsaata sulle faili .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6347,8 +6238,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
@@ -6364,9 +6255,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/eu.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Mikel Olasagasti <hey_neken@euskal.org>, 2004
 # Mikel Olasagasti Uranga <mikel@olasagasti.info>, 2012
@@ -10,15 +10,14 @@ 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: Basque (http://www.transifex.com/hexchat/hexchat/language/"
-"eu/)\n"
-"Language: eu\n"
+"Language-Team: Basque (http://www.transifex.com/hexchat/hexchat/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -300,9 +299,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* root bezala IRCa erabiltzia ez da ona! Erabiltzaile kontu\n"
-"  berri bat sortu beharko zenuke eta honekin sartu.\n"
+msgstr "* root bezala IRCa erabiltzia ez da ona! Erabiltzaile kontu\n  berri bat sortu beharko zenuke eta honekin sartu.\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
@@ -319,8 +316,7 @@ msgstr "EZ"
 #: src/common/ignore.c:370
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr ""
-"CTCP ugariegi jasotzen hari zara %s(r)engandik, %s ignoratu egingo da.\n"
+msgstr "CTCP ugariegi jasotzen hari zara %s(r)engandik, %s ignoratu egingo da.\n"
 
 #: src/common/ignore.c:397
 #, c-format
@@ -422,9 +418,7 @@ msgstr "Plugin hori kargatzeari uko egiten ari da.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <izena> <ekintza>, botoi bat gehitzen du erabiltzaile zerrendaren "
-"azpian"
+msgstr "ADDBUTTON <izena> <ekintza>, botoi bat gehitzen du erabiltzaile zerrendaren azpian"
 
 #: src/common/outbound.c:3933
 msgid ""
@@ -465,7 +459,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
@@ -492,7 +487,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
@@ -516,24 +512,19 @@ msgstr ""
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
-msgstr ""
-"DELBUTTON <izena>, erabiltzaile zerrendaren azpitik botoi bat ezabatzen du"
+msgstr "DELBUTTON <izena>, erabiltzaile zerrendaren azpitik botoi bat ezabatzen du"
 
 #: src/common/outbound.c:3972
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <ezizena>, uneko kanalean chanop egoera kentzen dio aukeratutako "
-"ezizenari (chanop egoera behar da)"
+msgstr "DEOP <ezizena>, uneko kanalean chanop egoera kentzen dio aukeratutako ezizenari (chanop egoera behar da)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <ezizena>, uneko kanalean voice egoera kentzen dio aukeratutako "
-"ezizenari <chanop egoera behar da>"
+msgstr "DEVOICE <ezizena>, uneko kanalean voice egoera kentzen dio aukeratutako ezizenari <chanop egoera behar da>"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -639,8 +630,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
@@ -658,8 +648,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
@@ -677,8 +667,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
@@ -709,14 +699,12 @@ msgstr ""
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <ezizena>, chanop egoera ematen dio erabiltzaileari (chanop behar da)"
+msgstr "OP <ezizena>, chanop egoera ematen dio erabiltzaileari (chanop behar da)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanala>] [<arrazoia>], kanaletik irteten da, unekotik lehenetsita"
+msgstr "PART [<kanala>] [<arrazoia>], kanaletik irteten da, unekotik lehenetsita"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -744,8 +732,8 @@ msgstr "QUOTE <mezua>, mezua era lauean bidaltzen dio zerbitzariari"
 
 #: 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 ""
 
@@ -792,9 +780,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <ostalaria> [<ataka>] [<pasahitza>], zerbitzari batera konektatzen "
-"da, lehenetsitako ataka 6667 da"
+msgstr "SERVER <ostalaria> [<ataka>] [<pasahitza>], zerbitzari batera konektatzen da, lehenetsitako ataka 6667 da"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -814,10 +800,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<gaia>], zerbait ematen bada gaia hori ezartzen du, bestela uneko "
-"gaia erakusten du"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<gaia>], zerbait ematen bada gaia hori ezartzen du, bestela uneko gaia erakusten du"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -831,8 +816,7 @@ msgstr ""
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <maskara> [<maskara>...], espezifikatutako maskarei debekua kentzen die"
+msgstr "UNBAN <maskara> [<maskara>...], espezifikatutako maskarei debekua kentzen die"
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -844,8 +828,8 @@ msgstr "UNLOAD <izena>, plugin edo skript-a deskargatzen du"
 
 #: 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
@@ -854,7 +838,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
@@ -884,9 +869,7 @@ msgstr "Erabilera: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Ez dago laguntzarik eskuragarri komando horrentzat.\n"
+msgstr "\nEz dago laguntzarik eskuragarri komando horrentzat.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -955,9 +938,7 @@ msgstr "Ziur zaude SSL erabiltzeko gai den zerbitzari eta ataka dela?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Ezin da ebatzi %s ostalari-izena\n"
-"Egiaztatu zure IP ezarpenak!\n"
+msgstr "Ezin da ebatzi %s ostalari-izena\nEgiaztatu zure IP ezarpenak!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -973,9 +954,7 @@ msgstr "Hurrengo zerbitzarira %s-n ziklatzen...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Oharra: \"%s\" karaktere-jokoa ezezaguna da. Ez da konbertsiorik aplikatu %s "
-"sarearentzat."
+msgstr "Oharra: \"%s\" karaktere-jokoa ezezaguna da. Ez da konbertsiorik aplikatu %s sarearentzat."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1134,7 +1113,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
@@ -1168,8 +1148,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
@@ -1190,7 +1170,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
@@ -1203,7 +1184,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
@@ -1220,7 +1202,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
@@ -1996,9 +1979,7 @@ msgstr "Debekuaren denbora"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Ezin da soinu fitxategia irakurri:\n"
-"%s"
+msgstr "Ezin da soinu fitxategia irakurri:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3357,10 +3338,7 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Ezin da fitxategira iritsi: %s\n"
-"%s.\n"
-"Berrekitea ezinezkoa."
+msgstr "Ezin da fitxategira iritsi: %s\n%s.\nBerrekitea ezinezkoa."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
@@ -3512,10 +3490,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Huts egin da letra tipoa irekitzen:\n"
-"\n"
-"%s"
+msgstr "Huts egin da letra tipoa irekitzen:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3533,18 +3508,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 "
@@ -3559,39 +3534,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
@@ -5725,8 +5700,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
@@ -5735,8 +5710,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
@@ -5787,7 +5762,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
@@ -5897,11 +5873,9 @@ msgstr "Hartu nire IPa IRC zerbitzaritik"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Galdetu IRC zerbitzariari zure benetako helbidea. Erabili hau 192.168.*.* "
-"moduko helbidea baduzu."
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Galdetu IRC zerbitzariari zure benetako helbidea. Erabili hau 192.168.*.* moduko helbidea baduzu."
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6136,15 +6110,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Egindako ezarpen aldaketa batzuk berrabiaraztea behar dute guztizko efektua "
-"egin dezaten."
+msgstr "Egindako ezarpen aldaketa batzuk berrabiaraztea behar dute guztizko efektua egin dezaten."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6152,11 +6123,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*OHARRA*\n"
-"DCCak automatikoki onartzea zure etxe karpetara\n"
-"kaltegarria izan daiteke. Adibidez norbaitek\n"
-".bash_profile fitxategia bidali dezake"
+msgstr "*OHARRA*\nDCCak automatikoki onartzea zure etxe karpetara\nkaltegarria izan daiteke. Adibidez norbaitek\n.bash_profile fitxategia bidali dezake"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6270,8 +6237,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
@@ -6287,9 +6254,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/fi.po

@@ -1,23 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2014,2016
 # Toni Willberg <toni@willberg.fi>, 2014
+# Toni Willberg <toni@willberg.fi>, 2014
 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: Finnish (http://www.transifex.com/hexchat/hexchat/language/"
-"fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/hexchat/hexchat/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -36,20 +36,13 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr ""
-"HexChat on helppokäyttäinen IRC-asiakassovellus, joka on helposti "
-"laajennettavissa. Sen avulla voit liittyä lukuisiin eri verkkoihin ja "
-"keskustella muiden kanssa kanavilla tai yksityiskeskusteluissa. Voit myös "
-"siirtää tiedostoja muiden käyttäjien kanssa."
+msgstr "HexChat on helppokäyttäinen IRC-asiakassovellus, joka on helposti laajennettavissa. Sen avulla voit liittyä lukuisiin eri verkkoihin ja keskustella muiden kanssa kanavilla tai yksityiskeskusteluissa. Voit myös siirtää tiedostoja muiden käyttäjien kanssa."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:12
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr ""
-"HexChat tukee muun muassa seuraavia ominaisuuksia: DCC, SASL, "
-"välityspalvelimet, oikoluku, hälytykset, lokitus, mukautettavat teemat ja "
-"Python-/Perl-skriptit."
+msgstr "HexChat tukee muun muassa seuraavia ominaisuuksia: DCC, SASL, välityspalvelimet, oikoluku, hälytykset, lokitus, mukautettavat teemat ja Python-/Perl-skriptit."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -306,9 +299,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRCin ajaminen pääkäyttäjänä on typerää!\n"
-"  Luo tavallinen käyttäjätunnus ja kirjaudu sillä.\n"
+msgstr "* IRCin ajaminen pääkäyttäjänä on typerää!\n  Luo tavallinen käyttäjätunnus ja kirjaudu sillä.\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
@@ -366,8 +357,7 @@ msgstr "Millekään kanavalle ei ole liitytty. Kokeile /join #<kanava>\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr ""
-"Mihinkään palvelimeen ei ole yhteyttä. Kokeile /server <isäntä> [<portti>]\n"
+msgstr "Mihinkään palvelimeen ei ole yhteyttä. Kokeile /server <isäntä> [<portti>]\n"
 
 #: src/common/outbound.c:277
 #, c-format
@@ -428,8 +418,7 @@ msgstr "Liitännäinen ei suostu poistumaan käytöstä.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <nimi> <toiminto>, lisää painikkeen käyttäjäluettelon alapuolelle"
+msgstr "ADDBUTTON <nimi> <toiminto>, lisää painikkeen käyttäjäluettelon alapuolelle"
 
 #: src/common/outbound.c:3933
 msgid ""
@@ -447,8 +436,7 @@ msgstr ""
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <komento>, lähettää komennon kaikille palvelimille, joilla ollaan"
+msgstr "ALLSERV <komento>, lähettää komennon kaikille palvelimille, joilla ollaan"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -463,10 +451,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <peite> [<bannityyppi>], bannaa jokaisen peitteeseen täsmäävän käyttäjän "
-"nykyiseltä kanavalta. Jos käyttäjät ovat jo kanavalla, tämä komento ei "
-"potkaise heitä (vaatii opit)"
+msgstr "BAN <peite> [<bannityyppi>], bannaa jokaisen peitteeseen täsmäävän käyttäjän nykyiseltä kanavalta. Jos käyttäjät ovat jo kanavalla, tämä komento ei potkaise heitä (vaatii opit)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -474,7 +459,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
@@ -497,13 +483,12 @@ msgstr "COUNTRY [-s] <koodi|jokeri>, etsii maakoodin, esim. au = Australia."
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <käyttäjä> <viesti>, lähettää CTCP-viestin käyttäjälle, yleiset viestit "
-"ovat VERSION ja USERINFO"
+msgstr "CTCP <käyttäjä> <viesti>, lähettää CTCP-viestin käyttäjälle, yleiset viestit ovat VERSION ja USERINFO"
 
 #: 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 "CYCLE, poistuu nykyiseltä kanavalta ja palaa heti takaisin"
 
 #: src/common/outbound.c:3956
@@ -517,28 +502,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <kutsumanimi>                    - hyväksy tarjottu tiedosto\n"
-"DCC SEND [-maxcps=#] <knimi> [tiedosto]  - lähetä tiedosto jollekulle\n"
-"DCC PSEND [-maxcps=#] <knimi> [tiedosto] - lähetä tiedosto "
-"passiivitilaisena\n"
-"DCC LIST                                 - näytä DCC-luettelo\n"
-"DCC CHAT <kutsumanimi>                   - ehdota DCC-keskustelua "
-"jollekulle\n"
-"DCC PCHAT <kutsumanimi>                  - ehdota DCC-keskustelua "
-"passiivitilaisena\n"
-"DCC CLOSE <tyyppi> <knimi> <tiedosto>    - keskeytä DCC-siirto, "
-"esimerkiksi:\n"
-"         /dcc close send jarkkoranta tiedosto.tar.gz"
+msgstr "\nDCC GET <kutsumanimi>                    - hyväksy tarjottu tiedosto\nDCC SEND [-maxcps=#] <knimi> [tiedosto]  - lähetä tiedosto jollekulle\nDCC PSEND [-maxcps=#] <knimi> [tiedosto] - lähetä tiedosto passiivitilaisena\nDCC LIST                                 - näytä DCC-luettelo\nDCC CHAT <kutsumanimi>                   - ehdota DCC-keskustelua jollekulle\nDCC PCHAT <kutsumanimi>                  - ehdota DCC-keskustelua passiivitilaisena\nDCC CLOSE <tyyppi> <knimi> <tiedosto>    - keskeytä DCC-siirto, esimerkiksi:\n         /dcc close send jarkkoranta tiedosto.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <käyttäjä>, poistaa puoliopit käyttäjältä nykyisellä kanavalla (vaatii "
-"opit)"
+msgstr "DEHOP <käyttäjä>, poistaa puoliopit käyttäjältä nykyisellä kanavalla (vaatii opit)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -548,16 +518,13 @@ msgstr "DELBUTTON <nimi>, poistaa painikkeen käyttäjäluettelon alta"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <käyttäjä>, poistaa opit käyttäjältä nykyisellä kanavalla (vaatii opit)"
+msgstr "DEOP <käyttäjä>, poistaa opit käyttäjältä nykyisellä kanavalla (vaatii opit)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <käyttäjä>, poistaa puheoikeuden käyttäjältä nykyisellä kanavalla "
-"(vaatii opit)"
+msgstr "DEVOICE <käyttäjä>, poistaa puheoikeuden käyttäjältä nykyisellä kanavalla (vaatii opit)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -579,9 +546,7 @@ msgstr "ECHO <teksti>, tulostaa tekstiä paikallisesti"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <komento>, ajaa komennon. Käytettäessä valitsinta -o tuloste "
-"lähetetään nykyiselle kanavalle, muutoin nykyiseen ikkunaan"
+msgstr "EXEC [-o] <komento>, ajaa komennon. Käytettäessä valitsinta -o tuloste lähetetään nykyiselle kanavalle, muutoin nykyiseen ikkunaan"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -591,9 +556,7 @@ msgstr "EXECCONT, lähettää prosessille signaalin SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], tappaa nykyisestä istunnosta käynnistetyn ohjelman. "
-"Käytettäessä valitsinta -9, prosessille lähetetään signaali SIGKILL"
+msgstr "EXECKILL [-9], tappaa nykyisestä istunnosta käynnistetyn ohjelman. Käytettäessä valitsinta -9, prosessille lähetetään signaali SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -613,8 +576,7 @@ msgstr "FLUSHQ, tyhjentää nykyisen palvelimen lähetysjonon"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <isäntä> [<portti>], käyttää isäntää välipalvelimena, oletusportti 23"
+msgstr "GATE <isäntä> [<portti>], käyttää isäntää välipalvelimena, oletusportti 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -635,20 +597,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <peite> <tyypit..> <valitsimet..>\n"
-"    peite - peite, jonka mukaan jätetään huomiotta, esim: *!*@*.aol.com\n"
-"    tyypit - viestityypit, jotka jätetään huomiotta, yksi tai useampi:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    valitsimet - NOSAVE, QUIET"
+msgstr "IGNORE <peite> <tyypit..> <valitsimet..>\n    peite - peite, jonka mukaan jätetään huomiotta, esim: *!*@*.aol.com\n    tyypit - viestityypit, jotka jätetään huomiotta, yksi tai useampi:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    valitsimet - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <käyttäjä> [<kanava>], kutsuu käyttäjän kanavalle, oletuksena "
-"nykyiselle (vaatii opit)"
+msgstr "INVITE <käyttäjä> [<kanava>], kutsuu käyttäjän kanavalle, oletuksena nykyiselle (vaatii opit)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -675,8 +630,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
@@ -686,8 +640,7 @@ msgstr "LOAD [-e] <tiedosto>, lataa liitännäisen tai komentotiedoston."
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, poistaa opit kaikilta nykyisen kanavan puoliopeilta (vaatii opit)"
+msgstr "MDEHOP, poistaa opit kaikilta nykyisen kanavan puoliopeilta (vaatii opit)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -695,11 +648,9 @@ msgstr "MDEOP, poistaa opit kaikilta nykyisen kanavan opeilta (vaatii opit)"
 
 #: 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)"
-msgstr ""
-"ME <toiminta>, lähettää toiminnan nykyiselle kanavalle (toiminnat "
-"kirjoitetaan kolmannessa persoonassa, kuten /me hyppää)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <toiminta>, lähettää toiminnan nykyiselle kanavalle (toiminnat kirjoitetaan kolmannessa persoonassa, kuten /me hyppää)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -712,14 +663,12 @@ msgstr "MKICK, potkaisee kaikki muut kanavalta (vaatii opit)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, antaa kanavaoperaattorin oikeudet kanavan kaikille käyttäjille (vaatii "
-"opit)"
+msgstr "MOP, antaa kanavaoperaattorin oikeudet kanavan kaikille käyttäjille (vaatii opit)"
 
 #: 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
@@ -746,14 +695,11 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n verkko1[,verkko2]] [<kutsumanimi>], näyttää ilmoitusluettelon tai "
-"lisää siihen jonkun"
+msgstr "NOTIFY [-n verkko1[,verkko2]] [<kutsumanimi>], näyttää ilmoitusluettelon tai lisää siihen jonkun"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <käyttäjä>, antaa kanavaoperaattorin oikeudet käyttäjälle (vaatii opit)"
+msgstr "OP <käyttäjä>, antaa kanavaoperaattorin oikeudet käyttäjälle (vaatii opit)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -786,23 +732,17 @@ msgstr "QUOTE <teksti>, lähettää tekstin raa'assa muodossa palvelimelle"
 
 #: 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 ""
-"RECONNECT [-ssl] [<isäntä>] [<portti>] [<salasana>], voidaan kutsua /"
-"RECONNECT nykyiseen palvelimeen uudelleen yhdistämiseksi, tai /RECONNECT ALL "
-"kaikkiin avoimiin palvelimiin uudelleen yhdistämiseksi"
+msgstr "RECONNECT [-ssl] [<isäntä>] [<portti>] [<salasana>], voidaan kutsua /RECONNECT nykyiseen palvelimeen uudelleen yhdistämiseksi, tai /RECONNECT ALL kaikkiin avoimiin palvelimiin uudelleen yhdistämiseksi"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<isäntä>] [<portti>] [<salasana>], voidaan kutsua /RECONNECT "
-"nykyiseen palvelimeen uudelleen yhdistämiseksi, tai /RECONNECT ALL kaikkiin "
-"avoimiin palvelimiin uudelleen yhdistämiseksi"
+msgstr "RECONNECT [<isäntä>] [<portti>] [<salasana>], voidaan kutsua /RECONNECT nykyiseen palvelimeen uudelleen yhdistämiseksi, tai /RECONNECT ALL kaikkiin avoimiin palvelimiin uudelleen yhdistämiseksi"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -824,8 +764,7 @@ msgstr "SEND <käyttäjä> [<tiedosto>], lähettää käyttäjälle tiedoston"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <isäntä> <portti> <kanava>, yhdistää ja liittyy kanavalle"
+msgstr "SERVCHAN [-ssl] <isäntä> <portti> <kanava>, yhdistää ja liittyy kanavalle"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -841,9 +780,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <isäntä> [<portti>] [<salasana>], yhdistää palvelimelle, oletusportti "
-"on 6667"
+msgstr "SERVER <isäntä> [<portti>] [<salasana>], yhdistää palvelimelle, oletusportti on 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -863,10 +800,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<aihe>], asettaa aiheen, jos se annetaan, muutoin näyttää nykyisen "
-"aiheen"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<aihe>], asettaa aiheen, jos se annetaan, muutoin näyttää nykyisen aiheen"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -876,14 +812,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <aika> <tied1> [<tied2>] Vuorottelee kahta kuvaketta "
-"ilmoitusalueella (välkyttää).\n"
-"TRAY -f <tiedostonimi>           Muuttumaton kuvake ilmoitusalueelle.\n"
-"TRAY -i <numero>                 Välkyttää sisäänrakennettua kuvaketta.\n"
-"TRAY -t <teksti>                 Asettaa ilmoitusalueen vihjetekstin.\n"
-"TRAY -b <otsikko> <teksti>       Asettaa ilmoitusalueen puhekuplan tekstin."
+msgstr "\nTRAY -f <aika> <tied1> [<tied2>] Vuorottelee kahta kuvaketta ilmoitusalueella (välkyttää).\nTRAY -f <tiedostonimi>           Muuttumaton kuvake ilmoitusalueelle.\nTRAY -i <numero>                 Välkyttää sisäänrakennettua kuvaketta.\nTRAY -t <teksti>                 Asettaa ilmoitusalueen vihjetekstin.\nTRAY -b <otsikko> <teksti>       Asettaa ilmoitusalueen puhekuplan tekstin."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -899,8 +828,8 @@ msgstr "UNLOAD <nimi>, poistaa käytöstä liitännäisen tai skriptin"
 
 #: 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
@@ -909,10 +838,9 @@ msgstr "URL <url>, avaa URLin selaimeen"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nimi1> <nimi2> jne., valitsee nimet kanavan "
-"käyttäjäluettelosta"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nimi1> <nimi2> jne., valitsee nimet kanavan käyttäjäluettelosta"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -941,9 +869,7 @@ msgstr "Käyttö: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Komennolle ei ole saatavissa ohjetta.\n"
+msgstr "\nKomennolle ei ole saatavissa ohjetta.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -964,8 +890,7 @@ msgstr ""
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Ei hexchat_plugin_init-symbolia; onko varmasti kyseessä HexChat-liitännäinen?"
+msgstr "Ei hexchat_plugin_init-symbolia; onko varmasti kyseessä HexChat-liitännäinen?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1013,9 +938,7 @@ msgstr "Onko tämä varmasti SSL:ää tukeva palvelin ja portti?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Isäntänimen %s selvitys ei onnistu\n"
-"Tarkista IP-asetukset!\n"
+msgstr "Isäntänimen %s selvitys ei onnistu\nTarkista IP-asetukset!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1031,9 +954,7 @@ msgstr "Siirrytään seuraavalle %s-verkon palvelimelle...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Varoitus: merkistö \"%s\" on tuntematon. Verkossa %s ei käytetä mitään "
-"muunnosta."
+msgstr "Varoitus: merkistö \"%s\" on tuntematon. Verkossa %s ei käytetä mitään muunnosta."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1192,7 +1113,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
@@ -1226,8 +1148,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
@@ -1248,7 +1170,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
@@ -1261,7 +1184,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
@@ -1278,7 +1202,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
@@ -1375,9 +1300,7 @@ msgstr ""
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tNimi on virheellinen tai jo käytössä. Käytä /NICK -komentoa "
-"yrittääksesi uudelleen."
+msgstr "%C20*%O$tNimi on virheellinen tai jo käytössä. Käytä /NICK -komentoa yrittääksesi uudelleen."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -2056,9 +1979,7 @@ msgstr "Bannausaika"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Äänitiedostoa ei voi lukea:\n"
-"%s"
+msgstr "Äänitiedostoa ei voi lukea:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3417,18 +3338,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Tiedostoa ei voi käsitellä: %s\n"
-"%s.\n"
-"Jatkaminen ei ole mahdollista."
+msgstr "Tiedostoa ei voi käsitellä: %s\n%s.\nJatkaminen ei ole mahdollista."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Tiedosto latauskansiossa on suurempi kuin tarjottu tiedosto. Jatkaminen ei "
-"ole mahdollista."
+msgstr "Tiedosto latauskansiossa on suurempi kuin tarjottu tiedosto. Jatkaminen ei ole mahdollista."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3558,8 +3474,7 @@ msgstr "Avaa URL tai suorita komento käynnissä olevassa HexChatissa"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Aloita pienennettynä. Taso: 0=tavallinen, 1=kuvakkeena, 2=ilmoitusalueella"
+msgstr "Aloita pienennettynä. Taso: 0=tavallinen, 1=kuvakkeena, 2=ilmoitusalueella"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3575,10 +3490,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Kirjasimen avaaminen ei onnistunut:\n"
-"\n"
-"%s"
+msgstr "Kirjasimen avaaminen ei onnistunut:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3596,18 +3508,18 @@ msgstr "Verkon lähetysjonossa on %d tavua."
 
 #: 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 "
@@ -3618,63 +3530,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Insert in Buffer -komento lisää Data 1:n sisällön syöteriville kohdistimen "
-"kohdalle"
+msgstr "Insert in Buffer -komento lisää Data 1:n sisällön syöteriville kohdistimen kohdalle"
 
 #: 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 "Set Buffer -komento asettaa syöteriviksi Data 1:n sisällön"
 
 #: 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"
-msgstr ""
-"Last Command -komento asettaa syöteriviksi edellisen annetun komennon - "
-"vastaa ylänuolen painamista kuoressa"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Last Command -komento asettaa syöteriviksi edellisen annetun komennon - vastaa ylänuolen painamista kuoressa"
 
 #: 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"
-msgstr ""
-"Next Command -komento asettaa syöteriviksi seuraavan annetun komennon - "
-"vastaa alanuolen painamista kuoressa"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Next Command -komento asettaa syöteriviksi seuraavan annetun komennon - vastaa alanuolen painamista kuoressa"
 
 #: 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"
-msgstr ""
-"Tämä komento täydentää syöterivillä osoittimen edellä olevan epätäydellisen "
-"kutsumanimen tai komennon. Jos Data 1 on asetettu, kaksi kertaa painaminen "
-"valitsee edellisen kutsumanimen, ei seuraavaa"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Tämä komento täydentää syöterivillä osoittimen edellä olevan epätäydellisen kutsumanimen tai komennon. Jos Data 1 on asetettu, kaksi kertaa painaminen valitsee edellisen kutsumanimen, ei seuraavaa"
 
 #: 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"
-msgstr ""
-"Tämä komento vierittää käyttäjäluetteloa ylös ja alas. Jos Data 1 on "
-"asetettu, luetteloa vieritetään ylös, muutoin alas"
+"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 "Tämä komento vierittää käyttäjäluetteloa ylös ja alas. Jos Data 1 on asetettu, luetteloa vieritetään ylös, muutoin alas"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Tämä komento vertaa viimeistä annettua sanaa korvauslistaan ja muuttaa sen,"
-"jos löytyy täsmäävyys."
+msgstr "Tämä komento vertaa viimeistä annettua sanaa korvauslistaan ja muuttaa sen,jos löytyy täsmäävyys."
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3849,8 +3748,7 @@ msgstr "Kanavalla ei ole aihetta."
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Palvelimelta on edelleen auki %d kanavaa tai keskustelua. Suljetaanko kaikki?"
+msgstr "Palvelimelta on edelleen auki %d kanavaa tai keskustelua. Suljetaanko kaikki?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4081,9 +3979,7 @@ msgstr "%d nimeä valittu."
 msgid ""
 "The Menubar is now hidden. You can show it again by pressing Control+F9 or "
 "right-clicking in a blank part of the main text area."
-msgstr ""
-"Valikkopalkki on nyt piilossa. Sen saa taas esiin painamalla Ctrl-F9:ää tai "
-"hiiren oikeaa painiketta tekstialueen tyhjässä kohdassa."
+msgstr "Valikkopalkki on nyt piilossa. Sen saa taas esiin painamalla Ctrl-F9:ää tai hiiren oikeaa painiketta tekstialueen tyhjässä kohdassa."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4225,19 +4121,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP-vastaukset - Erikoiskoodit:\n"
-"\n"
-"%d  =  data (koko ctcp)\n"
-"%e  =  nykyinen verkko\n"
-"%m  =  koneen tiedot\n"
-"%s  =  ctcp:n lähettäjän nimimerkki\n"
-"%t  =  aika/päiväys\n"
-"%2  =  2. sana\n"
-"%3  =  3. sana\n"
-"&2  =  2. sanasta rivin loppuun\n"
-"&3  =  3. sanasta rivin loppuun\n"
-"\n"
+msgstr "CTCP-vastaukset - Erikoiskoodit:\n\n%d  =  data (koko ctcp)\n%e  =  nykyinen verkko\n%m  =  koneen tiedot\n%s  =  ctcp:n lähettäjän nimimerkki\n%t  =  aika/päiväys\n%2  =  2. sana\n%3  =  3. sana\n&2  =  2. sanasta rivin loppuun\n&3  =  3. sanasta rivin loppuun\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4819,9 +4703,7 @@ msgstr "Yhdistä vain valittuun palvelimeen"
 
 #: src/fe-gtk/servlistgui.c:1867
 msgid "Don't cycle through all the servers when the connection fails."
-msgstr ""
-"Älä yritä yhdistää muihin palvelimiin, jos valittuun palvelimeen ei saada "
-"yhteyttä."
+msgstr "Älä yritä yhdistää muihin palvelimiin, jos valittuun palvelimeen ei saada yhteyttä."
 
 #: src/fe-gtk/servlistgui.c:1868
 msgid "Connect to this network automatically"
@@ -5818,8 +5700,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
@@ -5828,8 +5710,8 @@ msgstr "Sisällytä väritiedot automaattisesti"
 
 #: 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
@@ -5880,7 +5762,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
@@ -5990,11 +5873,9 @@ msgstr "Hae IP-osoite IRC-palvelimelta"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Tiedustelee osoittettasi IRC-palvelimelta. Rastita, mikäli osoitteesi on "
-"esimerkiksi muotoa 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Tiedustelee osoittettasi IRC-palvelimelta. Rastita, mikäli osoitteesi on esimerkiksi muotoa 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6226,19 +6107,15 @@ msgstr "Asetusryhmät"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"Puuta ei voi laittaa ylös eikä alas!\n"
-"Muuta ensin välilehtiasettelua <b>Näytä</b>-valikosta."
+msgstr "Puuta ei voi laittaa ylös eikä alas!\nMuuta ensin välilehtiasettelua <b>Näytä</b>-valikosta."
 
 #: 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 "Oikeaa nimeä ei voi jättää tyhjäksi."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Osa muutoksista tulee voimaan vasta kun ohjelma käynnistetään uudestaan."
+msgstr "Osa muutoksista tulee voimaan vasta kun ohjelma käynnistetään uudestaan."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6246,11 +6123,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*VAROITUS*\n"
-"DCC-siirtojen automaattinen hyväksyminen\n"
-"kotihakemistoon voi olla vaarallista. Esim:\n"
-"Joku voi lähettää tiedoston .bash_profile."
+msgstr "*VAROITUS*\nDCC-siirtojen automaattinen hyväksyminen\nkotihakemistoon voi olla vaarallista. Esim:\nJoku voi lähettää tiedoston .bash_profile."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6364,8 +6237,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
@@ -6381,9 +6254,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/gl.po

@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2015
 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-23 18:37+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: Galician (http://www.transifex.com/hexchat/hexchat/language/"
-"gl/)\n"
-"Language: gl\n"
+"Language-Team: Galician (http://www.transifex.com/hexchat/hexchat/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\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 ""
-"* Executar o IRC como root é estúpido! Debería\n"
-"  crear unha conta de usuario e usala para conectarse.\n"
+msgstr "* Executar o IRC como root é estúpido! Debería\n  crear unha conta de usuario e usala para conectarse.\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
@@ -419,8 +416,7 @@ msgstr "Ese complemento négase a ser desactivado.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <nome> <acción>, engade un botón debaixo da lista de usuarios"
+msgstr "ADDBUTTON <nome> <acción>, engade un botón debaixo da lista de usuarios"
 
 #: src/common/outbound.c:3933
 msgid ""
@@ -438,8 +434,7 @@ msgstr ""
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <cmd>, envía un comando a todos os servidores aos que está conectado"
+msgstr "ALLSERV <cmd>, envía un comando a todos os servidores aos que está conectado"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -454,10 +449,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <máscara> [<tipo de veto>], veta a todos aqueles que concorden coa "
-"máscara da canle actual. Se xa están na canle isto non os expulsa (é "
-"necesario ser operador da canle)"
+msgstr "BAN <máscara> [<tipo de veto>], veta a todos aqueles que concorden coa máscara da canle actual. Se xa están na canle isto non os expulsa (é necesario ser operador da canle)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -465,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
@@ -482,22 +475,19 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>, busca o código de país, ex: au = australia"
+msgstr "COUNTRY [-s] <code|wildcard>, busca o código de país, ex: au = australia"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <alcume> <mensaxe>, envía a mensaxe CTCP ao alcume, as mensaxes comúns "
-"son VERSION e USERINFO"
+msgstr "CTCP <alcume> <mensaxe>, envía a mensaxe CTCP ao alcume, as mensaxes comúns son VERSION e USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<canle>], márchase da canle actual e inmediatamente volve a entrar"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canle>], márchase da canle actual e inmediatamente volve a entrar"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -510,26 +500,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <alcume>                     - acepta un ficheiro ofrecido\n"
-"DCC SEND [-maxcps=#] <alcume> [ficheiro] - envía un ficheiro a alguén\n"
-"DCC PSEND [-maxcps=#] <alcume> [ficheiro] - envía un ficheiro a alguén "
-"usando o modo pasivo\n"
-"DCC LIST                           - amosa a lista DCC\n"
-"DCC CHAT <alcume>                    - ofrece o DCC CHAT a alguén\n"
-"DCC PCHAT <alcume>                    - ofrece o DCC CHAT usando modo "
-"pasivo\n"
-"DCC CLOSE <tipo> <alcume> <ficheiro>         exemplo:\n"
-"         /dcc close send xoándapena ficheiro.tar.gz"
+msgstr "\nDCC GET <alcume>                     - acepta un ficheiro ofrecido\nDCC SEND [-maxcps=#] <alcume> [ficheiro] - envía un ficheiro a alguén\nDCC PSEND [-maxcps=#] <alcume> [ficheiro] - envía un ficheiro a alguén usando o modo pasivo\nDCC LIST                           - amosa a lista DCC\nDCC CHAT <alcume>                    - ofrece o DCC CHAT a alguén\nDCC PCHAT <alcume>                    - ofrece o DCC CHAT usando modo pasivo\nDCC CLOSE <tipo> <alcume> <ficheiro>         exemplo:\n         /dcc close send xoándapena ficheiro.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <alcume>, elimina o estado de semi-operador da canle ao alcume na "
-"canle actual (necesita ser operador da canle)"
+msgstr "DEHOP <alcume>, elimina o estado de semi-operador da canle ao alcume na canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -539,17 +516,13 @@ msgstr "DELBUTTON <nome>, borra un botón de debaixo da lista de usuarios"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <alcume>, quita o estado de operador da canle ao alcume na canle actual "
-"(necesita ser operador da canle)"
+msgstr "DEOP <alcume>, quita o estado de operador da canle ao alcume na canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <alcume>, quita o estado de voz do alcume na canle actual (necesita "
-"ser operador da canle)"
+msgstr "DEVOICE <alcume>, quita o estado de voz do alcume na canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -571,9 +544,7 @@ msgstr "ECHO <texto>, Imprime texto localmente"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <comando>, executa o comando. Se se usa a bandeira -o entón a "
-"saída envíase á canle actual, se non, imprímese na caixa de texto actual"
+msgstr "EXEC [-o] <comando>, executa o comando. Se se usa a bandeira -o entón a saída envíase á canle actual, se non, imprímese na caixa de texto actual"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -583,9 +554,7 @@ msgstr "EXECCONT, envía o proceso SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], mata un executable correndo na sesión actual. Se se indica -9 "
-"o proceso é matado pola forza"
+msgstr "EXECKILL [-9], mata un executable correndo na sesión actual. Se se indica -9 o proceso é matado pola forza"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -605,9 +574,7 @@ msgstr "FLUSHQ, borra a cola de envío actual do servidor"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <equipo> [<porto>], utiliza un proxy a través dun equipo, o porto por "
-"defecto é o 23"
+msgstr "GATE <equipo> [<porto>], utiliza un proxy a través dun equipo, o porto por defecto é o 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -615,9 +582,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <alcume>, da o estado de semi-operador ao alcume (necesita ser operador "
-"da canle)"
+msgstr "HOP <alcume>, da o estado de semi-operador ao alcume (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -630,20 +595,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <máscara> <tipos..> <opcións..>\n"
-"    máscara - máscara de equipos a ignorar, ex: *!*@*.aol.com\n"
-"    tipos - tipos de datos a ignorar, un ou todos:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opcións - NOSAVE, QUIET"
+msgstr "IGNORE <máscara> <tipos..> <opcións..>\n    máscara - máscara de equipos a ignorar, ex: *!*@*.aol.com\n    tipos - tipos de datos a ignorar, un ou todos:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opcións - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <alcume> [<canle>], invita a alguén a unha canle, por omisión a canle "
-"actual (necesita ser operador da canle)"
+msgstr "INVITE <alcume> [<canle>], invita a alguén a unha canle, por omisión a canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -670,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
@@ -681,23 +638,17 @@ msgstr "LOAD [-e] <ficheiro>, carga un complemento ou script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Quita masivamente o estado de semi-operador na canle actual "
-"(necesita ser operador da canle)"
+msgstr "MDEHOP, Quita masivamente o estado de semi-operador na canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Quita masivamente o estado de operador na canle actual (necesita ser "
-"operador da canle)"
+msgstr "MDEOP, Quita masivamente o estado de operador na canle actual (necesita ser operador da canle)"
 
 #: 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)"
-msgstr ""
-"ME <acción>, envía a acción á canle actual (as accións están escritas en "
-"terceira persoa, como /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <acción>, envía a acción á canle actual (as accións están escritas en terceira persoa, como /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -706,20 +657,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Expulsa masivamente a todos excepto a vostede na canle actual "
-"(necesita ser operador da canle)"
+msgstr "MKICK, Expulsa masivamente a todos excepto a vostede na canle actual (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Otorga masivamente o estado de operador da canle actual (necesita ser "
-"operador da canle)"
+msgstr "MOP, Otorga masivamente o estado de operador da canle actual (necesita ser operador da canle)"
 
 #: 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
@@ -746,15 +693,11 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<alcume>], lista súa lista de "
-"notificacións ou agrega a alguén a ela"
+msgstr "NOTIFY [-n network1[,network2,...]] [<alcume>], lista súa lista de notificacións ou agrega a alguén a ela"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <alcume>, otorga o estado de operador da canle ao alcume (necesita ser "
-"operador da canle)"
+msgstr "OP <alcume>, otorga o estado de operador da canle ao alcume (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -787,23 +730,17 @@ msgstr "QUOTE <texto>, envía o texto en formato chan hacia o servidor"
 
 #: 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 ""
-"RECONNECT [-ssl] [<equipo>] [<porto>] [<contrasinal>], Pode ser chamado só "
-"como /RECONNECT para reconectarse ao servidor actual ou con /RECONNECT ALL "
-"para reconectarse a todos os servidores abertos"
+msgstr "RECONNECT [-ssl] [<equipo>] [<porto>] [<contrasinal>], Pode ser chamado só como /RECONNECT para reconectarse ao servidor actual ou con /RECONNECT ALL para reconectarse a todos os servidores abertos"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<equipo>] [<porto>] [<contrasinal>], Pode ser chamado só como /"
-"RECONNECT para reconectarse ao servidor actual ou con /RECONNECT ALL para "
-"reconectarse a todos os servidores abertos"
+msgstr "RECONNECT [<equipo>] [<porto>] [<contrasinal>], Pode ser chamado só como /RECONNECT para reconectarse ao servidor actual ou con /RECONNECT ALL para reconectarse a todos os servidores abertos"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -841,9 +778,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <equipo> [<porto>] [<contrasinal>], conéctao ao servidor, por defecto "
-"o porto é 6667"
+msgstr "SERVER <equipo> [<porto>] [<contrasinal>], conéctao ao servidor, por defecto o porto é 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -863,10 +798,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<tópico>], estable o tópico se se provee un, se non mostra o tópico "
-"actual "
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tópico>], estable o tópico se se provee un, se non mostra o tópico actual "
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -892,8 +826,8 @@ msgstr "UNLOAD <nome>, desactiva un complemento ou script"
 
 #: 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
@@ -902,16 +836,13 @@ msgstr "URL <url>, abre unha URL no seu navegador"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <alcume1> <alcume2> etc, resalta o(s) alcume(s) na lista "
-"de usuarios da canle"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <alcume1> <alcume2> etc, resalta o(s) alcume(s) na lista de usuarios da canle"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <alcume>, otorga o estado de voz a alguén (necesita ser operador da "
-"canle)"
+msgstr "VOICE <alcume>, otorga o estado de voz a alguén (necesita ser operador da canle)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -920,9 +851,7 @@ msgstr "WALLCHAN <mensaxe>, escribe a mensaxe a todos as canles"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mensaxe>, envía a mensaxe a todos os operadores da canle na canle "
-"actual"
+msgstr "WALLCHOP <mensaxe>, envía a mensaxe a todos os operadores da canle na canle actual"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -938,9 +867,7 @@ msgstr "Uso: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Non hai axuda dispoñible para ese comando.\n"
+msgstr "\nNon hai axuda dispoñible para ese comando.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1009,9 +936,7 @@ msgstr "Está seguro de que é un servidor e porto SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Non se pode resolver o nome do equipo %s\n"
-"Comprobe súa configuración de IP!\n"
+msgstr "Non se pode resolver o nome do equipo %s\nComprobe súa configuración de IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1027,9 +952,7 @@ msgstr "Ciclando ao seguinte servidor en %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Aviso: O conxunto de caracteres \"%s\" é descoñecido. Non se aplicará "
-"conversión para a rede %s."
+msgstr "Aviso: O conxunto de caracteres \"%s\" é descoñecido. Non se aplicará conversión para a rede %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1188,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
@@ -1222,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
@@ -1244,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
@@ -1257,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
@@ -1274,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
@@ -2050,9 +1977,7 @@ msgstr "Tempo de veto"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Non se pode ler o ficheiro de son:\n"
-"%s"
+msgstr "Non se pode ler o ficheiro de son:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3411,18 +3336,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Non se pode acceder ao ficheiro: %s\n"
-"%s.\n"
-"Non é posible continuar."
+msgstr "Non se pode acceder ao ficheiro: %s\n%s.\nNon é posible continuar."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"O ficheiro no directorio de descarga é máis grande que o ficheiro ofrecido. "
-"Non é posible continuar."
+msgstr "O ficheiro no directorio de descarga é máis grande que o ficheiro ofrecido. Non é posible continuar."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3568,10 +3488,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Fallou ao abrir a fonte:\n"
-"\n"
-"%s"
+msgstr "Fallou ao abrir a fonte:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3589,18 +3506,18 @@ msgstr "Cola de envío de rede: %d bytes"
 
 #: 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 "
@@ -3611,66 +3528,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"O comando Inserir no Búfer insertará o contido de Data 1 na entrada onde a "
-"secuencia de teclas foi pulsada na posicón actual do cursor"
+msgstr "O comando Inserir no Búfer insertará o contido de Data 1 na entrada onde a secuencia de teclas foi pulsada na posicón actual do cursor"
 
 #: 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"
-msgstr ""
-"O comando Establecer búfer establece a entrada onde a secuencia de teclas "
-"foi introducida aos contidos de Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "O comando Establecer búfer establece a entrada onde a secuencia de teclas foi introducida aos contidos de Data 1"
 
 #: 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"
-msgstr ""
-"O comando Último Comando establece a entrada para conter o último comando "
-"introducido á igual que premer a tecla enriba na liña de comandos"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "O comando Último Comando establece a entrada para conter o último comando introducido á igual que premer a tecla enriba na liña de comandos"
 
 #: 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"
-msgstr ""
-"O comando Seguinte Comando establece a entrada que conteña o seguinte "
-"comando ingresado á igual que ao premer a tecla abaixo na liña de comandos"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "O comando Seguinte Comando establece a entrada que conteña o seguinte comando ingresado á igual que ao premer a tecla abaixo na liña de comandos"
 
 #: 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"
-msgstr ""
-"Este comando cambia o texto na entrada para completar un alcume incompleto "
-"ou un comando. Se Data 1 está establecido entón ao premer dúas veces a tecla "
-"TAB sobre unha cadea seleccionará o último alcume, non o seguinte."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Este comando cambia o texto na entrada para completar un alcume incompleto ou un comando. Se Data 1 está establecido entón ao premer dúas veces a tecla TAB sobre unha cadea seleccionará o último alcume, non o seguinte."
 
 #: 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"
-msgstr ""
-"Este comando despraza hacia arriba e abaixo a lista de alcumes. Se Data 1 "
-"está establecido a calquera entón desprazarase hacia arriba, se non "
-"desprazarase hacia abaixo"
+"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 "Este comando despraza hacia arriba e abaixo a lista de alcumes. Se Data 1 está establecido a calquera entón desprazarase hacia arriba, se non desprazarase hacia abaixo"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Este comando comproba a última palabra introducida na entrada contra a lista "
-"de remprazos e a rempraza se atopa unha coincidencia"
+msgstr "Este comando comproba a última palabra introducida na entrada contra a lista de remprazos e a rempraza se atopa unha coincidencia"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3845,8 +3746,7 @@ msgstr "Non está establecido ningún tópico"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Este servidor ten todavía %d canles ou diálogos asociados. Pechalos todos?"
+msgstr "Este servidor ten todavía %d canles ou diálogos asociados. Pechalos todos?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4219,19 +4119,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Respostas CTCP - Códigos especiais:\n"
-"\n"
-"%d  =  datos (o ctcp completo)\n"
-"%e  =  nome da rede actual\n"
-"%m  =  información da máquina\n"
-"%s  =  alcume de quen enviou o ctcp\n"
-"%t  =  hora/data\n"
-"%2  =  palabra 2\n"
-"%3  =  palabra 3\n"
-"&2  =  palabra 2 do fin de liña\n"
-"&3  =  palabra 3 do fin de liña\n"
-"\n"
+msgstr "Respostas CTCP - Códigos especiais:\n\n%d  =  datos (o ctcp completo)\n%e  =  nome da rede actual\n%m  =  información da máquina\n%s  =  alcume de quen enviou o ctcp\n%t  =  hora/data\n%2  =  palabra 2\n%3  =  palabra 3\n&2  =  palabra 2 do fin de liña\n&3  =  palabra 3 do fin de liña\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4813,8 +4701,7 @@ msgstr "Conectar só ao servidor seleccionado"
 
 #: src/fe-gtk/servlistgui.c:1867
 msgid "Don't cycle through all the servers when the connection fails."
-msgstr ""
-"Non ciclar a non ser que todos os servidores aos que está conectando fallen."
+msgstr "Non ciclar a non ser que todos os servidores aos que está conectando fallen."
 
 #: src/fe-gtk/servlistgui.c:1868
 msgid "Connect to this network automatically"
@@ -5683,8 +5570,7 @@ msgstr "Mensaxes resaltadas"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"As mensaxes resaltadas son nas que se menciona o seu alcume, pero tamén:"
+msgstr "As mensaxes resaltadas son nas que se menciona o seu alcume, pero tamén:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5812,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
@@ -5822,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
@@ -5874,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
@@ -5984,11 +5871,9 @@ msgstr "Obter o meu enderezo do servidor IRC"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Preguntarlle ao servidor IRC o teu enderezo verdadeiro. Usa isto se tes un "
-"enderezo 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Preguntarlle ao servidor IRC o teu enderezo verdadeiro. Usa isto se tes un enderezo 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6223,15 +6108,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Algunhas opcións que cambiou requiren un reinicio para ter efecto "
-"completamente."
+msgstr "Algunhas opcións que cambiou requiren un reinicio para ter efecto completamente."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6239,11 +6121,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*AVISO*\n"
-"Aceptar automaticamente DCC ao seu directorio de inicio\n"
-"pode ser peligroso e é explotable. Por exemplo:\n"
-"Alguén pode enviarlle un ficheiro .bash_profile"
+msgstr "*AVISO*\nAceptar automaticamente DCC ao seu directorio de inicio\npode ser peligroso e é explotable. Por exemplo:\nAlguén pode enviarlle un ficheiro .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6357,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
@@ -6374,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/gu.po

@@ -1,21 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 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: Gujarati (http://www.transifex.com/hexchat/hexchat/language/"
-"gu/)\n"
-"Language: gu\n"
+"Language-Team: Gujarati (http://www.transifex.com/hexchat/hexchat/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -297,9 +296,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC ને રુટ તરીકે ચલાવવાનું ગાંડપણ છે! તમારે વપરાશકર્તા\n"
-"  ખાતું બનાવવું જોઈએ અને તેનો ઉપયોગ પ્રવેશ માટે કરવો જોઈએ.\n"
+msgstr "* IRC ને રુટ તરીકે ચલાવવાનું ગાંડપણ છે! તમારે વપરાશકર્તા\n  ખાતું બનાવવું જોઈએ અને તેનો ઉપયોગ પ્રવેશ માટે કરવો જોઈએ.\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
@@ -451,9 +448,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <mask> [<bantype>], દરેકને વર્તમાન ચેનલમાંથી માસ્ક જોડણી કરવામાં બેન કરે છે. જો તેઓ "
-"પહેલાથી જ ચેનલ પર હોય તો આ તેમને કિક કરતું નથી (ચેનલ ચાલક જરૂરી છે)"
+msgstr "BAN <mask> [<bantype>], દરેકને વર્તમાન ચેનલમાંથી માસ્ક જોડણી કરવામાં બેન કરે છે. જો તેઓ પહેલાથી જ ચેનલ પર હોય તો આ તેમને કિક કરતું નથી (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -461,7 +456,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
@@ -484,13 +480,12 @@ msgstr "COUNTRY [-s] <code|wildcard>, દેશ કોડ શોધે છે,
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <message>, નામને CTCP સંદેશો મોકલે છે, સામાન્ય સંદેશો VERSION અને "
-"USERINFO છે"
+msgstr "CTCP <nick> <message>, નામને CTCP સંદેશો મોકલે છે, સામાન્ય સંદેશો VERSION અને USERINFO છે"
 
 #: 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
@@ -504,24 +499,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <nick>                      - તક અપાયેલ ફાઈલ સ્વીકારો\n"
-"DCC SEND [-maxcps=#] <nick> [file]  - કોઈકને ફાઈલ મોકલો\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - પેસીવ સ્થિતિની મદદથી ફાઈલ મોકલો\n"
-"DCC LIST                            - DCC યાદી બતાવો\n"
-"DCC CHAT <nick>                     - કોઈકને DCC CHAT ની તક આપો\n"
-"DCC PCHAT <nick>                    - પેસીવ સ્થિતિની મદદથી DCC CHAT ની તક આપો\n"
-"DCC CLOSE <type> <nick> <file>         ઉદાહરણ:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <nick>                      - તક અપાયેલ ફાઈલ સ્વીકારો\nDCC SEND [-maxcps=#] <nick> [file]  - કોઈકને ફાઈલ મોકલો\nDCC PSEND [-maxcps=#] <nick> [file] - પેસીવ સ્થિતિની મદદથી ફાઈલ મોકલો\nDCC LIST                            - DCC યાદી બતાવો\nDCC CHAT <nick>                     - કોઈકને DCC CHAT ની તક આપો\nDCC PCHAT <nick>                    - પેસીવ સ્થિતિની મદદથી DCC CHAT ની તક આપો\nDCC CLOSE <type> <nick> <file>         ઉદાહરણ:\n         /dcc close send johnsmith file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nick>, વર્તમાન ચેનલ પરના નામમાંથી અડધો-ચેનલ ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક "
-"જરૂરી છે)"
+msgstr "DEHOP <nick>, વર્તમાન ચેનલ પરના નામમાંથી અડધો-ચેનલ ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -531,15 +515,13 @@ msgstr "DELBUTTON <name>, વપરાશકર્તા-યાદી હેઠ
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, વર્તમાન ચેનલ પરના નામમાંથી ચેનલ ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
+msgstr "DEOP <nick>, વર્તમાન ચેનલ પરના નામમાંથી ચેનલ ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, વર્તમાન ચેનલ પરના નામમાંથી અવાજ સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
+msgstr "DEVOICE <nick>, વર્તમાન ચેનલ પરના નામમાંથી અવાજ સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -561,9 +543,7 @@ msgstr "ECHO <text>, લખાણ સ્થાનિક રીતે છાપ
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <command>, આદેશ ચલાવે છે. જો -o ફ્લેગ વપરાય છે તો પછી આઉટપુટ વર્તમાન ચેનલને "
-"મોકલાય છે, નહિંતર તે વર્તમાન લખાણ બોક્સમાં છપાય છે"
+msgstr "EXEC [-o] <command>, આદેશ ચલાવે છે. જો -o ફ્લેગ વપરાય છે તો પછી આઉટપુટ વર્તમાન ચેનલને મોકલાય છે, નહિંતર તે વર્તમાન લખાણ બોક્સમાં છપાય છે"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -573,9 +553,7 @@ msgstr "EXECCONT, પ્રક્રિયા SIGCONT મોકલે છે"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], વર્તમાન સત્રમાં ચાલતું exec મારી નાંખે છે. જો -9 ને SIGKILL વાળી "
-"પ્રક્રિયા અપાયેલ હોય"
+msgstr "EXECKILL [-9], વર્તમાન સત્રમાં ચાલતું exec મારી નાંખે છે. જો -9 ને SIGKILL વાળી પ્રક્રિયા અપાયેલ હોય"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -616,20 +594,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mask> <types..> <options..>\n"
-"    mask - અવગણવા માટે યજમાન માસ્ક, દાત: *!*@*.aol.com\n"
-"    types - અવગણવા માટે માહિતીના પ્રકારો, એક અથવા બધા:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    mask - અવગણવા માટે યજમાન માસ્ક, દાત: *!*@*.aol.com\n    types - અવગણવા માટે માહિતીના પ્રકારો, એક અથવા બધા:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    options - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <nick> [<channel>], કોઈકને ચેનલમાં આમંત્રિત કરે છે, મૂળભુત રીતે વર્તમાન ચેનલ (ચેનલ "
-"ચાલક જરૂરી છે)"
+msgstr "INVITE <nick> [<channel>], કોઈકને ચેનલમાં આમંત્રિત કરે છે, મૂળભુત રીતે વર્તમાન ચેનલ (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -656,8 +627,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
@@ -667,8 +637,7 @@ msgstr "LOAD [-e] <file>, પ્લગઈન અથવા સ્ક્રિપ
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, વર્તમાન ચેનલમાં બધા અડધા-ચેનલ ચાલકની ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
+msgstr "MDEHOP, વર્તમાન ચેનલમાં બધા અડધા-ચેનલ ચાલકની ચાલક સ્થિતિ દૂર કરે છે (ચેનલ ચાલક જરૂરી છે)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -676,11 +645,9 @@ msgstr "MDEOP, વર્તમાન ચેનલમાં માસ ડિઓ
 
 #: 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)"
-msgstr ""
-"ME <action>, વર્તમાન ચેનલને ક્રિયા મોકલે છે (ક્રિયાઓ ૩જી વ્યક્તિને લખાય છે, /me jumps "
-"ની જેમ)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, વર્તમાન ચેનલને ક્રિયા મોકલે છે (ક્રિયાઓ ૩જી વ્યક્તિને લખાય છે, /me jumps ની જેમ)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -697,8 +664,8 @@ msgstr "MOP, વર્તમાન ચેનલમાં માસ ઓપના
 
 #: 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
@@ -762,21 +729,17 @@ msgstr "QUOTE <text>, સર્વરને કાચા બંધારણમ
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], વર્તમાન સર્વર સાથે ખાલી /"
-"RECONNECT તરીકે બોલાવી શકાય છે અથવા બધા ખૂલેલા સર્વરો માટે /RECONNECT ALL સાથે"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<password>], વર્તમાન સર્વર સાથે ખાલી /RECONNECT તરીકે બોલાવી શકાય છે અથવા બધા ખૂલેલા સર્વરો માટે /RECONNECT ALL સાથે"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<port>] [<password>], વર્તમાન સર્વર સાથે ખાલી /RECONNECT "
-"તરીકે બોલાવી શકાય છે અથવા બધા ખૂલેલા સર્વરો માટે /RECONNECT ALL સાથે"
+msgstr "RECONNECT [<host>] [<port>] [<password>], વર્તમાન સર્વર સાથે ખાલી /RECONNECT તરીકે બોલાવી શકાય છે અથવા બધા ખૂલેલા સર્વરો માટે /RECONNECT ALL સાથે"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -814,8 +777,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], સર્વર સાથે જોડાય છે, 6667 મૂળભૂત પોર્ટ છે"
+msgstr "SERVER <host> [<port>] [<password>], સર્વર સાથે જોડાય છે, 6667 મૂળભૂત પોર્ટ છે"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -835,9 +797,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], મુદ્દો સુયોજિત કરે છે જો કોઈ આપેલ હોય, નહિંતર વર્તમાન મુદ્દો બતાવે છે"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], મુદ્દો સુયોજિત કરે છે જો કોઈ આપેલ હોય, નહિંતર વર્તમાન મુદ્દો બતાવે છે"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -863,8 +825,8 @@ msgstr "UNLOAD <name>, પ્લગઈન અથવા સ્ક્રિપ્
 
 #: 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
@@ -873,7 +835,8 @@ msgstr "URL <url>, તમારા બ્રાઉઝરમાં URL ખોલ
 
 #: 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
@@ -903,9 +866,7 @@ msgstr "વપરાશ: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"તે આદેશ પર કોઈ મદદ ઉપલબ્ધ નથી.\n"
+msgstr "\nતે આદેશ પર કોઈ મદદ ઉપલબ્ધ નથી.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -974,9 +935,7 @@ msgstr "શું તમે ચોક્કસ છો કે આ SSL સક્
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"યજમાન નામ %s ઉકેલી શક્યા નહિં\n"
-"તમારા IP સુયોજનો ચકાસો!\n"
+msgstr "યજમાન નામ %s ઉકેલી શક્યા નહિં\nતમારા IP સુયોજનો ચકાસો!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1151,7 +1110,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
@@ -1185,8 +1145,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
@@ -1207,7 +1167,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
@@ -1220,7 +1181,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
@@ -1237,7 +1199,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
@@ -2013,9 +1976,7 @@ msgstr "બેન સમય"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"સાઉન્ડ ફાઈલ વાંચી શકતા નથી:\n"
-"%s"
+msgstr "સાઉન્ડ ફાઈલ વાંચી શકતા નથી:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3374,10 +3335,7 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"ફાઈલ વાપરી શકતા નથી: %s\n"
-"%s.\n"
-"અટકાવવાનું શક્ય નથી."
+msgstr "ફાઈલ વાપરી શકતા નથી: %s\n%s.\nઅટકાવવાનું શક્ય નથી."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
@@ -3529,10 +3487,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"ફોન્ટ ખોલવામાં નિષ્ફળ:\n"
-"\n"
-"%s"
+msgstr "ફોન્ટ ખોલવામાં નિષ્ફળ:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3550,18 +3505,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 "
@@ -3572,64 +3527,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"બફરમાં દાખલ કરો  આદેશ માહિતી ૧ ના સમાવિષ્ટો પ્રવેશમાં દાખલ કરશે કે જ્યાં કી હરોળ "
-"વર્તમાન કર્સર સ્થાને દબાવાયેલ હતી"
+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"
-msgstr ""
-"બફર સુયોજિત કરો  આદેશ પ્રવેશ સુયોજિત કરે છે કે જ્યાં કી હરોળ માહિતી ૧ ના સમાવિષ્ટોમાં "
-"દાખલ થયેલ હતું"
+"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"
-msgstr ""
-"છેલ્લો આદેશ  આદેશ દાખલ થયેલ છેલ્લો આદેશ સમાવવા માટે પ્રવેશ સુયોજિત કરે છે - એવું જ શેલમાં ઉપર "
-"દબાવીને"
+"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"
-msgstr ""
-"આગળનો આદેશ  આદેશ દાખલ થયેલ આગળનો આદેશ સમાવવા માટે પ્રવેશ સુયોજિત કરે છે - એવું જ શેલમાં "
-"નીચે દબાવીને"
+"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"
-msgstr ""
-"આ આદેશ અપૂર્ણ નામ અથવા આદેશ પૂર્ણ કરવા માટે પ્રવેશમાં લખાણ બદલે છે. જો માહિતી ૧ સુયોજિત "
-"થયેલ હોય તો પછી શબ્દમાળામાં દ્વિ-ટેબ કરવાનું છેલ્લું નામ પસંદ કરશે, નહિં કે આગળનું"
+"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"
-msgstr ""
-"આ આદેશ ઉપર અને નીચે નામોની યાદીમાં સરકે છે. જો માહિતી ૧ સુયોજિત હોય કે જે કંઈપણ ઉપર "
-"ખસશે નહિં, નહિંતર તે નીચે ખસશે"
+"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
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"આ આદેશ દાખલ થયેલ છેલ્લો શબ્દ પ્રવેશમાં બદલો યાદી વિરુદ્ધ ચકાસે છે અને તેને જોડણી શોધવા માટે "
-"બદલે છે"
+msgstr "આ આદેશ દાખલ થયેલ છેલ્લો શબ્દ પ્રવેશમાં બદલો યાદી વિરુદ્ધ ચકાસે છે અને તેને જોડણી શોધવા માટે બદલે છે"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -5756,8 +5697,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
@@ -5766,8 +5707,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
@@ -5818,7 +5759,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
@@ -5928,11 +5870,9 @@ msgstr "IRC સર્વરમાંથી મારું સરનામું
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"તમારા વાસ્તવિક સરનામા માટે IRC સર્વરને પૂછે છે. આ વાપરો જે તમારી પાસે 192.168.*.* "
-"સરનામું હોય!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "તમારા વાસ્તવિક સરનામા માટે IRC સર્વરને પૂછે છે. આ વાપરો જે તમારી પાસે 192.168.*.* સરનામું હોય!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6167,14 +6107,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"અમુક સુયોજનો બદલવાની જરૂર હતી કે જેને સંપૂર્ણપણે અસર આપવા માટે ફરી શરૂ થવાની જરૂર છે."
+msgstr "અમુક સુયોજનો બદલવાની જરૂર હતી કે જેને સંપૂર્ણપણે અસર આપવા માટે ફરી શરૂ થવાની જરૂર છે."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6182,11 +6120,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*WARNING*\n"
-"તમારી ઘર ડિરેક્ટરીમાં DCC ને આપોઆપ સ્વીકારવાનું\n"
-"એ ભયજનક અને વિનાશકારી હોઈ શકે. દાત:\n"
-"કોઈક તમને .bash_profile મોકલી શક્યું હોય"
+msgstr "*WARNING*\nતમારી ઘર ડિરેક્ટરીમાં DCC ને આપોઆપ સ્વીકારવાનું\nએ ભયજનક અને વિનાશકારી હોઈ શકે. દાત:\nકોઈક તમને .bash_profile મોકલી શક્યું હોય"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6300,8 +6234,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
@@ -6317,9 +6251,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/hi.po

@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Rajesh Ranjan <rajesh672@gmail.com>, 2005
+# Rajesh Ranjan <rajesh672@gmail.com>, 2005
 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: Hindi (http://www.transifex.com/hexchat/hexchat/language/"
-"hi/)\n"
-"Language: hi\n"
+"Language-Team: Hindi (http://www.transifex.com/hexchat/hexchat/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -298,9 +298,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* बतौर रूट IRC चलाना वेबकूफी है! आपको एक उपयोक्ता \n"
-"  खाता बनाना चाहिये और उसे लॉगिन के लिये प्रयोग करना चाहिये.\n"
+msgstr "* बतौर रूट IRC चलाना वेबकूफी है! आपको एक उपयोक्ता \n  खाता बनाना चाहिये और उसे लॉगिन के लिये प्रयोग करना चाहिये.\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
@@ -452,9 +450,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <mask> [<bantype>], मौजूदा चैनल से मास्क से मिलान करने वाले हर को प्रतिबंधित करता "
-"है. अगर वे पहले से चैनल पर हैं तो यह उनको किक नहीं करता है (chanop होना आवश्यक)"
+msgstr "BAN <mask> [<bantype>], मौजूदा चैनल से मास्क से मिलान करने वाले हर को प्रतिबंधित करता है. अगर वे पहले से चैनल पर हैं तो यह उनको किक नहीं करता है (chanop होना आवश्यक)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -462,7 +458,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
@@ -479,20 +476,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>, देश कोड प्राप्त करता है, उदाहरण के लिये: au = "
-"australia"
+msgstr "COUNTRY [-s] <code|wildcard>, देश कोड प्राप्त करता है, उदाहरण के लिये: au = australia"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <message>, CTCP संदेश निक को भेजें, सामान्य संदेश VERSION और USERINFO हैं"
+msgstr "CTCP <nick> <message>, CTCP संदेश निक को भेजें, सामान्य संदेश VERSION और USERINFO हैं"
 
 #: 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
@@ -512,9 +507,7 @@ msgstr ""
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nick>, मौजूदा चैनल पर उपनाम से चैनल आधा ऑपरेटर स्थिति हटाता है (chanop होना "
-"जरूरी)"
+msgstr "DEHOP <nick>, मौजूदा चैनल पर उपनाम से चैनल आधा ऑपरेटर स्थिति हटाता है (chanop होना जरूरी)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -524,15 +517,13 @@ msgstr "DELBUTTON <name>, उपयोक्ता सूची के अंद
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, मौजूदा चैनल पर उपनाम से चैनल ऑपरेटर स्थिति हटाता है (chanop होना जरूरी)"
+msgstr "DEOP <nick>, मौजूदा चैनल पर उपनाम से चैनल ऑपरेटर स्थिति हटाता है (chanop होना जरूरी)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, मौजूदा चैनल पर उपनाम से ध्वनि स्थिति हटाता है (chanop होना जरूरी)"
+msgstr "DEVOICE <nick>, मौजूदा चैनल पर उपनाम से ध्वनि स्थिति हटाता है (chanop होना जरूरी)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -554,9 +545,7 @@ msgstr "ECHO <text>, स्थानीय रूप से पाठ मुद
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <command>, समादेश चलाता है. अगर -o फ्लैग का प्रयोग होता है तो आउटपुट "
-"मौजूदा चैनल को जाता है, नहीं तो मौजूदा पाठ बॉक्स में मुद्रित हो जाता है"
+msgstr "EXEC [-o] <command>, समादेश चलाता है. अगर -o फ्लैग का प्रयोग होता है तो आउटपुट मौजूदा चैनल को जाता है, नहीं तो मौजूदा पाठ बॉक्स में मुद्रित हो जाता है"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -566,9 +555,7 @@ msgstr "EXECCONT, SIGCONT प्रक्रिया भेजता है"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], मौजूदा सत्र में एक चलायमान निष्पादन को मारता है. अगर -9 दिया जाता है "
-"तो प्रक्रिया SIGKILL हो जाता है"
+msgstr "EXECKILL [-9], मौजूदा सत्र में एक चलायमान निष्पादन को मारता है. अगर -9 दिया जाता है तो प्रक्रिया SIGKILL हो जाता है"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -588,8 +575,7 @@ msgstr "FLUSHQ, मौजूदा सर्वर के प्रेषण क
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<port>], मेजबान के द्वारा प्रॉक्सी करता है, 23 में मूलभूत पोर्ट करता है"
+msgstr "GATE <host> [<port>], मेजबान के द्वारा प्रॉक्सी करता है, 23 में मूलभूत पोर्ट करता है"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -610,20 +596,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mask> <types..> <options..>\n"
-"    मास्क - अनदेखा करने के लिये मेजबान मास्क करें, उदा: *!*@*.aol.com\n"
-"    प्रकार - अनदेखा करने के लिये आंकड़ा प्रकार, एक या सभी का:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    विकल्प - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    मास्क - अनदेखा करने के लिये मेजबान मास्क करें, उदा: *!*@*.aol.com\n    प्रकार - अनदेखा करने के लिये आंकड़ा प्रकार, एक या सभी का:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    विकल्प - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <nick> [<channel>], किसी को चैनल में आमंत्रित करता है, मूलभूत रूप से मौजूदा चैनल "
-"में (chanop आवश्यक)"
+msgstr "INVITE <nick> [<channel>], किसी को चैनल में आमंत्रित करता है, मूलभूत रूप से मौजूदा चैनल में (chanop आवश्यक)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -650,8 +629,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
@@ -661,21 +639,17 @@ msgstr ""
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, मौजूदा चैनल में सभी चैनलहाफ ऑपरेटर की ऑपरेटर स्थिति लेना (chanop होना जरूरी है)"
+msgstr "MDEHOP, मौजूदा चैनल में सभी चैनलहाफ ऑपरेटर की ऑपरेटर स्थिति लेना (chanop होना जरूरी है)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, मौजूदा चैनल में सभी चैनल ऑपरेटर की ऑपरेटर स्थिति लेना (chanop होना जरूरी है)"
+msgstr "MDEOP, मौजूदा चैनल में सभी चैनल ऑपरेटर की ऑपरेटर स्थिति लेना (chanop होना जरूरी है)"
 
 #: 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)"
-msgstr ""
-"ME <action>, मौजूदा चैनल में एक्शन भेजता है (एक्शन तृतीय पुरूष के रूप में लिखा जाता है, जैसे /"
-"me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, मौजूदा चैनल में एक्शन भेजता है (एक्शन तृतीय पुरूष के रूप में लिखा जाता है, जैसे /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -692,8 +666,8 @@ msgstr "MOP, मौजूदा चैनल में सभी उपयोक
 
 #: 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
@@ -757,21 +731,17 @@ msgstr "QUOTE <text>, सर्वर में पाठ कच्चे रू
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], मौजूदा सर्वर में पुनः जुड़ने के लिये /"
-"RECONNECT के रूप में लाया सकता है या /RECONNECT ALL से सभी खुले सर्वर से फिर से जोड़कर"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<password>], मौजूदा सर्वर में पुनः जुड़ने के लिये /RECONNECT के रूप में लाया सकता है या /RECONNECT ALL से सभी खुले सर्वर से फिर से जोड़कर"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<port>] [<password>], मौजूदा सर्वर में पुनः जुड़ने के लिये /"
-"RECONNECT के रूप में लाया सकता है या /RECONNECT ALL से सभी खुले सर्वर से फिर से जोड़कर"
+msgstr "RECONNECT [<host>] [<port>] [<password>], मौजूदा सर्वर में पुनः जुड़ने के लिये /RECONNECT के रूप में लाया सकता है या /RECONNECT ALL से सभी खुले सर्वर से फिर से जोड़कर"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -793,14 +763,11 @@ msgstr ""
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <port> <channel>, एक चैनल से संबंधित होता है औऱ शामिल होता "
-"है"
+msgstr "SERVCHAN [-ssl] <host> <port> <channel>, एक चैनल से संबंधित होता है औऱ शामिल होता है"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <host> <port> <channel>, एक चैनल से संबंधित होता है औऱ शामिल होता है"
+msgstr "SERVCHAN <host> <port> <channel>, एक चैनल से संबंधित होता है औऱ शामिल होता है"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -812,8 +779,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], एक सर्वर से जोड़ता है, मूलभूत पोर्ट 6667 है"
+msgstr "SERVER <host> [<port>] [<password>], एक सर्वर से जोड़ता है, मूलभूत पोर्ट 6667 है"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -833,10 +799,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], अगर एक दिया हुआ है तो टॉपिक सेट करता है, अन्यथा मौजूदा टॉपिक "
-"दिखाता है"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], अगर एक दिया हुआ है तो टॉपिक सेट करता है, अन्यथा मौजूदा टॉपिक दिखाता है"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -862,8 +827,8 @@ msgstr "UNLOAD <name>, एक प्लगिन या स्क्रिप्
 
 #: 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
@@ -872,7 +837,8 @@ msgstr "URL <url>, URL में ब्रॉउजर खोलता है"
 
 #: 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
@@ -902,9 +868,7 @@ msgstr "उपयोग: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"उस समादेश पर कोई सहायता उपलब्ध है.\n"
+msgstr "\nउस समादेश पर कोई सहायता उपलब्ध है.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -973,9 +937,7 @@ msgstr "क्या आप निश्चित हैं कि यह एक
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"%s मेजबाननाम हल नहीं कर सकता है\n"
-"अपना IP सेटिंग जांचें!\n"
+msgstr "%s मेजबाननाम हल नहीं कर सकता है\nअपना IP सेटिंग जांचें!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -991,8 +953,7 @@ msgstr "%s में अगला सर्वर में चक्रीय
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"चेतावनी: \"%s\" संप्रतीक सेट अज्ञात है. %s संजाल के लिये कोई वार्तालाप लागू नहीं होगी."
+msgstr "चेतावनी: \"%s\" संप्रतीक सेट अज्ञात है. %s संजाल के लिये कोई वार्तालाप लागू नहीं होगी."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1151,7 +1112,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
@@ -1185,8 +1147,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
@@ -1207,7 +1169,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
@@ -1220,7 +1183,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
@@ -1237,7 +1201,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
@@ -2013,9 +1978,7 @@ msgstr "प्रतिबंध समय"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"ध्वनि फाइल नहीं पढ़ सकता है:\n"
-"%s"
+msgstr "ध्वनि फाइल नहीं पढ़ सकता है:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3374,10 +3337,7 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"फाइल अभिगम नहीं कर सकता: %s\n"
-"%s.\n"
-"पुनर्बहाली संभव नहीं."
+msgstr "फाइल अभिगम नहीं कर सकता: %s\n%s.\nपुनर्बहाली संभव नहीं."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
@@ -3529,10 +3489,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"पोर्ट खोलने में विफल:\n"
-"\n"
-"%s"
+msgstr "पोर्ट खोलने में विफल:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3550,18 +3507,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 "
@@ -3572,65 +3529,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"The Insert in Buffer command will insert the contents of Data 1 into the "
-"entry where the key sequence was pressed at the current cursor position"
+msgstr "The Insert in Buffer command will insert the contents of Data 1 into the entry where the key sequence was pressed at the current cursor position"
 
 #: 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"
-msgstr ""
-"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 "The Set Buffer command sets the entry where the key sequence was entered to the contents of Data 1"
 
 #: 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"
-msgstr ""
-"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 "The Last Command command sets the entry to contain the last command entered - the same as pressing up in a shell"
 
 #: 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"
-msgstr ""
-"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 "The Next Command command sets the entry to contain the next command entered - the same as pressing down in a shell"
 
 #: 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"
-msgstr ""
-"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 "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"
 
 #: 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"
-msgstr ""
-"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 "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"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"This command checks the last word entered in the entry against the replace "
-"list and replaces it if it finds a match"
+msgstr "This command checks the last word entered in the entry against the replace list and replaces it if it finds a match"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -5757,8 +5699,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
@@ -5767,8 +5709,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
@@ -5819,7 +5761,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
@@ -5929,11 +5872,9 @@ msgstr "IRC सर्वर से मेरा पता लीजिये"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"आपके वास्तविक पता के लिये IRC सर्वर से पूछता है. इसका उपयोग करें अगर आपके पास 192.168.*."
-"* पता है!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "आपके वास्तविक पता के लिये IRC सर्वर से पूछता है. इसका उपयोग करें अगर आपके पास 192.168.*.* पता है!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6168,8 +6109,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
@@ -6182,11 +6122,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*WARNING*\n"
-"Auto accepting DCC to your home directory\n"
-"can be dangerous and is exploitable. Eg:\n"
-"Someone could send you a .bash_profile"
+msgstr "*WARNING*\nAuto accepting DCC to your home directory\ncan be dangerous and is exploitable. Eg:\nSomeone could send you a .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6300,8 +6236,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
@@ -6317,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/ja_JP.po

@@ -1,10 +1,11 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # k725, 2014
 # Emmanuel Chanel <emmanuelchanel@gmail.com>, 2013-2014
+# Itsuki Toyota <titsuki@cpan.org>, 2020
 # k725, 2014
 # Ooyama Yosiyuki <qqke6wd9k@apricot.ocn.ne.jp>, 2016
 # pabook_32 <inactive+pabook_32@transifex.com>, 2015
@@ -13,15 +14,14 @@ 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-23 19:02+0000\n"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Japanese (Japan) (http://www.transifex.com/hexchat/hexchat/"
-"language/ja_JP/)\n"
-"Language: ja_JP\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2020-01-03 01:18+0000\n"
+"Last-Translator: Itsuki Toyota <titsuki@cpan.org>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/hexchat/hexchat/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -40,18 +40,13 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr ""
-"HexChatは使いやすく、しかも拡張可能なIRCクライアントです。安全に複数のネット"
-"ワークに参加でき、カスタマイズ可能なインターフェイスを使用してチャネルのユー"
-"ザーと話すことが可能、さらにファイルを転送することができます。"
+msgstr "HexChatは使いやすく、しかも拡張可能なIRCクライアントです。安全に複数のネットワークに参加でき、カスタマイズ可能なインターフェイスを使用してチャネルのユーザーと話すことが可能、さらにファイルを転送することができます。"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:12
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr ""
-"HexChatは、次の機能をサポートしています: DCC, SASL, プロキシ, スペルチェッ"
-"ク, アラート, カスタムテーマ, Python/Perl スクリプト"
+msgstr "HexChatは、次の機能をサポートしています: DCC, SASL, プロキシ, スペルチェック, アラート, カスタムテーマ, Python/Perl スクリプト"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -195,19 +190,19 @@ msgstr "オペレーターアクション(_P)"
 
 #: src/common/hexchat.c:892
 msgid "Give Ops"
-msgstr "なるとを与える"
+msgstr "オペレーター権限を与える"
 
 #: src/common/hexchat.c:893
 msgid "Take Ops"
-msgstr "なるとを奪う"
+msgstr "オペレーター権限を奪う"
 
 #: src/common/hexchat.c:894
 msgid "Give Voice"
-msgstr "Voice を与える"
+msgstr "発言権を与える"
 
 #: src/common/hexchat.c:895
 msgid "Take Voice"
-msgstr "Voice を奪う"
+msgstr "発言権を奪う"
 
 #: src/common/hexchat.c:897
 msgid "Kick/Ban"
@@ -254,11 +249,11 @@ msgstr "バージョンを隠す"
 
 #: src/common/hexchat.c:932
 msgid "Op"
-msgstr "なると"
+msgstr "オペレーター"
 
 #: src/common/hexchat.c:933
 msgid "DeOp"
-msgstr "なると奪略"
+msgstr "オペレーター権限剥奪"
 
 #: src/common/hexchat.c:936
 msgid "bye"
@@ -302,18 +297,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"%s へのに書き込み許可がありません。このセッションの何も保存されません。"
+msgstr "%s へのに書き込み許可がありません。このセッションの何も保存されません。"
 
 #: src/common/hexchat.c:1134
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC を root 権限で立ち上げるなんて愚かにも程があります!\n"
-"  きちんとユーザーアカウント作成してから そのユーザーで\n"
-"  ログインしなおしてください。\n"
-"\n"
+msgstr "* IRC を root 権限で立ち上げるなんて愚かにも程があります!\n  きちんとユーザーアカウント作成してから そのユーザーで\n  ログインしなおしてください。\n\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
@@ -367,14 +357,11 @@ msgstr "  %-20s オフライン\n"
 
 #: src/common/outbound.c:69
 msgid "No channel joined. Try /join #<channel>\n"
-msgstr ""
-"チャンネルに参加していません。「/join #<チャンネル>」を実行してください。\n"
+msgstr "チャンネルに参加していません。「/join #<チャンネル>」を実行してください。\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr ""
-"サーバーと接続していません。「/server <ホスト> [<ポート>]」を実行してくださ"
-"い。\n"
+msgstr "サーバーと接続していません。「/server <ホスト> [<ポート>]」を実行してください。\n"
 
 #: src/common/outbound.c:277
 #, c-format
@@ -449,8 +436,7 @@ msgstr "ALLCHAN <コマンド>, 参加している全チャンネルへコマン
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <コマンド> 現在のサーバーの全てのチャンネルにコマンドを送ります。"
+msgstr "ALLCHANL <コマンド> 現在のサーバーの全てのチャンネルにコマンドを送ります。"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -469,9 +455,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <マスク> [<禁止タイプ>], 現在のチャンネルから, マスクに一致するニックをバ"
-"ンする. 既にチャンネルに参加しているニックに関しては効果がない (なるとが必要)"
+msgstr "BAN <マスク> [<禁止タイプ>], 現在のチャンネルから, マスクに一致するニックをバンする. 既にチャンネルに参加しているニックに関しては効果がない (オペレーター権限が必要)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -479,9 +463,9 @@ msgstr "CHANOPT [-quiet] <変数> [<値>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<文字コード>], 現在の接続の文字コードを取得あるいはセットします。"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<文字コード>], 現在の接続の文字コードを取得あるいはセットします。"
 
 #: src/common/outbound.c:3946
 msgid ""
@@ -497,21 +481,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <国別コード|ワイルドカード>, 国別コードを表示します。 eg: au = "
-"オーストラリア"
+msgstr "COUNTRY [-s] <国別コード|ワイルドカード>, 国別コードを表示します。 eg: au = オーストラリア"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <ニック> <メッセージ>, CTCP メッセージを指定のニックへ送信する。メッセー"
-"ジは普通, VERSION や USERINFO を使う"
+msgstr "CTCP <ニック> <メッセージ>, CTCP メッセージを指定のニックへ送信する。メッセージは普通, VERSION や USERINFO を使う"
 
 #: 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 "CYCLE [<チャンネル>], チャンネルを離席し、即時に再入室します。"
 
 #: src/common/outbound.c:3956
@@ -525,26 +506,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <ニック>                         - 差し出されたファイルを受け取る\n"
-"DCC SEND [-maxcps=#] <ニック> <ファイル> - ファイルを送信する\n"
-"DCC PSEND [-maxcps=#] <nick> [file]      - パッシブモードでファイルを送信す"
-"る\n"
-"DCC LIST                                 - DCC 一覧を表示する\n"
-"DCC CHAT <ニック>                        - DCC CHAT を申し込む\n"
-"DCC PCHAT <ニック>                       - パッシブモードで DCC CHAT を申し込"
-"む\n"
-"DCC CLOSE <種類> <ニック> <ファイル>   例:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <ニック>                         - 差し出されたファイルを受け取る\nDCC SEND [-maxcps=#] <ニック> <ファイル> - ファイルを送信する\nDCC PSEND [-maxcps=#] <nick> [file]      - パッシブモードでファイルを送信する\nDCC LIST                                 - DCC 一覧を表示する\nDCC CHAT <ニック>                        - DCC CHAT を申し込む\nDCC PCHAT <ニック>                       - パッシブモードで DCC CHAT を申し込む\nDCC CLOSE <種類> <ニック> <ファイル>   例:\n         /dcc close send johnsmith file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <ニック>, 現在のチャンネルの指定ニックからハーフなるとを剥奪する (なる"
-"とが必要)"
+msgstr "DEHOP <ニック>, 現在のチャンネルの指定ニックからハーフオペレーター権限を剥奪する (オペレーター権限が必要)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -554,17 +522,13 @@ msgstr "DELBUTTON <ボタン名>, ユーザーリストの下のボタンを削
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <ニック>, 現在のチャンネルの指定ニックからなるとを剥奪する (なるとが必"
-"要)"
+msgstr "DEOP <ニック>, 現在のチャンネルの指定ニックからオペレーター権限を剥奪する (オペレーター権限が必要)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <ニック>, 現在のチャンネルの指定ニックから, 発言権を削除する (なると"
-"が必要)"
+msgstr "DEVOICE <ニック>, 現在のチャンネルの指定ニックから, 発言権を削除する (オペレーター権限が必要)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -586,9 +550,7 @@ msgstr "ECHO テキスト, テキストをローカル上に表示する"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <コマンド>, コマンドを実行する. -o フラグを利用すると出力は現在の"
-"チャンネルへ送信する。それ以外は現在のテキスト・ボックスに表示する"
+msgstr "EXEC [-o] <コマンド>, コマンドを実行する. -o フラグを利用すると出力は現在のチャンネルへ送信する。それ以外は現在のテキスト・ボックスに表示する"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -598,9 +560,7 @@ msgstr "EXECCONT, プロセスに対して SIGCONT を発行する"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], 現在のプロセスに対してシグナルを発行する。-9 を指定した場合、"
-"プロセスは SIGKILL される"
+msgstr "EXECKILL [-9], 現在のプロセスに対してシグナルを発行する。-9 を指定した場合、プロセスは SIGKILL される"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -628,7 +588,7 @@ msgstr "GHOST <ニック> [パスワード], 幽霊化したニックを Kill
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr "HOP <ニック>, 指定のニックにハーフなるとを与える (なるとが必要)"
+msgstr "HOP <ニック>, 指定のニックにハーフオペレーター権限を与える (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -641,20 +601,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"/IGNORE <マスク> <種類...> <オプション...>\n"
-"     マスク - 無視するホスト名のマスク, 例: *!*@*.ne.jp\n"
-"     種類   - 無視するデータの種類, 以下の一つもしくは全部:\n"
-"              PRIV, CHAN, NOTI, CTCP, INVI, ALL\n"
-"     オプション - NOSAVE, QUIET"
+msgstr "/IGNORE <マスク> <種類...> <オプション...>\n     マスク - 無視するホスト名のマスク, 例: *!*@*.ne.jp\n     種類   - 無視するデータの種類, 以下の一つもしくは全部:\n              PRIV, CHAN, NOTI, CTCP, INVI, ALL\n     オプション - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <ニック> [<チャンネル>], 指定のチャンネルへ招待する。標準では現在の"
-"チャンネル名 (なるとが必要)"
+msgstr "INVITE <ニック> [<チャンネル>], 指定のチャンネルへ招待する。標準では現在のチャンネル名 (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -681,14 +634,8 @@ 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'"
-msgstr ""
-"LASTLOG [-h] [-m] [-r] [--] <文字列>, バッファ中から文字列を検索する。\n"
-"    -h で、ヒットした文字列にハイライトをつけます。\n"
-"    -m で大文字・小文字の区別をします。\n"
-"    -r は正規表現文字列で検索する事を表します。\n"
-"   -- (ダブル・ハイフン)は、 '-r' オプションで検索文字列の終了を表します。"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <文字列>, バッファ中から文字列を検索する。\n    -h で、ヒットした文字列にハイライトをつけます。\n    -m で大文字・小文字の区別をします。\n    -r は正規表現文字列で検索する事を表します。\n   -- (ダブル・ハイフン)は、 '-r' オプションで検索文字列の終了を表します。"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -697,37 +644,35 @@ msgstr "LOAD [-e] <ファイル>, スクリプトかプラグインを読み込
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr "MDEHOP, 現在のチャンネルの全員のハーフなるとを剥奪する (なるとが必要)"
+msgstr "MDEHOP, 現在のチャンネルの全員のハーフオペレーター権限を剥奪する (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr "MDEOP, 現在のチャンネルの全員のなるとを剥奪する (なるとが必要)"
+msgstr "MDEOP, 現在のチャンネルの全員のオペレーター権限を剥奪する (オペレーター権限が必要)"
 
 #: 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)"
-msgstr ""
-"ME <行動>, 現在のチャンネルに対して, 指定の ACTION を送信する (行動は 『/me "
-"jumps』のように第3者側で書かれる)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <行動>, 現在のチャンネルに対して, 指定の ACTION を送信する (行動は 『/me jumps』のように第3者側で書かれる)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MHOP, 現在のチャンネルの全員にハーフオペレーター権限を与える (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr "MKICK, 現在のチャンネルの自分以外の全員をキックする (なるとが必要)"
+msgstr "MKICK, 現在のチャンネルの自分以外の全員をキックする (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr "MOP, 現在のチャンネルの全員のなるとを剥奪する (なるとが必要)"
+msgstr "MOP, 現在のチャンネルの全員のオペレーター権限を剥奪する (オペレーター権限が必要)"
 
 #: 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
@@ -754,20 +699,16 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<ニック>], 通知リストを表示したり、通知"
-"リストにニックを追加します。"
+msgstr "NOTIFY [-n network1[,network2,...]] [<ニック>], 通知リストを表示したり、通知リストにニックを追加します。"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr "OP <ニック>, 指定のニックになるとを与える (なるとが必要)"
+msgstr "OP <ニック>, 指定のニックにオペレーター権限を与える (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<チャンネル>]  [<理由>], チャンネルを去る。デフォルトでは現在のチャンネ"
-"ル"
+msgstr "PART [<チャンネル>]  [<理由>], チャンネルを去る。デフォルトでは現在のチャンネル"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -795,23 +736,17 @@ msgstr "QUOTE <テキスト>, サーバーへ生形式のテキストを送信
 
 #: 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 ""
-"RECONNECT [-ssl] [<ホスト>] [<ポート>] [<パスワード>], /RECONNECTだけで現在の"
-"サーバーに接続しなおすこともできるし、/RECONNECT ALLで開いているサーバーすべ"
-"てに接続しなおすこともできる"
+msgstr "RECONNECT [-ssl] [<ホスト>] [<ポート>] [<パスワード>], /RECONNECTだけで現在のサーバーに接続しなおすこともできるし、/RECONNECT ALLで開いているサーバーすべてに接続しなおすこともできる"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<ホスト>] [<ポート>] [<パスワード>], /RECONNECTだけで現在のサー"
-"バーに接続しなおすこともできるし、/RECONNECT ALLで開いているサーバーすべてに"
-"接続しなおすこともできる"
+msgstr "RECONNECT [<ホスト>] [<ポート>] [<パスワード>], /RECONNECTだけで現在のサーバーに接続しなおすこともできるし、/RECONNECT ALLで開いているサーバーすべてに接続しなおすこともできる"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -833,30 +768,23 @@ msgstr "SEND <ニック> [<ファイル>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <ホスト> <ポート> <チャンネル>, 接続およびチャンネルへ参加す"
-"る"
+msgstr "SERVCHAN [-ssl] <ホスト> <ポート> <チャンネル>, 接続およびチャンネルへ参加する"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <ホスト> <ポート> <チャンネル>, 接続およびチャンネルへ参加する"
+msgstr "SERVCHAN <ホスト> <ポート> <チャンネル>, 接続およびチャンネルへ参加する"
 
 #: src/common/outbound.c:4099
 msgid ""
 "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the "
 "default port is 6667 for normal connections, and 6697 for ssl connections"
-msgstr ""
-"SERVER [-ssl] <ホスト> [<ポート>] [<パスワード>], サーバーに接続します。デ"
-"フォールトのポートは、通常は 6667 、SSL接続の場合は 6697 です。"
+msgstr "SERVER [-ssl] <ホスト> [<ポート>] [<パスワード>], サーバーに接続します。デフォールトのポートは、通常は 6667 、SSL接続の場合は 6697 です。"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <ホスト> [<ポート>] [<パスワード>], サーバーへ接続する。標準ポート番号"
-"は6667"
+msgstr "SERVER <ホスト> [<ポート>] [<パスワード>], サーバーへ接続する。標準ポート番号は6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -876,10 +804,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<トピック>], トピックを設定する。引数がなければ現在のトピックを表示す"
-"る"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<トピック>], トピックを設定する。引数がなければ現在のトピックを表示する"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -905,8 +832,8 @@ msgstr "UNLOAD <名前> プラグインかスクリプトの読み込みをや
 
 #: 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
@@ -915,14 +842,13 @@ msgstr "URL <url>, ブラウザーで URL を開く"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <ニック1> <ニック2> など、チャンネルのユーザー一覧のニック"
-"をハイライトにします"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <ニック1> <ニック2> など、チャンネルのユーザー一覧のニックをハイライトにします"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr "VOICE <ニック>, 発言権を指定のニックへ与える (なるとが必要)"
+msgstr "VOICE <ニック>, 発言権を指定のニックへ与える (オペレーター権限が必要)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -931,9 +857,7 @@ msgstr "WALLCHAN <メッセージ>, 全チャンネルへメッセージを送
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <メッセージ>, 現在のチャンネルのなると保持者全員へメッセージを送信す"
-"る"
+msgstr "WALLCHOP <メッセージ>, 現在のチャンネルのオペレーター権限保持者全員へメッセージを送信する"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -949,9 +873,7 @@ msgstr "使い方: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"このコマンドのヘルプは利用できません.\n"
+msgstr "\nこのコマンドのヘルプは利用できません.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1020,9 +942,7 @@ msgstr "このサーバーとポートが SSL 対応なのは確かですか？\
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"ホスト名「%s」を解決できません。\n"
-"IP 設定を確認してください!\n"
+msgstr "ホスト名「%s」を解決できません。\nIP 設定を確認してください!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1197,7 +1117,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
@@ -1231,8 +1152,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
@@ -1253,7 +1174,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
@@ -1266,7 +1188,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
@@ -1283,7 +1206,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
@@ -1761,11 +1685,11 @@ msgstr ""
 
 #: src/common/text.c:1127
 msgid "The nick of the person who has been op'ed"
-msgstr "なるとをもらったニック"
+msgstr "オペレーター権限をもらったニック"
 
 #: src/common/text.c:1131
 msgid "The nick of the person who has been halfop'ed"
-msgstr "ハーフなるとをもらったニック"
+msgstr "ハーフオペレーター権限をもらったニック"
 
 #: src/common/text.c:1132
 msgid "The nick of the person who did the halfop'ing"
@@ -1809,7 +1733,7 @@ msgstr ""
 
 #: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
-msgstr "なるとを取られたニック"
+msgstr "オペレーター権限を取られたニック"
 
 #: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
@@ -1817,7 +1741,7 @@ msgstr ""
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
-msgstr "ハーフなるとを取られたニック"
+msgstr "ハーフオペレーター権限を取られたニック"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
@@ -2059,9 +1983,7 @@ msgstr "バン時間"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"サウンドファイルの読み込みができません:\n"
-"%s"
+msgstr "サウンドファイルの読み込みができません:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3420,18 +3342,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"ファイルにアクセスできません: %s\n"
-"%s.\n"
-"おそらく継続できません。"
+msgstr "ファイルにアクセスできません: %s\n%s.\nおそらく継続できません。"
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"ダウンロード・フォルダーにあるファイルは、提案されているファイルより大きいの"
-"で、レジューム出来ません。"
+msgstr "ダウンロード・フォルダーにあるファイルは、提案されているファイルより大きいので、レジューム出来ません。"
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3577,10 +3494,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"フォントを開けません:\n"
-"\n"
-"%s"
+msgstr "フォントを開けません:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3598,18 +3512,18 @@ msgstr "ネットワーク送信キュー: %d バイト"
 
 #: 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 "
@@ -3620,57 +3534,44 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"バッファへ挿入 コマンドはデータ1の内容を, 入力行中のカーソルの場所へ挿入しま"
-"す。"
+msgstr "バッファへ挿入 コマンドはデータ1の内容を, 入力行中のカーソルの場所へ挿入します。"
 
 #: 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"
-msgstr ""
-"バッファ設定コマンドは, テキスト入力行の内容を, データ1の内容として置き換えま"
-"す。"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "バッファ設定コマンドは, テキスト入力行の内容を, データ1の内容として置き換えます。"
 
 #: 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"
-msgstr ""
-"最後のコマンドはテキスト入力行に, 最後に入力されたコマンド内容を含ませます. "
-"シェル上で, コマンドを直接実行するのと同じです。"
+"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"
-msgstr ""
-"次のコマンドはテキスト入力行に, 次に入力されたコマンド内容を含ませます. シェ"
-"ル上で, コマンドを直接実行するのと同じです。"
+"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"
-msgstr ""
-"このコマンドは, 入力行中の不完全なニックやコマンドを補完します. データ1が設定"
-"されていると, タブキーを2回押した場合に, 次の補完候補でなく, 最後に入力された"
-"ニックが補完されます。"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "このコマンドは, 入力行中の不完全なニックやコマンドを補完します. データ1が設定されていると, タブキーを2回押した場合に, 次の補完候補でなく, 最後に入力されたニックが補完されます。"
 
 #: 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"
-msgstr ""
-"このコマンドは, ニックリストを上下へスクロールさせます. データ1に何か設定され"
-"ていれば上へスクロールし, そうでなければ下へスクロールします。"
+"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 "このコマンドは, ニックリストを上下へスクロールさせます. データ1に何か設定されていれば上へスクロールし, そうでなければ下へスクロールします。"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
@@ -3819,8 +3720,7 @@ msgstr "チャンネルへ参加:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"参加したいチャンネルの名前を分かっている場合は、ここで入力してください。"
+msgstr "参加したいチャンネルの名前を分かっている場合は、ここで入力してください。"
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -4083,9 +3983,7 @@ msgstr ""
 msgid ""
 "The Menubar is now hidden. You can show it again by pressing Control+F9 or "
 "right-clicking in a blank part of the main text area."
-msgstr ""
-"メニューバーは現在非表示です。再表示する場合は Control+F9 を押すか、またはメ"
-"インテキストエリアの空白部分で右クリックします。"
+msgstr "メニューバーは現在非表示です。再表示する場合は Control+F9 を押すか、またはメインテキストエリアの空白部分で右クリックします。"
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4181,25 +4079,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"ユーザーコマンド - 特殊なコード:\n"
-"\n"
-"%c = 現在のチャンネル\n"
-"%e = 現在のネットワーク名\n"
-"%m = マシン情報\n"
-"%n = 自分のニック\n"
-"%t = 時間/日付\n"
-"%v = HexChatのバージョン\n"
-"%2 = 単語 2\n"
-"%3 = 単語 3\n"
-"&2 = 行の末尾にある単語 2\n"
-"&3 = 行の末尾にある単語 3\n"
-"\n"
-"例:\n"
-"/cmd john hello\n"
-"\n"
-"%2 \"john\" になります\n"
-"&2 \"john hello\" になります"
+msgstr "ユーザーコマンド - 特殊なコード:\n\n%c = 現在のチャンネル\n%e = 現在のネットワーク名\n%m = マシン情報\n%n = 自分のニック\n%t = 時間/日付\n%v = HexChatのバージョン\n%2 = 単語 2\n%3 = 単語 3\n&2 = 行の末尾にある単語 2\n&3 = 行の末尾にある単語 3\n\n例:\n/cmd john hello\n\n%2 \"john\" になります\n&2 \"john hello\" になります"
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -5268,10 +5148,7 @@ msgstr "辞書を使用:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"使用している言語のコードは次の場所にあります (\"%LOCALAPPDATA%\\enchant"
-"\\myspell\\dicts\")\n"
-"複数のエントリはコンマで区切ります。"
+msgstr "使用している言語のコードは次の場所にあります (\"%LOCALAPPDATA%\\enchant\\myspell\\dicts\")\n複数のエントリはコンマで区切ります。"
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5367,9 +5244,7 @@ msgstr "ユーザーモードのアイコンを表示する"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"ユーザリスト内のグラフィックアイコンではなく、テキストシンボルを使用してくだ"
-"さい。"
+msgstr "ユーザリスト内のグラフィックアイコンではなく、テキストシンボルを使用してください。"
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5723,9 +5598,7 @@ msgstr "ニックを常にハイライトする:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"複数の単語はカンマで区切ります。\n"
-"ワイルドカードも使用できます。"
+msgstr "複数の単語はカンマで区切ります。\nワイルドカードも使用できます。"
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5831,8 +5704,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
@@ -5841,8 +5714,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
@@ -5893,7 +5766,8 @@ msgstr "BANの種類:"
 
 #: 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
@@ -6003,8 +5877,8 @@ msgstr "IRC サーバーから自分の IP アドレスを取得する"
 
 #: 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
@@ -6240,8 +6114,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
@@ -6254,12 +6127,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*警告*\n"
-"ホーム・ディレクトリへ自動DCC受け取りを有効にする\n"
-"ことは悪戯される危険があり, 勧められません. 例えば,\n"
-"誰からがあなたへ『.bash_profile』ファイルを転送す\n"
-"ると, 勝手にシェルの設定が上書きされてしまいます。"
+msgstr "*警告*\nホーム・ディレクトリへ自動DCC受け取りを有効にする\nことは悪戯される危険があり, 勧められません. 例えば,\n誰からがあなたへ『.bash_profile』ファイルを転送す\nると, 勝手にシェルの設定が上書きされてしまいます。"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6351,7 +6219,7 @@ msgstr "ファイルにリストを保存"
 #: src/fe-gtk/userlistgui.c:108
 #, c-format
 msgid "%d ops, %d total"
-msgstr "%d 個のなると、合計 %d 個"
+msgstr "%d 人のオペレーター、合計 %d 人"
 
 #: src/fe-text/fe-text.c:472
 msgid "Open an irc://server:port/channel URL"
@@ -6373,8 +6241,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
@@ -6390,9 +6258,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/kn.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # shankar <svenkate@redhat.com>, 2010
 # shankar <svenkate@redhat.com>, 2010
@@ -9,16 +9,15 @@ 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: Kannada (http://www.transifex.com/hexchat/hexchat/language/"
-"kn/)\n"
-"Language: kn\n"
+"Language-Team: Kannada (http://www.transifex.com/hexchat/hexchat/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -299,9 +298,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC ಅನ್ನು ನಿರ್ವಾಹಕರಾಗಿ ಚಲಾಯಿಸುವುದು ಮೂರ್ಖತನ! \n"
-"  ನೀವು ಒಂದು ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ರಚಿಸಿ ನಂತರ ಒಳಕ್ಕೆ ಪ್ರವೇಶಿಸಬೇಕು.\n"
+msgstr "* IRC ಅನ್ನು ನಿರ್ವಾಹಕರಾಗಿ ಚಲಾಯಿಸುವುದು ಮೂರ್ಖತನ! \n  ನೀವು ಒಂದು ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ರಚಿಸಿ ನಂತರ ಒಳಕ್ಕೆ ಪ್ರವೇಶಿಸಬೇಕು.\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
@@ -420,8 +417,7 @@ msgstr "ಆ ಪ್ಲಗ್‌ಇನ್ ಲೋಡ್ ಆಗಲು ನಿರಾ
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <name> <action>, ಇದು ಬಳಕೆದಾರ ಪಟ್ಟಿಯಲ್ಲಿ ಒಂದು ಗುಂಡಿಯನ್ನು ಸೇರಿಸುತ್ತದೆ"
+msgstr "ADDBUTTON <name> <action>, ಇದು ಬಳಕೆದಾರ ಪಟ್ಟಿಯಲ್ಲಿ ಒಂದು ಗುಂಡಿಯನ್ನು ಸೇರಿಸುತ್ತದೆ"
 
 #: src/common/outbound.c:3933
 msgid ""
@@ -454,10 +450,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <mask> [<bantype>], ಮುಸುಕಿಗೆ(ಮಾಸ್ಕ್) ತಾಳೆಯಾಗುವ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲರನ್ನೂ "
-"ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ. ಅವರು ಈಗಾಗಲೆ ಚಾನಲ್‌ನಲ್ಲಿದ್ದಲ್ಲಿ ಇದು ಅವರನ್ನು ಹೊರಹಾಕುವುದಿಲ್ಲ (chanop "
-"ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "BAN <mask> [<bantype>], ಮುಸುಕಿಗೆ(ಮಾಸ್ಕ್) ತಾಳೆಯಾಗುವ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲರನ್ನೂ ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ. ಅವರು ಈಗಾಗಲೆ ಚಾನಲ್‌ನಲ್ಲಿದ್ದಲ್ಲಿ ಇದು ಅವರನ್ನು ಹೊರಹಾಕುವುದಿಲ್ಲ (chanop ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -465,7 +458,8 @@ msgstr "CHANOPT [-quiet] <variable> [<value>]"
 
 #: 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
@@ -482,24 +476,19 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>, ಒಂದು ದೇಶದ ಸಂಕೇತವನ್ನು ಹುಡುಕುತ್ತದೆ, ಉದಾ: au = "
-"australia"
+msgstr "COUNTRY [-s] <code|wildcard>, ಒಂದು ದೇಶದ ಸಂಕೇತವನ್ನು ಹುಡುಕುತ್ತದೆ, ಉದಾ: au = australia"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <message>, ನಿಗದಿತ ಅಡ್ಡಹೆಸರಿಗೆ CTCP ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುತ್ತದೆ, ಸಾಮಾನ್ಯ "
-"ಸಂದೇಶಗಳೆಂದರೆ VERSION ಹಾಗು USERINFO ಆಗಿರುತ್ತದೆ"
+msgstr "CTCP <nick> <message>, ನಿಗದಿತ ಅಡ್ಡಹೆಸರಿಗೆ CTCP ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುತ್ತದೆ, ಸಾಮಾನ್ಯ ಸಂದೇಶಗಳೆಂದರೆ VERSION ಹಾಗು USERINFO ಆಗಿರುತ್ತದೆ"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<channel>], ಪ್ರಸಕ್ತ ಅಥವ ಸೂಚಿಸಲಾದ ಚಾನಲ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ ನಂತರ ತಕ್ಷಣ ಮರಳಿ "
-"ಸೇರಿಕೊಳ್ಳಲಾಗುತ್ತದೆ"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<channel>], ಪ್ರಸಕ್ತ ಅಥವ ಸೂಚಿಸಲಾದ ಚಾನಲ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ ನಂತರ ತಕ್ಷಣ ಮರಳಿ ಸೇರಿಕೊಳ್ಳಲಾಗುತ್ತದೆ"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -512,25 +501,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <nick>                      - ಕಳುಹಿಸಲಾದ ಕಡತವನ್ನು ಸ್ವೀಕರಿಸಿ\n"
-"DCC SEND [-maxcps=#] <nick> [ಕಡತ]  - ನಿಗದಿತ ವ್ಯಕ್ತಿಗೆ ಕಡತವನ್ನು ಕಳುಹಿಸಿ\n"
-"DCC PSEND [-maxcps=#] <nick> [ಕಡತ] - ನಿಷ್ಕ್ರಿಯ ಕ್ರಮದಲ್ಲಿ ಒಂದು ಕಡತವನ್ನು ಕಳುಹಿಸಿ\n"
-"DCC LIST                            - DCC ಪಟ್ಟಿಯನ್ನು ತೋರಿಸಿ\n"
-"DCC CHAT <nick>                     - ನಿಗದಿತ ವ್ಯಕ್ತಿಯೊಂದಿಗೆ DCC CHAT ನಡೆಸಿ\n"
-"DCC PCHAT <nick>                    - ನಿಗದಿತ ವ್ಯಕ್ತಿಯೊಂದಿಗೆ ನಿಷ್ಕ್ರಿಯ ಕ್ರಮದಲ್ಲಿ "
-"DCC CHAT ನಡೆಸಿ\n"
-"DCC CLOSE <type> <nick> <file>         ಉದಾಹರಣೆ:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <nick>                      - ಕಳುಹಿಸಲಾದ ಕಡತವನ್ನು ಸ್ವೀಕರಿಸಿ\nDCC SEND [-maxcps=#] <nick> [ಕಡತ]  - ನಿಗದಿತ ವ್ಯಕ್ತಿಗೆ ಕಡತವನ್ನು ಕಳುಹಿಸಿ\nDCC PSEND [-maxcps=#] <nick> [ಕಡತ] - ನಿಷ್ಕ್ರಿಯ ಕ್ರಮದಲ್ಲಿ ಒಂದು ಕಡತವನ್ನು ಕಳುಹಿಸಿ\nDCC LIST                            - DCC ಪಟ್ಟಿಯನ್ನು ತೋರಿಸಿ\nDCC CHAT <nick>                     - ನಿಗದಿತ ವ್ಯಕ್ತಿಯೊಂದಿಗೆ DCC CHAT ನಡೆಸಿ\nDCC PCHAT <nick>                    - ನಿಗದಿತ ವ್ಯಕ್ತಿಯೊಂದಿಗೆ ನಿಷ್ಕ್ರಿಯ ಕ್ರಮದಲ್ಲಿ DCC CHAT ನಡೆಸಿ\nDCC CLOSE <type> <nick> <file>         ಉದಾಹರಣೆ:\n         /dcc close send johnsmith file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ chanhalf-op ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು "
-"ಹಾಕುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "DEHOP <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ chanhalf-op ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -540,17 +517,13 @@ msgstr "DELBUTTON <name>, ಇದು ಬಳಕೆದಾರ ಪಟ್ಟಿಯಲ
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ chanop ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ "
-"(chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "DEOP <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ chanop ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ ಧ್ವನಿ ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ "
-"(chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "DEVOICE <nick>, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿ ಅಡ್ಡಹೆಸರಿನಿಂದ ಧ್ವನಿ ಸ್ಥಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -572,9 +545,7 @@ msgstr "ECHO <text>, ಪಠ್ಯವನ್ನು ನಿಮಗೆ ಮಾತ್ರ
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <command>, ಆಜ್ಞೆಯನ್ನು ಚಲಾಯಿಸುತ್ತದೆ. -o ಫ್ಲಾಗ್‌ ಅನ್ನು ಬಳಸಲಾಗಿದ್ದರೆ ಔಟ್‌ಪುಟ್ "
-"ಅನ್ನು ಪ್ರಸಕ್ತ ಚಾನಲ್‌ಗೆ ಕಳುಹಿಸಲಾಗುತ್ತದೆ, ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಪ್ರಸಕ್ತ ಪಠ್ಯ ಚೌಕಕ್ಕೆ ಮುದ್ರಿಸಲಾಗುತ್ತದೆ"
+msgstr "EXEC [-o] <command>, ಆಜ್ಞೆಯನ್ನು ಚಲಾಯಿಸುತ್ತದೆ. -o ಫ್ಲಾಗ್‌ ಅನ್ನು ಬಳಸಲಾಗಿದ್ದರೆ ಔಟ್‌ಪುಟ್ ಅನ್ನು ಪ್ರಸಕ್ತ ಚಾನಲ್‌ಗೆ ಕಳುಹಿಸಲಾಗುತ್ತದೆ, ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಪ್ರಸಕ್ತ ಪಠ್ಯ ಚೌಕಕ್ಕೆ ಮುದ್ರಿಸಲಾಗುತ್ತದೆ"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -584,9 +555,7 @@ msgstr "EXECCONT, ಪ್ರಕ್ರಿಯೆ SIGCONT ಅನ್ನು ಕಳು
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], ಚಾಲನೆಯಲ್ಲಿರುವ exec ಅನ್ನು ಅಂತ್ಯಗೊಳಿಸುತ್ತದೆ. -9 ಅನ್ನು ನೀಡಲಾಗಿದ್ದರೆ "
-"SIGKILL ಆಗುತ್ತದೆ"
+msgstr "EXECKILL [-9], ಚಾಲನೆಯಲ್ಲಿರುವ exec ಅನ್ನು ಅಂತ್ಯಗೊಳಿಸುತ್ತದೆ. -9 ಅನ್ನು ನೀಡಲಾಗಿದ್ದರೆ SIGKILL ಆಗುತ್ತದೆ"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -606,9 +575,7 @@ msgstr "FLUSHQ, ಇದು ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದ ಕಳ
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<port>], ಒಂದು ಆತಿಥೇಯದ ಮೂಲಕ ಪ್ರಾಕ್ಸಿಗಳು, ಪೂರ್ವನಿಯೋಜಿತ ಸಂಪರ್ಕಸ್ಥಾನವು "
-"23 ಆಗಿರುತ್ತದೆ"
+msgstr "GATE <host> [<port>], ಒಂದು ಆತಿಥೇಯದ ಮೂಲಕ ಪ್ರಾಕ್ಸಿಗಳು, ಪೂರ್ವನಿಯೋಜಿತ ಸಂಪರ್ಕಸ್ಥಾನವು 23 ಆಗಿರುತ್ತದೆ"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -616,9 +583,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nick>, ಅಡ್ಡಹೆಸರಿಗೆ chanhalf-op ಸ್ಥಿತಿಯನ್ನು ಒದಗಿಸುತ್ತದೆ (chanop ನ "
-"ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "HOP <nick>, ಅಡ್ಡಹೆಸರಿಗೆ chanhalf-op ಸ್ಥಿತಿಯನ್ನು ಒದಗಿಸುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -631,20 +596,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mask> <types..> <options..>\n"
-"    mask - ಕಡೆಗಣಿಸಬೇಕಿರುವ ಆತಿಥೇಯ ಮುಸುಕು, ಉದಾ: *!*@*.aol.com\n"
-"    types - ಕಡೆಗಣಿಸಬೇಕಿರುವ ದತ್ತಾಂಶದ ಬಗೆಗಳು, ಇವುಗಳಲ್ಲಿ ಒಂದು ಅಥವ ಎಲ್ಲವೂ:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    mask - ಕಡೆಗಣಿಸಬೇಕಿರುವ ಆತಿಥೇಯ ಮುಸುಕು, ಉದಾ: *!*@*.aol.com\n    types - ಕಡೆಗಣಿಸಬೇಕಿರುವ ದತ್ತಾಂಶದ ಬಗೆಗಳು, ಇವುಗಳಲ್ಲಿ ಒಂದು ಅಥವ ಎಲ್ಲವೂ:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    options - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <nick> [<channel>], ನಿಗದಿತ ವ್ಯಕ್ತಿಯನ್ನು ಚಾನಲ್‌ಗೆ ಆಮಂತ್ರಿಸುತ್ತದೆ, "
-"ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ ಆಗಿರುತ್ತದೆ (chanop ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "INVITE <nick> [<channel>], ನಿಗದಿತ ವ್ಯಕ್ತಿಯನ್ನು ಚಾನಲ್‌ಗೆ ಆಮಂತ್ರಿಸುತ್ತದೆ, ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ ಆಗಿರುತ್ತದೆ (chanop ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -671,8 +629,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
@@ -682,23 +639,17 @@ msgstr "LOAD [-e] <file>, ಪ್ಲಗ್‌ಇನ್ ಅಥವ ಸ್ಕ್ರ
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ chanhalf-op ಗಳನ್ನು ಒಟ್ಟಿಗೆ deop ಮಾಡುತ್ತದೆ (chanop "
-"ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "MDEHOP, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ chanhalf-op ಗಳನ್ನು ಒಟ್ಟಿಗೆ deop ಮಾಡುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ chanop ಗಳನ್ನು ಒಟ್ಟಿಗೆ deop ಮಾಡುತ್ತದೆ (chanop ನ "
-"ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "MDEOP, ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ chanop ಗಳನ್ನು ಒಟ್ಟಿಗೆ deop ಮಾಡುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: 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)"
-msgstr ""
-"ME <action>, ಕ್ರಿಯೆಯನ್ನು ಪ್ರಸಕ್ತ ಚಾನಲ್‌ಗೆ ಕಳುಹಿಸುತ್ತದೆ (ಕ್ರಿಯೆಗಳನ್ನು ಮೂರನೆ ವ್ಯಕ್ತಿ "
-"ಹೇಳುವಂತೆ ಬರೆಯಲಾಗುತ್ತದೆ, ಉದಾ., /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, ಕ್ರಿಯೆಯನ್ನು ಪ್ರಸಕ್ತ ಚಾನಲ್‌ಗೆ ಕಳುಹಿಸುತ್ತದೆ (ಕ್ರಿಯೆಗಳನ್ನು ಮೂರನೆ ವ್ಯಕ್ತಿ ಹೇಳುವಂತೆ ಬರೆಯಲಾಗುತ್ತದೆ, ಉದಾ., /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -707,19 +658,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, ನಿಮ್ಮನ್ನು ಹೊರತು ಪಡಿಸಿ ಎಲ್ಲರನ್ನೂ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಿಂದ ಹೊರಹಾಕುತ್ತದೆ (chanop ನ "
-"ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "MKICK, ನಿಮ್ಮನ್ನು ಹೊರತು ಪಡಿಸಿ ಎಲ್ಲರನ್ನೂ ಪ್ರಸಕ್ತ ಚಾನಲ್‌ನಿಂದ ಹೊರಹಾಕುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗೂ ಒಟ್ಟಿಗೆ op ಮಾಡಲಾಗುತ್ತದೆ (chanop ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "MOP, ಚಾನಲ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗೂ ಒಟ್ಟಿಗೆ op ಮಾಡಲಾಗುತ್ತದೆ (chanop ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: 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
@@ -746,26 +694,20 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], ನಿಮ್ಮ ಸೂಚನಾ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸುತ್ತದೆ "
-"ಅಥವ ಅದಕ್ಕೆ ನಿಶ್ಚಿತ ವ್ಯಕ್ತಿಯನ್ನು ಸೇರಿಸುತ್ತದೆ"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], ನಿಮ್ಮ ಸೂಚನಾ ಪಟ್ಟಿಯನ್ನು ತೋರಿಸುತ್ತದೆ ಅಥವ ಅದಕ್ಕೆ ನಿಶ್ಚಿತ ವ್ಯಕ್ತಿಯನ್ನು ಸೇರಿಸುತ್ತದೆ"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nick>, ಅಡ್ಡಹೆಸರಿಗೆ chanop ಸ್ಥಿತಿಯನ್ನು ನೀಡುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "OP <nick>, ಅಡ್ಡಹೆಸರಿಗೆ chanop ಸ್ಥಿತಿಯನ್ನು ನೀಡುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<channel>] [<reason>], ಚಾನಲ್‌ನಿಂದ ಹೊರಹೋಗಲಾಗುತ್ತದೆ, ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಪ್ರಸಕ್ತ "
-"ಚಾನಲ್ ಆಗಿರುತ್ತದೆ"
+msgstr "PART [<channel>] [<reason>], ಚಾನಲ್‌ನಿಂದ ಹೊರಹೋಗಲಾಗುತ್ತದೆ, ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಪ್ರಸಕ್ತ ಚಾನಲ್ ಆಗಿರುತ್ತದೆ"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr ""
-"PING <nick | channel>, ಅಡ್ಡಹೆಸರಿಗೆ ಅಥವ ಚಾನಲ್‌ಗೆ CTCP ಪಿಂಗ್‌ಗಳನ್ನು ಕಳುಹಿಸುತ್ತದೆ"
+msgstr "PING <nick | channel>, ಅಡ್ಡಹೆಸರಿಗೆ ಅಥವ ಚಾನಲ್‌ಗೆ CTCP ಪಿಂಗ್‌ಗಳನ್ನು ಕಳುಹಿಸುತ್ತದೆ"
 
 #: src/common/outbound.c:4071
 msgid ""
@@ -789,23 +731,17 @@ msgstr "QUOTE <text>, ಇದು ಪಠ್ಯವನ್ನು ಕಚ್ಛಾ ರ
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದೊಂದಿಗೆ ಮರಳಿ "
-"ಸಂಪರ್ಕ ಹೊಂದಲು /RECONNECT ಬಳಸಬಹುದು ಅಥವ ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಮುಕ್ತ ಪರಿಚಾರಕಗಳೊಂದಿಗೆ "
-"ಸಂಪರ್ಕಸಾಧಿಸಲು /RECONNECT ALL ಅನ್ನು ಬಳಸಬಹುದು"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<password>], ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದೊಂದಿಗೆ ಮರಳಿ ಸಂಪರ್ಕ ಹೊಂದಲು /RECONNECT ಬಳಸಬಹುದು ಅಥವ ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಮುಕ್ತ ಪರಿಚಾರಕಗಳೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು /RECONNECT ALL ಅನ್ನು ಬಳಸಬಹುದು"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<port>] [<password>], ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದೊಂದಿಗೆ ಮರಳಿ ಸಂಪರ್ಕ "
-"ಹೊಂದಲು /RECONNECT ಬಳಸಬಹುದು ಅಥವ ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಮುಕ್ತ ಪರಿಚಾರಕಗಳೊಂದಿಗೆ "
-"ಸಂಪರ್ಕಸಾಧಿಸಲು /RECONNECT ALL ಅನ್ನು ಬಳಸಬಹುದು"
+msgstr "RECONNECT [<host>] [<port>] [<password>], ಪ್ರಸಕ್ತ ಪರಿಚಾರಕದೊಂದಿಗೆ ಮರಳಿ ಸಂಪರ್ಕ ಹೊಂದಲು /RECONNECT ಬಳಸಬಹುದು ಅಥವ ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಮುಕ್ತ ಪರಿಚಾರಕಗಳೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಲು /RECONNECT ALL ಅನ್ನು ಬಳಸಬಹುದು"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -827,15 +763,11 @@ msgstr "SEND <nick> [<file>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <port> <channel>, ಒಂದು ಚಾನಲ್‌ಗೆ ಸಂಪರ್ಕಿತಗಗೊಂಡು ನಂತರ "
-"ಸೇರ್ಪಡೆಗೊಳ್ಳುತ್ತದೆ"
+msgstr "SERVCHAN [-ssl] <host> <port> <channel>, ಒಂದು ಚಾನಲ್‌ಗೆ ಸಂಪರ್ಕಿತಗಗೊಂಡು ನಂತರ ಸೇರ್ಪಡೆಗೊಳ್ಳುತ್ತದೆ"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <host> <port> <channel>, ಒಂದು ಚಾನಲ್‌ಗೆ ಸಂಪರ್ಕಿತಗಗೊಂಡು ನಂತರ "
-"ಸೇರ್ಪಡೆಗೊಳ್ಳುತ್ತದೆ"
+msgstr "SERVCHAN <host> <port> <channel>, ಒಂದು ಚಾನಲ್‌ಗೆ ಸಂಪರ್ಕಿತಗಗೊಂಡು ನಂತರ ಸೇರ್ಪಡೆಗೊಳ್ಳುತ್ತದೆ"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -847,9 +779,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], ಒಂದು ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುತ್ತದೆ, "
-"ಪೂರ್ವನಿಯೋಜಿತ ಸಂಪರ್ಕಸ್ಥಾನವು 6667 ಆಗಿರುತ್ತದೆ"
+msgstr "SERVER <host> [<port>] [<password>], ಒಂದು ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುತ್ತದೆ, ಪೂರ್ವನಿಯೋಜಿತ ಸಂಪರ್ಕಸ್ಥಾನವು 6667 ಆಗಿರುತ್ತದೆ"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -869,9 +799,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], ಸೂಚಿಸಿದ ವಿಷಯವನ್ನು ಹೊಂದಿಸುತ್ತದೆ, ಅಥವ ಪ್ರಸಕ್ತ ವಿಷಯವನ್ನು ತೋರಿಸುತ್ತದೆ "
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], ಸೂಚಿಸಿದ ವಿಷಯವನ್ನು ಹೊಂದಿಸುತ್ತದೆ, ಅಥವ ಪ್ರಸಕ್ತ ವಿಷಯವನ್ನು ತೋರಿಸುತ್ತದೆ "
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -881,21 +811,11 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <timeout> <file1> [<file2>] ಎರಡು ಚಿಹ್ನೆಗಳ ನಡುವೆ ಟ್ರೇಯನ್ನು "
-"ಮಿನುಗಿಸುತ್ತದೆ.\n"
-"TRAY -f <filename>                  ಟ್ರೇ ಅನ್ನು ಒಂದು ನಿಶ್ಚಿತ ಚಿಹ್ನೆಗೆ "
-"ಹೊಂದಿಸುತ್ತದೆ.\n"
-"TRAY -i <number>                    ಒಂದು ಆಂತರಿಕ ಚಿಹ್ನೆಯೊಂದಿಗೆ ಟ್ರೇಯನ್ನು "
-"ಮಿನುಗಿಸುತ್ತದೆ.\n"
-"TRAY -t <text>                      ಟ್ರೇಯ ಸಲಹೆಉಪಕರಣವನ್ನು ಹೊಂದಿಸುತ್ತದೆ.\n"
-"TRAY -b <title> <text>              ಟ್ರೇ ಬಲೂನ್ ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ."
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] ಎರಡು ಚಿಹ್ನೆಗಳ ನಡುವೆ ಟ್ರೇಯನ್ನು ಮಿನುಗಿಸುತ್ತದೆ.\nTRAY -f <filename>                  ಟ್ರೇ ಅನ್ನು ಒಂದು ನಿಶ್ಚಿತ ಚಿಹ್ನೆಗೆ ಹೊಂದಿಸುತ್ತದೆ.\nTRAY -i <number>                    ಒಂದು ಆಂತರಿಕ ಚಿಹ್ನೆಯೊಂದಿಗೆ ಟ್ರೇಯನ್ನು ಮಿನುಗಿಸುತ್ತದೆ.\nTRAY -t <text>                      ಟ್ರೇಯ ಸಲಹೆಉಪಕರಣವನ್ನು ಹೊಂದಿಸುತ್ತದೆ.\nTRAY -b <title> <text>              ಟ್ರೇ ಬಲೂನ್ ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <mask> [<mask>...], ಸೂಚಿತ ಮುಸುಕುಗಳ(ಮಾಸ್ಕ್) ನಿಶೇಧವನ್ನು ರದ್ದುಗೊಳಿಸುತ್ತದೆ"
+msgstr "UNBAN <mask> [<mask>...], ಸೂಚಿತ ಮುಸುಕುಗಳ(ಮಾಸ್ಕ್) ನಿಶೇಧವನ್ನು ರದ್ದುಗೊಳಿಸುತ್ತದೆ"
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -907,8 +827,8 @@ msgstr "UNLOAD <name>, ಪ್ಲಗ್‌ಇನ್ ಅಥವ ಸ್ಕ್ರಿ
 
 #: 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
@@ -917,15 +837,13 @@ msgstr "URL <url>, ಒಂದು URL ಅನ್ನು ನಿಮ್ಮ ಜಾಲವ
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> ಇತರೆ, ಚಾನಲ್‌ನ ಬಳಕೆದಾರಪಟ್ಟಿಯಲ್ಲಿ "
-"ಅಡ್ಡಹೆಸರನ್ನು೯(ಗಳನ್ನು) ಹೈಲೈಟ್ ಮಾಡುತ್ತದೆ"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> ಇತರೆ, ಚಾನಲ್‌ನ ಬಳಕೆದಾರಪಟ್ಟಿಯಲ್ಲಿ ಅಡ್ಡಹೆಸರನ್ನು೯(ಗಳನ್ನು) ಹೈಲೈಟ್ ಮಾಡುತ್ತದೆ"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <nick>, ಬೇರೆಯೊಬ್ಬರಿಗೆ ಧ್ವನಿ ಸ್ಥಿತಿಯನ್ನು ಒದಗಿಸುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
+msgstr "VOICE <nick>, ಬೇರೆಯೊಬ್ಬರಿಗೆ ಧ್ವನಿ ಸ್ಥಿತಿಯನ್ನು ಒದಗಿಸುತ್ತದೆ (chanop ನ ಅಗತ್ಯವಿರುತ್ತದೆ)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -950,9 +868,7 @@ msgstr "ಬಳಕೆ: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"ಆ ಆಜ್ಞೆಗೆ ಯಾವುದೆ ನೆರವು ಲಭ್ಯವಿಲ್ಲ.\n"
+msgstr "\nಆ ಆಜ್ಞೆಗೆ ಯಾವುದೆ ನೆರವು ಲಭ್ಯವಿಲ್ಲ.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1021,9 +937,7 @@ msgstr "ಇದು ಒಂದು SSL ಸಮರ್ಥವಾದ ಪರಿಚಾರ
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"%s ಎಂಬ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಪರಿಹರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\n"
-"ನಿಮ್ಮ IP ಸಿದ್ಧತೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ!\n"
+msgstr "%s ಎಂಬ ಆತಿಥೇಯ ಹೆಸರನ್ನು ಪರಿಹರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ\nನಿಮ್ಮ IP ಸಿದ್ಧತೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1039,9 +953,7 @@ msgstr "%s ನಲ್ಲಿ ಮುಂದಿನ ಪರಿಚಾರಕಕ್ಕೆ
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"ಎಚ್ಚರಿಕೆ: \"%s\" ಅಕ್ಷರದ ಸೆಟ್‌ ತಿಳಿದಿಲ್ಲ. %s ಎಂಬ ಜಾಲಬಂಧಕ್ಕೆ ಯಾವುದೆ ಮಾತುಕತೆಯನ್ನು "
-"ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ."
+msgstr "ಎಚ್ಚರಿಕೆ: \"%s\" ಅಕ್ಷರದ ಸೆಟ್‌ ತಿಳಿದಿಲ್ಲ. %s ಎಂಬ ಜಾಲಬಂಧಕ್ಕೆ ಯಾವುದೆ ಮಾತುಕತೆಯನ್ನು ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1200,7 +1112,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
@@ -1234,8 +1147,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
@@ -1256,7 +1169,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
@@ -1269,7 +1183,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
@@ -1286,7 +1201,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
@@ -2062,9 +1978,7 @@ msgstr "ನಿಶೇಧದ ಸಮಯ"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"ಧ್ವನಿ ಕಡತವನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:\n"
-"%s"
+msgstr "ಧ್ವನಿ ಕಡತವನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3423,18 +3337,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"ಕಡತವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ: %s\n"
-"%s.\n"
-"ಮರಳಿ ಆರಂಭಿಸುವುದು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಕಡತವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ: %s\n%s.\nಮರಳಿ ಆರಂಭಿಸುವುದು ಸಾಧ್ಯವಿಲ್ಲ."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"ಡೌನ್‌ಲೋಡ್ ಕೋಶದಲ್ಲಿನ ಕಡತದ ಗಾತ್ರವು ನೀಡಲು ಬಯಸಿರುವ ಕಡತಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿದೆ. ಮರಳಿ "
-"ಆರಂಭಿಸುವುದು ಸಾಧ್ಯವಿಲ್ಲ."
+msgstr "ಡೌನ್‌ಲೋಡ್ ಕೋಶದಲ್ಲಿನ ಕಡತದ ಗಾತ್ರವು ನೀಡಲು ಬಯಸಿರುವ ಕಡತಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿದೆ. ಮರಳಿ ಆರಂಭಿಸುವುದು ಸಾಧ್ಯವಿಲ್ಲ."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3580,10 +3489,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"ಅಕ್ಷರಶೈಲಿಯನ್ನು ತೆರೆಯಲು ವಿಫಲಗೊಂಡಿದೆ:\n"
-"\n"
-"%s"
+msgstr "ಅಕ್ಷರಶೈಲಿಯನ್ನು ತೆರೆಯಲು ವಿಫಲಗೊಂಡಿದೆ:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3601,18 +3507,18 @@ msgstr "ಜಾಲಬಂಧ ಕಳುಹಿಸುವ ಸರತಿ: %d ಬೈಟ
 
 #: 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 "
@@ -3623,65 +3529,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Insert in Buffer ಆಜ್ಞೆಯು ದತ್ತಾಂಶ 1 ರಲ್ಲಿರುವುದನ್ನು ಪ್ರಸಕ್ತ ತೆರೆಸೂಚಕದ ಸ್ಥಳದಲ್ಲಿ ಒತ್ತಲಾದ "
-"ಕೀಲಿ ಅನುಕ್ರಮದ ನಮೂದಿಗೆ ಸೇರಿಸುತ್ತದೆ."
+msgstr "Insert in Buffer ಆಜ್ಞೆಯು ದತ್ತಾಂಶ 1 ರಲ್ಲಿರುವುದನ್ನು ಪ್ರಸಕ್ತ ತೆರೆಸೂಚಕದ ಸ್ಥಳದಲ್ಲಿ ಒತ್ತಲಾದ ಕೀಲಿ ಅನುಕ್ರಮದ ನಮೂದಿಗೆ ಸೇರಿಸುತ್ತದೆ."
 
 #: 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"
-msgstr ""
-"Set Buffer ಆಜ್ಞೆಯು ದತ್ತಾಂಶ 1 ಕ್ಕೆ ನಮೂದಿಸಲಾದ ವಿಷಯಕ್ಕೆ ನಮೂದಿಸಲಾದ ಕೀಲಿ ಅನುಕ್ರಮಕ್ಕೆ "
-"ನಮೂದನ್ನು ಹೊಂದಿಸುತ್ತದೆ"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Set Buffer ಆಜ್ಞೆಯು ದತ್ತಾಂಶ 1 ಕ್ಕೆ ನಮೂದಿಸಲಾದ ವಿಷಯಕ್ಕೆ ನಮೂದಿಸಲಾದ ಕೀಲಿ ಅನುಕ್ರಮಕ್ಕೆ ನಮೂದನ್ನು ಹೊಂದಿಸುತ್ತದೆ"
 
 #: 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"
-msgstr ""
-"ಕೊನೆಯ ಆಜ್ಞೆ ಆಜ್ಞೆಯು ಕೊನೆಯ ಬಾರಿಗೆ ನಮೂದಿಸಲಾದ ಆಜ್ಞೆಯನ್ನು ನಮೂದಿನಲ್ಲಿ ಇರುವಂತೆ "
-"ಹೊಂದಿಸುತ್ತದೆ - ಶೆಲ್‌ನಲ್ಲಿ ಮಾಡುವ ರೀತಿಯಲ್ಲಿಯೆ"
+"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"
-msgstr ""
-"ಕೊನೆಯ ಆಜ್ಞೆ ಆಜ್ಞೆಯು ಮುಂದಿನ ಆಜ್ಞೆಯನ್ನು ನಮೂದಿನಲ್ಲಿ ಇರುವಂತೆ ಹೊಂದಿಸುತ್ತದೆ - ಶೆಲ್‌ನಲ್ಲಿ "
-"ಮಾಡುವ ರೀತಿಯಲ್ಲಿಯೆ"
+"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"
-msgstr ""
-"ಈ ಆಜ್ಞೆಯು ಅಪೂರ್ಣಗೊಂಡ ಅಡ್ಡಹೆಸರು ಅಥವ ಆಜ್ಞೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸುವ ನಮೂದಿನ ಪಠ್ಯವನ್ನು "
-"ಬದಲಾಯಿಸುತ್ತದೆ. ದತ್ತಾಂಶ 1 ಅನ್ನು ಹೊಂದಿಸಲಾಗಿದ್ದಲ್ಲಿ, ಎರಡು ಬಾರಿ ಟ್ಯಾಬ್ ಅನ್ನು ಒತ್ತುವುದರಿಂದ "
-"ಕೊನೆಯ ಬಾರಿಯ ಅಡ್ಡಹೆಸರನ್ನು ಆರಿಸುತ್ತದೆಯೆ ಹೊರತು ಮುಂದಿನದ್ದಲ್ಲ"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "ಈ ಆಜ್ಞೆಯು ಅಪೂರ್ಣಗೊಂಡ ಅಡ್ಡಹೆಸರು ಅಥವ ಆಜ್ಞೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸುವ ನಮೂದಿನ ಪಠ್ಯವನ್ನು ಬದಲಾಯಿಸುತ್ತದೆ. ದತ್ತಾಂಶ 1 ಅನ್ನು ಹೊಂದಿಸಲಾಗಿದ್ದಲ್ಲಿ, ಎರಡು ಬಾರಿ ಟ್ಯಾಬ್ ಅನ್ನು ಒತ್ತುವುದರಿಂದ ಕೊನೆಯ ಬಾರಿಯ ಅಡ್ಡಹೆಸರನ್ನು ಆರಿಸುತ್ತದೆಯೆ ಹೊರತು ಮುಂದಿನದ್ದಲ್ಲ"
 
 #: 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"
-msgstr ""
-"ಈ ಆಜ್ಞೆಯು ಅಡ್ಡಹೆಸರುಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಹಾಗು ಕೆಳಕ್ಕೆ ಚಲಿಸುತ್ತದೆ. ದತ್ತಾಂಶ 1 ನ್ನು "
-"ಯಾವುದಕ್ಕಾದರೂ ಹೊಂದಿಸಿದಲ್ಲಿ ಇದು ಮೇಲಕ್ಕೆ ಚಲಿಸುತ್ತದೆ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಕೆಳಕ್ಕೆ ಚಲಿಸುತ್ತದೆ"
+"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 "ಈ ಆಜ್ಞೆಯು ಅಡ್ಡಹೆಸರುಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಮೇಲಕ್ಕೆ ಹಾಗು ಕೆಳಕ್ಕೆ ಚಲಿಸುತ್ತದೆ. ದತ್ತಾಂಶ 1 ನ್ನು ಯಾವುದಕ್ಕಾದರೂ ಹೊಂದಿಸಿದಲ್ಲಿ ಇದು ಮೇಲಕ್ಕೆ ಚಲಿಸುತ್ತದೆ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ಕೆಳಕ್ಕೆ ಚಲಿಸುತ್ತದೆ"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"ಈ ಆಜ್ಞೆಯು ಬದಲಾಯಿಸುವ ಪಟ್ಟಿಯಲ್ಲಿನ ನಮೂದಿನಲ್ಲಿ ಕಡೆಯದಾಗಿ ನಮೂದಿಸಲಾದ ಹುಡುಕುತ್ತದೆ ಹಾಗು "
-"ತಾಳೆಯಾಗುವುದು ಕಂಡು ಬಂದಲ್ಲಿ ಬದಲಾಯಿಸುತ್ತದೆ"
+msgstr "ಈ ಆಜ್ಞೆಯು ಬದಲಾಯಿಸುವ ಪಟ್ಟಿಯಲ್ಲಿನ ನಮೂದಿನಲ್ಲಿ ಕಡೆಯದಾಗಿ ನಮೂದಿಸಲಾದ ಹುಡುಕುತ್ತದೆ ಹಾಗು ತಾಳೆಯಾಗುವುದು ಕಂಡು ಬಂದಲ್ಲಿ ಬದಲಾಯಿಸುತ್ತದೆ"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3856,8 +3747,7 @@ msgstr "ವಿಷಯವನ್ನು ಗೊತ್ತುಪಡಿಸಿಲ್ಲ"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"ಈ ಪರಿಚಾರಕವು ಇನ್ನೂ ಸಹ %d ಚಾನಲ್‌ಗಳನ್ನು ಅಥವ ಸಂವಾದಗಳನ್ನು ಹೊಂದಿದೆ. ಎಲ್ಲವನ್ನೂ ಮುಚ್ಚಬೇಕೆ?"
+msgstr "ಈ ಪರಿಚಾರಕವು ಇನ್ನೂ ಸಹ %d ಚಾನಲ್‌ಗಳನ್ನು ಅಥವ ಸಂವಾದಗಳನ್ನು ಹೊಂದಿದೆ. ಎಲ್ಲವನ್ನೂ ಮುಚ್ಚಬೇಕೆ?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4230,19 +4120,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP ಪ್ರತ್ಯುತ್ತರಗಳು - ವಿಶೇಷ ಸಂಕೇತಗಳು:\n"
-"\n"
-"%d  =  ದತ್ತಾಂಶ (ಸಂಪೂರ್ಣ ctcp)\n"
-"%e  =  ಪ್ರಸಕ್ತ ಜಾಲಬಂಧದ ಹೆಸರು\n"
-"%m  =  ಗಣಕದ ಹೆಸರು\n"
-"%s  =  ctcp ಅನ್ನು ಕಳುಹಿಸಿದವರ ಅಡ್ಡಹೆಸರು\n"
-"%t  =  ಸಮಯ/ದಿನಾಂಕ\n"
-"%2  =  ಪದ 2\n"
-"%3  =  ಪದ 3\n"
-"&2  =  ಪದ 2 ರಿಂದ ಸಾಲಿನ ಕೊನೆಯವರೆಗೆ\n"
-"&3  =  ಪದ 3 ರಿಂದ ಸಾಲಿನ ಕೊನೆಯವರೆಗೆ\n"
-"\n"
+msgstr "CTCP ಪ್ರತ್ಯುತ್ತರಗಳು - ವಿಶೇಷ ಸಂಕೇತಗಳು:\n\n%d  =  ದತ್ತಾಂಶ (ಸಂಪೂರ್ಣ ctcp)\n%e  =  ಪ್ರಸಕ್ತ ಜಾಲಬಂಧದ ಹೆಸರು\n%m  =  ಗಣಕದ ಹೆಸರು\n%s  =  ctcp ಅನ್ನು ಕಳುಹಿಸಿದವರ ಅಡ್ಡಹೆಸರು\n%t  =  ಸಮಯ/ದಿನಾಂಕ\n%2  =  ಪದ 2\n%3  =  ಪದ 3\n&2  =  ಪದ 2 ರಿಂದ ಸಾಲಿನ ಕೊನೆಯವರೆಗೆ\n&3  =  ಪದ 3 ರಿಂದ ಸಾಲಿನ ಕೊನೆಯವರೆಗೆ\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5520,8 +5398,7 @@ msgstr "ಸವಲತ್ತುಗಳನ್ನು ಇದರಲ್ಲಿ ತೆರ
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"DCC, ಕಡೆಗಣಿಸು, ಸೂಚಿಸು ಇತ್ಯಾದಿಗಳನ್ನು ಹೊಸ ಹಾಳೆಗಳಲ್ಲಿ ಅಥವ ವಿಂಡೊಗಳಲ್ಲಿ ತೆರೆಯಬೇಕೆ?"
+msgstr "DCC, ಕಡೆಗಣಿಸು, ಸೂಚಿಸು ಇತ್ಯಾದಿಗಳನ್ನು ಹೊಸ ಹಾಳೆಗಳಲ್ಲಿ ಅಥವ ವಿಂಡೊಗಳಲ್ಲಿ ತೆರೆಯಬೇಕೆ?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5694,8 +5571,7 @@ msgstr "ಹೈಲೈಟ್ ಮಾಡಲಾದ ಸಂದೇಶಗಳು"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"ಹೈಲೈಟ್ ಮಾಡಲಾದ ಸಂದೇಶಗಳು ನಿಮ್ಮ ಅಡ್ಡಹೆಸರನ್ನು ಉಲ್ಲೇಖಿಸಲಾದವುಗಳಾಗಿರುತ್ತವೆ, ಅದರ ಜೊತೆಗೆ:"
+msgstr "ಹೈಲೈಟ್ ಮಾಡಲಾದ ಸಂದೇಶಗಳು ನಿಮ್ಮ ಅಡ್ಡಹೆಸರನ್ನು ಉಲ್ಲೇಖಿಸಲಾದವುಗಳಾಗಿರುತ್ತವೆ, ಅದರ ಜೊತೆಗೆ:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5717,9 +5593,7 @@ msgstr "ಯಾವಾಗಲೂ ಹೈಲೈಟ್ ಮಾಡಬೇಕಿರುವ
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"ಅನೇಕ ಪದಗಳನ್ನು ವಿರಾಮ ಚಿಹ್ನೆಗಳ ಮೂಲಕ ಪ್ರತ್ಯೇಕಿಸಿ.\n"
-"ವೈಲ್ಡ್‌ಕಾರ್ಡುಗಳಿಗೆ ಬೆಂಬಲವಿರುತ್ತದೆ."
+msgstr "ಅನೇಕ ಪದಗಳನ್ನು ವಿರಾಮ ಚಿಹ್ನೆಗಳ ಮೂಲಕ ಪ್ರತ್ಯೇಕಿಸಿ.\nವೈಲ್ಡ್‌ಕಾರ್ಡುಗಳಿಗೆ ಬೆಂಬಲವಿರುತ್ತದೆ."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5825,8 +5699,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
@@ -5835,8 +5709,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
@@ -5887,7 +5761,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
@@ -5997,11 +5872,9 @@ msgstr "IRC ಪರಿಚಾರಕದಿಂದ ನನ್ನ ವಿಳಾಸವನ
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"IRC ಪರಿಚಾರಕವನ್ನು ನಿಜವಾದ ವಿಳಾಸಕ್ಕಾಗಿ ಕೇಳುತ್ತದೆ. ನಿಮ್ಮಲ್ಲಿ 192.168.*.* ವಿಳಾಸವಿದ್ದಲ್ಲಿ "
-"ಇದನ್ನು ಬಳಸಿ!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "IRC ಪರಿಚಾರಕವನ್ನು ನಿಜವಾದ ವಿಳಾಸಕ್ಕಾಗಿ ಕೇಳುತ್ತದೆ. ನಿಮ್ಮಲ್ಲಿ 192.168.*.* ವಿಳಾಸವಿದ್ದಲ್ಲಿ ಇದನ್ನು ಬಳಸಿ!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6233,20 +6106,15 @@ msgstr "ಪಂಗಡಗಳು"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"ವೃಕ್ಷವನ್ನು ನೀವು ಮೇಲೆ ಅಥವ ಕೆಳಗೆ ಇರಿಸುವಂತಿಲ್ಲ!\n"
-"ದಯವಿಟ್ಟು ಮೊದಲು <b>ನೋಟ</b>ದ ಮೆನುವಿನಲ್ಲಿ <b>ಹಾಳೆಗಳ</b> ವಿನ್ಯಾಸಕ್ಕೆ ಬದಲಾಯಿಸಿ."
+msgstr "ವೃಕ್ಷವನ್ನು ನೀವು ಮೇಲೆ ಅಥವ ಕೆಳಗೆ ಇರಿಸುವಂತಿಲ್ಲ!\nದಯವಿಟ್ಟು ಮೊದಲು <b>ನೋಟ</b>ದ ಮೆನುವಿನಲ್ಲಿ <b>ಹಾಳೆಗಳ</b> ವಿನ್ಯಾಸಕ್ಕೆ ಬದಲಾಯಿಸಿ."
 
 #: 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"ಮಾಡಲಾದ ಕೆಲವು ಬದಲಾವಣೆಗಳು ಸಂಪೂರ್ಣವಾಗಿ ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರಲು ಮರಳಿ ಆರಂಭಿಸುವ "
-"ಅಗತ್ಯವಿರುತ್ತದೆ."
+msgstr "ಮಾಡಲಾದ ಕೆಲವು ಬದಲಾವಣೆಗಳು ಸಂಪೂರ್ಣವಾಗಿ ಕಾರ್ಯರೂಪಕ್ಕೆ ಬರಲು ಮರಳಿ ಆರಂಭಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6254,11 +6122,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*ಎಚ್ಚರಿಕೆ*\n"
-"DCC ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗು ನಿಮ್ಮ ನೆಲೆ ಕೋಶಕ್ಕೆ ಒಪ್ಪಿಕೊಳ್ಳುವುದು\n"
-"ಅಪಾಯಕಾರಿ ಹಾಗು ಮೋಸದ ಬಳಕೆಗೆ ಕಾರಣವಾಗಬಹುದು. ಉದಾ:\n"
-"ಯಾರಾದರೂ ನಿಮಗೆ ಒಂದು .bash_profile ಅನ್ನು ಕಳುಹಿಸಬಹುದು"
+msgstr "*ಎಚ್ಚರಿಕೆ*\nDCC ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗು ನಿಮ್ಮ ನೆಲೆ ಕೋಶಕ್ಕೆ ಒಪ್ಪಿಕೊಳ್ಳುವುದು\nಅಪಾಯಕಾರಿ ಹಾಗು ಮೋಸದ ಬಳಕೆಗೆ ಕಾರಣವಾಗಬಹುದು. ಉದಾ:\nಯಾರಾದರೂ ನಿಮಗೆ ಒಂದು .bash_profile ಅನ್ನು ಕಳುಹಿಸಬಹುದು"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6372,8 +6236,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
@@ -6389,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/lv.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Artis Trops <hornet@navigators>, 2001
 # Zigmars Dzenis <zigmars@gmail.com>, 2016
@@ -9,17 +9,15 @@ 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: Latvian (http://www.transifex.com/hexchat/hexchat/language/"
-"lv/)\n"
-"Language: lv\n"
+"Language-Team: Latvian (http://www.transifex.com/hexchat/hexchat/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -55,7 +53,7 @@ msgstr "Tērzēt ar citiem cilvēkiem tiešsaistē"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:6
 msgid "IM;Chat;"
-msgstr "TZ;Tērzēšana;"
+msgstr "TZ;Tērzēšana"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
@@ -300,9 +298,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Lietot IRC kā rootam ir muļķīgi! Jums vajadzētu\n"
-" Izveidot Lietotāja Kontu un lietot to, lai pieteiktos.\n"
+msgstr "* Lietot IRC kā rootam ir muļķīgi! Jums vajadzētu\n Izveidot Lietotāja Kontu un lietot to, lai pieteiktos.\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
@@ -454,9 +450,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <maska> [<bantype>], izraida visus, kuri atbilst maskai no pašreizējā "
-"kanāla. Ja viņi jau ir kanālā, tas viņus neizmet (vajag būt kanālop)"
+msgstr "BAN <maska> [<bantype>], izraida visus, kuri atbilst maskai no pašreizējā kanāla. Ja viņi jau ir kanālā, tas viņus neizmet (vajag būt kanālop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -464,7 +458,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,13 +482,12 @@ msgstr ""
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <segvārds> <ziņa>, sūta CTCP ziņu segvārdam, izplatītākās ziņas ir "
-"VERSION un USERINFO"
+msgstr "CTCP <segvārds> <ziņa>, sūta CTCP ziņu segvārdam, izplatītākās ziņas ir VERSION un USERINFO"
 
 #: 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
@@ -513,9 +507,7 @@ msgstr ""
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <segvāds>, noņem kanālpus-op statusu segvārdam pašreizējā kanālā "
-"(vajag būt kanālop)"
+msgstr "DEHOP <segvāds>, noņem kanālpus-op statusu segvārdam pašreizējā kanālā (vajag būt kanālop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -525,17 +517,13 @@ msgstr "DELBUTTON <nosaukums>, izdzēš pogu no lietotājsaraksta"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <segvāds>, noņem kanālop statusu segvārdam pašreizējā kanālā (vajag būt "
-"kanālop)"
+msgstr "DEOP <segvāds>, noņem kanālop statusu segvārdam pašreizējā kanālā (vajag būt kanālop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <segvārds>, noņem balss statusu segvārdam pašreizējā kanāla (vajag "
-"būt kanālop)"
+msgstr "DEVOICE <segvārds>, noņem balss statusu segvārdam pašreizējā kanāla (vajag būt kanālop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -557,10 +545,7 @@ msgstr "ECHO <teksts>, Izvada tekstu lokāli"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <komanda>, palaiž komandu. Ja -o karodziņš tiek lietots, tad "
-"izvade tiek sūtīta uz pašreizējo kanālu, citādāk tā tiek izvadīta uz "
-"pašreizējo teksta lodziņu"
+msgstr "EXEC [-o] <komanda>, palaiž komandu. Ja -o karodziņš tiek lietots, tad izvade tiek sūtīta uz pašreizējo kanālu, citādāk tā tiek izvadīta uz pašreizējo teksta lodziņu"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -570,9 +555,7 @@ msgstr "EXECCONT, sūta procesam SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], nokauj palaisto exec pašreizējā sesijā. Ja tiek dots -9, "
-"process tiek SIGKILL'ots"
+msgstr "EXECKILL [-9], nokauj palaisto exec pašreizējā sesijā. Ja tiek dots -9, process tiek SIGKILL'ots"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -592,9 +575,7 @@ msgstr "FLUSHQ, noflašo pašreizējā servera sūtīšanas rindu"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <hostdators> [<ports>], caur resursdatoru kā starpserveri, noklusētais "
-"ports ir 23"
+msgstr "GATE <hostdators> [<ports>], caur resursdatoru kā starpserveri, noklusētais ports ir 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -602,8 +583,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <segvārds>, piešķir kanālpus-op'a statusu segvārdam (vajag būt kanālop)"
+msgstr "HOP <segvārds>, piešķir kanālpus-op'a statusu segvārdam (vajag būt kanālop)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -622,9 +602,7 @@ msgstr ""
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <segvārds> [<kanāls>], ielūdz kādu kanālā, pēc noklusējuma uz "
-"pašreizējo kanālu (vajag kanālop)"
+msgstr "INVITE <segvārds> [<kanāls>], ielūdz kādu kanālā, pēc noklusējuma uz pašreizējo kanālu (vajag kanālop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -651,8 +629,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
@@ -662,22 +639,17 @@ msgstr ""
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Masveidā deop'o visus kanālpus-op'us pašreizējā kanālā (vajag būt "
-"kanālop)"
+msgstr "MDEHOP, Masveidā deop'o visus kanālpus-op'us pašreizējā kanālā (vajag būt kanālop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Masveidā deop'o visus kanālop'us pašreizējā kanālā (vajag būt kanālop)"
+msgstr "MDEOP, Masveidā deop'o visus kanālop'us pašreizējā kanālā (vajag būt kanālop)"
 
 #: 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)"
-msgstr ""
-"ME <darbība>, sūta darbību uz pašreizējo kanālu (darbības tiek rakstītas "
-"trešajā personā, kā /me smaida)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <darbība>, sūta darbību uz pašreizējo kanālu (darbības tiek rakstītas trešajā personā, kā /me smaida)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -686,9 +658,7 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Masveidā izmet visus, izņemot tevi, pašreizējā kanālā (vajag būt "
-"kanālop)"
+msgstr "MKICK, Masveidā izmet visus, izņemot tevi, pašreizējā kanālā (vajag būt kanālop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -696,8 +666,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
@@ -761,23 +731,17 @@ msgstr "QUOTE <teksts>, sūta tekstu jēlā formā serverim"
 
 #: 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 ""
-"RECONNECT [-ssl] [<hostdators>] [<ports>] [<parole>], Var izsaukt arī "
-"vienkārši kā /RECONNECT, lai vēlreiz pārslēgtos uz pašreizējo serveri vai "
-"ar /RECONNECT ALL uz visiem atvērtajiem serveriem"
+msgstr "RECONNECT [-ssl] [<hostdators>] [<ports>] [<parole>], Var izsaukt arī vienkārši kā /RECONNECT, lai vēlreiz pārslēgtos uz pašreizējo serveri vai ar /RECONNECT ALL uz visiem atvērtajiem serveriem"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<hostdators>] [<ports>] [<parole>], Var izsaukt arī vienkārši kā /"
-"RECONNECT, lai vēlreiz pārslēgtos uz pašreizējo serveri vai ar /RECONNECT "
-"ALL uz visiem atvērtajiem serveriem"
+msgstr "RECONNECT [<hostdators>] [<ports>] [<parole>], Var izsaukt arī vienkārši kā /RECONNECT, lai vēlreiz pārslēgtos uz pašreizējo serveri vai ar /RECONNECT ALL uz visiem atvērtajiem serveriem"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -799,14 +763,11 @@ msgstr "SEND <segvārds> [<datne>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <hostdators> <ports> <kanāls>, pieslēdzas un pievienojas "
-"kanālam"
+msgstr "SERVCHAN [-ssl] <hostdators> <ports> <kanāls>, pieslēdzas un pievienojas kanālam"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <hostdators> <ports> <kanāls>, pieslēdzas un pievienojas kanālam"
+msgstr "SERVCHAN <hostdators> <ports> <kanāls>, pieslēdzas un pievienojas kanālam"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -818,9 +779,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <hostdators> [<ports>] [<parole>], pieslēdzas serverim, noklusētais "
-"ports ir 6667"
+msgstr "SERVER <hostdators> [<ports>] [<parole>], pieslēdzas serverim, noklusētais ports ir 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -840,10 +799,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<temats>], uzstāda tematu, ja tāds ir dots, savādāk parāda pašreizējo "
-"tematu"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<temats>], uzstāda tematu, ja tāds ir dots, savādāk parāda pašreizējo tematu"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -869,8 +827,8 @@ msgstr "UNLOAD <nosaukums>, izlādē iespraudni vai skriptu"
 
 #: 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
@@ -879,7 +837,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
@@ -909,9 +868,7 @@ msgstr "Lietošana: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Šādai komandai palīdzība nav pieejama.\n"
+msgstr "\nŠādai komandai palīdzība nav pieejama.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -980,9 +937,7 @@ msgstr ""
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nevaru atšķetināt hostdatora vārdu %s\n"
-"Pārbauiet savus IP Uzstādījumus!\n"
+msgstr "Nevaru atšķetināt hostdatora vārdu %s\nPārbauiet savus IP Uzstādījumus!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1157,7 +1112,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
@@ -1191,8 +1147,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
@@ -1213,7 +1169,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
@@ -1226,7 +1183,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
@@ -1243,7 +1201,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
@@ -3548,18 +3507,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 "
@@ -3570,57 +3529,44 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Komanda Ievietot Buferī ievietos Dati 1 saturu ierakstā, kur taustiņi tika "
-"nospiesti secībā, konkrētajā kursora pozīcijā"
+msgstr "Komanda Ievietot Buferī ievietos Dati 1 saturu ierakstā, kur taustiņi tika nospiesti secībā, konkrētajā kursora pozīcijā"
 
 #: 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"
-msgstr ""
-"Komanda Iestatīt Buferi iestata ierakstu, kur taustiņu secība tika ievadīta "
-"atbiltoši Dati 1 saturam"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Komanda Iestatīt Buferi iestata ierakstu, kur taustiņu secība tika ievadīta atbiltoši Dati 1 saturam"
 
 #: 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"
-msgstr ""
-"Komanda Iepriekšējā Komanda iestata rindiņu, lai tā satur iepriekšējo "
-"ievadīto komandu - tas pats, kas nospiežot augšup čaulā"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Komanda Iepriekšējā Komanda iestata rindiņu, lai tā satur iepriekšējo ievadīto komandu - tas pats, kas nospiežot augšup čaulā"
 
 #: 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"
-msgstr ""
-"Komanda Nākamā Komanda iestata rindiņu, lai tā satur nākamo ievadīto komandu "
-"- tas pats, kas nospiežot lejup čaulā"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Komanda Nākamā Komanda iestata rindiņu, lai tā satur nākamo ievadīto komandu - tas pats, kas nospiežot lejup čaulā"
 
 #: 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"
-msgstr ""
-"Šī komanda maina ieraksta tekstu, lai pabeigtu nepilnu segvārdu vai komandu. "
-"Ja Dati 1 ir iestatīti, tad dubult-tabulācija rindiņā izvēlēsies pēdējo "
-"segvārdu, nevis nākamo"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Šī komanda maina ieraksta tekstu, lai pabeigtu nepilnu segvārdu vai komandu. Ja Dati 1 ir iestatīti, tad dubult-tabulācija rindiņā izvēlēsies pēdējo segvārdu, nevis nākamo"
 
 #: 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"
-msgstr ""
-"Šī komanda ritina augšup un lejup pa segvārdu sarakstu. Ja Dati 1 ir "
-"iestatīti uz kaut ko, tā ritināsies augšup, citādi tā ritināsies lejup"
+"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 "Šī komanda ritina augšup un lejup pa segvārdu sarakstu. Ja Dati 1 ir iestatīti uz kaut ko, tā ritināsies augšup, citādi tā ritināsies lejup"
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
@@ -5753,8 +5699,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
@@ -5763,8 +5709,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
@@ -5815,7 +5761,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
@@ -5925,8 +5872,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
@@ -6162,8 +6109,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
@@ -6176,11 +6122,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*BRĪDINĀJUMS*\n"
-"Automātiski akceptēt DCC uz savu mājas direktoriju\n"
-"var būt bīstami un viegli exploitējams. Piem.:\n"
-"Kāds var atsūtīt tev .bash_profile"
+msgstr "*BRĪDINĀJUMS*\nAutomātiski akceptēt DCC uz savu mājas direktoriju\nvar būt bīstami un viegli exploitējams. Piem.:\nKāds var atsūtīt tev .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6294,8 +6236,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
@@ -6311,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/mk.po

@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Jovan Naumovski <jovan@lugola.net>, 2007
 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:13+0000\n"
 "Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Macedonian (http://www.transifex.com/hexchat/hexchat/language/"
-"mk/)\n"
-"Language: mk\n"
+"Language-Team: Macedonian (http://www.transifex.com/hexchat/hexchat/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 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 ""
-"* Користењето на IRC како root е глупаво! Подобро е\n"
-"  да си создадете корисничка сметка и да ја користите неа.\n"
+msgstr "* Користењето на IRC како root е глупаво! Подобро е\n  да си создадете корисничка сметка и да ја користите неа.\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
@@ -452,9 +449,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <маска> [<тип>], ги банира сите кои што одговарат на маската на "
-"сегашниот канал. Ако се веќе на каналот ова не ги исфрла (треба оператор)"
+msgstr "BAN <маска> [<тип>], ги банира сите кои што одговарат на маската на сегашниот канал. Ако се веќе на каналот ова не ги исфрла (треба оператор)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -462,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
@@ -479,21 +475,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>, ја наоѓа кратенката на земјата, пр: au = "
-"австралија"
+msgstr "COUNTRY [-s] <code|wildcard>, ја наоѓа кратенката на земјата, пр: au = австралија"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <прекар> <порака>, испрати ја CTCP пораката до прекарот, вообичаени "
-"пораки се VERSION и USERINFO"
+msgstr "CTCP <прекар> <порака>, испрати ја CTCP пораката до прекарот, вообичаени пораки се VERSION и USERINFO"
 
 #: 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 "CYCLE [<channel>], го напушта тековниот канал и се приклучува повторно"
 
 #: src/common/outbound.c:3956
@@ -507,26 +500,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <прекар>                     - прифатете понудена датотека\n"
-"DCC SEND [-maxcps=#] <прекар> [датотека] - испратете датотека некому\n"
-"DCC PSEND [-maxcps=#] <прекар> [датотека] - испратете датотека во пасивен "
-"режим\n"
-"DCC LIST                           - покажи DCC листа\n"
-"DCC CHAT <прекар>                    - понуди DCC CHAT некому\n"
-"DCC PCHAT <nick>                    - понуди DCC CHAT со користење на "
-"пасивен режим\n"
-"DCC CLOSE <тип> <прекар> <датотека>         пример:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <прекар>                     - прифатете понудена датотека\nDCC SEND [-maxcps=#] <прекар> [датотека] - испратете датотека некому\nDCC PSEND [-maxcps=#] <прекар> [датотека] - испратете датотека во пасивен режим\nDCC LIST                           - покажи DCC листа\nDCC CHAT <прекар>                    - понуди DCC CHAT некому\nDCC PCHAT <nick>                    - понуди DCC CHAT со користење на пасивен режим\nDCC CLOSE <тип> <прекар> <датотека>         пример:\n         /dcc close send johnsmith file.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <прекар>, отстранува операторски статус од прекарот на тековниот канал "
-"(потребно е да имате операторски статус)"
+msgstr "DEHOP <прекар>, отстранува операторски статус од прекарот на тековниот канал (потребно е да имате операторски статус)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -536,17 +516,13 @@ msgstr "DELBUTTON <име>, брише копче под корисничкат
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <прекар>, отстранува операторски статус од прекарот на тековниот канал "
-"(потребно е да имате операторски статус)"
+msgstr "DEOP <прекар>, отстранува операторски статус од прекарот на тековниот канал (потребно е да имате операторски статус)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <прекар>, отстранува глас од прекарот на тековниот канал (потребно е "
-"да имате операторски статус)"
+msgstr "DEVOICE <прекар>, отстранува глас од прекарот на тековниот канал (потребно е да имате операторски статус)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -568,9 +544,7 @@ msgstr "ECHO <text>, Печати текст локално"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <command>, ја извршува командата. Ако користите -o тогаш испраќате "
-"на тековниот канал"
+msgstr "EXEC [-o] <command>, ја извршува командата. Ако користите -o тогаш испраќате на тековниот канал"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -580,9 +554,7 @@ msgstr "EXECCONT, го испраќа процесот SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], убива извршена програма во тековната сесија. Ако -9 е даден "
-"тогаш процесот е SIGKILL'ed"
+msgstr "EXECKILL [-9], убива извршена програма во тековната сесија. Ако -9 е даден тогаш процесот е SIGKILL'ed"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -610,9 +582,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <прекар> дава chanhalf-op статус на прекарот (потребен е операторски "
-"статус)"
+msgstr "HOP <прекар> дава chanhalf-op статус на прекарот (потребен е операторски статус)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -625,20 +595,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <mask> <types..> <options..>\n"
-"    маска - host маска за игнорирање, пр: *!*@*.mt.net.mk\n"
-"    типови - типови на податоци за игнорирање, еден или сите од:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    опции - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    маска - host маска за игнорирање, пр: *!*@*.mt.net.mk\n    типови - типови на податоци за игнорирање, еден или сите од:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    опции - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <прекар> [<канал>], кани некого на каналот, стандардно тоа е "
-"тековниот канал (потребен е операторски статус)"
+msgstr "INVITE <прекар> [<канал>], кани некого на каналот, стандардно тоа е тековниот канал (потребен е операторски статус)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -665,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
@@ -676,23 +638,17 @@ msgstr "LOAD [-e] <датотека>, вчитува додаток или ск
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, одзема опер. статус на сите оператори во тековниот канал (потребен е "
-"операторски статус)"
+msgstr "MDEHOP, одзема опер. статус на сите оператори во тековниот канал (потребен е операторски статус)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, одзема опер. статус на сите оператори во тековниот канал (потребен е "
-"операторски статус)"
+msgstr "MDEOP, одзема опер. статус на сите оператори во тековниот канал (потребен е операторски статус)"
 
 #: 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)"
-msgstr ""
-"ME <акција>, ја испраќа акцијата на тековниот канал (акциите се испишани во "
-"трето лице, на пр. /me скокна)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <акција>, ја испраќа акцијата на тековниот канал (акциите се испишани во трето лице, на пр. /me скокна)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -705,14 +661,12 @@ msgstr "MKICK, ги исфрла сите од каналот (потребен
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, дава опер. статус на сите корисници во тековниот канал (потребен е "
-"операторски статус)"
+msgstr "MOP, дава опер. статус на сите корисници во тековниот канал (потребен е операторски статус)"
 
 #: 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
@@ -739,14 +693,11 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], ја покажува вашата листа за "
-"известување или додава некој на неа"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], ја покажува вашата листа за известување или додава некој на неа"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <прекар>, дава опер. статус на прекарот (потребен е операторски статус)"
+msgstr "OP <прекар>, дава опер. статус на прекарот (потребен е операторски статус)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -779,23 +730,17 @@ msgstr "QUOTE <текст>, праќа текст до серверот во с
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<port>] [<password>], може да се стартува само "
-"со /RECONNECT за повторно врзување на истиот сервер или /RECONNECT ALL за "
-"врзување на сите отворени сервери"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<password>], може да се стартува само со /RECONNECT за повторно врзување на истиот сервер или /RECONNECT ALL за врзување на сите отворени сервери"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<port>] [<password>], може да се стартува само со /"
-"RECONNECT за повторно врзување на истиот сервер или /RECONNECT ALL за "
-"врзување на сите отворени сервери"
+msgstr "RECONNECT [<host>] [<port>] [<password>], може да се стартува само со /RECONNECT за повторно врзување на истиот сервер или /RECONNECT ALL за врзување на сите отворени сервери"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -817,8 +762,7 @@ msgstr "SEND <прекар> [<датотека>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <port> <channel>, се врзува и се приклучува на канал"
+msgstr "SERVCHAN [-ssl] <host> <port> <channel>, се врзува и се приклучува на канал"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -834,9 +778,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], се врзува на сервер, стандардната порта "
-"е 6667"
+msgstr "SERVER <host> [<port>] [<password>], се врзува на сервер, стандардната порта е 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -856,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 "TOPIC [<наслов>], поставува наслов на каналот"
 
 #: src/common/outbound.c:4112
@@ -867,15 +810,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr ""
-"\n"
-"TRAY -f <timeout> <file1> [<file2>] Во фиоката трепка помеѓу двете икони.\n"
-"TRAY -f <filename>                  Постави ја иконата во фоката на некоја "
-"фиксна икона.\n"
-"TRAY -i <number>                    Иконата светка со внатрешна икона.\n"
-"TRAY -t <text>                      Постави го балончето со совет на "
-"фиоката.\n"
-"TRAY -b <title> <text>              Постави го балончето со совет на фиоката."
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] Во фиоката трепка помеѓу двете икони.\nTRAY -f <filename>                  Постави ја иконата во фоката на некоја фиксна икона.\nTRAY -i <number>                    Иконата светка со внатрешна икона.\nTRAY -t <text>                      Постави го балончето со совет на фиоката.\nTRAY -b <title> <text>              Постави го балончето со совет на фиоката."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -891,8 +826,8 @@ msgstr "UNLOAD <име> исклучува додаток или скрипта"
 
 #: 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
@@ -901,10 +836,9 @@ msgstr "URL <url>, отвора URL во вашиот прелистувач"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> итн, означува прекар(и) во листата на "
-"присутни на каналот"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> итн, означува прекар(и) во листата на присутни на каналот"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -917,8 +851,7 @@ msgstr "WALLCHAN <порака>, ја пишува пораката на сит
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <порака>, ја испраќа пораката на сите оператори на тековниот канал"
+msgstr "WALLCHOP <порака>, ја испраќа пораката на сите оператори на тековниот канал"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -934,9 +867,7 @@ msgstr "Користење: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Не постои помош за таа команда.\n"
+msgstr "\nНе постои помош за таа команда.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1005,9 +936,7 @@ msgstr "Дали сте сигурни дека ова е SSL способена
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Не можам да го резолвирам hostname %s\n"
-"Проверете ги вашите IP подесувања!\n"
+msgstr "Не можам да го резолвирам hostname %s\nПроверете ги вашите IP подесувања!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1023,9 +952,7 @@ msgstr "Ќе пробам на следниот сервер за %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Предупредување: \"%s\" дадениот карактер е непознат. Нема да биде применет "
-"разговор за мрежата %s."
+msgstr "Предупредување: \"%s\" дадениот карактер е непознат. Нема да биде применет разговор за мрежата %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1184,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
@@ -1218,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
@@ -1240,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
@@ -1253,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
@@ -1270,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
@@ -2046,9 +1977,7 @@ msgstr "Време на банот"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Неможам да ја прочитам звучната датотека:\n"
-"%s"
+msgstr "Неможам да ја прочитам звучната датотека:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3286,9 +3215,7 @@ msgstr "Дата"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Можете да го отворите прозорецот на листата со банирани додека сте во "
-"јазичето на каналот."
+msgstr "Можете да го отворите прозорецот на листата со банирани додека сте во јазичето на каналот."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3409,18 +3336,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Не можам да пристапам до датотеката: %s\n"
-"%s.\n"
-"Доиспраќањето е невозможно."
+msgstr "Не можам да пристапам до датотеката: %s\n%s.\nДоиспраќањето е невозможно."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Датотеката во директориумот за преземање е поголема од понудената. "
-"Доиспраќањето не е возможно."
+msgstr "Датотеката во директориумот за преземање е поголема од понудената. Доиспраќањето не е возможно."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3550,8 +3472,7 @@ msgstr ""
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Започни минимизирано. Ниво 0=нормално 1=иконизирано 2=место за известување"
+msgstr "Започни минимизирано. Ниво 0=нормално 1=иконизирано 2=место за известување"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3567,10 +3488,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Не можам да го отворам фонтот:\n"
-"\n"
-"%s"
+msgstr "Не можам да го отворам фонтот:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3588,18 +3506,18 @@ msgstr "Редица за испраќање на мрежата: %d бајти"
 
 #: 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 "
@@ -3610,59 +3528,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"Командата за внесување во бафер ќе ја внесе содржината на податок 1 во "
-"записот каде што главната секвенца била притисната, односно на тековната "
-"позиција на стрелката."
+msgstr "Командата за внесување во бафер ќе ја внесе содржината на податок 1 во записот каде што главната секвенца била притисната, односно на тековната позиција на стрелката."
 
 #: 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"
-msgstr ""
-"Командата за поставување на бафер го поставува записот каде што била внесена "
-"содржината за главната секвенца на податокот 1."
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Командата за поставување на бафер го поставува записот каде што била внесена содржината за главната секвенца на податокот 1."
 
 #: 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"
-msgstr ""
-"Оваа команда го менува текстот во полето со цел да доврши некомплетен прекар "
-"или команда."
+"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
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Командата ги проверува последните внесени зборови и ги заменува ако најде "
-"совпаѓање"
+msgstr "Командата ги проверува последните внесени зборови и ги заменува ако најде совпаѓање"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3682,8 +3591,7 @@ msgstr "Оваа команда ја преместува тековната ф
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Ја става линијата за внесување во историја но не ја испраќа на серверот"
+msgstr "Ја става линијата за внесување во историја но не ја испраќа на серверот"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
@@ -3806,9 +3714,7 @@ msgstr "_Приклучи се на овој канал:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Ако го знаете името на каналот на кој што сакате да се приклучите, внесете "
-"го тука."
+msgstr "Ако го знаете името на каналот на кој што сакате да се приклучите, внесете го тука."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3840,8 +3746,7 @@ msgstr "Нема поставено наслов"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Овој сервер има %d канали и дијалози поврзани со него. Да ги затворам сите?"
+msgstr "Овој сервер има %d канали и дијалози поврзани со него. Да ги затворам сите?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4214,19 +4119,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP одговори - специјални кодови:\n"
-"\n"
-"%d  =  дата (целиот ctcp)\n"
-"%e  =  име на тековната мрежа\n"
-"%m  =  инфо за машината\n"
-"%s  =  прекар кој испрати ctcp\n"
-"%t  =  време/дата\n"
-"%2  =  збор 2\n"
-"%3  =  збор 3\n"
-"&2  =  збор 2 на крај на линијата\n"
-"&3  =  збор 3 на крај на линијата\n"
-"\n"
+msgstr "CTCP одговори - специјални кодови:\n\n%d  =  дата (целиот ctcp)\n%e  =  име на тековната мрежа\n%m  =  инфо за машината\n%s  =  прекар кој испрати ctcp\n%t  =  време/дата\n%2  =  збор 2\n%3  =  збор 3\n&2  =  збор 2 на крај на линијата\n&3  =  збор 3 на крај на линијата\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5805,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
@@ -5815,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
@@ -5867,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
@@ -5977,11 +5871,9 @@ msgstr "Земи ја мојата адреса од IRC серверот"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"Го прашува IRC серверот за вашата вистинска адреса. Користете го ова ако "
-"имате 192.168.*.* адреса!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Го прашува IRC серверот за вашата вистинска адреса. Користете го ова ако имате 192.168.*.* адреса!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6213,14 +6105,10 @@ msgstr "Категории"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
-"Не можете да го поставите дрвото на дното или најгоре!\n"
-"Ве молам, прво направете промена во распоредот на  <b>Јазичињата</b> во "
-"менито <b>Поглед</b>."
+msgstr "Не можете да го поставите дрвото на дното или најгоре!\nВе молам, прво направете промена во распоредот на  <b>Јазичињата</b> во менито <b>Поглед</b>."
 
 #: 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
@@ -6233,11 +6121,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*ПРЕДУПРЕДУВАЊЕ*\n"
-"Автоматско прифаќање на DCC во твојот домашен директориум\n"
-"може да биде опасно. Пр:\n"
-"Некој може да ти испрати „.bash_profile“"
+msgstr "*ПРЕДУПРЕДУВАЊЕ*\nАвтоматско прифаќање на DCC во твојот домашен директориум\nможе да биде опасно. Пр:\nНекој може да ти испрати „.bash_profile“"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6351,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
@@ -6368,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/ml.po

@@ -1,26 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # bviktor, 2012
 # bviktor, 2012
-# Thorne Heathenspring <thorne@null.net>, 2013
+# Thorne Heathenspring <thorne@null.net>, 2012-2013
 # Thorne Heathenspring <thorne@null.net>, 2012
 # Thorne Heathenspring <thorne@null.net>, 2012-2013
 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-23 17:57+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: Malayalam (http://www.transifex.com/hexchat/hexchat/language/"
-"ml/)\n"
-"Language: ml\n"
+"Language-Team: Malayalam (http://www.transifex.com/hexchat/hexchat/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -302,8 +301,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"റൂട്ട് ആയി IRC ഉപയോഗിക്കുന്നത് മണ്ടത്തരമാണ് . പുതിയ ഒരു അക്കൗണ്ട്‌  ഉണ്ടാക്കി  അതുപയോഗിക്കുക.\n"
+msgstr "റൂട്ട് ആയി IRC ഉപയോഗിക്കുന്നത് മണ്ടത്തരമാണ് . പുതിയ ഒരു അക്കൗണ്ട്‌  ഉണ്ടാക്കി  അതുപയോഗിക്കുക.\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
@@ -463,7 +461,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
@@ -490,7 +489,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
@@ -632,8 +632,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
@@ -651,8 +650,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
@@ -670,8 +669,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
@@ -735,8 +734,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 ""
 
@@ -803,7 +802,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
@@ -830,8 +830,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
@@ -840,7 +840,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
@@ -1114,7 +1115,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
@@ -1148,8 +1150,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
@@ -1170,7 +1172,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
@@ -1183,7 +1186,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
@@ -1200,7 +1204,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
@@ -3505,18 +3510,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 "
@@ -3531,39 +3536,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
@@ -5697,8 +5702,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
@@ -5707,8 +5712,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
@@ -5759,7 +5764,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
@@ -5869,8 +5875,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
@@ -6106,8 +6112,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
@@ -6234,8 +6239,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

po/ms.po

@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Hasbullah Bin Pit <sebol@ikhlas.com>, 2003
 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: Malay (http://www.transifex.com/hexchat/hexchat/language/"
-"ms/)\n"
-"Language: ms\n"
+"Language-Team: Malay (http://www.transifex.com/hexchat/hexchat/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\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 ""
-"* Melaksanakan IRC sebagai root adalah bodoh! Anda sepatutnya\n"
-" mencipta satu akaun pengguna dan menggunakannya untuk logmasuk\n"
+msgstr "* Melaksanakan IRC sebagai root adalah bodoh! Anda sepatutnya\n mencipta satu akaun pengguna dan menggunakannya untuk logmasuk\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
@@ -867,9 +867,7 @@ msgstr "Penggunaan: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Tiada bantuan yang ada bagi larahan itu.\n"
+msgstr "\nTiada bantuan yang ada bagi larahan itu.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1113,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
@@ -1147,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
@@ -1169,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
@@ -1182,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
@@ -1199,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
@@ -3486,10 +3488,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Gagal membuka font:\n"
-"\n"
-"%s"
+msgstr "Gagal membuka font:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3507,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 "
@@ -3533,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
@@ -5699,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
@@ -5709,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
@@ -5761,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
@@ -5871,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
@@ -6108,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
@@ -6236,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
@@ -6253,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/nl.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Arjan Scherpenise <acscherp@wins.uva.nl>, 2000
 # Bart Coppens <coppensbart@pi.be>, 2002
@@ -13,15 +13,14 @@ 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: Dutch (http://www.transifex.com/hexchat/hexchat/language/"
-"nl/)\n"
-"Language: nl\n"
+"Language-Team: Dutch (http://www.transifex.com/hexchat/hexchat/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -303,9 +302,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC uitvoeren als root is dom! U moet een\n"
-"  gebruikersaccount aanmaken en daarmee inloggen.\n"
+msgstr "* IRC uitvoeren als root is dom! U moet een\n  gebruikersaccount aanmaken en daarmee inloggen.\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
@@ -457,10 +454,7 @@ msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr ""
-"BAN <masker> [<verbansoort>], verbant iedereen die voldoet aan het masker "
-"uit het huidige kanaal. Als ze al in het huidige kanaal zitten worden ze "
-"niet weggeschopt (kanaal-operator vereist)"
+msgstr "BAN <masker> [<verbansoort>], verbant iedereen die voldoet aan het masker uit het huidige kanaal. Als ze al in het huidige kanaal zitten worden ze niet weggeschopt (kanaal-operator vereist)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -468,7 +462,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,21 +480,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>, zoek een landcode, bijvoorbeeld be = België en "
-"nl = Nederland"
+msgstr "COUNTRY [-s] <code|wildcard>, zoek een landcode, bijvoorbeeld be = België en nl = Nederland"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <persoon> <bericht>, een CTCP bericht naar de persoon sturen. Veel "
-"voorkomende berichten zijn VERSION en USERINFO"
+msgstr "CTCP <persoon> <bericht>, een CTCP bericht naar de persoon sturen. Veel voorkomende berichten zijn VERSION en USERINFO"
 
 #: 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
@@ -513,26 +505,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
-"\n"
-"DCC GET <persoon>         - een aangeboden bestand accepteren\n"
-"DCC SEND [-maxcps=#] <persoon> [bestand] - een bestand naar iemand sturen\n"
-"DCC PSEND [-maxcps=#] <persoon> [bestand] - een bestand sturen gebruik "
-"makend van de passieve modus\n"
-"DCC LIST           - DCC lijst weergeven\n"
-"DCC CHAT <persoon>        - iemand DCC CHAT aanbieden\n"
-"DCC PCHAT <persoon>       - DCC CHAT aanbieden gebruikmakend van de passieve "
-"modus\n"
-"DCC CLOSE <soort> <persoon> <bestand>     voorbeeld:\n"
-"      /dcc close send janjanssen bestand.tar.gz"
+msgstr "\nDCC GET <persoon>         - een aangeboden bestand accepteren\nDCC SEND [-maxcps=#] <persoon> [bestand] - een bestand naar iemand sturen\nDCC PSEND [-maxcps=#] <persoon> [bestand] - een bestand sturen gebruik makend van de passieve modus\nDCC LIST           - DCC lijst weergeven\nDCC CHAT <persoon>        - iemand DCC CHAT aanbieden\nDCC PCHAT <persoon>       - DCC CHAT aanbieden gebruikmakend van de passieve modus\nDCC CLOSE <soort> <persoon> <bestand>     voorbeeld:\n      /dcc close send janjanssen bestand.tar.gz"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <persoon>, de kanaal-halfoperator status van de persoon in het huidige "
-"kanaal verwijderen (kanaal-operator vereist)"
+msgstr "DEHOP <persoon>, de kanaal-halfoperator status van de persoon in het huidige kanaal verwijderen (kanaal-operator vereist)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -542,17 +521,13 @@ msgstr "DELBUTTON <naam>, een knop van de gebruikerslijst wissen"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <persoon>, kanaal-operatorstatus van de persoon in het huidige kanaal "
-"verwijderen (kanaal-operator vereist)"
+msgstr "DEOP <persoon>, kanaal-operatorstatus van de persoon in het huidige kanaal verwijderen (kanaal-operator vereist)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <persoon>, de stemstatus van de persoon in het huidige kanaal "
-"verwijderen (kanaal-operator vereist)"
+msgstr "DEVOICE <persoon>, de stemstatus van de persoon in het huidige kanaal verwijderen (kanaal-operator vereist)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -574,10 +549,7 @@ msgstr "ECHO <tekst>, lokaal een tekst afdrukken"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr ""
-"EXEC [-o] <opdracht>, een opdracht uitvoeren. Als de -o vlag meegegeven is, "
-"wordt de uitvoer naar het huidige kanaal gestuurd, anders naar het huidige "
-"tekstvenster"
+msgstr "EXEC [-o] <opdracht>, een opdracht uitvoeren. Als de -o vlag meegegeven is, wordt de uitvoer naar het huidige kanaal gestuurd, anders naar het huidige tekstvenster"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -587,9 +559,7 @@ msgstr "EXECCONT, het proces SIGCONT sturen"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], een lopende exec in de huidige sessie stoppen. Als -9 is "
-"meegegeven wordt het proces geSIGKILLd"
+msgstr "EXECKILL [-9], een lopende exec in de huidige sessie stoppen. Als -9 is meegegeven wordt het proces geSIGKILLd"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -609,9 +579,7 @@ msgstr "FLUSHQ, de verzendrij van de huidige server doerspoelen"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<poort>], verbinding maken door een proxy, de poort is "
-"standaard 23"
+msgstr "GATE <host> [<poort>], verbinding maken door een proxy, de poort is standaard 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -619,9 +587,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <persoon>, geeft kanaal-halfoperator status aan de persoon (kanaal-"
-"operator vereist)"
+msgstr "HOP <persoon>, geeft kanaal-halfoperator status aan de persoon (kanaal-operator vereist)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -634,20 +600,13 @@ msgid ""
 "    types - types of data to ignore, one or all of:\n"
 "            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
 "    options - NOSAVE, QUIET"
-msgstr ""
-"IGNORE <masker> <soorten..> <opties..>\n"
-"    masker - host masker om te negeren, bijv.: *!*@*.aol.com\n"
-"    soorten - soorten gegevens om te negeren, een of meer van:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opties - NOSAVE, QUIET"
+msgstr "IGNORE <masker> <soorten..> <opties..>\n    masker - host masker om te negeren, bijv.: *!*@*.aol.com\n    soorten - soorten gegevens om te negeren, een of meer van:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opties - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <persoon> [<kanaal>], iemand uitnodigen een kanaal te openen, "
-"standaard het huidige kanaal (kanaal-operator vereist)"
+msgstr "INVITE <persoon> [<kanaal>], iemand uitnodigen een kanaal te openen, standaard het huidige kanaal (kanaal-operator vereist)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -674,8 +633,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
@@ -685,23 +643,17 @@ msgstr "LOAD [-e] <bestand>, laadt een plugin of script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, massaal van alle kanaal-halfops op-status verwijderen in huidige "
-"kanaal (kanaal-operator vereist)"
+msgstr "MDEHOP, massaal van alle kanaal-halfops op-status verwijderen in huidige kanaal (kanaal-operator vereist)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, massaal van alle kanaal-ops op-status verwijderen in huidige kanaal "
-"(kanaal-operator vereist)"
+msgstr "MDEOP, massaal van alle kanaal-ops op-status verwijderen in huidige kanaal (kanaal-operator vereist)"
 
 #: 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)"
-msgstr ""
-"ME <actie>, stuurt de actie naar het huidige kanaal (acties worden "
-"geschreven in de 3e persoon, bijv: /me springt)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <actie>, stuurt de actie naar het huidige kanaal (acties worden geschreven in de 3e persoon, bijv: /me springt)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -710,20 +662,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, massaal iedereen behalve jezelf uit huidige kanaal schoppen (kanaal-"
-"operator vereist)"
+msgstr "MKICK, massaal iedereen behalve jezelf uit huidige kanaal schoppen (kanaal-operator vereist)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, massaal alle gebruikers in huidige kanaal op-status geven (kanaal-"
-"operator vereist)"
+msgstr "MOP, massaal alle gebruikers in huidige kanaal op-status geven (kanaal-operator vereist)"
 
 #: 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
@@ -754,15 +702,12 @@ msgstr ""
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <persoon>, de kanaal-operator status aan de persoon geven (kanaal-"
-"operator vereist)"
+msgstr "OP <persoon>, de kanaal-operator status aan de persoon geven (kanaal-operator vereist)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanaal>] [<reden>], het kanaal verlaten, standaard het huidige kanaal."
+msgstr "PART [<kanaal>] [<reden>], het kanaal verlaten, standaard het huidige kanaal."
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -790,23 +735,17 @@ msgstr "QUOTE <tekst>, tekst in ruw formaat naar de server sturen"
 
 #: 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 ""
-"RECONNECT [-ssl] [<host>] [<poort>] [<wachtwoord>], kan net als /RECONNECT "
-"gebruikt worden om opnieuw te verbinden met de huidige server, of met /"
-"RECONNECT ALL om met alle open servers een nieuwe verbinding te maken"
+msgstr "RECONNECT [-ssl] [<host>] [<poort>] [<wachtwoord>], kan net als /RECONNECT gebruikt worden om opnieuw te verbinden met de huidige server, of met /RECONNECT ALL om met alle open servers een nieuwe verbinding te maken"
 
 #: src/common/outbound.c:4083
 msgid ""
 "RECONNECT [<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 ""
-"RECONNECT [<host>] [<poort>] [<wachtwoord>], kan net als /RECONNECT gebruikt "
-"worden om opnieuw te verbinden met de huidige server, of met /RECONNECT ALL "
-"om met alle open servers een nieuwe verbinding te maken"
+msgstr "RECONNECT [<host>] [<poort>] [<wachtwoord>], kan net als /RECONNECT gebruikt worden om opnieuw te verbinden met de huidige server, of met /RECONNECT ALL om met alle open servers een nieuwe verbinding te maken"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -828,14 +767,11 @@ msgstr "SEND <bijnaam> [<bestand>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <poort> <kanaal>, verbinding maken en een kanaal "
-"openen"
+msgstr "SERVCHAN [-ssl] <host> <poort> <kanaal>, verbinding maken en een kanaal openen"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN  <host> <poort> <kanaal>, verbinding maken en een kanaal openen"
+msgstr "SERVCHAN  <host> <poort> <kanaal>, verbinding maken en een kanaal openen"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -847,9 +783,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<poort>] [<paswoord>], verbinding maken met een server, de "
-"standaard poort is 6667 voor gewone verbindingen"
+msgstr "SERVER <host> [<poort>] [<paswoord>], verbinding maken met een server, de standaard poort is 6667 voor gewone verbindingen"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -869,10 +803,9 @@ msgstr ""
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], het onderwerp opeven als topic gespecifiëerd is, anders het "
-"huidige onderwerp laten zien"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], het onderwerp opeven als topic gespecifiëerd is, anders het huidige onderwerp laten zien"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -898,8 +831,8 @@ msgstr "UNLOAD <naam>, een plugin of script laden"
 
 #: 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
@@ -908,15 +841,13 @@ msgstr "URL <url> opent een URL in uw browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <bijnaam1> <bijnaam2> enz, laat bijnamen oplichten in "
-"gebruikerslijst van het kanaal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <bijnaam1> <bijnaam2> enz, laat bijnamen oplichten in gebruikerslijst van het kanaal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <persoon>, geef de stemstatus aan iemand (kanaal operator vereist)"
+msgstr "VOICE <persoon>, geef de stemstatus aan iemand (kanaal operator vereist)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -925,9 +856,7 @@ msgstr "WALLCHAN <bericht>, het bericht naar alle kanalen sturen"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <bericht>, een bericht naar alle kanaaloperatoren op het huidige "
-"kanaal"
+msgstr "WALLCHOP <bericht>, een bericht naar alle kanaaloperatoren op het huidige kanaal"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -943,9 +872,7 @@ msgstr "Gebruik: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Geen help beschikbaar over die opdracht.\n"
+msgstr "\nGeen help beschikbaar over die opdracht.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1014,9 +941,7 @@ msgstr "Weet u zeker dat deze server en poort SSL ondersteunen?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Kan hostnaam %s niet oplossen\n"
-"Controleer uw IP instellingen!\n"
+msgstr "Kan hostnaam %s niet oplossen\nControleer uw IP instellingen!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1032,9 +957,7 @@ msgstr "Overschakelen naar volgende server in %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Waarschuwing: tekenset \"%s\" is onbekend. Er zal geen conversie worden "
-"toegepast voor netwerk %s."
+msgstr "Waarschuwing: tekenset \"%s\" is onbekend. Er zal geen conversie worden toegepast voor netwerk %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1193,7 +1116,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
@@ -1227,8 +1151,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
@@ -1249,7 +1173,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
@@ -1262,7 +1187,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
@@ -1279,7 +1205,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
@@ -1558,9 +1485,7 @@ msgstr "**** LOGGEN GESTART OP %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Kan log bestand(en) niet schrijven. Controleer de\n"
-"permissies op %s."
+msgstr "* Kan log bestand(en) niet schrijven. Controleer de\npermissies op %s."
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2057,9 +1982,7 @@ msgstr "Bantijd"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Kan geluidsbestand niet lezen:\n"
-"%s"
+msgstr "Kan geluidsbestand niet lezen:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3297,9 +3220,7 @@ msgstr "Datum"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"U kunt het Ban List venster enkel openen wanneer u zich in een kanaaltab "
-"bevindt."
+msgstr "U kunt het Ban List venster enkel openen wanneer u zich in een kanaaltab bevindt."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3420,18 +3341,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Kan geen toegang krijgen tot bestand: %s\n"
-"%s.\n"
-"Pauzeren is niet mogelijk."
+msgstr "Kan geen toegang krijgen tot bestand: %s\n%s.\nPauzeren is niet mogelijk."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Bestand in downloadmap is groter dan aangeboden bestand. Pauzeren is niet "
-"mogelijk."
+msgstr "Bestand in downloadmap is groter dan aangeboden bestand. Pauzeren is niet mogelijk."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3577,10 +3493,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Openen lettertype mislukt:\n"
-"\n"
-"%s"
+msgstr "Openen lettertype mislukt:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3598,18 +3511,18 @@ msgstr "Netwerk zendwachtrij: %d bytes"
 
 #: 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 "
@@ -3620,65 +3533,50 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr ""
-"De Invoegen in buffer opdracht zal de inhoud van Data 1 invoegen in de "
-"ingang waar de toetsencombinatie was ingedrukt op de huidige aanwijzerpositie"
+msgstr "De Invoegen in buffer opdracht zal de inhoud van Data 1 invoegen in de ingang waar de toetsencombinatie was ingedrukt op de huidige aanwijzerpositie"
 
 #: 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"
-msgstr ""
-"De Buffer instellen opdracht stelt de ingang waar de toetsencombinatie is "
-"ingedrukt in op de inhoud van Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "De Buffer instellen opdracht stelt de ingang waar de toetsencombinatie is ingedrukt in op de inhoud van Data 1"
 
 #: 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"
-msgstr ""
-"De Laatste opdracht opdracht stelt de ingang in op de laatst ingevoerde "
-"opdracht - hetzelfde als pijltje omhoog in een shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "De Laatste opdracht opdracht stelt de ingang in op de laatst ingevoerde opdracht - hetzelfde als pijltje omhoog in een shell"
 
 #: 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"
-msgstr ""
-"De Volgende opdracht opdracht stelt de ingang in op de volgend ingevoerde "
-"opdracht - hetzelfde als pijltje omlaag in een shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "De Volgende opdracht opdracht stelt de ingang in op de volgend ingevoerde opdracht - hetzelfde als pijltje omlaag in een shell"
 
 #: 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"
-msgstr ""
-"Deze opdracht wijzigt de tekst in de ingang zodat een incomplete bijnaam of "
-"opdracht wordt voltooid. Als Data 1 is ingesteld, dan selecteert tweemaal "
-"tab indrukken de laatste bijnaam, niet de volgende"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Deze opdracht wijzigt de tekst in de ingang zodat een incomplete bijnaam of opdracht wordt voltooid. Als Data 1 is ingesteld, dan selecteert tweemaal tab indrukken de laatste bijnaam, niet de volgende"
 
 #: 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"
-msgstr ""
-"Deze opdracht schuift omhoog en omlaag in de lijst met bijnamen. Als Data 1 "
-"ergens op is ingesteld, wordt er omhoog geschoven, anders omlaag."
+"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 "Deze opdracht schuift omhoog en omlaag in de lijst met bijnamen. Als Data 1 ergens op is ingesteld, wordt er omhoog geschoven, anders omlaag."
 
 #: src/fe-gtk/fkeys.c:159
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr ""
-"Deze opdracht vergelijkt het laatst ingevoerde woord ingevoerd in de ingang, "
-"met de vervangingslijst, en vervangt als er een overeenkomst is"
+msgstr "Deze opdracht vergelijkt het laatst ingevoerde woord ingevoerd in de ingang, met de vervangingslijst, en vervangt als er een overeenkomst is"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3702,9 +3600,7 @@ msgstr "Invoerregel naar geschiedenis duwen maar niet naar server verzenden"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Er is een fout opgetreden bij het laden van de configuratie van de "
-"toetsenbordkoppelingen"
+msgstr "Er is een fout opgetreden bij het laden van de configuratie van de toetsenbordkoppelingen"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3823,8 +3719,7 @@ msgstr "Kanaal vervoegen (_J):"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Als u de naam van het kanaal dat u wilt vervoegen kent, geef het dan hier op."
+msgstr "Als u de naam van het kanaal dat u wilt vervoegen kent, geef het dan hier op."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3856,9 +3751,7 @@ msgstr "Er is geen onderwerp ingesteld"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Er zijn nog steeds %d kanalen of dialogen met deze server geassocieerd. Wilt "
-"u ze allemaal sluiten?"
+msgstr "Er zijn nog steeds %d kanalen of dialogen met deze server geassocieerd. Wilt u ze allemaal sluiten?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -5350,9 +5243,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Gebruik grafische pictogrammen in plaats van tekstsymbolen in de "
-"gebruikerslijst."
+msgstr "Gebruik grafische pictogrammen in plaats van tekstsymbolen in de gebruikerslijst."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5812,8 +5703,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
@@ -5822,8 +5713,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
@@ -5874,7 +5765,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
@@ -5984,11 +5876,9 @@ msgstr "Mijn adres van de IRC server halen"
 
 #: src/fe-gtk/setup.c:639
 msgid ""
-"Asks the IRC server for your real address. Use this if you have a 192.168.*."
-"* address!"
-msgstr ""
-"De IRC-server om uw echte adres vragen. Gebruik dit als u een 192.168.*.* "
-"adres heeft!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "De IRC-server om uw echte adres vragen. Gebruik dit als u een 192.168.*.* adres heeft!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6223,15 +6113,12 @@ 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
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Sommige instellingen die zijn veranderd worden pas actief na het opnieuw "
-"starten."
+msgstr "Sommige instellingen die zijn veranderd worden pas actief na het opnieuw starten."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6239,13 +6126,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
-"*WAARSCHUWING*\n"
-"Auto accepteren van DCC naar uw persoonlijke\n"
-"map is gevaarlijk en er kan misbruik van worden\n"
-"gemaakt.\n"
-"Iemand kan u bijvoorbeeld een .bash_profile\n"
-"bestand opsturen."
+msgstr "*WAARSCHUWING*\nAuto accepteren van DCC naar uw persoonlijke\nmap is gevaarlijk en er kan misbruik van worden\ngemaakt.\nIemand kan u bijvoorbeeld een .bash_profile\nbestand opsturen."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6359,8 +6240,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
@@ -6376,9 +6257,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/no.po

@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Kjartan Maraas <kmaraas@online.no>, 1999
 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-23 17:57+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: Norwegian (http://www.transifex.com/hexchat/hexchat/language/"
-"no/)\n"
-"Language: no\n"
+"Language-Team: Norwegian (http://www.transifex.com/hexchat/hexchat/language/no/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: no\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
 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
@@ -5692,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
@@ -5702,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
@@ -5754,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
@@ -5864,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
@@ -6101,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
@@ -6229,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
@@ -6246,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"

po/pa.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005
 # A S Alam <aalam@users.sf.net>, 2009
@@ -9,15 +9,14 @@ 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: Panjabi (Punjabi) (http://www.transifex.com/hexchat/hexchat/"
-"language/pa/)\n"
-"Language: pa\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/hexchat/hexchat/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -299,9 +298,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC ਨੂੰ ਰੂਟ ਦੇ ਤੌਰ ਤੇ ਚਲਾਉਣਾ ਮੂਰਖਤਾ ਹੈ! ਤੁਹਾਨੂੰ ਇੱਕ\n"
-" ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।\n"
+msgstr "* IRC ਨੂੰ ਰੂਟ ਦੇ ਤੌਰ ਤੇ ਚਲਾਉਣਾ ਮੂਰਖਤਾ ਹੈ! ਤੁਹਾਨੂੰ ਇੱਕ\n ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ।\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
@@ -394,10 +391,7 @@ msgstr "ਯੂਜ਼ਰ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਕਮਾਂਡ
 
 #: src/common/outbound.c:2292
 msgid "Plugin defined commands:"
-msgstr ""
-"ਪਲੱਗਇਨ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਕਮਾਂਡਾਂ:\n"
-"\n"
-"  "
+msgstr "ਪਲੱਗਇਨ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਕਮਾਂਡਾਂ:\n\n  "
 
 #: src/common/outbound.c:2303
 msgid "Type /HELP <command> for more information, or /HELP -l"
@@ -464,7 +458,8 @@ msgstr "CHANOPT [-quiet] <variable> [<value>]"
 
 #: 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
@@ -491,7 +486,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
@@ -606,9 +602,7 @@ msgstr ""
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <nick> [<channel>], ਕਿਸੇ ਨੂੰ ਇੱਕ ਚੈਨਲ ਵਿੱਚ ਆਉਣ ਲਈ ਸੱਦਾ ਦਿਓ, ਮੂਲ ਰੂਪ ਵਿੱਚ ਮੌਜੂਦਾ "
-"ਚੈਨਲ ਲਈ (ਮੁੱਖੀ ਹੋਣਾ ਲਾਜ਼ਮੀ)"
+msgstr "INVITE <nick> [<channel>], ਕਿਸੇ ਨੂੰ ਇੱਕ ਚੈਨਲ ਵਿੱਚ ਆਉਣ ਲਈ ਸੱਦਾ ਦਿਓ, ਮੂਲ ਰੂਪ ਵਿੱਚ ਮੌਜੂਦਾ ਚੈਨਲ ਲਈ (ਮੁੱਖੀ ਹੋਣਾ ਲਾਜ਼ਮੀ)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -635,8 +629,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
@@ -654,11 +647,9 @@ 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)"
-msgstr ""
-"ME <action>, ਚੈਨਲ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰੋ (ਕਾਰਵਾਈ ਤੀਜੇ ਵਿਅਕਤੀ ਦੇ ਤੌਰ ਤੇ ਕੀਤੀ ਜਾਵੇਗੀ, ਜਿਵੇਂ /me "
-"ਚੱਲਿਆ)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, ਚੈਨਲ ਵਿੱਚ ਕਾਰਵਾਈ ਕਰੋ (ਕਾਰਵਾਈ ਤੀਜੇ ਵਿਅਕਤੀ ਦੇ ਤੌਰ ਤੇ ਕੀਤੀ ਜਾਵੇਗੀ, ਜਿਵੇਂ /me ਚੱਲਿਆ)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -667,8 +658,7 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, ਮਾਸ ਕਿੱਕ, ਮੌਜੂਦਾ ਚੈਨਲ ਵਿੱਚ ਆਪਣੇ ਆਪ ਨੂੰ ਛੱਡ ਕੇ ਸਭ ਨੂੰ ਬਾਹਰ ਸੁੱਟੋ (ਮੁੱਖੀ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ)"
+msgstr "MKICK, ਮਾਸ ਕਿੱਕ, ਮੌਜੂਦਾ ਚੈਨਲ ਵਿੱਚ ਆਪਣੇ ਆਪ ਨੂੰ ਛੱਡ ਕੇ ਸਭ ਨੂੰ ਬਾਹਰ ਸੁੱਟੋ (ਮੁੱਖੀ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -676,8 +666,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
@@ -741,8 +731,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 ""
 
@@ -809,7 +799,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 "TOPIC [<topic>], ਜੇਕਰ ਕੋਈ ਦਿੱਤਾ ਹੋਵੇ ਤਾਂ ਲਗਾਉ, ਨਹੀਂ ਤਾਂ ਮੌਜੂਦਾ ਵੇਖਾਇਆ ਜਾਵੇਗਾ"
 
 #: src/common/outbound.c:4112
@@ -836,8 +827,8 @@ msgstr "UNLOAD <name>, ਪਲੱਗਇਨ ਜਾਂ ਸਕ੍ਰਿਪਟ ਹਟ
 
 #: 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
@@ -846,7 +837,8 @@ msgstr "URL <url>, ਆਪਣੇ ਬਰਾਊਜ਼ਰ ਵਿੱਚ URL ਖੋਲ
 
 #: 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
@@ -876,9 +868,7 @@ msgstr "ਵਰਤੋਂ: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"ਇਸ ਕਮਾਂਡ ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।\n"
+msgstr "\nਇਸ ਕਮਾਂਡ ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -947,9 +937,7 @@ msgstr "ਕੀ ਤੁਸੀਂ SSL ਅਨੁਕੂਲ ਸਰਵਰ ਤੇ ਪੋ
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"ਹੋਸਟ %s ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ\n"
-"ਆਪਣੀ IP ਸੈਟਿੰਗ ਵੇਖੋ!\n"
+msgstr "ਹੋਸਟ %s ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ\nਆਪਣੀ IP ਸੈਟਿੰਗ ਵੇਖੋ!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1124,7 +1112,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
@@ -1158,8 +1147,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
@@ -1180,7 +1169,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
@@ -1193,7 +1183,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
@@ -1210,7 +1201,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
@@ -1986,9 +1978,7 @@ msgstr "ਪਾਬੰਦੀ ਸਮਾਂ"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"ਸਾਊਂਡ ਫਾਇਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ:\n"
-"%s"
+msgstr "ਸਾਊਂਡ ਫਾਇਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3347,10 +3337,7 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"ਫਾਇਲ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ: %s\n"
-"%s.\n"
-"ਮੁੜ-ਪ੍ਰਾਪਤੀ ਸੰਭਵ ਨਹੀਂ।"
+msgstr "ਫਾਇਲ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ: %s\n%s.\nਮੁੜ-ਪ੍ਰਾਪਤੀ ਸੰਭਵ ਨਹੀਂ।"
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
@@ -3502,10 +3489,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"ਫੋਂਟ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ:\n"
-"\n"
-"%s"
+msgstr "ਫੋਂਟ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3523,18 +3507,18 @@ msgstr "ਨੈੱਟਵਰਕ ਨੇ ਕਤਾਰ ਭੇਜੀ: %d ਬਾਈਟ"
 
 #: 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 "
@@ -3549,39 +3533,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
@@ -5715,8 +5699,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
@@ -5725,8 +5709,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
@@ -5777,7 +5761,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
@@ -5887,8 +5872,8 @@ msgstr "IRC ਸਰਵਰ ਤੋਂ ਮੇਰਾ ਐਡਰੈੱਸ ਪ੍ਰਾ
 
 #: 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
@@ -6124,8 +6109,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
@@ -6252,8 +6236,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
@@ -6269,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"