Merge upstream changes

141 files changed, 11308 insertions, 19286 deletions

diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
new file mode 100644
index 00000000..f2d3ac8e
--- /dev/null
+++ b/.github/workflows/ubuntu-build.yml
@@ -0,0 +1,27 @@
+name: Ubuntu Build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y meson libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libnotify-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev python3-cffi mono-devel desktop-file-utils
+
+      - name: Configure
+        run: meson build -Dwith-text=true -Dwith-theme-manager=true
+
+      - name: Build
+        run: ninja -C build
+
+      - name: Test
+        run: ninja -C build test
+
+      - name: Install
+        run: sudo ninja -C build install
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
new file mode 100644
index 00000000..f8a965f9
--- /dev/null
+++ b/.github/workflows/windows-build.yml
@@ -0,0 +1,74 @@
+name: Windows Build
+on: [push, pull_request]
+
+jobs:
+  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
+        with:
+          fetch-depth: 1
+
+      - 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.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.6" -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.6" -Name "${{ matrix.platform }}" -ItemType "SymbolicLink" -Value "C:/hostedtoolcache/windows/Python/3.6.8/${{ matrix.arch }}"
+
+          C:/hostedtoolcache/windows/Python/3.6.8/${{ 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-preview
+        with:
+          name: Installer
+          path: HexChat*.exe
+
+      - uses: actions/upload-artifact@v2-preview
+        with:
+          name: Build
+          path: hexchat-build
diff --git a/.lgtm.yml b/.lgtm.yml
new file mode 100644
index 00000000..eb33bb6f
--- /dev/null
+++ b/.lgtm.yml
@@ -0,0 +1,5 @@
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - python3-cffi
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index df0c7e1f..00000000
--- a/.travis.yml
+++ /dev/null
@@ -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
diff --git a/data/misc/io.github.Hexchat.appdata.xml.in b/data/misc/io.github.Hexchat.appdata.xml.in
index 97eec2f7..9b0bac72 100644
--- a/data/misc/io.github.Hexchat.appdata.xml.in
+++ b/data/misc/io.github.Hexchat.appdata.xml.in
@@ -26,6 +26,19 @@
     <id>hexchat.desktop</id>
   </provides>
   <releases>
+    <release date="2019-12-20" version="2.14.3">
+      <description>
+        <p>This is a bug-fix release:</p>
+        <ul>
+          <li>Fix various incorrect parsing of IRC messages relating to trailing parameters</li>
+          <li>Fix SASL negotiation combined with multi-line cap</li>
+          <li>Fix input box theming with Yaru theme</li>
+          <li>python: Work around Python 3.7 regression causing crash on unload</li>
+          <li>sysinfo: Add support for /etc/os-release</li>
+          <li>sysinfo: Ignore irrelevant mounts when calculating storage size</li>
+        </ul>
+      </description>
+    </release>
     <release date="2018-08-29" version="2.14.2">
       <description>
         <p>This is a minor release:</p>
@@ -101,5 +114,8 @@
     <kudo>HiDpiIcon</kudo>
     <kudo>Notifications</kudo>
   </kudos>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
   <update_contact>tingping_at_fedoraproject.org</update_contact>
 </component>
diff --git a/meson.build b/meson.build
index 9d2ae05b..9b33574b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('hexchat', 'c',
-  version: '2.14.2',
+  version: '2.14.3',
   meson_version: '>= 0.40.0',
   default_options: [
     'c_std=gnu89',
@@ -49,6 +49,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 +91,6 @@ endif
 
 global_cflags = []
 test_cflags = [
-  '-pipe',
-  '-fPIE',
   '-funsigned-char',
   '-Wno-conversion',
   '-Wno-pointer-sign',
@@ -132,9 +134,11 @@ 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 meson.version().version_compare('>= 0.46.0')
     has_arg = cc.has_link_argument(ldflag)
diff --git a/plugins/checksum/checksum.vcxproj b/plugins/checksum/checksum.vcxproj
index 7924be88..fba08cce 100644
--- a/plugins/checksum/checksum.vcxproj
+++ b/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">

diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj
index e34f10e6..ceb11843 100644
--- a/plugins/exec/exec.vcxproj
+++ b/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">

diff --git a/plugins/fishlim/fish.c b/plugins/fishlim/fish.c
index 00ecfbfa..c2c2b9da 100644
--- a/plugins/fishlim/fish.c
+++ b/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,430 @@ 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;
+/**
+ * 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);
         }
-        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;
-            }
+
+        for (i = 0; i < 6; ++i) {
+            *end++ = fish_base64[left & 0x3fu];
+            left = (left >> 6u);
         }
-        
-        /* Stop if a null terminator was found */
-        if (c == '\0') break;
+
+        /* The previous for'd ensure fill all bytes of encoded, we don't need will with zeros */
+        message += 8;
     }
+
     *end = '\0';
-    return encrypted;
+    return encoded;
 }
 
+/**
+ * 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_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;
 
-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;
-            }
+    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;
+}
+
+/**
+ * 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_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;
         }
-        
-        /* Decrypt block */
-        BF_decrypt(binary, &bfkey);
-        
-        /* Copy to buffer */
-        GET_BYTES(end, binary[0]);
-        GET_BYTES(end, binary[1]);
+
+        cipher = (EVP_CIPHER *) EVP_bf_cbc();
+    } else if (mode == EVP_CIPH_ECB_MODE) {
+        cipher = (EVP_CIPHER *) EVP_bf_ecb();
+    }
+
+    /* 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;
     }
-    
-  decrypt_end:
-    *end = '\0';
-    return decrypted;
 }
 
 /**
- * Encrypts a message (see fish_decrypt). The key is searched for in the
- * key store.
+ * 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_for_nick(const char *nick, const char *data) {
+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;
-    char *encrypted;
+    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);
+    key = keystore_get_key(nick, &mode);
     if (!key) return NULL;
-    
-    /* Encrypt */
-    encrypted = fish_encrypt(key, strlen(key), data);
-    
-    g_free(key);
-    return encrypted;
+
+    *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.
+ * 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) {
+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;
 }
 
diff --git a/plugins/fishlim/fish.h b/plugins/fishlim/fish.h
index 238f52e7..6a2e911c 100644
--- a/plugins/fishlim/fish.h
+++ b/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,19 @@
 
 #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
+};
+
+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
 
diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj
index 43ae1df9..579c2436 100644
--- a/plugins/fishlim/fishlim.vcxproj
+++ b/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">

@@ -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" />

diff --git a/plugins/fishlim/fishlim.vcxproj.filters b/plugins/fishlim/fishlim.vcxproj.filters
index d8fbf454..ee4e855a 100644
--- a/plugins/fishlim/fishlim.vcxproj.filters
+++ b/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>

diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c
index 061faa03..adefc700 100644
--- a/plugins/fishlim/keystore.c
+++ b/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);
diff --git a/plugins/fishlim/keystore.h b/plugins/fishlim/keystore.h
index 3d90606a..4af46693 100644
--- a/plugins/fishlim/keystore.h
+++ b/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
diff --git a/plugins/fishlim/meson.build b/plugins/fishlim/meson.build
index 894923aa..65ccc9ea 100644
--- a/plugins/fishlim/meson.build
+++ b/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'
diff --git a/plugins/fishlim/plugin_hexchat.c b/plugins/fishlim/plugin_hexchat.c
index 3eaad986..83286e28 100644
--- a/plugins/fishlim/plugin_hexchat.c
+++ b/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>";
@@ -54,6 +55,13 @@ 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.
  */
 gchar *get_config_filename(void) {
@@ -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,21 @@ 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 +442,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 +453,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 +472,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 +490,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 +512,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;
+
+    /* 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");
 
-    /* Check syntax */
-    if (*word[2] == '\0' || *word[3] != '\0') {
-        hexchat_printf(ph, "%s\n", usage_delkey);
-        return HEXCHAT_EAT_HEXCHAT;
+        /* 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 +554,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 +566,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 +583,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 +598,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 +676,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;
 }
 
 /**
diff --git a/plugins/fishlim/tests/fake/keystore.c b/plugins/fishlim/tests/fake/keystore.c
new file mode 100644
index 00000000..854f38dc
--- /dev/null
+++ b/plugins/fishlim/tests/fake/keystore.c
@@ -0,0 +1,47 @@
+/*
+
+  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;
+}
diff --git a/plugins/fishlim/tests/meson.build b/plugins/fishlim/tests/meson.build
new file mode 100644
index 00000000..3b75018e
--- /dev/null
+++ b/plugins/fishlim/tests/meson.build
@@ -0,0 +1,17 @@
+subdir('old_version')
+
+fishlim_test_sources = [
+  'tests.c',
+  'fake/keystore.c',
+  '../fish.c',
+  '../utils.c',
+]
+
+fishlim_tests = executable('fishlim_tests', fishlim_test_sources,
+  dependencies: [libgio_dep, libssl_dep],
+  link_with : fishlim_old_lib
+)
+
+test('Fishlim Tests', fishlim_tests,
+  timeout: 90
+)
diff --git a/plugins/fishlim/tests/old_version/fish.c b/plugins/fishlim/tests/old_version/fish.c
new file mode 100644
index 00000000..99601398
--- /dev/null
+++ b/plugins/fishlim/tests/old_version/fish.c
@@ -0,0 +1,155 @@
+/*
+
+  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.
+
+*/
+
+#ifdef __APPLE__
+#define __AVAILABILITYMACROS__
+#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/blowfish.h>
+
+#include "fish.h"
+
+#define IB 64
+static const char fish_base64[64] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+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,
+/*      !  "  #  $  %  &  '  (    )  *  +  ,  -  .  / */
+    IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB, 0, 1,
+/*   0  1  2  3  4  5  6  7    8  9  :  ;  <  =  >  ? */
+     2, 3, 4, 5, 6, 7, 8, 9,  10,11,IB,IB,IB,IB,IB,IB,
+/*   @  A  B  C  D  E  F  G    H  I  J  K  L  M  N  O */
+    IB,38,39,40,41,42,43,44,  45,46,47,48,49,50,51,52,
+/*   P  Q  R  S  T  U  V  W    X  Y  Z  [  \  ]  ^  _*/
+    53,54,55,56,57,58,59,60,  61,62,63,IB,IB,IB,IB,IB,
+/*   `  a  b  c  d  e  f  g    h  i  j  k  l  m  n  o */
+    IB,12,13,14,15,16,17,18,  19,20,21,22,23,24,25,26,
+/*   p  q  r  s  t  u  v  w    x  y  z  {  |  }  ~  <del> */
+    27,28,29,30,31,32,33,34,  35,36,37,IB,IB,IB,IB,IB,
+};
+
+#define GET_BYTES(dest, source) do { \
+    *((dest)++) = ((source) >> 24) & 0xFF; \
+    *((dest)++) = ((source) >> 16) & 0xFF; \
+    *((dest)++) = ((source) >> 8) & 0xFF; \
+    *((dest)++) = (source) & 0xFF; \
+} while (0);
+
+
+char *__old_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;
+        }
+        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 *__old_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;
+}
\ No newline at end of file
diff --git a/plugins/fishlim/tests/old_version/fish.h b/plugins/fishlim/tests/old_version/fish.h
new file mode 100644
index 00000000..7037782b
--- /dev/null
+++ b/plugins/fishlim/tests/old_version/fish.h
@@ -0,0 +1,37 @@
+/*
+
+  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.
+
+*/
+
+#ifndef FISH_OLD_H
+#define FISH_OLD_H
+
+#include <stddef.h>
+
+#include <glib.h>
+
+char *__old_fish_encrypt(const char *key, size_t keylen, const char *message);
+char *__old_fish_decrypt(const char *key, size_t keylen, const char *data);
+
+#endif
+
+
diff --git a/plugins/fishlim/tests/old_version/meson.build b/plugins/fishlim/tests/old_version/meson.build
new file mode 100644
index 00000000..54647d71
--- /dev/null
+++ b/plugins/fishlim/tests/old_version/meson.build
@@ -0,0 +1,4 @@
+fishlim_old_lib = shared_library('fishlim_old_lib',
+  ['fish.c'],
+  dependencies: [libgio_dep, libssl_dep],
+)
diff --git a/plugins/fishlim/tests/tests.c b/plugins/fishlim/tests/tests.c
new file mode 100644
index 00000000..bb841c5e
--- /dev/null
+++ b/plugins/fishlim/tests/tests.c
@@ -0,0 +1,297 @@
+/*
+
+  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_TEST_H
+#define PLUGIN_HEXCHAT_FISHLIM_TEST_H
+
+// Libs
+#include <glib.h>
+// Project Libs
+#include "../fish.h"
+#include "../utils.h"
+#include "old_version/fish.h"
+
+/**
+ * Auxiliary function: Generate a random string
+ * @param out Preallocated string to fill
+ * @param len Size of bytes to fill
+ */
+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 and compare with old implementation
+ */
+void __ecb(void) {
+    char *bo64 = NULL, *b64 = NULL;
+    char *deo = NULL, *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 */
+            bo64 = __old_fish_encrypt(key, key_len, message);
+            g_assert_nonnull(bo64);
+            b64 = fish_encrypt(key, key_len, message, message_len, FISH_ECB_MODE);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(g_strcmp0(b64, bo64), == , 0);
+
+            /* Decrypt */
+            /* Linear */
+            deo = __old_fish_decrypt(key, key_len, bo64);
+            de = fish_decrypt_str(key, key_len, b64, FISH_ECB_MODE);
+            g_assert_nonnull(deo);
+            g_assert_nonnull(de);
+            g_assert_cmpuint(g_strcmp0(de, message), == , 0);
+            g_assert_cmpuint(g_strcmp0(deo, message), == , 0);
+            g_assert_cmpuint(g_strcmp0(de, deo), == , 0);
+            g_free(deo);
+            g_free(de);
+            /* Mixed */
+            deo = __old_fish_decrypt(key, key_len, b64);
+            de = fish_decrypt_str(key, key_len, bo64, FISH_ECB_MODE);
+            g_assert_nonnull(deo);
+            g_assert_nonnull(de);
+            g_assert_cmpuint(g_strcmp0(de, message), == , 0);
+            g_assert_cmpuint(g_strcmp0(deo, message), == , 0);
+            g_assert_cmpuint(g_strcmp0(de, deo), == , 0);
+            g_free(deo);
+            g_free(de);
+
+            /* Free */
+            g_free(bo64);
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check encrypt and decrypt in CBC mode
+ */
+void __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_nonnull(de);
+            g_assert_cmpuint(g_strcmp0(de, message), == , 0);
+            g_free(de);
+
+            /* Free */
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check the calculation of final length from an encoded string in Base64
+ */
+void __base64_len(void) {
+    char *b64 = NULL;
+    int i, message_len = 0;
+    char message[1000];
+
+    for (i = 0; i < 10; ++i) {
+
+        for (message_len = 1; message_len < 1000; ++message_len) {
+            random_string(message, message_len);
+            b64 = g_base64_encode((const unsigned char *) message, message_len);
+            g_assert_nonnull(b64);
+            g_assert_cmpuint(strlen(b64), == , base64_len(message_len));
+            g_free(b64);
+        }
+    }
+}
+
+/**
+ * Check the calculation of final length from an encoded string in BlowcryptBase64
+ */
+void __base64_fish_len(void) {
+    char *b64 = NULL;
+    int i, message_len = 0;
+    char message[1000];
+
+    for (i = 0; i < 10; ++i) {
+
+        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
+ */
+void __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
+ */
+void __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
+ */
+void __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
+ */
+void __foreach_utf8_data_chunks(void) {
+    GRand *rand = NULL;
+    GString *chunks = NULL;
+    int tests, max_chunks_len, chunks_len;
+    char ascii_message[1001];
+    char *data_chunk = NULL;
+
+    rand = g_rand_new();
+
+    for (tests = 0; tests < 1000; ++tests) {
+
+        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);
+    }
+}
+
+
+int main(int argc, char *argv[]) {
+
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/fishlim/__ecb", __ecb);
+    g_test_add_func("/fishlim/__cbc", __ecb);
+    g_test_add_func("/fishlim/__base64_len", __base64_len);
+    g_test_add_func("/fishlim/__base64_fish_len", __base64_fish_len);
+    g_test_add_func("/fishlim/__base64_ecb_len", __base64_ecb_len);
+    g_test_add_func("/fishlim/__base64_cbc_len", __base64_cbc_len);
+    g_test_add_func("/fishlim/__max_text_command_len", __max_text_command_len);
+    g_test_add_func("/fishlim/__foreach_utf8_data_chunks", __foreach_utf8_data_chunks);
+
+    return g_test_run();
+}
+
+#endif //PLUGIN_HEXCHAT_FISHLIM_TEST_H
\ No newline at end of file
diff --git a/plugins/fishlim/utils.c b/plugins/fishlim/utils.c
new file mode 100644
index 00000000..4052995a
--- /dev/null
+++ b/plugins/fishlim/utils.c
@@ -0,0 +1,149 @@
+/*
+
+  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 "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;
+}
\ No newline at end of file
diff --git a/plugins/fishlim/utils.h b/plugins/fishlim/utils.h
new file mode 100644
index 00000000..623c67a4
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
index 941342bb..d1370eaf 100644
--- a/plugins/lua/lua.c
+++ b/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);
@@ -1187,11 +1189,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;
diff --git a/plugins/lua/lua.vcxproj b/plugins/lua/lua.vcxproj
index 22afe729..5c0be68e 100644
--- a/plugins/lua/lua.vcxproj
+++ b/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">
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index ab06dc96..6f30400c 100644
--- a/plugins/perl/perl.c
+++ b/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);
diff --git a/plugins/perl/perl.vcxproj b/plugins/perl/perl.vcxproj
index 8b5069c0..92c27408 100644
--- a/plugins/perl/perl.vcxproj
+++ b/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">

diff --git a/plugins/python/_hexchat.py b/plugins/python/_hexchat.py
new file mode 100644
index 00000000..5e4b0c65
--- /dev/null
+++ b/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)
diff --git a/plugins/python/generate_plugin.py b/plugins/python/generate_plugin.py
new file mode 100755
index 00000000..5c52b37b
--- /dev/null
+++ b/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])
diff --git a/plugins/python/hexchat.py b/plugins/python/hexchat.py
new file mode 100644
index 00000000..6922490b
--- /dev/null
+++ b/plugins/python/hexchat.py
@@ -0,0 +1 @@
+from _hexchat import *
diff --git a/plugins/python/meson.build b/plugins/python/meson.build
index e24f0c6f..5fd7ec2f 100644
--- a/plugins/python/meson.build
+++ b/plugins/python/meson.build
@@ -1,12 +1,30 @@
 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: '',
diff --git a/plugins/python/python.c b/plugins/python/python.c
deleted file mode 100644
index 4403474d..00000000
--- a/plugins/python/python.c
+++ /dev/null
@@ -1,2834 +0,0 @@
-/*
-* Copyright (c) 2002-2003  Gustavo Niemeyer <niemeyer@conectiva.com>
-*
-* XChat Python Plugin Interface
-*
-* Xchat Python Plugin Interface is free software; you can redistribute
-* it and/or modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2 of the
-* License, or (at your option) any later version.
-*
-* pybot is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this file; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-*/
-
-/* Thread support
- * ==============
- *
- * The python interpreter has a global interpreter lock. Any thread
- * executing must acquire it before working with data accessible from
- * python code. Here we must also care about xchat not being
- * thread-safe. We do this by using an xchat lock, which protects
- * xchat instructions from being executed out of time (when this
- * plugin is not "active").
- *
- * When xchat calls python code:
- *   - Change the current_plugin for the executing plugin;
- *   - Release xchat lock
- *   - Acquire the global interpreter lock
- *   - Make the python call
- *   - Release the global interpreter lock
- *   - Acquire xchat lock
- *
- * When python code calls xchat:
- *   - Release the global interpreter lock
- *   - Acquire xchat lock
- *   - Restore context, if necessary
- *   - Make the xchat call
- *   - Release xchat lock
- *   - Acquire the global interpreter lock
- *
- * Inside a timer, so that individual threads have a chance to run:
- *   - Release xchat lock
- *   - Go ahead threads. Have a nice time!
- *   - Acquire xchat lock
- *
- */
-
-#include "config.h"
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <dirent.h>
-#endif
-
-#include "hexchat-plugin.h"
-#undef _POSIX_C_SOURCE	/* Avoid warnings from /usr/include/features.h */
-#undef _XOPEN_SOURCE
-#undef HAVE_MEMRCHR /* Avoid redefinition in Python.h */
-#undef HAVE_STRINGS_H
-#include <Python.h>
-#include <structmember.h>
-#include <pythread.h>
-
-/* Macros to convert version macros into string literals.
- * The indirect macro is a well-known preprocessor trick to force X to be evaluated before the # operator acts to make it a string literal.
- * If STRINGIZE were to be directly defined as #X instead, VERSION would be "VERSION_MAJOR" instead of "1".
- */
-#define STRINGIZE2(X) #X
-#define STRINGIZE(X) STRINGIZE2(X)
-
-/* Version number macros */
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 0
-
-/* Version string macro e.g 1.0/3.3 */
-#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "/" \
-				STRINGIZE(PY_MAJOR_VERSION) "." STRINGIZE (PY_MINOR_VERSION)
-
-/* #define's for Python 2 */
-#if PY_MAJOR_VERSION == 2
-#undef PyLong_Check
-#define PyLong_Check PyInt_Check
-#define PyLong_AsLong PyInt_AsLong
-#define PyLong_FromLong PyInt_FromLong
-
-#undef PyUnicode_Check
-#undef PyUnicode_FromString
-#undef PyUnicode_FromFormat
-#define PyUnicode_Check PyString_Check
-#define PyUnicode_AsFormat PyString_AsFormat
-#define PyUnicode_FromFormat PyString_FromFormat
-#define PyUnicode_FromString PyString_FromString
-#define PyUnicode_AsUTF8 PyString_AsString
-
-#ifdef WIN32
-#undef WITH_THREAD
-#endif
-#endif
-
-/* #define for Python 3 */
-#if PY_MAJOR_VERSION == 3
-#define IS_PY3K
-#endif
-
-#define NONE 0
-#define ALLOW_THREADS 1
-#define RESTORE_CONTEXT 2
-
-#ifdef WITH_THREAD
-#define ACQUIRE_XCHAT_LOCK() PyThread_acquire_lock(xchat_lock, 1)
-#define RELEASE_XCHAT_LOCK() PyThread_release_lock(xchat_lock)
-#define BEGIN_XCHAT_CALLS(x) \
-	do { \
-		PyObject *calls_plugin = NULL; \
-		PyThreadState *calls_thread; \
-		if ((x) & RESTORE_CONTEXT) \
-			calls_plugin = Plugin_GetCurrent(); \
-		calls_thread = PyEval_SaveThread(); \
-		ACQUIRE_XCHAT_LOCK(); \
-		if (!((x) & ALLOW_THREADS)) { \
-			PyEval_RestoreThread(calls_thread); \
-			calls_thread = NULL; \
-		} \
-		if (calls_plugin) \
-			hexchat_set_context(ph, \
-				Plugin_GetContext(calls_plugin)); \
-		while (0)
-#define END_XCHAT_CALLS() \
-		RELEASE_XCHAT_LOCK(); \
-		if (calls_thread) \
-			PyEval_RestoreThread(calls_thread); \
-	} while(0)
-#else
-#define ACQUIRE_XCHAT_LOCK()
-#define RELEASE_XCHAT_LOCK()
-#define BEGIN_XCHAT_CALLS(x)
-#define END_XCHAT_CALLS()
-#endif
-
-#ifdef WITH_THREAD
-
-#define BEGIN_PLUGIN(plg) \
-	do { \
-	hexchat_context *begin_plugin_ctx = hexchat_get_context(ph); \
-	RELEASE_XCHAT_LOCK(); \
-	Plugin_AcquireThread(plg); \
-	Plugin_SetContext(plg, begin_plugin_ctx); \
-	} while (0)
-#define END_PLUGIN(plg) \
-	do { \
-	Plugin_ReleaseThread(plg); \
-	ACQUIRE_XCHAT_LOCK(); \
-	} while (0)
-
-#else /* !WITH_THREAD (win32) */
-
-static PyThreadState *pTempThread;
-
-#define BEGIN_PLUGIN(plg) \
-	do { \
-	hexchat_context *begin_plugin_ctx = hexchat_get_context(ph); \
-	RELEASE_XCHAT_LOCK(); \
-	PyEval_AcquireLock(); \
-	pTempThread = PyThreadState_Swap(((PluginObject *)(plg))->tstate); \
-	Plugin_SetContext(plg, begin_plugin_ctx); \
-	} while (0)
-#define END_PLUGIN(plg) \
-	do { \
-	((PluginObject *)(plg))->tstate = PyThreadState_Swap(pTempThread); \
-	PyEval_ReleaseLock(); \
-	ACQUIRE_XCHAT_LOCK(); \
-	} while (0)
-
-#endif /* !WITH_THREAD */
-
-#define Plugin_Swap(x) \
-	PyThreadState_Swap(((PluginObject *)(x))->tstate)
-#define Plugin_AcquireThread(x) \
-	PyEval_AcquireThread(((PluginObject *)(x))->tstate)
-#define Plugin_ReleaseThread(x) \
-	Util_ReleaseThread(((PluginObject *)(x))->tstate)
-#define Plugin_GetFilename(x) \
-	(((PluginObject *)(x))->filename)
-#define Plugin_GetName(x) \
-	(((PluginObject *)(x))->name)
-#define Plugin_GetVersion(x) \
-	(((PluginObject *)(x))->version)
-#define Plugin_GetDesc(x) \
-	(((PluginObject *)(x))->description)
-#define Plugin_GetHooks(x) \
-	(((PluginObject *)(x))->hooks)
-#define Plugin_GetContext(x) \
-	(((PluginObject *)(x))->context)
-#define Plugin_SetFilename(x, y) \
-	((PluginObject *)(x))->filename = (y);
-#define Plugin_SetName(x, y) \
-	((PluginObject *)(x))->name = (y);
-#define Plugin_SetVersion(x, y) \
-	((PluginObject *)(x))->version = (y);
-#define Plugin_SetDescription(x, y) \
-	((PluginObject *)(x))->description = (y);
-#define Plugin_SetHooks(x, y) \
-	((PluginObject *)(x))->hooks = (y);
-#define Plugin_SetContext(x, y) \
-	((PluginObject *)(x))->context = (y);
-#define Plugin_SetGui(x, y) \
-	((PluginObject *)(x))->gui = (y);
-
-#define HOOK_XCHAT  1
-#define HOOK_XCHAT_ATTR 2
-#define HOOK_UNLOAD 3
-
-/* ===================================================================== */
-/* Object definitions */
-
-typedef struct {
-	PyObject_HEAD
-	int softspace; /* We need it for print support. */
-} XChatOutObject;
-
-typedef struct {
-	PyObject_HEAD
-	hexchat_context *context;
-} ContextObject;
-
-typedef struct {
-	PyObject_HEAD
-	PyObject *time;
-} AttributeObject;
-
-typedef struct {
-	PyObject_HEAD
-	const char *listname;
-	PyObject *dict;
-} ListItemObject;
-
-typedef struct {
-	PyObject_HEAD
-	char *name;
-	char *version;
-	char *filename;
-	char *description;
-	GSList *hooks;
-	PyThreadState *tstate;
-	hexchat_context *context;
-	void *gui;
-} PluginObject;
-
-typedef struct {
-	int type;
-	PyObject *plugin;
-	PyObject *callback;
-	PyObject *userdata;
-	char *name;
-	void *data; /* A handle, when type == HOOK_XCHAT */
-} Hook;
-
-
-/* ===================================================================== */
-/* Function declarations */
-
-static PyObject *Util_BuildList(char *word[]);
-static PyObject *Util_BuildEOLList(char *word[]);
-static void Util_Autoload(void);
-static char *Util_Expand(char *filename);
-
-static int Callback_Server(char *word[], char *word_eol[], hexchat_event_attrs *attrs, void *userdata);
-static int Callback_Command(char *word[], char *word_eol[], void *userdata);
-static int Callback_Print_Attrs(char *word[], hexchat_event_attrs *attrs, void *userdata);
-static int Callback_Print(char *word[], void *userdata);
-static int Callback_Timer(void *userdata);
-static int Callback_ThreadTimer(void *userdata);
-
-static PyObject *XChatOut_New(void);
-static PyObject *XChatOut_write(PyObject *self, PyObject *args);
-static void XChatOut_dealloc(PyObject *self);
-
-static PyObject *Attribute_New(hexchat_event_attrs *attrs);
-
-static void Context_dealloc(PyObject *self);
-static PyObject *Context_set(ContextObject *self, PyObject *args);
-static PyObject *Context_command(ContextObject *self, PyObject *args);
-static PyObject *Context_prnt(ContextObject *self, PyObject *args);
-static PyObject *Context_get_info(ContextObject *self, PyObject *args);
-static PyObject *Context_get_list(ContextObject *self, PyObject *args);
-static PyObject *Context_compare(ContextObject *a, ContextObject *b, int op);
-static PyObject *Context_FromContext(hexchat_context *context);
-static PyObject *Context_FromServerAndChannel(char *server, char *channel);
-
-static PyObject *Plugin_New(char *filename, PyObject *xcoobj);
-static PyObject *Plugin_GetCurrent(void);
-static PluginObject *Plugin_ByString(char *str);
-static Hook *Plugin_AddHook(int type, PyObject *plugin, PyObject *callback,
-			    PyObject *userdata, char *name, void *data);
-static Hook *Plugin_FindHook(PyObject *plugin, char *name);
-static void Plugin_RemoveHook(PyObject *plugin, Hook *hook);
-static void Plugin_RemoveAllHooks(PyObject *plugin);
-
-static PyObject *Module_hexchat_command(PyObject *self, PyObject *args);
-static PyObject *Module_xchat_prnt(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_get_context(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_find_context(PyObject *self, PyObject *args,
-					   PyObject *kwargs);
-static PyObject *Module_hexchat_get_info(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_hook_command(PyObject *self, PyObject *args,
-					   PyObject *kwargs);
-static PyObject *Module_hexchat_hook_server(PyObject *self, PyObject *args,
-					  PyObject *kwargs);
-static PyObject *Module_hexchat_hook_print(PyObject *self, PyObject *args,
-					 PyObject *kwargs);
-static PyObject *Module_hexchat_hook_timer(PyObject *self, PyObject *args,
-					 PyObject *kwargs);
-static PyObject *Module_hexchat_unhook(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_get_info(PyObject *self, PyObject *args);
-static PyObject *Module_xchat_get_list(PyObject *self, PyObject *args);
-static PyObject *Module_xchat_get_lists(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_nickcmp(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_strip(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_pluginpref_set(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_pluginpref_get(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_pluginpref_delete(PyObject *self, PyObject *args);
-static PyObject *Module_hexchat_pluginpref_list(PyObject *self, PyObject *args);
-
-static void IInterp_Exec(char *command);
-static int IInterp_Cmd(char *word[], char *word_eol[], void *userdata);
-
-static void Command_PyList(void);
-static void Command_PyLoad(char *filename);
-static void Command_PyUnload(char *name);
-static void Command_PyReload(char *name);
-static void Command_PyAbout(void);
-static int Command_Py(char *word[], char *word_eol[], void *userdata);
-
-/* ===================================================================== */
-/* Static declarations and definitions */
-
-static PyTypeObject Plugin_Type;
-static PyTypeObject XChatOut_Type;
-static PyTypeObject Context_Type;
-static PyTypeObject ListItem_Type;
-static PyTypeObject Attribute_Type;
-
-static PyThreadState *main_tstate = NULL;
-static void *thread_timer = NULL;
-
-static hexchat_plugin *ph;
-static GSList *plugin_list = NULL;
-
-static PyObject *interp_plugin = NULL;
-static PyObject *xchatout = NULL;
-
-#ifdef WITH_THREAD
-static PyThread_type_lock xchat_lock = NULL;
-#endif
-
-static const char usage[] = "\
-Usage: /PY LOAD   <filename>\n\
-           UNLOAD <filename|name>\n\
-           RELOAD <filename|name>\n\
-           LIST\n\
-           EXEC <command>\n\
-           CONSOLE\n\
-           ABOUT\n\
-\n";
-
-static const char about[] = "HexChat Python interface version " VERSION "\n";
-
-/* ===================================================================== */
-/* Utility functions */
-
-static PyObject *
-Util_BuildList(char *word[])
-{
-	PyObject *list;
-	int listsize = 31;
-	int i;
-	/* Find the last valid array member; there may be intermediate NULLs that
-	 * would otherwise cause us to drop some members. */
-	while (listsize > 0 &&
-	       (word[listsize] == NULL || word[listsize][0] == 0))
-		listsize--;
-	list = PyList_New(listsize);
-	if (list == NULL) {
-		PyErr_Print();
-		return NULL;
-	}
-	for (i = 1; i <= listsize; i++) {
-		PyObject *o;
-		if (word[i] == NULL) {
-			Py_INCREF(Py_None);
-			o = Py_None;
-		} else {
-			/* This handles word[i][0] == 0 automatically. */
-			o = PyUnicode_FromString(word[i]);
-		}
-		PyList_SetItem(list, i - 1, o);
-	}
-	return list;
-}
-
-static PyObject *
-Util_BuildEOLList(char *word[])
-{
-	PyObject *list;
-	int listsize = 31;
-	int i;
-	char *accum = NULL;
-	char *last = NULL;
-
-	/* Find the last valid array member; there may be intermediate NULLs that
-	 * would otherwise cause us to drop some members. */
-	while (listsize > 0 &&
-	       (word[listsize] == NULL || word[listsize][0] == 0))
-		listsize--;
-	list = PyList_New(listsize);
-	if (list == NULL) {
-		PyErr_Print();
-		return NULL;
-	}
-	for (i = listsize; i > 0; i--) {
-		char *part = word[i];
-		PyObject *uni_part;
-		if (accum == NULL) {
-			accum = g_strdup (part);
-		} else if (part != NULL && part[0] != 0) {
-			last = accum;
-			accum = g_strjoin(" ", part, last, NULL);
-			g_free (last);
-			last = NULL;
-
-			if (accum == NULL) {
-				Py_DECREF(list);
-				hexchat_print(ph, "Not enough memory to alloc accum"
-				              "for python plugin callback");
-				return NULL;
-			}
-		}
-		uni_part = PyUnicode_FromString(accum);
-		PyList_SetItem(list, i - 1, uni_part);
-	}
-
-	g_free (last);
-	g_free (accum);
-
-	return list;
-}
-
-static void
-Util_Autoload_from (const char *dir_name)
-{
-	gchar *oldcwd;
-	const char *entry_name;
-	GDir *dir;
-
-	oldcwd = g_get_current_dir ();
-	if (oldcwd == NULL)
-		return;
-	if (g_chdir(dir_name) != 0)
-	{
-		g_free (oldcwd);
-		return;
-	}
-	dir = g_dir_open (".", 0, NULL);
-	if (dir == NULL)
-	{
-		g_free (oldcwd);
-		return;
-	}
-	while ((entry_name = g_dir_read_name (dir)))
-	{
-		if (g_str_has_suffix (entry_name, ".py"))
-			Command_PyLoad((char*)entry_name);
-	}
-	g_dir_close (dir);
-	g_chdir (oldcwd);
-}
-
-static void
-Util_Autoload()
-{
-	const char *xdir;
-	char *sub_dir;
-	/* we need local filesystem encoding for g_chdir, g_dir_open etc */
-
-	xdir = hexchat_get_info(ph, "configdir");
-
-	/* auto-load from subdirectory addons */
-	sub_dir = g_build_filename (xdir, "addons", NULL);
-	Util_Autoload_from(sub_dir);
-	g_free (sub_dir);
-}
-
-static char *
-Util_Expand(char *filename)
-{
-	char *expanded;
-
-	/* Check if this is an absolute path. */
-	if (g_path_is_absolute(filename)) {
-		if (g_file_test(filename, G_FILE_TEST_EXISTS))
-			return g_strdup(filename);
-		else
-			return NULL;
-	}
-
-	/* Check if it starts with ~/ and expand the home if positive. */
-	if (*filename == '~' && *(filename+1) == '/') {
-		expanded = g_build_filename(g_get_home_dir(),
-					    filename+2, NULL);
-		if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-			return expanded;
-		else {
-			g_free(expanded);
-			return NULL;
-		}
-	}
-
-	/* Check if it's in the current directory. */
-	expanded = g_build_filename(g_get_current_dir(),
-				    filename, NULL);
-	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-		return expanded;
-	g_free(expanded);
-
-	/* Check if ~/.config/hexchat/addons/<filename> exists. */
-	expanded = g_build_filename(hexchat_get_info(ph, "configdir"),
-				    "addons", filename, NULL);
-	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-		return expanded;
-	g_free(expanded);
-
-	return NULL;
-}
-
-/* Similar to PyEval_ReleaseThread, but accepts NULL thread states. */
-static void
-Util_ReleaseThread(PyThreadState *tstate)
-{
-	PyThreadState *old_tstate;
-	if (tstate == NULL)
-		Py_FatalError("PyEval_ReleaseThread: NULL thread state");
-	old_tstate = PyThreadState_Swap(NULL);
-	if (old_tstate != tstate && old_tstate != NULL)
-		Py_FatalError("PyEval_ReleaseThread: wrong thread state");
-	PyEval_ReleaseLock();
-}
-
-/* ===================================================================== */
-/* Hookable functions. These are the entry points to python code, besides
- * the load function, and the hooks for interactive interpreter. */
-
-static int
-Callback_Server(char *word[], char *word_eol[], hexchat_event_attrs *attrs, void *userdata)
-{
-	Hook *hook = (Hook *) userdata;
-	PyObject *retobj;
-	PyObject *word_list, *word_eol_list;
-	PyObject *attributes;
-	int ret = HEXCHAT_EAT_NONE;
-	PyObject *plugin;
-
-	plugin = hook->plugin;
-	BEGIN_PLUGIN(plugin);
-
-	word_list = Util_BuildList(word);
-	if (word_list == NULL) {
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-	word_eol_list = Util_BuildList(word_eol);
-	if (word_eol_list == NULL) {
-		Py_DECREF(word_list);
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-
-	attributes = Attribute_New(attrs);
-
-	if (hook->type == HOOK_XCHAT_ATTR)
-		retobj = PyObject_CallFunction(hook->callback, "(OOOO)", word_list,
-					       word_eol_list, hook->userdata, attributes);
-	else
-		retobj = PyObject_CallFunction(hook->callback, "(OOO)", word_list,
-					       word_eol_list, hook->userdata);
-	Py_DECREF(word_list);
-	Py_DECREF(word_eol_list);
-	Py_DECREF(attributes);
-
-	if (retobj == Py_None) {
-		ret = HEXCHAT_EAT_NONE;
-		Py_DECREF(retobj);
-	} else if (retobj) {
-		ret = PyLong_AsLong(retobj);
-		Py_DECREF(retobj);
-	} else {
-		PyErr_Print();
-	}
-
-	END_PLUGIN(plugin);
-
-	return ret;
-}
-
-static int
-Callback_Command(char *word[], char *word_eol[], void *userdata)
-{
-	Hook *hook = (Hook *) userdata;
-	PyObject *retobj;
-	PyObject *word_list, *word_eol_list;
-	int ret = HEXCHAT_EAT_NONE;
-	PyObject *plugin;
-
-	plugin = hook->plugin;
-	BEGIN_PLUGIN(plugin);
-
-	word_list = Util_BuildList(word);
-	if (word_list == NULL) {
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-	word_eol_list = Util_BuildList(word_eol);
-	if (word_eol_list == NULL) {
-		Py_DECREF(word_list);
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-
-	retobj = PyObject_CallFunction(hook->callback, "(OOO)", word_list,
-				       word_eol_list, hook->userdata);
-	Py_DECREF(word_list);
-	Py_DECREF(word_eol_list);
-
-	if (retobj == Py_None) {
-		ret = HEXCHAT_EAT_NONE;
-		Py_DECREF(retobj);
-	} else if (retobj) {
-		ret = PyLong_AsLong(retobj);
-		Py_DECREF(retobj);
-	} else {
-		PyErr_Print();
-	}
-
-	END_PLUGIN(plugin);
-
-	return ret;
-}
-
-static int
-Callback_Print_Attrs(char *word[], hexchat_event_attrs *attrs, void *userdata)
-{
-	Hook *hook = (Hook *) userdata;
-	PyObject *retobj;
-	PyObject *word_list;
-	PyObject *word_eol_list;
-	PyObject *attributes;
-	int ret = HEXCHAT_EAT_NONE;
-	PyObject *plugin;
-
-	plugin = hook->plugin;
-	BEGIN_PLUGIN(plugin);
-
-	word_list = Util_BuildList(word);
-	if (word_list == NULL) {
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-	word_eol_list = Util_BuildEOLList(word);
-	if (word_eol_list == NULL) {
-		Py_DECREF(word_list);
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-
-	attributes = Attribute_New(attrs);
-
-	retobj = PyObject_CallFunction(hook->callback, "(OOOO)", word_list,
-					    word_eol_list, hook->userdata, attributes);
-
-	Py_DECREF(word_list);
-	Py_DECREF(word_eol_list);
-	Py_DECREF(attributes);
-
-	if (retobj == Py_None) {
-		ret = HEXCHAT_EAT_NONE;
-		Py_DECREF(retobj);
-	} else if (retobj) {
-		ret = PyLong_AsLong(retobj);
-		Py_DECREF(retobj);
-	} else {
-		PyErr_Print();
-	}
-
-	END_PLUGIN(plugin);
-
-	return ret;
-}
-
-static int
-Callback_Print(char *word[], void *userdata)
-{
-	Hook *hook = (Hook *) userdata;
-	PyObject *retobj;
-	PyObject *word_list;
-	PyObject *word_eol_list;
-	int ret = HEXCHAT_EAT_NONE;
-	PyObject *plugin;
-
-	plugin = hook->plugin;
-	BEGIN_PLUGIN(plugin);
-
-	word_list = Util_BuildList(word);
-	if (word_list == NULL) {
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-	word_eol_list = Util_BuildEOLList(word);
-	if (word_eol_list == NULL) {
-		Py_DECREF(word_list);
-		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
-	}
-
-	retobj = PyObject_CallFunction(hook->callback, "(OOO)", word_list,
-					       word_eol_list, hook->userdata);
-
-	Py_DECREF(word_list);
-	Py_DECREF(word_eol_list);
-
-	if (retobj == Py_None) {
-		ret = HEXCHAT_EAT_NONE;
-		Py_DECREF(retobj);
-	} else if (retobj) {
-		ret = PyLong_AsLong(retobj);
-		Py_DECREF(retobj);
-	} else {
-		PyErr_Print();
-	}
-
-	END_PLUGIN(plugin);
-
-	return ret;
-}
-
-static int
-Callback_Timer(void *userdata)
-{
-	Hook *hook = (Hook *) userdata;
-	PyObject *retobj;
-	int ret = 0;
-	PyObject *plugin;
-
-	plugin = hook->plugin;
-
-	BEGIN_PLUGIN(hook->plugin);
-
-	retobj = PyObject_CallFunction(hook->callback, "(O)", hook->userdata);
-
-	if (retobj) {
-		ret = PyObject_IsTrue(retobj);
-		Py_DECREF(retobj);
-	} else {
-		PyErr_Print();
-	}
-
-	/* Returning 0 for this callback unhooks itself. */
-	if (ret == 0)
-		Plugin_RemoveHook(plugin, hook);
-
-	END_PLUGIN(plugin);
-
-	return ret;
-}
-
-#ifdef WITH_THREAD
-static int
-Callback_ThreadTimer(void *userdata)
-{
-	RELEASE_XCHAT_LOCK();
-#ifndef WIN32
-	usleep(1);
-#endif
-	ACQUIRE_XCHAT_LOCK();
-	return 1;
-}
-#endif
-
-/* ===================================================================== */
-/* XChatOut object */
-
-/* We keep this information global, so we can reset it when the
- * deinit function is called. */
-/* XXX This should be somehow bound to the printing context. */
-static GString *xchatout_buffer = NULL;
-
-static PyObject *
-XChatOut_New()
-{
-	XChatOutObject *xcoobj;
-	xcoobj = PyObject_New(XChatOutObject, &XChatOut_Type);
-	if (xcoobj != NULL)
-		xcoobj->softspace = 0;
-	return (PyObject *) xcoobj;
-}
-
-static void
-XChatOut_dealloc(PyObject *self)
-{
-	Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-/* This is a little bit complex because we have to buffer data
- * until a \n is received, since xchat breaks the line automatically.
- * We also crop the last \n for this reason. */
-static PyObject *
-XChatOut_write(PyObject *self, PyObject *args)
-{
-	gboolean add_space;
-	char *data, *pos;
-
-	if (!PyArg_ParseTuple(args, "s:write", &data))
-		return NULL;
-	if (!data || !*data) {
-		Py_RETURN_NONE;
-	}
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
-	if (((XChatOutObject *)self)->softspace) {
-		add_space = TRUE;
-		((XChatOutObject *)self)->softspace = 0;
-	} else {
-		add_space = FALSE;
-	}
-
-	g_string_append (xchatout_buffer, data);
-
-	/* If not end of line add space to continue buffer later */
-	if (add_space && xchatout_buffer->str[xchatout_buffer->len - 1] != '\n')
-	{
-		g_string_append_c (xchatout_buffer, ' ');
-	}
-
-	/* If there is an end of line print up to that */
-	if ((pos = strrchr (xchatout_buffer->str, '\n')))
-	{
-		*pos = '\0';
-		hexchat_print (ph, xchatout_buffer->str);
-
-		/* Then remove it from buffer */
-		g_string_erase (xchatout_buffer, 0, pos - xchatout_buffer->str + 1);
-	}
-
-	END_XCHAT_CALLS();
-	Py_RETURN_NONE;
-}
-
-#define OFF(x) offsetof(XChatOutObject, x)
-
-static PyMemberDef XChatOut_members[] = {
-	{"softspace", T_INT, OFF(softspace), 0},
-	{0}
-};
-
-static PyMethodDef XChatOut_methods[] = {
-	{"write", XChatOut_write, METH_VARARGS},
-	{NULL, NULL}
-};
-
-static PyTypeObject XChatOut_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"hexchat.XChatOut",	/*tp_name*/
-	sizeof(XChatOutObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	XChatOut_dealloc,	/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        PyObject_GenericGetAttr,/*tp_getattro*/
-        PyObject_GenericSetAttr,/*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        XChatOut_methods,       /*tp_methods*/
-        XChatOut_members,       /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,                      /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        PyType_GenericAlloc,    /*tp_alloc*/
-        PyType_GenericNew,      /*tp_new*/
-      	PyObject_Del,          /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-
-
-/* ===================================================================== */
-/* Attribute object */
-
-#undef OFF
-#define OFF(x) offsetof(AttributeObject, x)
-
-static PyMemberDef Attribute_members[] = {
-	{"time", T_OBJECT, OFF(time), 0},
-	{0}
-};
-
-static void
-Attribute_dealloc(PyObject *self)
-{
-	Py_DECREF(((AttributeObject*)self)->time);
-	Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static PyObject *
-Attribute_repr(PyObject *self)
-{
-	return PyUnicode_FromFormat("<Attribute object at %p>", self);
-}
-
-static PyTypeObject Attribute_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"hexchat.Attribute",	/*tp_name*/
-	sizeof(AttributeObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	Attribute_dealloc,	/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	Attribute_repr,		/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        PyObject_GenericGetAttr,/*tp_getattro*/
-        PyObject_GenericSetAttr,/*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        0,                      /*tp_methods*/
-        Attribute_members,		/*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,						/*tp_dictoffset*/
-        0,                      /*tp_init*/
-        PyType_GenericAlloc,    /*tp_alloc*/
-        PyType_GenericNew,      /*tp_new*/
-      	PyObject_Del,          /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-
-static PyObject *
-Attribute_New(hexchat_event_attrs *attrs)
-{
-	AttributeObject *attr;
-	attr = PyObject_New(AttributeObject, &Attribute_Type);
-	if (attr != NULL) {
-		attr->time = PyLong_FromLong((long)attrs->server_time_utc);
-	}
-	return (PyObject *) attr;
-}
-
-
-/* ===================================================================== */
-/* Context object */
-
-static void
-Context_dealloc(PyObject *self)
-{
-	Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static PyObject *
-Context_set(ContextObject *self, PyObject *args)
-{
-	PyObject *plugin = Plugin_GetCurrent();
-	Plugin_SetContext(plugin, self->context);
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Context_command(ContextObject *self, PyObject *args)
-{
-	char *text;
-	if (!PyArg_ParseTuple(args, "s:command", &text))
-		return NULL;
-	BEGIN_XCHAT_CALLS(ALLOW_THREADS);
-	hexchat_set_context(ph, self->context);
-	hexchat_command(ph, text);
-	END_XCHAT_CALLS();
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Context_prnt(ContextObject *self, PyObject *args)
-{
-	char *text;
-	if (!PyArg_ParseTuple(args, "s:prnt", &text))
-		return NULL;
-	BEGIN_XCHAT_CALLS(ALLOW_THREADS);
-	hexchat_set_context(ph, self->context);
-	hexchat_print(ph, text);
-	END_XCHAT_CALLS();
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Context_emit_print(ContextObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *argv[6];
-	char *name;
-	int res;
-	long time = 0;
-	hexchat_event_attrs *attrs;
-	char *kwlist[] = {"name", "arg1", "arg2", "arg3",
-					"arg4", "arg5", "arg6", 
-					"time", NULL};
-	memset(&argv, 0, sizeof(char*)*6);
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ssssssl:print_event", kwlist, &name,
-			      &argv[0], &argv[1], &argv[2],
-			      &argv[3], &argv[4], &argv[5],
-				  &time))
-		return NULL;
-	BEGIN_XCHAT_CALLS(ALLOW_THREADS);
-	hexchat_set_context(ph, self->context);
-	attrs = hexchat_event_attrs_create(ph);
-	attrs->server_time_utc = (time_t)time; 
-	
-	res = hexchat_emit_print_attrs(ph, attrs, name, argv[0], argv[1], argv[2],
-					 argv[3], argv[4], argv[5], NULL);
-
-	hexchat_event_attrs_free(ph, attrs);
-	END_XCHAT_CALLS();
-	return PyLong_FromLong(res);
-}
-
-static PyObject *
-Context_get_info(ContextObject *self, PyObject *args)
-{
-	const char *info;
-	char *name;
-	if (!PyArg_ParseTuple(args, "s:get_info", &name))
-		return NULL;
-	BEGIN_XCHAT_CALLS(NONE);
-	hexchat_set_context(ph, self->context);
-	info = hexchat_get_info(ph, name);
-	END_XCHAT_CALLS();
-	if (info == NULL) {
-		Py_RETURN_NONE;
-	}
-	return PyUnicode_FromString(info);
-}
-
-static PyObject *
-Context_get_list(ContextObject *self, PyObject *args)
-{
-	PyObject *plugin = Plugin_GetCurrent();
-	hexchat_context *saved_context = Plugin_GetContext(plugin);
-	PyObject *ret;
-	Plugin_SetContext(plugin, self->context);
-	ret = Module_xchat_get_list((PyObject*)self, args);
-	Plugin_SetContext(plugin, saved_context);
-	return ret;
-}
-
-/* needed to make context1 == context2 work */
-static PyObject *
-Context_compare(ContextObject *a, ContextObject *b, int op)
-{
-	PyObject *ret;
-	/* check for == */
-	if (op == Py_EQ)
-		ret = (a->context == b->context ? Py_True : Py_False);
-	/* check for != */
-	else if (op == Py_NE)
-		ret = (a->context != b->context ? Py_True : Py_False);
-	/* only makes sense as == and != */
-	else
-	{
-		PyErr_SetString(PyExc_TypeError, "contexts are either equal or not equal");
-		ret = Py_None;
-	}
-
-	Py_INCREF(ret);
-	return ret;
-}
-
-static PyMethodDef Context_methods[] = {
-	{"set", (PyCFunction) Context_set, METH_NOARGS},
-	{"command", (PyCFunction) Context_command, METH_VARARGS},
-	{"prnt", (PyCFunction) Context_prnt, METH_VARARGS},
-	{"emit_print", (PyCFunction) Context_emit_print, METH_VARARGS|METH_KEYWORDS},
-	{"get_info", (PyCFunction) Context_get_info, METH_VARARGS},
-	{"get_list", (PyCFunction) Context_get_list, METH_VARARGS},
-	{NULL, NULL}
-};
-
-static PyTypeObject Context_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"hexchat.Context",	/*tp_name*/
-	sizeof(ContextObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	Context_dealloc,        /*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        PyObject_GenericGetAttr,/*tp_getattro*/
-        PyObject_GenericSetAttr,/*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        (richcmpfunc)Context_compare,    /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        Context_methods,        /*tp_methods*/
-        0,                      /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,                      /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        PyType_GenericAlloc,    /*tp_alloc*/
-        PyType_GenericNew,      /*tp_new*/
-      	PyObject_Del,          /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-
-static PyObject *
-Context_FromContext(hexchat_context *context)
-{
-	ContextObject *ctxobj = PyObject_New(ContextObject, &Context_Type);
-	if (ctxobj != NULL)
-		ctxobj->context = context;
-	return (PyObject *) ctxobj;
-}
-
-static PyObject *
-Context_FromServerAndChannel(char *server, char *channel)
-{
-	ContextObject *ctxobj;
-	hexchat_context *context;
-	BEGIN_XCHAT_CALLS(NONE);
-	context = hexchat_find_context(ph, server, channel);
-	END_XCHAT_CALLS();
-	if (context == NULL)
-		return NULL;
-	ctxobj = PyObject_New(ContextObject, &Context_Type);
-	if (ctxobj == NULL)
-		return NULL;
-	ctxobj->context = context;
-	return (PyObject *) ctxobj;
-}
-
-
-/* ===================================================================== */
-/* ListItem object */
-
-#undef OFF
-#define OFF(x) offsetof(ListItemObject, x)
-
-static PyMemberDef ListItem_members[] = {
-	{"__dict__", T_OBJECT, OFF(dict), 0},
-	{0}
-};
-
-static void
-ListItem_dealloc(PyObject *self)
-{
-	Py_DECREF(((ListItemObject*)self)->dict);
-	Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static PyObject *
-ListItem_repr(PyObject *self)
-{
-	return PyUnicode_FromFormat("<%s list item at %p>",
-			    	   ((ListItemObject*)self)->listname, self);
-}
-
-static PyTypeObject ListItem_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"hexchat.ListItem",	/*tp_name*/
-	sizeof(ListItemObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	ListItem_dealloc,	/*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	ListItem_repr,		/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        PyObject_GenericGetAttr,/*tp_getattro*/
-        PyObject_GenericSetAttr,/*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        0,                      /*tp_methods*/
-        ListItem_members,       /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        OFF(dict),              /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        PyType_GenericAlloc,    /*tp_alloc*/
-        PyType_GenericNew,      /*tp_new*/
-      	PyObject_Del,          /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-
-static PyObject *
-ListItem_New(const char *listname)
-{
-	ListItemObject *item;
-	item = PyObject_New(ListItemObject, &ListItem_Type);
-	if (item != NULL) {
-		/* listname parameter must be statically allocated. */
-		item->listname = listname;
-		item->dict = PyDict_New();
-		if (item->dict == NULL) {
-			Py_DECREF(item);
-			item = NULL;
-		}
-	}
-	return (PyObject *) item;
-}
-
-
-/* ===================================================================== */
-/* Plugin object */
-
-#define GET_MODULE_DATA(x, force) \
-	o = PyObject_GetAttrString(m, "__module_" #x "__"); \
-	if (o == NULL) { \
-		if (force) { \
-			hexchat_print(ph, "Module has no __module_" #x "__ " \
-					"defined"); \
-			goto error; \
-		} \
-		plugin->x = g_strdup(""); \
-	} else {\
-		if (!PyUnicode_Check(o)) { \
-			hexchat_print(ph, "Variable __module_" #x "__ " \
-					"must be a string"); \
-			goto error; \
-		} \
-		plugin->x = g_strdup(PyUnicode_AsUTF8(o)); \
-		if (plugin->x == NULL) { \
-			hexchat_print(ph, "Not enough memory to allocate " #x); \
-			goto error; \
-		} \
-	}
-
-static PyObject *
-Plugin_GetCurrent()
-{
-	PyObject *plugin;
-	plugin = PySys_GetObject("__plugin__");
-	if (plugin == NULL)
-		PyErr_SetString(PyExc_RuntimeError, "lost sys.__plugin__");
-	return plugin;
-}
-
-static hexchat_plugin *
-Plugin_GetHandle(PluginObject *plugin)
-{
-	/* This works but the issue is that the script must be ran to get
-	 * the name of it thus upon first use it will use the wrong handler
-	 * work around would be to run a fake script once to get name? */
-#if 0
-	/* return fake handle for pluginpref */
-	if (plugin->gui != NULL)
-		return plugin->gui;
-	else
-#endif
-		return ph;
-}
-
-static PluginObject *
-Plugin_ByString(char *str)
-{
-	GSList *list;
-	PluginObject *plugin;
-	char *basename;
-	list = plugin_list;
-	while (list != NULL) {
-		plugin = (PluginObject *) list->data;
-		basename = g_path_get_basename(plugin->filename);
-		if (basename == NULL)
-			break;
-		if (strcasecmp(plugin->name, str) == 0 ||
-		    strcasecmp(plugin->filename, str) == 0 ||
-		    strcasecmp(basename, str) == 0) {
-			g_free(basename);
-			return plugin;
-		}
-		g_free(basename);
-		list = list->next;
-	}
-	return NULL;
-}
-
-static Hook *
-Plugin_AddHook(int type, PyObject *plugin, PyObject *callback,
-	       PyObject *userdata, char *name, void *data)
-{
-	Hook *hook = g_new(Hook, 1);
-	hook->type = type;
-	hook->plugin = plugin;
-	Py_INCREF(callback);
-	hook->callback = callback;
-	Py_INCREF(userdata);
-	hook->userdata = userdata;
-	hook->name = g_strdup (name);
-	hook->data = NULL;
-	Plugin_SetHooks(plugin, g_slist_append(Plugin_GetHooks(plugin),
-					       hook));
-
-	return hook;
-}
-
-static Hook *
-Plugin_FindHook(PyObject *plugin, char *name)
-{
-	Hook *hook = NULL;
-	GSList *plugin_hooks = Plugin_GetHooks(plugin);
-	
-	while (plugin_hooks)
-	{
-		if (g_strcmp0 (((Hook *)plugin_hooks->data)->name, name) == 0)
-		{
-			hook = (Hook *)plugin_hooks->data;
-			break;
-		}
-		
-		plugin_hooks = g_slist_next(plugin_hooks);
-	}
-
-	return hook;
-}
-
-static void
-Plugin_RemoveHook(PyObject *plugin, Hook *hook)
-{
-	GSList *list;
-	/* Is this really a hook of the running plugin? */
-	list = g_slist_find(Plugin_GetHooks(plugin), hook);
-	if (list) {
-		/* Ok, unhook it. */
-		if (hook->type != HOOK_UNLOAD) {
-			/* This is an xchat hook. Unregister it. */
-			BEGIN_XCHAT_CALLS(NONE);
-			hexchat_unhook(ph, (hexchat_hook*)hook->data);
-			END_XCHAT_CALLS();
-		}
-		Plugin_SetHooks(plugin,
-				g_slist_remove(Plugin_GetHooks(plugin),
-					       hook));
-		Py_DECREF(hook->callback);
-		Py_DECREF(hook->userdata);
-		g_free(hook->name);
-		g_free(hook);
-	}
-}
-
-static void
-Plugin_RemoveAllHooks(PyObject *plugin)
-{
-	GSList *list = Plugin_GetHooks(plugin);
-	while (list) {
-		Hook *hook = (Hook *) list->data;
-		if (hook->type != HOOK_UNLOAD) {
-			/* This is an xchat hook. Unregister it. */
-			BEGIN_XCHAT_CALLS(NONE);
-			hexchat_unhook(ph, (hexchat_hook*)hook->data);
-			END_XCHAT_CALLS();
-		}
-		Py_DECREF(hook->callback);
-		Py_DECREF(hook->userdata);
-		g_free(hook->name);
-		g_free(hook);
-		list = list->next;
-	}
-	Plugin_SetHooks(plugin, NULL);
-}
-
-static void
-Plugin_Delete(PyObject *plugin)
-{
-	PyThreadState *tstate = ((PluginObject*)plugin)->tstate;
-	GSList *list = Plugin_GetHooks(plugin);
-	while (list) {
-		Hook *hook = (Hook *) list->data;
-		if (hook->type == HOOK_UNLOAD) {
-			PyObject *retobj;
-			retobj = PyObject_CallFunction(hook->callback, "(O)",
-						       hook->userdata);
-			if (retobj) {
-				Py_DECREF(retobj);
-			} else {
-				PyErr_Print();
-				PyErr_Clear();
-			}
-		}
-		list = list->next;
-	}
-	Plugin_RemoveAllHooks(plugin);
-	if (((PluginObject *)plugin)->gui != NULL)
-		hexchat_plugingui_remove(ph, ((PluginObject *)plugin)->gui);
-	Py_DECREF(plugin);
-	/*PyThreadState_Swap(tstate); needed? */
-	Py_EndInterpreter(tstate);
-}
-
-static PyObject *
-Plugin_New(char *filename, PyObject *xcoobj)
-{
-	PluginObject *plugin = NULL;
-	PyObject *m, *o;
-#ifdef IS_PY3K
-	wchar_t *argv[] = { L"<hexchat>", 0 };
-#else
-	char *argv[] = { "<hexchat>", 0 };
-#endif
-
-	if (filename) {
-		char *old_filename = filename;
-		filename = Util_Expand(filename);
-		if (filename == NULL) {
-			hexchat_printf(ph, "File not found: %s", old_filename);
-			return NULL;
-		}
-	}
-
-	/* Allocate plugin structure. */
-	plugin = PyObject_New(PluginObject, &Plugin_Type);
-	if (plugin == NULL) {
-		hexchat_print(ph, "Can't create plugin object");
-		goto error;
-	}
-
-	Plugin_SetName(plugin, NULL);
-	Plugin_SetVersion(plugin, NULL);
-	Plugin_SetFilename(plugin, NULL);
-	Plugin_SetDescription(plugin, NULL);
-	Plugin_SetHooks(plugin, NULL);
-	Plugin_SetContext(plugin, hexchat_get_context(ph));
-	Plugin_SetGui(plugin, NULL);
-
-	/* Start a new interpreter environment for this plugin. */
-	PyEval_AcquireThread(main_tstate);
-	plugin->tstate = Py_NewInterpreter();
-	if (plugin->tstate == NULL) {
-		hexchat_print(ph, "Can't create interpreter state");
-		goto error;
-	}
-
-	PySys_SetArgv(1, argv);
-	PySys_SetObject("__plugin__", (PyObject *) plugin);
-
-	/* Set stdout and stderr to xchatout. */
-	Py_INCREF(xcoobj);
-	PySys_SetObject("stdout", xcoobj);
-	Py_INCREF(xcoobj);
-	PySys_SetObject("stderr", xcoobj);
-
-	if (filename) {
-#ifdef WIN32
-		char *file;
-		if (!g_file_get_contents(filename, &file, NULL, NULL)) {
-			hexchat_printf(ph, "Can't open file %s: %s\n",
-				     filename, strerror(errno));
-			goto error;
-		}
-
-		if (PyRun_SimpleString(file) != 0) {
-			hexchat_printf(ph, "Error loading module %s\n",
-				     filename);
-			g_free (file);
-			goto error;
-		}
-
-		plugin->filename = filename;
-		filename = NULL;
-		g_free (file);
-#else
-		FILE *fp;
-		plugin->filename = filename;
-
-		/* It's now owned by the plugin. */
-		filename = NULL;
-
-		/* Open the plugin file. */
-		fp = fopen(plugin->filename, "r");
-		if (fp == NULL) {
-			hexchat_printf(ph, "Can't open file %s: %s\n",
-				     plugin->filename, strerror(errno));
-			goto error;
-		}
-
-		/* Run the plugin. */
-		if (PyRun_SimpleFile(fp, plugin->filename) != 0) {
-			hexchat_printf(ph, "Error loading module %s\n",
-				     plugin->filename);
-			fclose(fp);
-			goto error;
-		}
-		fclose(fp);
-#endif
-		m = PyDict_GetItemString(PyImport_GetModuleDict(),
-					 "__main__");
-		if (m == NULL) {
-			hexchat_print(ph, "Can't get __main__ module");
-			goto error;
-		}
-		GET_MODULE_DATA(name, 1);
-		GET_MODULE_DATA(version, 0);
-		GET_MODULE_DATA(description, 0);
-		plugin->gui = hexchat_plugingui_add(ph, plugin->filename,
-						  plugin->name,
-						  plugin->description,
-						  plugin->version, NULL);
-	}
-
-	PyEval_ReleaseThread(plugin->tstate);
-
-	return (PyObject *) plugin;
-
-error:
-	g_free(filename);
-
-	if (plugin) {
-		if (plugin->tstate)
-			Plugin_Delete((PyObject *)plugin);
-		else
-			Py_DECREF(plugin);
-	}
-	PyEval_ReleaseLock();
-
-	return NULL;
-}
-
-static void
-Plugin_dealloc(PluginObject *self)
-{
-	g_free(self->filename);
-	g_free(self->name);
-	g_free(self->version);
-	g_free(self->description);
-	Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static PyTypeObject Plugin_Type = {
-	PyVarObject_HEAD_INIT(NULL, 0)
-	"hexchat.Plugin",		/*tp_name*/
-	sizeof(PluginObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	(destructor)Plugin_dealloc, /*tp_dealloc*/
-	0,			/*tp_print*/
-	0,			/*tp_getattr*/
-	0,			/*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-        0,                      /*tp_call*/
-        0,                      /*tp_str*/
-        PyObject_GenericGetAttr,/*tp_getattro*/
-        PyObject_GenericSetAttr,/*tp_setattro*/
-        0,                      /*tp_as_buffer*/
-        Py_TPFLAGS_DEFAULT,     /*tp_flags*/
-        0,                      /*tp_doc*/
-        0,                      /*tp_traverse*/
-        0,                      /*tp_clear*/
-        0,                      /*tp_richcompare*/
-        0,                      /*tp_weaklistoffset*/
-        0,                      /*tp_iter*/
-        0,                      /*tp_iternext*/
-        0,                      /*tp_methods*/
-        0,                      /*tp_members*/
-        0,                      /*tp_getset*/
-        0,                      /*tp_base*/
-        0,                      /*tp_dict*/
-        0,                      /*tp_descr_get*/
-        0,                      /*tp_descr_set*/
-        0,                      /*tp_dictoffset*/
-        0,                      /*tp_init*/
-        PyType_GenericAlloc,    /*tp_alloc*/
-        PyType_GenericNew,      /*tp_new*/
-      	PyObject_Del,          /*tp_free*/
-        0,                      /*tp_is_gc*/
-};
-
-
-/* ===================================================================== */
-/* XChat module */
-
-static PyObject *
-Module_hexchat_command(PyObject *self, PyObject *args)
-{
-	char *text;
-	if (!PyArg_ParseTuple(args, "s:command", &text))
-		return NULL;
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
-	hexchat_command(ph, text);
-	END_XCHAT_CALLS();
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Module_xchat_prnt(PyObject *self, PyObject *args)
-{
-	char *text;
-	if (!PyArg_ParseTuple(args, "s:prnt", &text))
-		return NULL;
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
-	hexchat_print(ph, text);
-	END_XCHAT_CALLS();
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Module_hexchat_emit_print(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *argv[6];
-	char *name;
-	int res;
-	long time = 0;
-	hexchat_event_attrs *attrs;
-	char *kwlist[] = {"name", "arg1", "arg2", "arg3",
-					"arg4", "arg5", "arg6", 
-					"time", NULL};
-	memset(&argv, 0, sizeof(char*)*6);
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ssssssl:print_event", kwlist, &name,
-			      &argv[0], &argv[1], &argv[2],
-			      &argv[3], &argv[4], &argv[5],
-				  &time))
-		return NULL;
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
-	attrs = hexchat_event_attrs_create(ph);
-	attrs->server_time_utc = (time_t)time; 
-	
-	res = hexchat_emit_print_attrs(ph, attrs, name, argv[0], argv[1], argv[2],
-					 argv[3], argv[4], argv[5], NULL);
-
-	hexchat_event_attrs_free(ph, attrs);
-	END_XCHAT_CALLS();
-	return PyLong_FromLong(res);
-}
-
-static PyObject *
-Module_hexchat_get_info(PyObject *self, PyObject *args)
-{
-	const char *info;
-	char *name;
-	if (!PyArg_ParseTuple(args, "s:get_info", &name))
-		return NULL;
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT);
-	info = hexchat_get_info(ph, name);
-	END_XCHAT_CALLS();
-	if (info == NULL) {
-		Py_RETURN_NONE;
-	}
-	if (strcmp (name, "gtkwin_ptr") == 0 || strcmp (name, "win_ptr") == 0)
-		return PyUnicode_FromFormat("%p", info); /* format as pointer */
-	else
-		return PyUnicode_FromString(info);
-}
-
-static PyObject *
-Module_xchat_get_prefs(PyObject *self, PyObject *args)
-{
-	PyObject *res;
-	const char *info;
-	int integer;
-	char *name;
-	int type;
-	if (!PyArg_ParseTuple(args, "s:get_prefs", &name))
-		return NULL;
-	BEGIN_XCHAT_CALLS(NONE);
-	type = hexchat_get_prefs(ph, name, &info, &integer);
-	END_XCHAT_CALLS();
-	switch (type) {
-		case 0:
-			Py_INCREF(Py_None);
-			res = Py_None;
-			break;
-		case 1:
-			res = PyUnicode_FromString((char*)info);
-			break;
-		case 2:
-		case 3:
-			res = PyLong_FromLong(integer);
-			break;
-		default:
-			PyErr_Format(PyExc_RuntimeError,
-				     "unknown get_prefs type (%d), "
-				     "please report", type);
-			res = NULL;
-			break;
-	}
-	return res;
-}
-
-static PyObject *
-Module_hexchat_get_context(PyObject *self, PyObject *args)
-{
-	PyObject *plugin;
-	PyObject *ctxobj;
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	ctxobj = Context_FromContext(Plugin_GetContext(plugin));
-	if (ctxobj == NULL) {
-		Py_RETURN_NONE;
-	}
-	return ctxobj;
-}
-
-static PyObject *
-Module_hexchat_find_context(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *server = NULL;
-	char *channel = NULL;
-	PyObject *ctxobj;
-	char *kwlist[] = {"server", "channel", 0};
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|zz:find_context",
-					 kwlist, &server, &channel))
-		return NULL;
-	ctxobj = Context_FromServerAndChannel(server, channel);
-	if (ctxobj == NULL) {
-		Py_RETURN_NONE;
-	}
-	return ctxobj;
-}
-
-static PyObject *
-Module_hexchat_pluginpref_set(PyObject *self, PyObject *args)
-{
-	PluginObject *plugin = (PluginObject*)Plugin_GetCurrent();
-	hexchat_plugin *prefph = Plugin_GetHandle(plugin);
-	int result;
-	char *var;
-	PyObject *value;
-		
-	if (!PyArg_ParseTuple(args, "sO:set_pluginpref", &var, &value))
-		return NULL;
-	if (PyLong_Check(value)) {
-		int intvalue = PyLong_AsLong(value);
-		BEGIN_XCHAT_CALLS(NONE);
-		result = hexchat_pluginpref_set_int(prefph, var, intvalue);
-		END_XCHAT_CALLS();
-	}
-	else if (PyUnicode_Check(value)) {
-		char *charvalue = PyUnicode_AsUTF8(value);
-		BEGIN_XCHAT_CALLS(NONE);
-		result = hexchat_pluginpref_set_str(prefph, var, charvalue);
-		END_XCHAT_CALLS();
-	}
-	else
-		result = 0;
-	return PyBool_FromLong(result);
-}
-
-static PyObject *
-Module_hexchat_pluginpref_get(PyObject *self, PyObject *args)
-{
-	PluginObject *plugin = (PluginObject*)Plugin_GetCurrent();
-	hexchat_plugin *prefph = Plugin_GetHandle(plugin);
-	PyObject *ret;
-	char *var;
-	char retstr[512];
-	int retint;
-	int result;
-	if (!PyArg_ParseTuple(args, "s:get_pluginpref", &var))
-		return NULL;
-		
-	/* This will always return numbers as integers. */
-	BEGIN_XCHAT_CALLS(NONE);
-	result = hexchat_pluginpref_get_str(prefph, var, retstr);
-	END_XCHAT_CALLS();
-	if (result) {
-		if (strlen (retstr) <= 12) {
-			BEGIN_XCHAT_CALLS(NONE);
-			retint = hexchat_pluginpref_get_int(prefph, var);
-			END_XCHAT_CALLS();
-			if ((retint == -1) && (strcmp(retstr, "-1") != 0))
-				ret = PyUnicode_FromString(retstr);
-			else
-				ret = PyLong_FromLong(retint);
-		} else
-			ret = PyUnicode_FromString(retstr);
-	}
-	else
-	{
-		Py_INCREF(Py_None);
-		ret = Py_None;
-	}
-	return ret;
-}
-
-static PyObject *
-Module_hexchat_pluginpref_delete(PyObject *self, PyObject *args)
-{
-	PluginObject *plugin = (PluginObject*)Plugin_GetCurrent();
-	hexchat_plugin *prefph = Plugin_GetHandle(plugin);
-	char *var;
-	int result;
-	if (!PyArg_ParseTuple(args, "s:del_pluginpref", &var))
-		return NULL;
-	BEGIN_XCHAT_CALLS(NONE);
-	result = hexchat_pluginpref_delete(prefph, var);
-	END_XCHAT_CALLS();
-	return PyBool_FromLong(result);
-}
-
-static PyObject *
-Module_hexchat_pluginpref_list(PyObject *self, PyObject *args)
-{
-	PluginObject *plugin = (PluginObject*)Plugin_GetCurrent();
-	hexchat_plugin *prefph = Plugin_GetHandle(plugin);
-	char list[4096];
-	char* token;
-	int result;
-	PyObject *pylist;
-	pylist = PyList_New(0);
-	BEGIN_XCHAT_CALLS(NONE);
-	result = hexchat_pluginpref_list(prefph, list);
-	END_XCHAT_CALLS();
-	if (result) {
-		token = strtok(list, ",");
-		while (token != NULL) {
-			PyList_Append(pylist, PyUnicode_FromString(token));
-			token = strtok (NULL, ",");
-		}
-	}
-	return pylist;
-}
-
-static PyObject *
-Module_hexchat_hook_command(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *name;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	int priority = HEXCHAT_PRI_NORM;
-	char *help = NULL;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"name", "callback", "userdata",
-			  "priority", "help", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|Oiz:hook_command",
-					 kwlist, &name, &callback, &userdata,
-					 &priority, &help))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT, plugin, callback, userdata, name, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_command(ph, name, priority,
-					       Callback_Command, help, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_server(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *name;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	int priority = HEXCHAT_PRI_NORM;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|Oi:hook_server",
-					 kwlist, &name, &callback, &userdata,
-					 &priority))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT, plugin, callback, userdata, NULL, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_server_attrs(ph, name, priority,
-					      Callback_Server, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_server_attrs(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *name;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	int priority = HEXCHAT_PRI_NORM;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|Oi:hook_server",
-					 kwlist, &name, &callback, &userdata,
-					 &priority))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT_ATTR, plugin, callback, userdata, NULL, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_server_attrs(ph, name, priority,
-					      Callback_Server, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_print(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *name;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	int priority = HEXCHAT_PRI_NORM;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|Oi:hook_print",
-					 kwlist, &name, &callback, &userdata,
-					 &priority))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT, plugin, callback, userdata, name, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_print(ph, name, priority,
-					     Callback_Print, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_print_attrs(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	char *name;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	int priority = HEXCHAT_PRI_NORM;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|Oi:hook_print_attrs",
-					 kwlist, &name, &callback, &userdata,
-					 &priority))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT_ATTR, plugin, callback, userdata, name, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_print_attrs(ph, name, priority,
-					     Callback_Print_Attrs, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_timer(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	int timeout;
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"timeout", "callback", "userdata", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iO|O:hook_timer",
-					 kwlist, &timeout, &callback,
-					 &userdata))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_XCHAT, plugin, callback, userdata, NULL, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	BEGIN_XCHAT_CALLS(NONE);
-	hook->data = (void*)hexchat_hook_timer(ph, timeout,
-					     Callback_Timer, hook);
-	END_XCHAT_CALLS();
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_hook_unload(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-	PyObject *callback;
-	PyObject *userdata = Py_None;
-	PyObject *plugin;
-	Hook *hook;
-	char *kwlist[] = {"callback", "userdata", 0};
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:hook_unload",
-					 kwlist, &callback, &userdata))
-		return NULL;
-
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "callback is not callable");
-		return NULL;
-	}
-
-	hook = Plugin_AddHook(HOOK_UNLOAD, plugin, callback, userdata, NULL, NULL);
-	if (hook == NULL)
-		return NULL;
-
-	return PyLong_FromVoidPtr(hook);
-}
-
-static PyObject *
-Module_hexchat_unhook(PyObject *self, PyObject *args)
-{
-	PyObject *plugin;
-	PyObject *obj;
-	Hook *hook;
-	if (!PyArg_ParseTuple(args, "O:unhook", &obj))
-		return NULL;
-	plugin = Plugin_GetCurrent();
-	if (plugin == NULL)
-		return NULL;
-
-	if (PyUnicode_Check (obj))
-	{
-		hook = Plugin_FindHook(plugin, PyUnicode_AsUTF8 (obj));
-		while (hook)
-		{
-			Plugin_RemoveHook(plugin, hook);
-			hook = Plugin_FindHook(plugin, PyUnicode_AsUTF8 (obj));
-		}
-	}
-	else
-	{
-		hook = (Hook *)PyLong_AsVoidPtr(obj);
-		Plugin_RemoveHook(plugin, hook);
-	}	
-
-	Py_RETURN_NONE;
-}
-
-static PyObject *
-Module_xchat_get_list(PyObject *self, PyObject *args)
-{
-	hexchat_list *list;
-	PyObject *l;
-	const char *name;
-	const char *const *fields;
-	int i;
-
-	if (!PyArg_ParseTuple(args, "s:get_list", &name))
-		return NULL;
-	/* This function is thread safe, and returns statically
-	 * allocated data. */
-	fields = hexchat_list_fields(ph, "lists");
-	for (i = 0; fields[i]; i++) {
-		if (strcmp(fields[i], name) == 0) {
-			/* Use the static allocated one. */
-			name = fields[i];
-			break;
-		}
-	}
-	if (fields[i] == NULL) {
-		PyErr_SetString(PyExc_KeyError, "list not available");
-		return NULL;
-	}
-	l = PyList_New(0);
-	if (l == NULL)
-		return NULL;
-	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT);
-	list = hexchat_list_get(ph, (char*)name);
-	if (list == NULL)
-		goto error;
-	fields = hexchat_list_fields(ph, (char*)name);
-	while (hexchat_list_next(ph, list)) {
-		PyObject *o = ListItem_New(name);
-		if (o == NULL || PyList_Append(l, o) == -1) {
-			Py_XDECREF(o);
-			goto error;
-		}
-		Py_DECREF(o); /* l is holding a reference */
-		for (i = 0; fields[i]; i++) {
-			const char *fld = fields[i]+1;
-			PyObject *attr = NULL;
-			const char *sattr;
-			int iattr;
-			time_t tattr;
-			switch(fields[i][0]) {
-			case 's':
-				sattr = hexchat_list_str(ph, list, (char*)fld);
-				attr = PyUnicode_FromString(sattr?sattr:"");
-				break;
-			case 'i':
-				iattr = hexchat_list_int(ph, list, (char*)fld);
-				attr = PyLong_FromLong((long)iattr);
-				break;
-			case 't':
-				tattr = hexchat_list_time(ph, list, (char*)fld);
-				attr = PyLong_FromLong((long)tattr);
-				break;
-			case 'p':
-				sattr = hexchat_list_str(ph, list, (char*)fld);
-				if (strcmp(fld, "context") == 0) {
-					attr = Context_FromContext(
-						(hexchat_context*)sattr);
-					break;
-				}
-			default: /* ignore unknown (newly added?) types */
-				continue;
-			}
-			if (attr == NULL)
-				goto error;
-			PyObject_SetAttrString(o, (char*)fld, attr); /* add reference on attr in o */
-			Py_DECREF(attr); /* make o own attr */
-		}
-	}
-	hexchat_list_free(ph, list);
-	goto exit;
-error:
-	if (list)
-		hexchat_list_free(ph, list);
-	Py_DECREF(l);
-	l = NULL;
-
-exit:
-	END_XCHAT_CALLS();
-	return l;
-}
-
-static PyObject *
-Module_xchat_get_lists(PyObject *self, PyObject *args)
-{
-	PyObject *l, *o;
-	const char *const *fields;
-	int i;
-	/* This function is thread safe, and returns statically
-	 * allocated data. */
-	fields = hexchat_list_fields(ph, "lists");
-	l = PyList_New(0);
-	if (l == NULL)
-		return NULL;
-	for (i = 0; fields[i]; i++) {
-		o = PyUnicode_FromString(fields[i]);
-		if (o == NULL || PyList_Append(l, o) == -1) {
-			Py_DECREF(l);
-			Py_XDECREF(o);
-			return NULL;
-		}
-		Py_DECREF(o); /* l is holding a reference */
-	}
-	return l;
-}
-
-static PyObject *
-Module_hexchat_nickcmp(PyObject *self, PyObject *args)
-{
-	char *s1, *s2;
-	if (!PyArg_ParseTuple(args, "ss:nickcmp", &s1, &s2))
-		return NULL;
-	return PyLong_FromLong((long) hexchat_nickcmp(ph, s1, s2));
-}
-
-static PyObject *
-Module_hexchat_strip(PyObject *self, PyObject *args)
-{
-	PyObject *result;
-	char *str, *str2;
-	int len = -1, flags = 1 | 2;
-	if (!PyArg_ParseTuple(args, "s|ii:strip", &str, &len, &flags))
-		return NULL;
-	str2 = hexchat_strip(ph, str, len, flags);
-	result = PyUnicode_FromString(str2);
-	hexchat_free(ph, str2);
-	return result;
-}
-
-static PyMethodDef Module_xchat_methods[] = {
-	{"command",		Module_hexchat_command,
-		METH_VARARGS},
-	{"prnt",		Module_xchat_prnt,
-		METH_VARARGS},
-	{"emit_print",		(PyCFunction)Module_hexchat_emit_print,
-		METH_VARARGS|METH_KEYWORDS},
-	{"get_info",		Module_hexchat_get_info,
-		METH_VARARGS},
-	{"get_prefs",		Module_xchat_get_prefs,
-		METH_VARARGS},
-	{"get_context",		Module_hexchat_get_context,
-		METH_NOARGS},
-	{"find_context",	(PyCFunction)Module_hexchat_find_context,
-		METH_VARARGS|METH_KEYWORDS},
-	{"set_pluginpref", Module_hexchat_pluginpref_set,
-		METH_VARARGS},
-	{"get_pluginpref", Module_hexchat_pluginpref_get,
-		METH_VARARGS},
-	{"del_pluginpref", Module_hexchat_pluginpref_delete,
-		METH_VARARGS},
-	{"list_pluginpref", Module_hexchat_pluginpref_list,
-		METH_VARARGS},
-	{"hook_command",	(PyCFunction)Module_hexchat_hook_command,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_server",		(PyCFunction)Module_hexchat_hook_server,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_server_attrs",		(PyCFunction)Module_hexchat_hook_server_attrs,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_print",		(PyCFunction)Module_hexchat_hook_print,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_print_attrs",		(PyCFunction)Module_hexchat_hook_print_attrs,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_timer",		(PyCFunction)Module_hexchat_hook_timer,
-		METH_VARARGS|METH_KEYWORDS},
-	{"hook_unload",		(PyCFunction)Module_hexchat_hook_unload,
-		METH_VARARGS|METH_KEYWORDS},
-	{"unhook",		Module_hexchat_unhook,
-		METH_VARARGS},
-	{"get_list",		Module_xchat_get_list,
-		METH_VARARGS},
-	{"get_lists",		Module_xchat_get_lists,
-		METH_NOARGS},
-	{"nickcmp",		Module_hexchat_nickcmp,
-		METH_VARARGS},
-	{"strip",		Module_hexchat_strip,
-		METH_VARARGS},
-	{NULL, NULL}
-};
-
-#ifdef IS_PY3K
-static struct PyModuleDef moduledef = {
-	PyModuleDef_HEAD_INIT,
-	"hexchat",     /* m_name */
-	"HexChat Scripting Interface",  /* m_doc */
-	-1,                  /* m_size */
-	Module_xchat_methods,    /* m_methods */
-	NULL,                /* m_reload */
-	NULL,                /* m_traverse */
-	NULL,                /* m_clear */
-	NULL,                /* m_free */
-};
-
-static struct PyModuleDef xchat_moduledef = {
-	PyModuleDef_HEAD_INIT,
-	"xchat",     /* m_name */
-	"HexChat Scripting Interface",  /* m_doc */
-	-1,                  /* m_size */
-	Module_xchat_methods,    /* m_methods */
-	NULL,                /* m_reload */
-	NULL,                /* m_traverse */
-	NULL,                /* m_clear */
-	NULL,                /* m_free */
-};
-#endif
-
-static PyObject *
-moduleinit_hexchat(void)
-{
-	PyObject *hm;
-#ifdef IS_PY3K
-		hm = PyModule_Create(&moduledef);
-#else
-    hm = Py_InitModule3("hexchat", Module_xchat_methods, "HexChat Scripting Interface");
-#endif
-
-	PyModule_AddIntConstant(hm, "EAT_NONE", HEXCHAT_EAT_NONE);
-	PyModule_AddIntConstant(hm, "EAT_HEXCHAT", HEXCHAT_EAT_HEXCHAT);
-	PyModule_AddIntConstant(hm, "EAT_XCHAT", HEXCHAT_EAT_HEXCHAT); /* for compat */
-	PyModule_AddIntConstant(hm, "EAT_PLUGIN", HEXCHAT_EAT_PLUGIN);
-	PyModule_AddIntConstant(hm, "EAT_ALL", HEXCHAT_EAT_ALL);
-	PyModule_AddIntConstant(hm, "PRI_HIGHEST", HEXCHAT_PRI_HIGHEST);
-	PyModule_AddIntConstant(hm, "PRI_HIGH", HEXCHAT_PRI_HIGH);
-	PyModule_AddIntConstant(hm, "PRI_NORM", HEXCHAT_PRI_NORM);
-	PyModule_AddIntConstant(hm, "PRI_LOW", HEXCHAT_PRI_LOW);
-	PyModule_AddIntConstant(hm, "PRI_LOWEST", HEXCHAT_PRI_LOWEST);
-
-	PyObject_SetAttrString(hm, "__version__", Py_BuildValue("(ii)", VERSION_MAJOR, VERSION_MINOR));
-
-	return hm;
-}
-
-static PyObject *
-moduleinit_xchat(void)
-{
-	PyObject *xm;
-#ifdef IS_PY3K
-		xm = PyModule_Create(&xchat_moduledef);
-#else
-    xm = Py_InitModule3("xchat", Module_xchat_methods, "HexChat Scripting Interface");
-#endif
-
-	PyModule_AddIntConstant(xm, "EAT_NONE", HEXCHAT_EAT_NONE);
-	PyModule_AddIntConstant(xm, "EAT_XCHAT", HEXCHAT_EAT_HEXCHAT);
-	PyModule_AddIntConstant(xm, "EAT_PLUGIN", HEXCHAT_EAT_PLUGIN);
-	PyModule_AddIntConstant(xm, "EAT_ALL", HEXCHAT_EAT_ALL);
-	PyModule_AddIntConstant(xm, "PRI_HIGHEST", HEXCHAT_PRI_HIGHEST);
-	PyModule_AddIntConstant(xm, "PRI_HIGH", HEXCHAT_PRI_HIGH);
-	PyModule_AddIntConstant(xm, "PRI_NORM", HEXCHAT_PRI_NORM);
-	PyModule_AddIntConstant(xm, "PRI_LOW", HEXCHAT_PRI_LOW);
-	PyModule_AddIntConstant(xm, "PRI_LOWEST", HEXCHAT_PRI_LOWEST);
-
-	PyObject_SetAttrString(xm, "__version__", Py_BuildValue("(ii)", VERSION_MAJOR, VERSION_MINOR));
-
-	return xm;
-}
-
-#ifdef IS_PY3K
-PyMODINIT_FUNC
-PyInit_hexchat(void)
-{
-    return moduleinit_hexchat();
-}
-PyMODINIT_FUNC
-PyInit_xchat(void)
-{
-    return moduleinit_xchat();
-}
-#else
-PyMODINIT_FUNC
-inithexchat(void)
-{
-		moduleinit_hexchat();
-}
-PyMODINIT_FUNC
-initxchat(void)
-{
-		moduleinit_xchat();
-}
-#endif
-
-/* ===================================================================== */
-/* Python interactive interpreter functions */
-
-static void
-IInterp_Exec(char *command)
-{
-	PyObject *m, *d, *o;
-	char *buffer;
-	int len;
-
-	BEGIN_PLUGIN(interp_plugin);
-
-	m = PyImport_AddModule("__main__");
-	if (m == NULL) {
-		hexchat_print(ph, "Can't get __main__ module");
-		goto fail;
-	}
-	d = PyModule_GetDict(m);
-	len = strlen(command);
-
-	buffer = g_malloc(len + 2);
-	memcpy(buffer, command, len);
-	buffer[len] = '\n';
-	buffer[len+1] = 0;
-	PyRun_SimpleString("import hexchat");
-	o = PyRun_StringFlags(buffer, Py_single_input, d, d, NULL);
-	g_free(buffer);
-	if (o == NULL) {
-		PyErr_Print();
-		goto fail;
-	}
-	Py_DECREF(o);
-
-fail:
-	END_PLUGIN(interp_plugin);
-	return;
-}
-
-static int
-IInterp_Cmd(char *word[], char *word_eol[], void *userdata)
-{
-	char *channel = (char *) hexchat_get_info(ph, "channel");
-	if (channel && channel[0] == '>' && strcmp(channel, ">>python<<") == 0) {
-		hexchat_printf(ph, ">>> %s\n", word_eol[1]);
-		IInterp_Exec(word_eol[1]);
-		return HEXCHAT_EAT_HEXCHAT;
-	}
-	return HEXCHAT_EAT_NONE;
-}
-
-
-/* ===================================================================== */
-/* Python command handling */
-
-static void
-Command_PyList(void)
-{
-	GSList *list;
-	list = plugin_list;
-	if (list == NULL) {
-		hexchat_print(ph, "No python modules loaded");
-	} else {
-		hexchat_print(ph,
-		   "Name         Version  Filename             Description\n"
-		   "----         -------  --------             -----------\n");
-		while (list != NULL) {
-			PluginObject *plg = (PluginObject *) list->data;
-			char *basename = g_path_get_basename(plg->filename);
-			hexchat_printf(ph, "%-12s %-8s %-20s %-10s\n",
-				     plg->name,
-				     *plg->version ? plg->version
-				     		  : "<none>",
-				     basename,
-				     *plg->description ? plg->description
-				     		      : "<none>");
-			g_free(basename);
-			list = list->next;
-		}
-		hexchat_print(ph, "\n");
-	}
-}
-
-static void
-Command_PyLoad(char *filename)
-{
-	PyObject *plugin;
-	RELEASE_XCHAT_LOCK();
-	plugin = Plugin_New(filename, xchatout);
-	ACQUIRE_XCHAT_LOCK();
-	if (plugin)
-		plugin_list = g_slist_append(plugin_list, plugin);
-}
-
-static void
-Command_PyUnload(char *name)
-{
-	PluginObject *plugin = Plugin_ByString(name);
-	if (!plugin) {
-		hexchat_print(ph, "Can't find a python plugin with that name");
-	} else {
-		BEGIN_PLUGIN(plugin);
-		Plugin_Delete((PyObject*)plugin);
-		END_PLUGIN(plugin);
-		plugin_list = g_slist_remove(plugin_list, plugin);
-	}
-}
-
-static void
-Command_PyReload(char *name)
-{
-	PluginObject *plugin = Plugin_ByString(name);
-	if (!plugin) {
-		hexchat_print(ph, "Can't find a python plugin with that name");
-	} else {
-		char *filename = g_strdup(plugin->filename);
-		Command_PyUnload(filename);
-		Command_PyLoad(filename);
-		g_free(filename);
-	}
-}
-
-static void
-Command_PyAbout(void)
-{
-	hexchat_print(ph, about);
-}
-
-static int
-Command_Py(char *word[], char *word_eol[], void *userdata)
-{
-	char *cmd = word[2];
-	int ok = 0;
-	if (strcasecmp(cmd, "LIST") == 0) {
-		ok = 1;
-		Command_PyList();
-	} else if (strcasecmp(cmd, "EXEC") == 0) {
-		if (word[3][0]) {
-			ok = 1;
-			IInterp_Exec(word_eol[3]);
-		}
-	} else if (strcasecmp(cmd, "LOAD") == 0) {
-		if (word[3][0]) {
-			ok = 1;
-			Command_PyLoad(word[3]);
-		}
-	} else if (strcasecmp(cmd, "UNLOAD") == 0) {
-		if (word[3][0]) {
-			ok = 1;
-			Command_PyUnload(word[3]);
-		}
-	} else if (strcasecmp(cmd, "RELOAD") == 0) {
-		if (word[3][0]) {
-			ok = 1;
-			Command_PyReload(word[3]);
-		}
-	} else if (strcasecmp(cmd, "CONSOLE") == 0) {
-		ok = 1;
-		hexchat_command(ph, "QUERY >>python<<");
-	} else if (strcasecmp(cmd, "ABOUT") == 0) {
-		ok = 1;
-		Command_PyAbout();
-	}
-	if (!ok)
-		hexchat_print(ph, usage);
-	return HEXCHAT_EAT_ALL;
-}
-
-static int
-Command_Load(char *word[], char *word_eol[], void *userdata)
-{
-	int len = strlen(word[2]);
-	if (len > 3 && strcasecmp(".py", word[2]+len-3) == 0) {
-		Command_PyLoad(word[2]);
-		return HEXCHAT_EAT_HEXCHAT;
-	}
-	return HEXCHAT_EAT_NONE;
-}
-
-static int
-Command_Reload(char *word[], char *word_eol[], void *userdata)
-{
-	int len = strlen(word[2]);
-	if (len > 3 && strcasecmp(".py", word[2]+len-3) == 0) {
-	Command_PyReload(word[2]);
-	return HEXCHAT_EAT_HEXCHAT;
-	}
-	return HEXCHAT_EAT_NONE;
-}
-
-static int
-Command_Unload(char *word[], char *word_eol[], void *userdata)
-{
-	int len = strlen(word[2]);
-	if (len > 3 && strcasecmp(".py", word[2]+len-3) == 0) {
-		Command_PyUnload(word[2]);
-		return HEXCHAT_EAT_HEXCHAT;
-	}
-	return HEXCHAT_EAT_NONE;
-}
-
-/* ===================================================================== */
-/* Autoload function */
-
-/* ===================================================================== */
-/* (De)initialization functions */
-
-static int initialized = 0;
-static int reinit_tried = 0;
-
-void
-hexchat_plugin_get_info(char **name, char **desc, char **version, void **reserved)
-{
-	*name = "Python";
-	*version = VERSION;
-	*desc = "Python scripting interface";
-   if (reserved)
-      *reserved = NULL;
-}
-
-int
-hexchat_plugin_init(hexchat_plugin *plugin_handle,
-		  char **plugin_name,
-		  char **plugin_desc,
-		  char **plugin_version,
-		  char *arg)
-{
-#ifdef IS_PY3K
-	wchar_t *argv[] = { L"<hexchat>", 0 };
-#else
-	char *argv[] = { "<hexchat>", 0 };
-#endif
-
-	ph = plugin_handle;
-
-	/* Block double initalization. */
-	if (initialized != 0) {
-		hexchat_print(ph, "Python interface already loaded");
-		/* deinit is called even when init fails, so keep track
-		 * of a reinit failure. */
-		reinit_tried++;
-		return 0;
-	}
-	initialized = 1;
-
-	*plugin_name = "Python";
-	*plugin_version = VERSION;
-
-	/* FIXME You can't free this since it's used as long as the plugin's
-	 * loaded, but if you unload it, everything belonging to the plugin is
-	 * supposed to be freed anyway.
-	 */
-	*plugin_desc = g_strdup_printf ("Python %d scripting interface", PY_MAJOR_VERSION);
-
-	/* Initialize python. */
-#ifdef IS_PY3K
-	Py_SetProgramName(L"hexchat");
-	PyImport_AppendInittab("hexchat", PyInit_hexchat);
-	PyImport_AppendInittab("xchat", PyInit_xchat);
-#else
-	Py_SetProgramName("hexchat");
-	PyImport_AppendInittab("hexchat", inithexchat);
-	PyImport_AppendInittab("xchat", initxchat);
-#endif
-	Py_Initialize();
-	PySys_SetArgv(1, argv);
-
-	xchatout_buffer = g_string_new (NULL);
-	xchatout = XChatOut_New();
-	if (xchatout == NULL) {
-		hexchat_print(ph, "Can't allocate xchatout object");
-		return 0;
-	}
-
-#ifdef WITH_THREAD
-	PyEval_InitThreads();
-	xchat_lock = PyThread_allocate_lock();
-	if (xchat_lock == NULL) {
-		hexchat_print(ph, "Can't allocate hexchat lock");
-		Py_DECREF(xchatout);
-		xchatout = NULL;
-		return 0;
-	}
-#endif
-
-	main_tstate = PyEval_SaveThread();
-
-	interp_plugin = Plugin_New(NULL, xchatout);
-	if (interp_plugin == NULL) {
-		hexchat_print(ph, "Plugin_New() failed.\n");
-#ifdef WITH_THREAD
-		PyThread_free_lock(xchat_lock);
-#endif
-		Py_DECREF(xchatout);
-		xchatout = NULL;
-		return 0;
-	}
-
-
-	hexchat_hook_command(ph, "", HEXCHAT_PRI_NORM, IInterp_Cmd, 0, 0);
-	hexchat_hook_command(ph, "PY", HEXCHAT_PRI_NORM, Command_Py, usage, 0);
-	hexchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, Command_Load, 0, 0);
-	hexchat_hook_command(ph, "UNLOAD", HEXCHAT_PRI_NORM, Command_Unload, 0, 0);
-	hexchat_hook_command(ph, "RELOAD", HEXCHAT_PRI_NORM, Command_Reload, 0, 0);
-#ifdef WITH_THREAD
-	thread_timer = hexchat_hook_timer(ph, 300, Callback_ThreadTimer, NULL);
-#endif
-
-	hexchat_print(ph, "Python interface loaded\n");
-
-	Util_Autoload();
-	return 1;
-}
-
-int
-hexchat_plugin_deinit(void)
-{
-	GSList *list;
-
-	/* A reinitialization was tried. Just give up and live the
-	 * environment as is. We are still alive. */
-	if (reinit_tried) {
-		reinit_tried--;
-		return 1;
-	}
-
-	list = plugin_list;
-	while (list != NULL) {
-		PyObject *plugin = (PyObject *) list->data;
-		BEGIN_PLUGIN(plugin);
-		Plugin_Delete(plugin);
-		END_PLUGIN(plugin);
-		list = list->next;
-	}
-	g_slist_free(plugin_list);
-	plugin_list = NULL;
-
-	/* Reset xchatout buffer. */
-	g_string_free (xchatout_buffer, TRUE);
-	xchatout_buffer = NULL;
-
-	if (interp_plugin) {
-		Py_DECREF(interp_plugin);
-		interp_plugin = NULL;
-	}
-
-	/* Switch back to the main thread state. */
-	if (main_tstate) {
-		PyEval_RestoreThread(main_tstate);
-		PyThreadState_Swap(main_tstate);
-		main_tstate = NULL;
-	}
-	Py_Finalize();
-
-#ifdef WITH_THREAD
-	if (thread_timer != NULL) {
-		hexchat_unhook(ph, thread_timer);
-		thread_timer = NULL;
-	}
-	PyThread_free_lock(xchat_lock);
-#endif
-
-	hexchat_print(ph, "Python interface unloaded\n");
-	initialized = 0;
-
-	return 1;
-}
-
diff --git a/plugins/python/python.def b/plugins/python/python.def
index 6ce04e98..e560f50f 100644
--- a/plugins/python/python.def
+++ b/plugins/python/python.def
@@ -1,4 +1,3 @@
 EXPORTS 

 hexchat_plugin_init 

 hexchat_plugin_deinit 

-hexchat_plugin_get_info 

diff --git a/plugins/python/python.py b/plugins/python/python.py
new file mode 100644
index 00000000..30694802
--- /dev/null
+++ b/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) as f:
+                data = f.read()
+            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, 1, -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) is 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
diff --git a/plugins/python/python2.vcxproj b/plugins/python/python2.vcxproj
index f914a865..42895ce4 100644
--- a/plugins/python/python2.vcxproj
+++ b/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>

diff --git a/plugins/python/python3.vcxproj b/plugins/python/python3.vcxproj
index 815dc8b1..3eb86c2a 100644
--- a/plugins/python/python3.vcxproj
+++ b/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>
\ No newline at end of file
diff --git a/plugins/python/python3.vcxproj.filters b/plugins/python/python3.vcxproj.filters
index 9165e798..5c5834bb 100644
--- a/plugins/python/python3.vcxproj.filters
+++ b/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>
\ No newline at end of file
diff --git a/plugins/python/python_style_guide.md b/plugins/python/python_style_guide.md
new file mode 100644
index 00000000..41db2474
--- /dev/null
+++ b/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',
+}
+```
diff --git a/plugins/python/xchat.py b/plugins/python/xchat.py
new file mode 100644
index 00000000..6922490b
--- /dev/null
+++ b/plugins/python/xchat.py
@@ -0,0 +1 @@
+from _hexchat import *
diff --git a/plugins/sysinfo/meson.build b/plugins/sysinfo/meson.build
index 8b67da2e..7e2cdb6c 100644
--- a/plugins/sysinfo/meson.build
+++ b/plugins/sysinfo/meson.build
@@ -13,13 +13,13 @@ sysinfo_includes = []
 sysinfo_cargs = []
 
 system = host_machine.system()
-if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin'
+if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'darwin' or system == 'freebsd'
   sysinfo_includes += 'shared'
   sysinfo_sources += [
     'shared/df.c'
   ]
 
-  if system == 'linux' or system == 'gnu' or system.startswith('gnu/')
+  if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system == 'freebsd'
     libpci = dependency('libpci', required: false, method: 'pkg-config')
     if libpci.found()
       sysinfo_deps += libpci
diff --git a/plugins/sysinfo/shared/df.c b/plugins/sysinfo/shared/df.c
index ce0760a6..bb2c2131 100644
--- a/plugins/sysinfo/shared/df.c
+++ b/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;
 
diff --git a/plugins/sysinfo/sysinfo.vcxproj b/plugins/sysinfo/sysinfo.vcxproj
index b1c7c8f0..a3ff0f8a 100644
--- a/plugins/sysinfo/sysinfo.vcxproj
+++ b/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>

diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj
index 16f96e45..5dc497b4 100644
--- a/plugins/upd/upd.vcxproj
+++ b/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">

diff --git a/plugins/winamp/winamp.vcxproj b/plugins/winamp/winamp.vcxproj
index ccc04e72..78367ae9 100644
--- a/plugins/winamp/winamp.vcxproj
+++ b/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">

diff --git a/po/af.po b/po/af.po
index 2a5b8f51..f3956e32 100644
--- a/po/af.po
+++ b/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
diff --git a/po/am.po b/po/am.po
index 6d5721d4..e13bf33c 100644
--- a/po/am.po
+++ b/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
diff --git a/po/ast.po b/po/ast.po
index 6943e69e..db45a287 100644
--- a/po/ast.po
+++ b/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"
diff --git a/po/az.po b/po/az.po
index f1c5faf1..313f5f37 100644
--- a/po/az.po
+++ b/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"
diff --git a/po/be.po b/po/be.po
index 3fe3ea12..9fa1c137 100644
--- a/po/be.po
+++ b/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"
diff --git a/po/bg.po b/po/bg.po
index 331e39ff..02f2f412 100644
--- a/po/bg.po
+++ b/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"
diff --git a/po/ca.po b/po/ca.po
index db71a1d3..d53d21f1 100644
--- a/po/ca.po
+++ b/po/ca.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:
 # David Planella Molas <david.planella@gmail.com>, 2007
 # Ernest Adrogué Calveras <eadrogue@gmx.net>, 2004,2007
@@ -14,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: 2018-01-02 22:17+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/hexchat/hexchat/language/"
-"ca/)\n"
-"Language: ca\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: Catalan (http://www.transifex.com/hexchat/hexchat/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -41,19 +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 és un client IRC extensible i fàcil d'utilitzar. Et permet unir-te a "
-"múltiples xarxes amb seguretat i parlar amb altres usuaris en privat o en "
-"canals utilitzant una interfície personalitzable. Fins i tot pots transferir "
-"fitxers."
+msgstr "HexChat és un client IRC extensible i fàcil d'utilitzar. Et permet unir-te a múltiples xarxes amb seguretat i parlar amb altres usuaris en privat o en canals utilitzant una interfície personalitzable. Fins i tot pots transferir fitxers."
 
 #: 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 té suport per: DCC, SASL, proxis, correcció d'escriptura, "
-"notificacions, registre, temes personalitzats i scripts en Python o Perl."
+msgstr "HexChat té suport per: DCC, SASL, proxis, correcció d'escriptura, notificacions, registre, temes personalitzats i scripts en Python o Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -304,16 +297,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"No tens permís d'escriptura a %s. No es pot desar res d'aquesta sessió."
+msgstr "No tens permís d'escriptura a %s. No es pot desar res d'aquesta sessió."
 
 #: 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 ""
-"* L'execució d'IRC com a root és estúpid! Hauríeu de crear\n"
-"  un compte d'usuari i utilitzar-lo per identificar-vos.\n"
+msgstr "* L'execució d'IRC com a root és estúpid! Hauríeu de crear\n  un compte d'usuari i utilitzar-lo per identificar-vos.\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
@@ -335,9 +325,7 @@ msgstr "Esteu sent bombardejat amb peticions CTCP des de %s, s'ignorarà %s\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Esteu sent bombardejat amb missatges de %s, s'estableix l'opció "
-"gui_autoopen_dialog OFF.\n"
+msgstr "Esteu sent bombardejat amb missatges de %s, s'estableix l'opció gui_autoopen_dialog OFF.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -440,9 +428,7 @@ msgstr "ADDBUTTON <nom> <acció>, afegeix un botó a sota de la llista d'usuaris
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NovaXarxa> <nouservidor/6667>, afegeix una xarxa nova amb un "
-"servidor nou a la llista de xarxes"
+msgstr "ADDSERVER <NovaXarxa> <nouservidor/6667>, afegeix una xarxa nova amb un servidor nou a la llista de xarxes"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -458,9 +444,7 @@ msgstr "ALLSERV <cmd>, envia una ordre a tots els servidors on estigueu"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<motiu>], us estableix com a absent (utilitzeu /BACK per desestablir-"
-"ho)"
+msgstr "AWAY [<motiu>], us estableix com a absent (utilitzeu /BACK per desestablir-ho)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -471,10 +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 <mask> [<bantype>], bandeja tots els usuaris que coincideixin amb la "
-"màscara. Si ja es troben al canal amb això no els fareu fora (requereix "
-"chanop)"
+msgstr "BAN <mask> [<bantype>], bandeja tots els usuaris que coincideixin amb la màscara. Si ja es troben al canal amb això no els fareu fora (requereix chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -482,47 +463,37 @@ msgstr "CHANOPT [-quiet] <variable> [<valor>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<encoding>], obtén o estableix la codificació utilitzada per la "
-"connexió actual"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<encoding>], obtén o estableix la codificació utilitzada per la connexió actual"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<amount>], neteja el text actual de la finestra o "
-"l'historial d'ordres"
+msgstr "CLEAR [ALL|HISTORY|[-]<amount>], neteja el text actual de la finestra o l'historial d'ordres"
 
 #: 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 ""
-"CLOSE [-m], tanca la pestanya actual, amb el tancament de la finestra si "
-"aquesta és l'única pestanya oberta, o amb l'indicador \"-m\", tanca tots els "
-"missatges."
+msgstr "CLOSE [-m], tanca la pestanya actual, amb el tancament de la finestra si aquesta és l'única pestanya oberta, o amb l'indicador \"-m\", tanca tots els missatges."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <codi|comodí>, troba un codi de país, p. ex.: au = Austràlia"
+msgstr "COUNTRY [-s] <codi|comodí>, troba un codi de país, p. ex.: au = Austràlia"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <sobrenom> <missatge>, envia el missatge CTCP al sobrenom indicat, els "
-"missatges més comuns són VERSION i USERINFO"
+msgstr "CTCP <sobrenom> <missatge>, envia el missatge CTCP al sobrenom indicat, els missatges més comuns són VERSION i USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<canal>], abandona el canal actual o especificat i immediatament "
-"torna a unir-se"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canal>], abandona el canal actual o especificat i immediatament torna a unir-se"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -535,25 +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 <sobrenom> - accepta un fitxer ofert\n"
-"DCC SEND [-maxcps=#] <sobrenom> [fitxer] - envia un fitxer a algú\n"
-"DCC PSEND [-maxcps=#] <sobrenom> [fitxer] -envia un fitxer utilitzant el "
-"mode passiu\n"
-"DCC LIST - mostra la llista DCC\n"
-"DCC CHAT <sobrenom> - ofereix un xat DCC a algú\n"
-"DCC PCHAT <sobrenom> - ofereix un xat DCC utilitzant el mode passiu\n"
-"DCC CLOSE <tipus> <sobrenom> <fitxer> exemple:\n"
-"/dcc close send johnsmith fitxer.tar.gz"
+msgstr "\nDCC GET <sobrenom> - accepta un fitxer ofert\nDCC SEND [-maxcps=#] <sobrenom> [fitxer] - envia un fitxer a algú\nDCC PSEND [-maxcps=#] <sobrenom> [fitxer] -envia un fitxer utilitzant el mode passiu\nDCC LIST - mostra la llista DCC\nDCC CHAT <sobrenom> - ofereix un xat DCC a algú\nDCC PCHAT <sobrenom> - ofereix un xat DCC utilitzant el mode passiu\nDCC CLOSE <tipus> <sobrenom> <fitxer> exemple:\n/dcc close send johnsmith fitxer.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 <sobrenom>, treu l'estatus de semioperador de canal del sobrenom "
-"indicat al canal actual (requereix chanop)"
+msgstr "DEHOP <sobrenom>, treu l'estatus de semioperador de canal del sobrenom indicat al canal actual (requereix chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -563,17 +522,13 @@ msgstr "DELBUTTON <nom>, elimina un botó de sota la llista d'usuaris"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <sobrenom>, treu l'estatus d'operador del canal al sobrenom indicat "
-"(requereix chanop)"
+msgstr "DEOP <sobrenom>, treu l'estatus d'operador del canal al sobrenom indicat (requereix chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <sobrenom>, treu l'estatus de veu al sobrenom indicat (requereix "
-"chanop)"
+msgstr "DEVOICE <sobrenom>, treu l'estatus de veu al sobrenom indicat (requereix chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -595,9 +550,7 @@ msgstr "ECHO <text>, Imprimeix localment el 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] <ordre>, executa l'ordre. Si utilitzeu l'indicador -o s'enviarà la "
-"sortida cap al canal actual, si no es mostrarà al quadre de text actual"
+msgstr "EXEC [-o] <ordre>, executa l'ordre. Si utilitzeu l'indicador -o s'enviarà la sortida cap al canal actual, si no es mostrarà al quadre de text actual"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -607,9 +560,7 @@ msgstr "EXECCONT, envia un senyal SIGCONT al procés"
 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 procés que s'estigui executant en la sessió actual. "
-"Si es dóna -9, el senyal serà SIGKILL"
+msgstr "EXECKILL [-9], mata un procés que s'estigui executant en la sessió actual. Si es dóna -9, el senyal serà SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -629,9 +580,7 @@ msgstr "FLUSHQ, neteja la cua d'enviaments al servidor actual"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <amfitrió> [<port>], servidors intermediaris a través d'un amfitrió, el "
-"port per defecte és el 23"
+msgstr "GATE <amfitrió> [<port>], servidors intermediaris a través d'un amfitrió, el port per defecte és el 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -639,9 +588,7 @@ msgstr "GHOST <sobrenom> [contrasenya], mata un sobrenom fantasma"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <sobrenom>, dóna l'estatus de semioperador de canal al sobrenom indicat "
-"(requereix chanop)"
+msgstr "HOP <sobrenom>, dóna l'estatus de semioperador de canal al sobrenom indicat (requereix chanop)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -654,21 +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 <màscara> <tipus..> <opcions..>\n"
-"    màscara - màscara d'amfitrió a ignorar, p. ex.: *!*@*.pooles.rima-tde."
-"net\n"
-"    tipus   - tipus de dades a ignorar, una de les següents o totes:\n"
-"              PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opcions - NOSAVE, QUIET"
+msgstr "IGNORE <màscara> <tipus..> <opcions..>\n    màscara - màscara d'amfitrió a ignorar, p. ex.: *!*@*.pooles.rima-tde.net\n    tipus   - tipus de dades a ignorar, una de les següents o totes:\n              PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opcions - 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 <sobrenom> [<canal>], convida algú al canal, per defecte al canal "
-"actual (requereix chanop)"
+msgstr "INVITE <sobrenom> [<canal>], convida algú al canal, per defecte al canal actual (requereix chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -677,17 +616,13 @@ msgstr "JOIN <canal>, s'uneix al canal"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <sobrenom> [motiu], expulsa el sobrenom del canal actual (requereix "
-"chanop)"
+msgstr "KICK <sobrenom> [motiu], expulsa el sobrenom del canal actual (requereix chanop)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <sobrenom> [motiu], bandeja i expulsa el sobrenom del canal actual "
-"(requereix chanop)"
+msgstr "KICKBAN <sobrenom> [motiu], bandeja i expulsa el sobrenom del canal actual (requereix chanop)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -699,15 +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] [--] <cadena>, cerca un text al registre\n"
-"    Utilitzeu -h per ressaltar les cadenes trobades\n"
-"    Utilitzeu -m per distingir entre majúscules i minúscules\n"
-"    Utilitzeu -r si la cadena és una expressió regular\n"
-"    Utilitzeu -- (doble guió) per marcar el final de les opcions quan se "
-"cerca una cadena, per exemple, '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <cadena>, cerca un text al registre\n    Utilitzeu -h per ressaltar les cadenes trobades\n    Utilitzeu -m per distingir entre majúscules i minúscules\n    Utilitzeu -r si la cadena és una expressió regular\n    Utilitzeu -- (doble guió) per marcar el final de les opcions quan se cerca una cadena, per exemple, '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -716,23 +644,17 @@ msgstr "LOAD [-e] <fitxer>, carrega un connector o script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Treu l'estatus a tots els semioperadors del canal en el canal actual "
-"(requereix chanop)"
+msgstr "MDEHOP, Treu l'estatus a tots els semioperadors del canal en el canal actual (requereix chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Treu l'estatus a tots els operadors del canal en el canal actual "
-"(requereix chanop)"
+msgstr "MDEOP, Treu l'estatus a tots els operadors del canal en el canal actual (requereix 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 <acció>, anuncia una acció al canal actual (les accions s'escriuen en "
-"tercera persona, com ara /me salta d'alegria)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <acció>, anuncia una acció al canal actual (les accions s'escriuen en tercera persona, com ara /me salta d'alegria)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -745,17 +667,13 @@ msgstr "MKICK, Fa fora tots els usuaris del canal actual (requereix chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Dóna l'estatus d'operador a tots els usuaris en el canal actual "
-"(necessiteu ser operador del canal)"
+msgstr "MOP, Dóna l'estatus d'operador a tots els usuaris en el canal actual (necessiteu ser operador del 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"
-msgstr ""
-"MSG <sobrenom> <missatge>, envia un missatge privat, envia \".\" per enviar-"
-"lo a l'últim sobrenom o prefixa'l amb \"=\" per un xat dcc"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <sobrenom> <missatge>, envia un missatge privat, envia \".\" per enviar-lo a l'últim sobrenom o prefixa'l amb \"=\" per un xat dcc"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -781,9 +699,7 @@ msgstr "NOTICE <sobrenom/canal> <missatge>, envia una 'notice'"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n xarxa1[,xarxa2,...]] [<sobrenom>], mostra la vostra llista de "
-"notificacions o afegeix algú a ella"
+msgstr "NOTIFY [-n xarxa1[,xarxa2,...]] [<sobrenom>], mostra la vostra llista de notificacions o afegeix algú a ella"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -802,17 +718,13 @@ msgstr "PING <sobrenom | canal>, envia un ping CTCP a l'usuari o canal indicat"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <sobrenom> [missatge], obre una nova finestra de missatge "
-"privat amb algú i, opcionalment, envia un missatge"
+msgstr "QUERY [-nofocus] <sobrenom> [missatge], obre una nova finestra de missatge privat amb algú i, opcionalment, envia un missatge"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <màscara> [<tipus de quiet>], silencia tots els que concorden amb la "
-"màscara al canal actual si el servidor ho admet."
+msgstr "QUIET <màscara> [<tipus de quiet>], silencia tots els que concorden amb la màscara al canal actual si el servidor ho admet."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -824,31 +736,23 @@ msgstr "QUOTE <text>, envia el text «en cru» cap al 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 ""
-"RECONENCT [-ssl] [<amfitrió>] [<port>] [<contrasenya>], Pot invocar-se sols "
-"amb /RECONNECT per així reconnectar-se al servidor actual o amb /RECONNECT "
-"ALL per a reconnectar-se a tots els servidors oberts"
+msgstr "RECONENCT [-ssl] [<amfitrió>] [<port>] [<contrasenya>], Pot invocar-se sols amb /RECONNECT per així reconnectar-se al servidor actual o amb /RECONNECT ALL per a reconnectar-se a tots els servidors oberts"
 
 #: 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 ""
-"RECONENCT [<amfitrió>] [<port>] [<contrasenya>], Pot invocar-se sols amb /"
-"RECONNECT per així reconnectar-se al servidor actual o amb /RECONNECT ALL "
-"per a reconnectar-se a tots els servidors oberts"
+msgstr "RECONENCT [<amfitrió>] [<port>] [<contrasenya>], Pot invocar-se sols amb /RECONNECT per així reconnectar-se al servidor actual o amb /RECONNECT ALL per a reconnectar-se a tots els servidors oberts"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <text>, envia dades en cru a HexChat, com si haguessin set enviades des "
-"del servidor IRC"
+msgstr "RECV <text>, envia dades en cru a HexChat, com si haguessin set enviades des del servidor IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -864,8 +768,7 @@ msgstr "SEND <sobrenom> [<fitxer>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <amfitrió> <port> <canal>, es connecta i uneix a un canal"
+msgstr "SERVCHAN [-ssl] <amfitrió> <port> <canal>, es connecta i uneix a un canal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -875,18 +778,13 @@ msgstr "SERVCHAN <amfitrió> <port> <canal>, connecta i uneix-te a un canal"
 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] <amfitrió> [<port>] [contrasenya>], connecta a un servidor, el "
-"port per defecte és 6667 per a les connexions normals, i 6697 per a les "
-"connexions ssl"
+msgstr "SERVER [-ssl] <amfitrió> [<port>] [contrasenya>], connecta a un servidor, el port per defecte és 6667 per a les connexions normals, i 6697 per a les connexions ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <amfitrió> [<port>] [<contrasenya>], connecta amb un servidor, el "
-"port per defecte és el 6667"
+msgstr "SERVER <amfitrió> [<port>] [<contrasenya>], connecta amb un servidor, el port per defecte és el 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -898,9 +796,7 @@ msgstr "SETCURSOR [-|+]<posició>, recol·loca el cursor a la caixa de text"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nou nom>, canvia el nom de la pestanya, el límit tab_trunc s'aplica "
-"igualment"
+msgstr "SETTAB <nou nom>, canvia el nom de la pestanya, el límit tab_trunc s'aplica igualment"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -908,7 +804,8 @@ msgstr "SETTEXT <nou text>, substitueix el text al quadre d'entrada"
 
 #: 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 [<tema>], estableix o mostra el tema del canal actual"
 
 #: src/common/outbound.c:4112
@@ -935,11 +832,9 @@ msgstr "UNLOAD <fitxer>, descarrega un connector o script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <màscara> [<màscara>...], treu el silenciament a les màscares "
-"especificades si el servidor ho admet."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <màscara> [<màscara>...], treu el silenciament a les màscares especificades si el servidor ho admet."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -947,10 +842,9 @@ msgstr "URL <url>, obre un URL al vostre navegador"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <sobrenom1> <sobrenom2> etc,, ressalta el(s) sobrenom(s) a "
-"la llista d'usuaris del canal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <sobrenom1> <sobrenom2> etc,, ressalta el(s) sobrenom(s) a la llista d'usuaris del canal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -963,8 +857,7 @@ msgstr "WALLCHAN <missatge>, escriu un missatge a tots els canals"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <message>, envia un missatge a tots els operadors del canal actual"
+msgstr "WALLCHOP <message>, envia un missatge a tots els operadors del canal actual"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -980,9 +873,7 @@ msgstr "Sintaxi: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"No hi ha ajuda disponible per a aquesta ordre.\n"
+msgstr "\nNo hi ha ajuda disponible per a aquesta ordre.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1003,8 +894,7 @@ msgstr "%s: Ordre desconeguda. prova /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"No hi ha cap símbol hexchat_plugin_init; realment és un connector d'HexChat?"
+msgstr "No hi ha cap símbol hexchat_plugin_init; realment és un connector d'HexChat?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1045,18 +935,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 ""
-"Esteu segur que aquest servidor permet l'ús de SSL i que el port és "
-"correcte?\n"
+msgstr "Esteu segur que aquest servidor permet l'ús de SSL i que el port és correcte?\n"
 
 #: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"No s'ha pogut resoldre el nom d'amfitrió %s\n"
-"Comproveu els vostres paràmetres IP\n"
+msgstr "No s'ha pogut resoldre el nom d'amfitrió %s\nComproveu els vostres paràmetres IP\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1072,9 +958,7 @@ msgstr "Passant al següent servidor de %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Atenció: El joc de caràcters «%s» és desconegut. No es farà cap conversió "
-"per la xarxa %s."
+msgstr "Atenció: El joc de caràcters «%s» és desconegut. No es farà cap conversió per la xarxa %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1233,9 +1117,9 @@ 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"
-msgstr ""
-"%C24*%O$tDCC CHAT s'ha establert la connexió a %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 "%C24*%O$tDCC CHAT s'ha establert la connexió a %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1268,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
@@ -1290,9 +1174,9 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV s'ha establert la connexió a %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 "%C24*%O$tDCC RECV s'ha establert la connexió a %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1300,12 +1184,12 @@ msgstr ""
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: No es pot obrir '%C23$1%C' per a l'escriptura (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV: No es pot obrir '%C23$1%C' per a l'escriptura (%C20$2%O)"
 
 #: 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
@@ -1322,9 +1206,9 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND s'ha establert la connexió a %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 "%C24*%O$tDCC SEND s'ha establert la connexió a %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1532,8 +1416,7 @@ msgstr "%C20*%O$tAmfitrió desconegut. Potser l'heu escrit malament?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tNo es pot unir a %C22$1%C (%C20S'ha assolit el límit d'usuaris%O)"
+msgstr "%C20*%O$tNo es pot unir a %C22$1%C (%C20S'ha assolit el límit d'usuaris%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -2100,9 +1983,7 @@ msgstr "Duració del bandejament"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"No s'ha pogut llegir el fitxer de so:\n"
-"%s"
+msgstr "No s'ha pogut llegir el fitxer de so:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3340,9 +3221,7 @@ msgstr "Data"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Només podeu obrir la llista de bandejaments mentre esteu a la pestanya d'un "
-"canal."
+msgstr "Només podeu obrir la llista de bandejaments mentre esteu a la pestanya d'un canal."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3463,24 +3342,17 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"No s'ha pogut accedir al fitxer: %s\n"
-"%s.\n"
-"No es pot reprendre."
+msgstr "No s'ha pogut accedir al fitxer: %s\n%s.\nNo es pot reprendre."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"El fitxer al directori de baixades és més gran que el fitxer ofert. No es "
-"pot reprendre."
+msgstr "El fitxer al directori de baixades és més gran que el fitxer ofert. No es pot reprendre."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
-msgstr ""
-"No es pot reprendre la recepció del mateix fitxer des de dues persones "
-"diferents."
+msgstr "No es pot reprendre la recepció del mateix fitxer des de dues persones diferents."
 
 #: src/fe-gtk/dccgui.c:803
 #, c-format
@@ -3622,10 +3494,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"No s'ha pogut obrir lletra:\n"
-"\n"
-"%s"
+msgstr "No s'ha pogut obrir lletra:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3643,18 +3512,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 "
@@ -3665,65 +3534,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 ""
-"L'ordre ^BInsert in Buffer^B inserirà el contingut de Dades 1 a l'entrada on "
-"hàgiu premut la seqüència de tecles a la posició del cursor"
+msgstr "L'ordre ^BInsert in Buffer^B inserirà el contingut de Dades 1 a l'entrada on hàgiu premut la seqüència de tecles a la posició 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 ""
-"L'ordre ^BSet Buffer^B col·loca el contingut de Dades 1 a l'objecte on heu "
-"premut la seqüència de tecles"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "L'ordre ^BSet Buffer^B col·loca el contingut de Dades 1 a l'objecte on heu premut la seqüència de tecles"
 
 #: 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 ""
-"L'ordre ^BLast Command^B col·loca l'última ordre executada a la línia - "
-"igual que prémer la fletxa amunt al shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "L'ordre ^BLast Command^B col·loca l'última ordre executada a la línia - igual que prémer la fletxa amunt al 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 ""
-"L'ordre ^BNext Command^B col·loca la següent ordre a la línia - igual que "
-"prémer la fletxa avall al shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "L'ordre ^BNext Command^B col·loca la següent ordre a la línia - igual que prémer la fletxa avall al 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 ""
-"Aquesta ordre canvia el text de la línia per a completar un sobrenom o ordre "
-"incompleta. Si Dades 1 no està en blanc una doble tabulació seleccionarà "
-"l'anterior sobrenom i no el següent"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Aquesta ordre canvia el text de la línia per a completar un sobrenom o ordre incompleta. Si Dades 1 no està en blanc una doble tabulació seleccionarà l'anterior sobrenom i no el següent"
 
 #: 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 ""
-"Aquesta ordre desplaça amunt o avall la llista de sobrenoms. Si Dades 1 està "
-"en blanc es desplaçarà avall, i en cas contrari, amunt"
+"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 "Aquesta ordre desplaça amunt o avall la llista de sobrenoms. Si Dades 1 està en blanc es desplaçarà avall, i en cas contrari, amunt"
 
 #: 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 ""
-"Aquesta ordre cerca l'última paraula escrita a la llista de substitucions i "
-"la substitueix en cas de trobar-la"
+msgstr "Aquesta ordre cerca l'última paraula escrita a la llista de substitucions i la substitueix en cas de trobar-la"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3850,9 +3704,7 @@ msgstr "S'ha completat la connexió a %s."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"A la finestra de la llista de servidors, no heu introduït cap canal (sala de "
-"xat) per a l'autounió per a aquesta xarxa."
+msgstr "A la finestra de la llista de servidors, no heu introduït cap canal (sala de xat) per a l'autounió per a aquesta xarxa."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3900,9 +3752,7 @@ msgstr "No hi ha cap tema establert"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Aquest canal encara té %d canals o diàlegs associats amb ell. Tancar-los "
-"tots?"
+msgstr "Aquest canal encara té %d canals o diàlegs associats amb ell. Tancar-los tots?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4244,18 +4094,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botons de la llista d'usuaris: codis especials:\n"
-"\n"
-"%a  =  tots els sobrenoms seleccionats\n"
-"%c  =  el canal actual\n"
-"%e  =  el nom de la xarxa actual\n"
-"%h  =  el nom d'amfitrió del sobrenom seleccionat\n"
-"%m  =  la informació de la màquina\n"
-"%n  =  el vostre sobrenom\n"
-"%s  =  el sobrenom seleccionat\n"
-"%t  =  l'hora/data\n"
-"%u  =  els comptes dels usuaris seleccionats"
+msgstr "Botons de la llista d'usuaris: codis especials:\n\n%a  =  tots els sobrenoms seleccionats\n%c  =  el canal actual\n%e  =  el nom de la xarxa actual\n%h  =  el nom d'amfitrió del sobrenom seleccionat\n%m  =  la informació de la màquina\n%n  =  el vostre sobrenom\n%s  =  el sobrenom seleccionat\n%t  =  l'hora/data\n%u  =  els comptes dels usuaris seleccionats"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4270,18 +4109,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botons del diàleg: codis especials:\n"
-"\n"
-"%a  =  tots els sobrenoms seleccionats\n"
-"%c  =  el canal actual\n"
-"%e  =  el nom de la xarxa actual\n"
-"%h  =  el nom d'amfitrió del sobrenom seleccionat\n"
-"%m  =  la informació de la màquina\n"
-"%n  =  el vostre sobrenom\n"
-"%s  =  el sobrenom seleccionat\n"
-"%t  =  l'hora/data\n"
-"%u  =  els comptes dels usuaris seleccionats"
+msgstr "Botons del diàleg: codis especials:\n\n%a  =  tots els sobrenoms seleccionats\n%c  =  el canal actual\n%e  =  el nom de la xarxa actual\n%h  =  el nom d'amfitrió del sobrenom seleccionat\n%m  =  la informació de la màquina\n%n  =  el vostre sobrenom\n%s  =  el sobrenom seleccionat\n%t  =  l'hora/data\n%u  =  els comptes dels usuaris seleccionats"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4556,7 +4384,7 @@ msgstr "Restableix la línia de separació"
 
 #: src/fe-gtk/menu.c:1837
 msgid "Move to Marker Line"
-msgstr ""
+msgstr "Mou a la línia de separació"
 
 #: src/fe-gtk/menu.c:1838
 msgid "_Copy Selection"
@@ -4824,15 +4652,15 @@ msgstr "Realment voleu suprimir la xarxa \"%s\" i tots els seus servidors?"
 
 #: src/fe-gtk/servlistgui.c:1125 src/fe-gtk/servlistgui.c:1556
 msgid "User name cannot be left blank."
-msgstr ""
+msgstr "El nom d'usuari no es pot deixar en blanc."
 
 #: src/fe-gtk/servlistgui.c:1578
 msgid "You cannot have an empty nick name."
-msgstr ""
+msgstr "No podeu tenir un sobrenom en blanc."
 
 #: src/fe-gtk/servlistgui.c:1585
 msgid "You must have two unique nick names."
-msgstr ""
+msgstr "Heu de tenir dos sobrenoms únics."
 
 #: src/fe-gtk/servlistgui.c:1636
 msgid ""
@@ -4927,9 +4755,7 @@ msgstr "Contrasenya:"
 
 #: src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
-"La contrasenya que s'utilitza per a la identificació. Si dubteu, deixeu-ho "
-"en blanc."
+msgstr "La contrasenya que s'utilitza per a la identificació. Si dubteu, deixeu-ho en blanc."
 
 #: src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
@@ -4972,9 +4798,7 @@ msgstr "Ordena"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Ordena la llista de xarxes per ordre alfabètic. Utilitzeu les tecles "
-"Majúscules+Amunt i Majúscules+Avall per moure una fila."
+msgstr "Ordena la llista de xarxes per ordre alfabètic. Utilitzeu les tecles Majúscules+Amunt i Majúscules+Avall per moure una fila."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5294,7 +5118,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:191
 msgid "Input Box"
-msgstr ""
+msgstr "Quadre d'entrada"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
@@ -5306,11 +5130,11 @@ msgstr "Renderitza els colors i els atributs"
 
 #: src/fe-gtk/setup.c:194
 msgid "Show nick box"
-msgstr ""
+msgstr "Mostra el quadre del sobrenom"
 
 #: src/fe-gtk/setup.c:195
 msgid "Show user mode icon in nick box"
-msgstr ""
+msgstr "Mostra la icona del mode d'usuari al quadre del sobrenom"
 
 #: src/fe-gtk/setup.c:196
 msgid "Spell checking"
@@ -5324,10 +5148,7 @@ msgstr "Diccionari a utilitzar:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Utilitzeu els codis d'idioma (com en \"%LOCALAPPDATA%\\enchant\\myspell"
-"\\dicts\").\n"
-"Separeu diverses entrades amb comes."
+msgstr "Utilitzeu els codis d'idioma (com en \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSepareu diverses entrades amb comes."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5355,11 +5176,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:207
 msgid "nicks."
-msgstr ""
+msgstr "sobrenoms."
 
 #: src/fe-gtk/setup.c:215
 msgid "Graphical"
-msgstr ""
+msgstr "Gràfic"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
@@ -5423,7 +5244,7 @@ msgstr "Mostra les icones per als modes d'usuari"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
+msgstr "Utilitza icones gràfiques en lloc de símbols de text a la llista d'usuaris."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5451,8 +5272,7 @@ msgstr "Seguiment d'absències"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Segueix l'estatus d'absència dels usuaris i marca'ls amb un color diferent"
+msgstr "Segueix l'estatus d'absència dels usuaris i marca'ls amb un color diferent"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5519,7 +5339,7 @@ msgstr "Obre una pestanya addicional per als missatges del servidor"
 
 #: src/fe-gtk/setup.c:313
 msgid "Open a new tab when you receive a private message"
-msgstr ""
+msgstr "Obre una pestanya nova quan rebeu un missatge privat"
 
 #: src/fe-gtk/setup.c:314
 msgid "Sort tabs in alphabetical order"
@@ -5535,11 +5355,11 @@ msgstr "Mostra línies amb punts a l'arbre de canals"
 
 #: src/fe-gtk/setup.c:317
 msgid "Scroll mouse-wheel to change tabs"
-msgstr ""
+msgstr "Desplaçament de la roda del ratolí per canviar de pestanya"
 
 #: src/fe-gtk/setup.c:318
 msgid "Middle click to close tab"
-msgstr ""
+msgstr "Clic amb el botó del mig per tancar la pestanya"
 
 #: src/fe-gtk/setup.c:319
 msgid "Smaller text"
@@ -5642,9 +5462,8 @@ msgid "Chat window"
 msgstr "Finestra de xat"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Velocitat màxima de transferència de fitxers (bytes per segon)"
+msgstr ""
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5692,7 +5511,7 @@ msgstr "Parpelleja la barra de tasques amb:"
 #: src/fe-gtk/setup.c:451 src/fe-gtk/setup.c:454 src/fe-gtk/setup.c:456
 #: src/fe-gtk/setup.c:487 src/fe-gtk/setup.c:509
 msgid "Make a beep sound on:"
-msgstr ""
+msgstr "Reprodueix un avís sonor en:"
 
 #: src/fe-gtk/setup.c:407 src/fe-gtk/setup.c:451
 msgid ""
@@ -5779,9 +5598,7 @@ msgstr "Sobrenoms a ressaltar sempre:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separeu diverses paraules amb comes.\n"
-"S'admeten comodins."
+msgstr "Separeu diverses paraules amb comes.\nS'admeten comodins."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5887,8 +5704,8 @@ msgstr "Inclou automàticament les marques de temps"
 
 #: 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
@@ -5897,8 +5714,8 @@ msgstr "Inclou automàticament la informació del color"
 
 #: 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
@@ -5919,9 +5736,7 @@ msgstr "Visualitza les llistes al mode compacte"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Utilitza menys espaiat entre les files de l'arbre de canals i la llista "
-"d'usuaris."
+msgstr "Utilitza menys espaiat entre les files de l'arbre de canals i la llista d'usuaris."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -5951,7 +5766,8 @@ msgstr "Tipus de bandejament:"
 
 #: 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
@@ -6061,11 +5877,9 @@ msgstr "Obtén la meva adreça del 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 ""
-"Pregunta al servidor per la vostra adreça real. Useu això si teniu una "
-"adreça 192.168.*.*"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Pregunta al servidor per la vostra adreça real. Useu això si teniu una adreça 192.168.*.*"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6112,9 +5926,8 @@ msgid "Proxy Authentication"
 msgstr "Autenticació del servidor intermediari"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Utilitza autenticació (només HTTP o Socks5)"
+msgstr ""
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6301,15 +6114,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 ""
-"Alguns dels paràmetres que han canviat requereixen un reinici perquè tinguin "
-"un efecte complet."
+msgstr "Alguns dels paràmetres que han canviat requereixen un reinici perquè tinguin un efecte complet."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6317,11 +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 ""
-"*ATENCIÓ*\n"
-"Acceptar automàticament els DCC al vostre\n"
-"directori personal pot ser perillós. P. ex.:\n"
-"Algú podria enviar-vos un .bash_profile"
+msgstr "*ATENCIÓ*\nAcceptar automàticament els DCC al vostre\ndirectori personal pot ser perillós. P. ex.:\nAlgú podria enviar-vos un .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6349,7 +6155,7 @@ msgstr "Ignora-ho tot"
 
 #: src/fe-gtk/sexy-spell-entry.c:737
 msgid "Spelling Suggestions"
-msgstr ""
+msgstr "Suggeriments d'escriptura"
 
 #: src/fe-gtk/sexy-spell-entry.c:1310
 #, c-format
@@ -6421,9 +6227,7 @@ msgstr "Obre un URL irc://servidor:port/canal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: ha fallat l'obtenció de la informació. O bé no està admesa o bé és "
-"un error."
+msgstr "Sysinfo: ha fallat l'obtenció de la informació. O bé no està admesa o bé és un error."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6437,8 +6241,8 @@ msgstr "Sysinfo: %s està establert a: %d\n"
 #: 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
@@ -6454,9 +6258,3 @@ msgstr "S'ha carregat el connector %s\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "S'ha descarregat el connector %s\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/cs.po b/po/cs.po
index 3af84b7d..14abd3af 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,25 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Daniel Rusek <mail@asciiwolf.com>, 2018
+# Ascii Wolf <mail@asciiwolf.com>, 2018
+# Ascii Wolf <mail@asciiwolf.com>, 2018
 # David Hrdlička <hrdlickadavid@outlook.com>, 2015
 # Jakub Moc <Jakub.Moc@volny.cz>, 1999
+# jirislaby <jirislaby@gmail.com>, 2019
+# jirislaby <jirislaby@gmail.com>, 2019
+# Martin Urbanec <martin@urbanec.cz>, 2018
 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: 2018-02-13 23:06+0000\n"
-"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
-"Language-Team: Czech (http://www.transifex.com/hexchat/hexchat/language/"
-"cs/)\n"
-"Language: cs\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2019-05-20 09:29+0000\n"
+"Last-Translator: jirislaby <jirislaby@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/hexchat/hexchat/language/cs/)\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -37,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 je snadno použitelný, ale rozšířitelný IRC klient. Umožňuje vám se "
-"bezpečně připojit k více sítím a psát si s lidmi soukromě nebo v kanálech "
-"pomocí přizpůsobitelného prostředí. Dokonce můžete přenášet soubory."
+msgstr "HexChat je snadno použitelný a rozšířitelný IRC klient. Umožňuje vám se bezpečně připojit k více sítím a psát si s lidmi soukromě nebo v kanálech pomocí přizpůsobitelného prostředí. Dokonce můžete přenášet soubory."
 
 #: 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 podporuje funkce jako DCC, SASL, brány proxy, kontrolu pravopisu, "
-"ukládání záznamů, vlastní motivy a skripty v jazycích Python nebo Perl."
+msgstr "HexChat podporuje funkce jako DCC, SASL, brány proxy, kontrolu pravopisu, ukládání záznamů, vlastní motivy a skripty v jazycích Python nebo Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -60,12 +58,12 @@ msgstr "Chatujte online s ostatními lidmi"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:6
 msgid "IM;Chat;"
-msgstr ""
+msgstr " IM;Chat;"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -73,13 +71,13 @@ msgstr "Otevřít Nouzový režim"
 
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:3
 msgid "HexChat Theme Manager"
-msgstr ""
+msgstr "HexChat manažer témat"
 
 #. 0 means unlimited
 #. STRINGS
 #: src/common/cfgfiles.c:843
 msgid "I'm busy"
-msgstr "Pracuji"
+msgstr "Jsem zaneprázdněn"
 
 #: src/common/cfgfiles.c:880
 msgid "Leaving"
@@ -87,15 +85,15 @@ msgstr "Odcházím"
 
 #: src/common/chanopt.c:79
 msgid "OFF"
-msgstr ""
+msgstr "VYP"
 
 #: src/common/chanopt.c:81
 msgid "ON"
-msgstr ""
+msgstr "ZAP"
 
 #: src/common/chanopt.c:83
 msgid "{unset}"
-msgstr ""
+msgstr "{nenastaveno}"
 
 #: src/common/chanopt.c:128 src/common/text.c:1325 src/fe-gtk/notifygui.c:125
 #: src/fe-gtk/setup.c:1886
@@ -140,7 +138,7 @@ msgstr "Připojit"
 #. black
 #: src/common/dcc.c:77
 msgid "Aborted"
-msgstr "Zrušeno"
+msgstr "Přerušeno"
 
 #: src/common/dcc.c:1790 src/common/dcc.c:1801 src/common/dcc.c:1817
 #: src/common/outbound.c:2604
@@ -168,7 +166,7 @@ msgstr "Žádné aktivní DCC\n"
 
 #: src/common/hexchat.c:885
 msgid "_Open Dialog Window"
-msgstr ""
+msgstr "_Otevřít dialogové okno"
 
 #: src/common/hexchat.c:886
 msgid "_Send a File"
@@ -176,7 +174,7 @@ msgstr "_Poslat soubor"
 
 #: src/common/hexchat.c:887
 msgid "_User Info (WhoIs)"
-msgstr ""
+msgstr "Info o _uživateli (WhoIs)"
 
 #: src/common/hexchat.c:888
 msgid "_Add to Friends List"
@@ -184,19 +182,19 @@ msgstr "Přid_at do seznamu přátel"
 
 #: src/common/hexchat.c:889
 msgid "_Ignore"
-msgstr ""
+msgstr "_Ignorovat"
 
 #: src/common/hexchat.c:890
 msgid "O_perator Actions"
-msgstr ""
+msgstr "O_perátorské akce"
 
 #: src/common/hexchat.c:892
 msgid "Give Ops"
-msgstr "Dát práva Op"
+msgstr "Dát práva operátora"
 
 #: src/common/hexchat.c:893
 msgid "Take Ops"
-msgstr "Vzít práva Op"
+msgstr "Vzít práva operátora"
 
 #: src/common/hexchat.c:894
 msgid "Give Voice"
@@ -299,15 +297,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
+msgstr "Nemáš právo zápisu do %s. Z tohoto sezení nebude nic uloženo."
 
 #: 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 ""
-"* Spuštění IRC pod uživatelem root je hloupé! Měli byste si\n"
-"  vytvořit uživatelský účet a ten používat pro přihlášení.\n"
+msgstr "* Spuštění klienta pod uživatelským účtem root není dobrý nápad! \nMěli byste si vytvořit nový uživatelský účet a ten používat pro přihlášení.\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
@@ -334,20 +330,20 @@ msgstr ""
 #: src/common/inbound.c:1282
 #, c-format
 msgid "Resolved to %s"
-msgstr ""
+msgstr "Přeloženo na %s"
 
 #: src/common/inbound.c:1284 src/common/inbound.c:1312
 msgid "Not found"
-msgstr ""
+msgstr "Nenalezeno"
 
 #: src/common/inbound.c:1301
 msgid "Resolved to:"
-msgstr ""
+msgstr "Přeloženo na:"
 
 #: src/common/inbound.c:1331
 #, c-format
 msgid "Looking up %s..."
-msgstr ""
+msgstr "Vyhledávám %s..."
 
 #: src/common/notify.c:559
 #, c-format
@@ -370,7 +366,7 @@ msgstr "Nepřipojeno. Zkuste /server <host> [<port>]\n"
 #: src/common/outbound.c:277
 #, c-format
 msgid "Server %s already exists on network %s.\n"
-msgstr ""
+msgstr "Server %s už existuje v sítí %s.\n"
 
 #: src/common/outbound.c:283
 #, c-format
@@ -432,9 +428,7 @@ msgstr "ADDBUTTON <name> <action>, přidá tlačítko pod uživatelským sezname
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NewNetwork> <newserver/6667>, přidá novou síť s novým serverem do "
-"seznamu sítí"
+msgstr "ADDSERVER <NewNetwork> <newserver/6667>, přidá novou síť s novým serverem do seznamu sítí"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -450,7 +444,7 @@ msgstr "ALLSERV <cmd>, pošle příkaz na všechny servery, na kterých jste"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
+msgstr "AWAY [<reason>], nastaví, že jsi pryč (použij /BACK ke změně zpět)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -461,34 +455,29 @@ 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>], zakáže každého, kdo odpovídá masce na aktuálním "
-"kanálu. Pokud se již nacházíte na kanálu, nedojde k jeho vyhození (na to je "
-"potřeba chanop)"
+msgstr "BAN <mask> [<bantype>], zakáže každého, kdo odpovídá masce na aktuálním kanálu. Pokud se již nacházíte na kanálu, nedojde k jeho vyhození (na to je potřeba chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
-msgstr ""
+msgstr "CHANOPT [-quiet] <variable> [<value>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<encoding>], vypíše nebo nastaví kódování pro aktuální připojení"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<encoding>], vypíše nebo nastaví kódování pro aktuální připojení"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<amount>], vymaže aktuální textové okno nebo historii "
-"příkazů"
+msgstr "CLEAR [ALL|HISTORY|[-]<amount>], vymaže aktuální textové okno nebo historii příkazů"
 
 #: 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 ""
+msgstr "CLOSE [-m], Zavře aktuální záložku, nebo celé okno, pokud to byla poslední otevřená záložka, nebo s přiznakem \"-m\" zavře všechny požadavky."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -498,16 +487,13 @@ msgstr "COUNTRY [-s] <code|wildcard>, nalezne kód země, např: cs = CR"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <zpráva>, pošle zprávu CTCP dané přezdívce, běžné zprávy jsou "
-"VERSION a USERINFO"
+msgstr "CTCP <nick> <zpráva>, pošle zprávu CTCP dané přezdívce, běžné zprávy jsou VERSION a USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<channel>], odejde z aktuálního nebo zadaného kanálu a ihned se zas "
-"připojí"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<channel>], odejde z aktuálního nebo zadaného kanálu a ihned se zas připojí"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -520,24 +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 <nick>                      - přijme nabízený soubor\n"
-"DCC SEND [-maxcps=#] <nick> [file]  - pošle někomu soubor\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - pošle soubor pomocí pasivního módu\n"
-"DCC LIST                            - zobrazí seznam DCC\n"
-"DCC CHAT <nick>                     - nabídne někomu DCC CHAT\n"
-"DCC PCHAT <nick>                    - nabídne DCC CHAT v pasivní režimu\n"
-"DCC CLOSE <type> <nick> <file>        příklad:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <nick>                      - přijme nabízený soubor\nDCC SEND [-maxcps=#] <nick> [file]  - pošle někomu soubor\nDCC PSEND [-maxcps=#] <nick> [file] - pošle soubor pomocí pasivního módu\nDCC LIST                            - zobrazí seznam DCC\nDCC CHAT <nick>                     - nabídne někomu DCC CHAT\nDCC PCHAT <nick>                    - nabídne DCC CHAT v pasivní režimu\nDCC CLOSE <type> <nick> <file>        příklad:\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>, odstraní právo chanhalf-op z přezdívky na aktuálním kanálu "
-"(vyžaduje chanop)"
+msgstr "DEHOP <nick>, odstraní právo chanhalf-op z přezdívky na aktuálním kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -547,17 +522,13 @@ msgstr "DELBUTTON <name>, smaže tlačítko pod uživatelským seznamem"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, odstraní právo chanop z přezdívky na aktuálním kanálu (vyžaduje "
-"chanop)"
+msgstr "DEOP <nick>, odstraní právo chanop z přezdívky na aktuálním kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, odstraní právo voice z přezdívky na aktuálním kanálu "
-"(vyžaduje chanop)"
+msgstr "DEVOICE <nick>, odstraní právo voice z přezdívky na aktuálním kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -565,11 +536,11 @@ msgstr "DISCON, odpojí se od serveru"
 
 #: src/common/outbound.c:3976
 msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
-msgstr ""
+msgstr "DNS <nick|host|ip>, Přeloží IP adresu nebo jméno"
 
 #: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
-msgstr ""
+msgstr "DOAT <channel,list,/network> <command>"
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
@@ -579,9 +550,7 @@ msgstr "ECHO <text>, napíše text lokálně"
 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>, spustí příkaz. Je-li nastavena značka -o, bude výstup "
-"zobrazen na aktuálním kanálu, jinak se vytiskne do aktuálního textového pole"
+msgstr "EXEC [-o] <command>, spustí příkaz. Je-li nastavena značka -o, bude výstup zobrazen na aktuálním kanálu, jinak se vytiskne do aktuálního textového pole"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -591,9 +560,7 @@ msgstr "EXECCONT, pošle procesu SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], zabije spuštěný příkaz v současném sezení. Pokud předáte "
-"procesu -9, bude proces SIGKILLed"
+msgstr "EXECKILL [-9], zabije spuštěný příkaz v současném sezení. Pokud předáte procesu -9, bude proces SIGKILLed"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -617,7 +584,7 @@ msgstr "GATE <host> [<port>], použije proxy hostitele, výchozí port je 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr ""
+msgstr "GHOST <nick> [password], Zruší ghost přezdívku"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
@@ -634,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 <mask> <types..> <options..>\n"
-"    mask - maska hostitele, kterého chcete ignorovat, např: *!*@*.aol.com\n"
-"    types - typ igrnorování, jeden nebo všechny z:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    mask - maska hostitele, kterého chcete ignorovat, např: *!*@*.aol.com\n    types - typ igrnorování, jeden nebo všechny z:\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>], pozve někoho na kanál, výchozí je aktuální "
-"aktuální kanál (vyžaduje chanop)"
+msgstr "INVITE <nick> [<channel>], pozve někoho na kanál, výchozí je aktuální aktuální kanál (vyžaduje chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -656,13 +616,13 @@ msgstr "JOIN <channel>, připojí se ke kanálu"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
+msgstr "KICK <nick> [reason], Vyhodí přezdívku z aktuálního kanálu (nutné chanop oprávnění)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
+msgstr "KICKBAN <nick> [reason], zakáže vyhazování přezdívek z aktuálního kanálu (nutné chanop oprávnění)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -674,8 +634,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,21 +644,17 @@ msgstr "LOAD [-e] <file>, nahraje plugin nebo skript"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, hromadný deop všech chanhalf-op v aktuálním kanálu (vyžaduje chanop)"
+msgstr "MDEHOP, hromadný deop všech chanhalf-op v aktuálním kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, hromadný deop všech chanop v aktuálním kanálu (vyžaduje chanop)"
+msgstr "MDEHOP, hromadný deop všech chanop v aktuálním kanálu (vyžaduje 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>, pošle na aktuální kanál nějakou akci (akce jsou psány v třetí "
-"osobě, např. /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, pošle na aktuální kanál nějakou akci (akce jsou psány v třetí osobě, např. /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -708,8 +663,7 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, hromadný vyhozov všech kromě vás aktuálním kanálu (vyžaduje chanop)"
+msgstr "MKICK, hromadný vyhozov všech kromě vás aktuálním kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -717,8 +671,8 @@ msgstr "MOP, hromadný op všech uživatelů na aktuálním kanálu (vyžaduje c
 
 #: 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
@@ -745,9 +699,7 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], zobrazí váš seznam upozornění "
-"nebo tam někoho přidá"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], zobrazí váš seznam upozornění nebo tam někoho přidá"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -756,8 +708,7 @@ msgstr "OP <nick>, dá právo chanop určené přezdívce (vyžaduje chanop)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<channel>] [<reason>], opustí kanál, ve výchozím nastavení ten aktuální"
+msgstr "PART [<channel>] [<reason>], opustí kanál, ve výchozím nastavení ten aktuální"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -785,23 +736,17 @@ msgstr "QUOTE <text>, pošle text serveru"
 
 #: 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>], Může být volán stejně jako /"
-"RECONNECT pro nové připojení k aktuálnímu serveru nebo pomocí /RECONNECT ALL "
-"pro připojení ke všem otevřeným serverům"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<password>], Může být volán stejně jako /RECONNECT pro nové připojení k aktuálnímu serveru nebo pomocí /RECONNECT ALL pro připojení ke všem otevřeným serverům"
 
 #: 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>], Může být volán stejně jako /"
-"RECONNECT pro nové připojení k aktuálnímu serveru nebo pomocí /RECONNECT ALL "
-"pro připojení ke všem otevřeným serverům"
+msgstr "RECONNECT [<host>] [<port>] [<password>], Může být volán stejně jako /RECONNECT pro nové připojení k aktuálnímu serveru nebo pomocí /RECONNECT ALL pro připojení ke všem otevřeným serverům"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -823,8 +768,7 @@ 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>, připojí se a vstoupí do kanálu"
+msgstr "SERVCHAN [-ssl] <host> <port> <channel>, připojí se a vstoupí do kanálu"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -840,9 +784,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], připojí se k serveru na výchozím portu "
-"6667"
+msgstr "SERVER <host> [<port>] [<password>], připojí se k serveru na výchozím portu 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -862,7 +804,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>], nastaví téma kanálu, jinak ukáže aktuální téma"
 
 #: src/common/outbound.c:4112
@@ -873,13 +816,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>] Změní ikonu podle jmen souborů.\n"
-"TRAY -f <filename>                  Nastaví ikonu na pevnou.\n"
-"TRAY -i <number>                    Zabliká ikonou v daném intervalu.\n"
-"TRAY -t <text>                      Nastaví tip ikony.\n"
-"TRAY -b <title> <text>              Nastaví kontextovou nápovědu ikony.."
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] Změní ikonu podle jmen souborů.\nTRAY -f <filename>                  Nastaví ikonu na pevnou.\nTRAY -i <number>                    Zabliká ikonou v daném intervalu.\nTRAY -t <text>                      Nastaví tip ikony.\nTRAY -b <title> <text>              Nastaví kontextovou nápovědu ikony.."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -895,8 +832,8 @@ msgstr "UNLOAD <name>, uvolní z paměti plugin nebo skript"
 
 #: 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,10 +842,9 @@ msgstr "URL <url>, otevře URL ve vašem prohlížeči"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> atd, zvýrazní nick v uživatelském seznamu "
-"kanálu"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> atd, zvýrazní nick v uživatelském seznamu kanálu"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -926,7 +862,7 @@ msgstr "WALLCHOP <message>, pošle zprávu všem chanop na aktuálním kanálu"
 #: src/common/outbound.c:4166
 #, c-format
 msgid "User Command for: %s\n"
-msgstr ""
+msgstr "Uživatelský příkaz pro: %s\n"
 
 #: src/common/outbound.c:4193
 #, c-format
@@ -937,9 +873,7 @@ msgstr "Použití: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"K přikazu není k dispozici žádná nápověda.\n"
+msgstr "\nK přikazu není k dispozici žádná nápověda.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -956,16 +890,16 @@ msgstr "Příliš mnoho rekurzivních příkazů, ruším."
 #: src/common/outbound.c:4832
 #, c-format
 msgid "Unknown Command %s. Try /help\n"
-msgstr ""
+msgstr "Neznámý příkaz %s. Zkus /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
+msgstr "Nenalezen symbol hexchat_plugin_init; je tohle opravu HexChat plugin?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
 msgid "*\tServicing ident request from %s as %s"
-msgstr ""
+msgstr "*\tObsluhuji požadavek ident z %s jako %s"
 
 #: src/common/plugin-identd.c:238
 #, c-format
@@ -974,20 +908,20 @@ msgstr ""
 
 #: src/common/plugin-identd.c:262
 msgid "IDENTD <port> <username>"
-msgstr ""
+msgstr "IDENTD <port> <username>"
 
 #: src/common/plugin-timer.c:75
 #, c-format
 msgid "Timer %d deleted.\n"
-msgstr ""
+msgstr "Časovač %d smazán.\n"
 
 #: src/common/plugin-timer.c:81
 msgid "No such ref number found.\n"
-msgstr ""
+msgstr "Takové referenční číslo nenalezeno.\n"
 
 #: src/common/plugin-timer.c:145
 msgid "No timers installed.\n"
-msgstr ""
+msgstr "Žádné časové nejsou nastavené.\n"
 
 #. 00000 00000000 0000000 abc
 #: src/common/plugin-timer.c:150
@@ -997,7 +931,7 @@ msgstr ""
 #: src/common/plugin-timer.c:155
 #, c-format
 msgid "%5d %8.1f %7d  %s\n"
-msgstr ""
+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"
@@ -1008,9 +942,7 @@ msgstr "Jste si jistí, že server podporuje SSL a tento port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nemohu přeložit hostitele %s\n"
-"Zkontrolujte vaše nastavení IP!\n"
+msgstr "Nemohu přeložit hostitele %s\nZkontrolujte vaše nastavení IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1026,20 +958,19 @@ msgstr "Zkouším další server v %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Čekám: symbol \"%s\" je neznámý. Pro síť %s nebude použita žádná konverze."
+msgstr "Čekám: symbol \"%s\" je neznámý. Pro síť %s nebude použita žádná konverze."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
-msgstr ""
+msgstr "%C18*%O$t%C18$1%O přidáno do seznamu notifikací."
 
 #: src/common/textevents.h:10
 msgid "%C22*%O$t%C22$1%O: %C18$2%O on %C24$4%O by %C26$3%O"
-msgstr ""
+msgstr "%C22*%O$t%C22$1%O: %C18$2%O na %C24$4%O od %C26$3%O"
 
 #: src/common/textevents.h:13
 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)."
-msgstr ""
+msgstr "%C22*%O$tNelze se připojit do %C22$1 %O(%C20Jsi zakázaný%O)."
 
 #: src/common/textevents.h:19
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
@@ -1186,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
@@ -1220,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
@@ -1242,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
@@ -1255,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
@@ -1272,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
@@ -1314,7 +1249,7 @@ msgstr ""
 #: src/common/textevents.h:238
 #, c-format
 msgid "%C16,17"
-msgstr ""
+msgstr "%C16,17"
 
 #: src/common/textevents.h:241
 #, c-format
@@ -1394,7 +1329,7 @@ msgstr "$tSeznam upozornění je prázdný."
 #: src/common/textevents.h:307
 #, c-format
 msgid "%C16,17  Notify List"
-msgstr ""
+msgstr "%C16,17  Seznam notifikací"
 
 #: src/common/textevents.h:310
 msgid "%C23*%O$t%C23$1%O users in notify list."
@@ -1433,7 +1368,7 @@ msgstr ""
 #: src/common/textevents.h:349
 #, c-format
 msgid "%C24*$t$1 has quit ($2)"
-msgstr ""
+msgstr "%C24*$t$1 odešel ($2)"
 
 #: src/common/textevents.h:352
 msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
@@ -1453,7 +1388,7 @@ msgstr ""
 
 #: src/common/textevents.h:367
 msgid "%C29*%O$tConnected."
-msgstr ""
+msgstr "%C29*%O$tPřipojen."
 
 #: src/common/textevents.h:373
 msgid "%C29*%O$tLooking up %C29$1%O"
@@ -1551,7 +1486,7 @@ msgstr "**** ZAČÍNÁM ZÁZNAM V %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
+msgstr "* Nelze otevřít logovací soubor(y) pro zápis. Zkontroluj\npřístupová práva na %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -1585,7 +1520,7 @@ msgstr "Osobní počítač"
 
 #: src/common/text.c:975
 msgid "The account of the person"
-msgstr ""
+msgstr "Účet osoby"
 
 #: src/common/text.c:979 src/common/text.c:986 src/common/text.c:993
 #: src/common/text.c:1210 src/common/text.c:1217 src/common/text.c:1222
@@ -1660,7 +1595,7 @@ msgstr "Přezdívka osoby, která změnila téma"
 #: src/common/text.c:1024 src/common/text.c:1030 src/fe-gtk/chanlist.c:779
 #: src/fe-gtk/chanlist.c:881 src/fe-gtk/setup.c:337
 msgid "Topic"
-msgstr "Téma:"
+msgstr "Téma"
 
 #: src/common/text.c:1034 src/common/text.c:1087
 msgid "The nickname of the kicker"
@@ -1778,11 +1713,11 @@ msgstr "Maska banu"
 
 #: src/common/text.c:1146
 msgid "The nick of the person who did the quieting"
-msgstr ""
+msgstr "Přezdívka osoby, která utišovala"
 
 #: src/common/text.c:1147 src/common/text.c:1179
 msgid "The quiet mask"
-msgstr ""
+msgstr "Utišovací maska"
 
 #: src/common/text.c:1151
 msgid "The nick who removed the key"
@@ -1794,7 +1729,7 @@ msgstr "Přezdívka toho, kdo odstranil limit"
 
 #: src/common/text.c:1159
 msgid "The nick of the person who did the deop'ing"
-msgstr ""
+msgstr "Přezdívka osoby, která udělala deop"
 
 #: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
@@ -1802,7 +1737,7 @@ msgstr "Přezdívka toho, kdo byl deop-ován"
 
 #: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
-msgstr ""
+msgstr "Přezdívka osoby, která udělala halfdeop"
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
@@ -1810,7 +1745,7 @@ msgstr "Přezdívka toho, kdo byl dehalfop-ován"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
-msgstr ""
+msgstr "Přezdívka osoby, která udělala devoice"
 
 #: src/common/text.c:1169
 msgid "The nick of the person who has been devoice'ed"
@@ -1818,11 +1753,11 @@ msgstr "Přezdívka toho, kdo byl zbaven hlasování"
 
 #: src/common/text.c:1173
 msgid "The nick of the person who did the unban'ing"
-msgstr ""
+msgstr "Přezdívka osoby, která udělala unban"
 
 #: src/common/text.c:1178
 msgid "The nick of the person who did the unquiet'ing"
-msgstr ""
+msgstr "Přezdívka osoby, která udělala unquiet"
 
 #: src/common/text.c:1183
 msgid "The nick of the person who did the exempt"
@@ -1912,11 +1847,11 @@ msgstr "Jméno kanálu"
 
 #: src/common/text.c:1271
 msgid "Mechanism"
-msgstr ""
+msgstr "Mechanismus"
 
 #: src/common/text.c:1276 src/common/text.c:1284
 msgid "Raw Numeric or Identifier"
-msgstr ""
+msgstr "Surové číslo nebo identifikátor"
 
 #: src/common/text.c:1282 src/common/text.c:1288 src/common/text.c:1456
 #: src/fe-gtk/menu.c:1547 src/fe-gtk/menu.c:1795 src/fe-gtk/setup.c:216
@@ -1993,7 +1928,7 @@ msgstr "Řetězec DCC"
 
 #: src/common/text.c:1444
 msgid "Away Reason"
-msgstr ""
+msgstr "Důvod pro Pryč"
 
 #: src/common/text.c:1448
 msgid "Number of notify items"
@@ -2048,9 +1983,7 @@ msgstr "Trvání banu"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nemůžu přečíst zvkukový soubor:\n"
-"%s"
+msgstr "Nemůžu přečíst zvkukový soubor:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -2138,7 +2071,7 @@ msgstr "Americká Samoa"
 
 #: src/common/util.c:700
 msgid "Asia-Pacific Region"
-msgstr ""
+msgstr "Asijko-pacifická oblast"
 
 #: src/common/util.c:701
 msgid "Austria"
@@ -2250,7 +2183,7 @@ msgstr "Kanada"
 
 #: src/common/util.c:728 src/fe-gtk/setup.c:98
 msgid "Catalan"
-msgstr ""
+msgstr "Katalánsko"
 
 #: src/common/util.c:729
 msgid "Cocos Islands"
@@ -2334,7 +2267,7 @@ msgstr "Česká republika"
 
 #: src/common/util.c:749
 msgid "East Germany"
-msgstr ""
+msgstr "Východní Německo"
 
 #: src/common/util.c:750
 msgid "Germany"
@@ -2586,7 +2519,7 @@ msgstr "Jordánsko"
 
 #: src/common/util.c:812
 msgid "Company Jobs"
-msgstr ""
+msgstr "Pracovní pozice"
 
 #: src/common/util.c:813
 msgid "Japan"
@@ -2694,7 +2627,7 @@ msgstr "Moldávie"
 
 #: src/common/util.c:839
 msgid "Montenegro"
-msgstr ""
+msgstr "Černá Hora"
 
 #: src/common/util.c:840
 msgid "United States Medical"
@@ -2734,7 +2667,7 @@ msgstr "Macau"
 
 #: src/common/util.c:849
 msgid "Mobile Devices"
-msgstr ""
+msgstr "Mobilní zařízení"
 
 #: src/common/util.c:850
 msgid "Northern Mariana Islands"
@@ -2762,7 +2695,7 @@ msgstr "Mauritius"
 
 #: src/common/util.c:856
 msgid "Museums"
-msgstr ""
+msgstr "Musea"
 
 #: src/common/util.c:857
 msgid "Maldives"
@@ -2790,7 +2723,7 @@ msgstr "Namibie"
 
 #: src/common/util.c:863
 msgid "Individual's Names"
-msgstr ""
+msgstr "Jména jednotlivců"
 
 #: src/common/util.c:864
 msgid "New Caledonia"
@@ -2890,7 +2823,7 @@ msgstr "Puerto Rico"
 
 #: src/common/util.c:888
 msgid "Professions"
-msgstr ""
+msgstr "Profese"
 
 #: src/common/util.c:889
 msgid "Palestinian Territory"
@@ -2926,7 +2859,7 @@ msgstr "Starý školní ARPAnet"
 
 #: src/common/util.c:897
 msgid "Serbia"
-msgstr ""
+msgstr "Srbsko"
 
 #: src/common/util.c:898
 msgid "Russian Federation"
@@ -2998,7 +2931,7 @@ msgstr "Surinam"
 
 #: src/common/util.c:915
 msgid "South Sudan"
-msgstr ""
+msgstr "Jižní Súdán"
 
 #: src/common/util.c:916
 msgid "Sao Tome and Principe"
@@ -3030,7 +2963,7 @@ msgstr "Čad"
 
 #: src/common/util.c:923
 msgid "Internet Communication Services"
-msgstr ""
+msgstr "Internetové komunikační služby"
 
 #: src/common/util.c:924
 msgid "French Southern Territories"
@@ -3074,7 +3007,7 @@ msgstr "Turecko"
 
 #: src/common/util.c:935
 msgid "Travel and Tourism"
-msgstr ""
+msgstr "Cestování a turismus"
 
 #: src/common/util.c:936
 msgid "Trinidad and Tobago"
@@ -3154,7 +3087,7 @@ msgstr "Samoa"
 
 #: src/common/util.c:955
 msgid "Adult Entertainment"
-msgstr ""
+msgstr "Zábava pro dospělé"
 
 #: src/common/util.c:956
 msgid "Yemen"
@@ -3228,7 +3161,7 @@ msgstr ""
 
 #: src/fe-gtk/banlist.c:67
 msgid "Invites"
-msgstr ""
+msgstr "Pozvánky"
 
 #: src/fe-gtk/banlist.c:68 src/fe-gtk/ignoregui.c:164
 msgid "Invite"
@@ -3236,25 +3169,25 @@ msgstr "Pozvat"
 
 #: src/fe-gtk/banlist.c:76
 msgid "Quiets"
-msgstr ""
+msgstr "Utišení"
 
 #: src/fe-gtk/banlist.c:77
 msgid "Quiet"
-msgstr ""
+msgstr "Utišení"
 
 #. poor way to get which is selected but it works
 #: src/fe-gtk/banlist.c:354 src/fe-gtk/banlist.c:388
 msgid "Copy mask"
-msgstr ""
+msgstr "Maska kopírování"
 
 #: src/fe-gtk/banlist.c:357
 #, c-format
 msgid "%s on %s by %s"
-msgstr ""
+msgstr "%s na %s od %s"
 
 #: src/fe-gtk/banlist.c:389
 msgid "Copy entry"
-msgstr ""
+msgstr "Zkopírovat položku"
 
 #: src/fe-gtk/banlist.c:459 src/fe-gtk/chanlist.c:292
 #: src/fe-gtk/plugin-tray.c:180
@@ -3268,11 +3201,11 @@ msgstr "Musíte vybrat nějaký ban."
 #: src/fe-gtk/banlist.c:568
 #, c-format
 msgid "Are you sure you want to remove all listed items in %s?"
-msgstr ""
+msgstr "Jsi si jistý, že chceš odebrat všechny položky vypsané v %s?"
 
 #: src/fe-gtk/banlist.c:726
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: src/fe-gtk/banlist.c:727 src/fe-gtk/ignoregui.c:158
 msgid "Mask"
@@ -3339,7 +3272,7 @@ msgstr "_Vyhledávání"
 
 #: src/fe-gtk/chanlist.c:800
 msgid "_Download List"
-msgstr "Seznam _stahování"
+msgstr "_Stáhnout seznam"
 
 #: src/fe-gtk/chanlist.c:806
 msgid "Save _List..."
@@ -3352,7 +3285,7 @@ msgstr "Pouze zobrazit:"
 
 #: src/fe-gtk/chanlist.c:831
 msgid "channels with"
-msgstr "s kanály"
+msgstr "kanály s"
 
 #: src/fe-gtk/chanlist.c:844
 msgid "to"
@@ -3365,7 +3298,7 @@ msgstr "uživatelů."
 #. =============================================================
 #: src/fe-gtk/chanlist.c:862
 msgid "Look in:"
-msgstr "Podívat se:"
+msgstr "Hledat v:"
 
 #: src/fe-gtk/chanlist.c:874
 msgid "Channel name"
@@ -3409,18 +3342,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Nemohu přistoupit k souboru: %s\n"
-"%s.\n"
-"Nové poslání není možné."
+msgstr "Nemohu přistoupit k souboru: %s\n%s.\nNové poslání není možné."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Stahovaný soubor je větší než se vejde na disk. Pokračování ve stahování "
-"není možné."
+msgstr "Stahovaný soubor je větší než se vejde na disk. Pokračování ve stahování není možné."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3502,7 +3430,7 @@ msgstr "Čas"
 
 #: src/fe-gtk/editlist.c:358 src/fe-gtk/fkeys.c:830
 msgid "Add"
-msgstr ""
+msgstr "Přidat"
 
 #: src/fe-gtk/editlist.c:360 src/fe-gtk/fkeys.c:832 src/fe-gtk/ignoregui.c:385
 msgid "Delete"
@@ -3530,7 +3458,7 @@ msgstr "Nenačítat automaticky žádné pluginy"
 
 #: src/fe-gtk/fe-gtk.c:84 src/fe-text/fe-text.c:470
 msgid "Show plugin/script auto-load directory"
-msgstr ""
+msgstr "Ukázat adresář pro automatické nahrávání pluginů/skriptů"
 
 #: src/fe-gtk/fe-gtk.c:85 src/fe-text/fe-text.c:471
 msgid "Show user config directory"
@@ -3538,15 +3466,15 @@ msgstr "Zobrazit uživatelský konfigurační adresář"
 
 #: src/fe-gtk/fe-gtk.c:86 src/fe-gtk/fe-gtk.c:93 src/fe-text/fe-text.c:474
 msgid "Open an irc://server:port/channel?key URL"
-msgstr ""
+msgstr "Otevřít URL irc://server:port/channel?key"
 
 #: src/fe-gtk/fe-gtk.c:87 src/fe-gtk/setup.c:268
 msgid "Execute command:"
-msgstr "Vykonat příkaz"
+msgstr "Vykonat příkaz:"
 
 #: src/fe-gtk/fe-gtk.c:89
 msgid "Open URL or execute command in an existing HexChat"
-msgstr ""
+msgstr "Otevřít URL nebo spustit příkaz v existujícím HexChatu"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
@@ -3566,10 +3494,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Chyba při otvírání písma:\n"
-"\n"
-"%s"
+msgstr "Chyba při otvírání písma:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3583,22 +3508,22 @@ msgstr "%d bytů"
 #: src/fe-gtk/fe-gtk.c:827
 #, c-format
 msgid "Network send queue: %d bytes"
-msgstr "Po síti posláno: %d bytů"
+msgstr "Zbývá po síti poslat: %d bytů"
 
 #: 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 "
@@ -3609,65 +3534,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 ""
-"Příkaz pro vkládání do bufferu - vloží obsah Data 1 do položky, kde byla "
-"stisknuta klíčová sekvence. Vloží to na místo aktuální pozice kurzoru"
+msgstr "Příkaz pro vkládání do bufferu - vloží obsah Data 1 do položky, kde byla stisknuta klíčová sekvence. Vloží to na místo aktuální pozice kurzoru"
 
 #: 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 ""
-"Příkaz nastavení bufferu - nastaví položku, kde byla zadána řídící sekvence "
-"na obsah Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Příkaz nastavení bufferu - nastaví položku, kde byla zadána řídící sekvence na obsah 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 ""
-"Příkaz pro poslední příkaz nastaví položku na obsah posledního příkazu, "
-"který jsme zadali. Toho docílíme stiskem klávesy nahoru v shellu."
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Příkaz pro poslední příkaz nastaví položku na obsah posledního příkazu, který jsme zadali. Toho docílíme stiskem klávesy nahoru v shellu."
 
 #: 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 ""
-"Příkaz další nastaví položku na obsah dalšího příkazu, který jsme zadali. "
-"Toho docílíme stiskem klávesy dolů v shellu"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Příkaz další nastaví položku na obsah dalšího příkazu, který jsme zadali. Toho docílíme stiskem klávesy dolů v shellu"
 
 #: 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 ""
-"Tento příkaz změní text a provede jeho kompletaci z původně neúplné "
-"přezdívky nebo příkazu. Pokud jsou Data 1 nastavena, můžeme stisknout "
-"Tabulátor a vybrat nick."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Tento příkaz změní text a provede jeho kompletaci z původně neúplné přezdívky nebo příkazu. Pokud jsou Data 1 nastavena, můžeme stisknout Tabulátor a vybrat 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 ""
-"Tento příkaz umožní pohyb nahoru a dolů v seznamu přezdívek. Pokud jsou Data "
-"1na něco nastavena, bude se pohybovat nahoru, jinak to bude dolů"
+"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 "Tento příkaz umožní pohyb nahoru a dolů v seznamu přezdívek. Pokud jsou Data 1na něco nastavena, bude se pohybovat nahoru, jinak to bude dolů"
 
 #: 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 ""
-"Tento příkaz zkontroluje poslední zadané slovo ve vstupním poli proti "
-"seznamu náhrad a nahradí ho, pokud najde odpovídající náhradu"
+msgstr "Tento příkaz zkontroluje poslední zadané slovo ve vstupním poli proti seznamu náhrad a nahradí ho, pokud najde odpovídající náhradu"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3737,7 +3647,7 @@ msgstr "Zrušit ignoraci"
 
 #: src/fe-gtk/ignoregui.c:293
 msgid "Are you sure you want to remove all ignores?"
-msgstr ""
+msgstr "Jsii si jistý, že chceš odstranit všechny ignorace?"
 
 #: src/fe-gtk/ignoregui.c:303
 msgid "Enter mask to ignore:"
@@ -3810,8 +3720,7 @@ msgstr "_Připojit se k tomuto kanálu:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Pokud víte jméno kanálu, kte kterému se chcete připojit, pak ho zde zadejte."
+msgstr "Pokud víte jméno kanálu, kte kterému se chcete připojit, pak ho zde zadejte."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3843,12 +3752,11 @@ msgstr "Žádné téma není nastaveno"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Tento server má s tím asociováno %d kanálů nebo dialogů. Zavřít všechny?"
+msgstr "Tento server má s tím asociováno %d kanálů nebo dialogů. Zavřít všechny?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
-msgstr ""
+msgstr "Zavřít HexChat?"
 
 #: src/fe-gtk/maingui.c:1197
 msgid "Don't ask next time."
@@ -3885,7 +3793,7 @@ msgstr "<u>Podtrženo</u>"
 
 #: src/fe-gtk/maingui.c:1445
 msgid "<i>Italic</i>"
-msgstr ""
+msgstr "<i>Kurzíva</i>"
 
 #: src/fe-gtk/maingui.c:1446
 msgid "Normal"
@@ -3901,15 +3809,15 @@ msgstr "Barvy 8-15"
 
 #: src/fe-gtk/maingui.c:1504
 msgid "_Settings"
-msgstr ""
+msgstr "Na_stavení"
 
 #: src/fe-gtk/maingui.c:1506
 msgid "_Log to Disk"
-msgstr ""
+msgstr "_Logovat na disk"
 
 #: src/fe-gtk/maingui.c:1507
 msgid "_Reload Scrollback"
-msgstr ""
+msgstr "Znovu nah_rát historii"
 
 #: src/fe-gtk/maingui.c:1510
 msgid "Strip _Colors"
@@ -3921,23 +3829,23 @@ msgstr ""
 
 #: src/fe-gtk/maingui.c:1520
 msgid "_Extra Alerts"
-msgstr ""
+msgstr "_Extra upozornění"
 
 #: src/fe-gtk/maingui.c:1522
 msgid "Beep on _Message"
-msgstr ""
+msgstr "_Pípnout při zprávě"
 
 #: src/fe-gtk/maingui.c:1524
 msgid "Blink Tray _Icon"
-msgstr ""
+msgstr "Zablikat _ikonou v nástrojové liště"
 
 #: src/fe-gtk/maingui.c:1526
 msgid "Blink Task _Bar"
-msgstr ""
+msgstr "Zablikat lištou úloh"
 
 #: src/fe-gtk/maingui.c:1566 src/fe-gtk/menu.c:2351
 msgid "_Detach"
-msgstr ""
+msgstr "_Odpojit"
 
 #: src/fe-gtk/maingui.c:1568 src/fe-gtk/menu.c:2352 src/fe-gtk/menu.c:2357
 msgid "_Close"
@@ -3949,7 +3857,7 @@ msgstr "Uživatelský limit musí být číslo!\n"
 
 #: src/fe-gtk/maingui.c:2043
 msgid "Filter Colors"
-msgstr ""
+msgstr "Filtrovat barvy"
 
 #: src/fe-gtk/maingui.c:2044
 msgid "No outside messages"
@@ -3985,15 +3893,15 @@ msgstr "Zadejte novou přezdívku:"
 
 #: src/fe-gtk/maingui.c:2802
 msgid "No results found."
-msgstr ""
+msgstr "Nic nenalezeno."
 
 #: src/fe-gtk/maingui.c:2898
 msgid "Search hit end or not found."
-msgstr ""
+msgstr "Prohledávání narazilo na konec nebo nic nenalezeno."
 
 #: src/fe-gtk/maingui.c:2914
 msgid "_Highlight all"
-msgstr ""
+msgstr "_Zvýraznit vše"
 
 #: src/fe-gtk/maingui.c:2920
 msgid "Highlight all occurrences, and underline the current occurrence."
@@ -4001,19 +3909,19 @@ msgstr ""
 
 #: src/fe-gtk/maingui.c:2922
 msgid "Mat_ch case"
-msgstr ""
+msgstr "_Respektovat velikost písmen"
 
 #: src/fe-gtk/maingui.c:2927
 msgid "Perform a case-sensitive search."
-msgstr ""
+msgstr "Provede hledání s respektovaním velikostí písmen."
 
 #: src/fe-gtk/maingui.c:2929
 msgid "_Regex"
-msgstr ""
+msgstr "_Regulární výraz"
 
 #: src/fe-gtk/maingui.c:2934
 msgid "Regard search string as a regular expression."
-msgstr ""
+msgstr "Považuje hledací řetězec za regulární výraz."
 
 #: src/fe-gtk/menu.c:115
 msgid "Host unknown"
@@ -4021,7 +3929,7 @@ msgstr "Počítač není znám"
 
 #: src/fe-gtk/menu.c:116
 msgid "Account unknown"
-msgstr ""
+msgstr "Účet neznámý"
 
 #. let the translators tweak this if need be
 #: src/fe-gtk/menu.c:614
@@ -4043,7 +3951,7 @@ msgstr "Uživatel:"
 
 #: src/fe-gtk/menu.c:638
 msgid "Account:"
-msgstr ""
+msgstr "Účet:"
 
 #: src/fe-gtk/menu.c:648
 msgid "Country:"
@@ -4069,7 +3977,7 @@ msgstr "Zpráva pryč:"
 #: src/fe-gtk/menu.c:737
 #, c-format
 msgid "%d nicks selected."
-msgstr ""
+msgstr "%d přezdívek vybráno."
 
 #: src/fe-gtk/menu.c:862
 msgid ""
@@ -4099,15 +4007,15 @@ msgstr "Otočit kanál"
 
 #: src/fe-gtk/menu.c:1077
 msgid "_Autojoin"
-msgstr ""
+msgstr "_Automaticky připojit"
 
 #: src/fe-gtk/menu.c:1079
 msgid "Autojoin Channel"
-msgstr ""
+msgstr "_Automaticky se připojit ke kanálu"
 
 #: src/fe-gtk/menu.c:1113 src/fe-gtk/menu.c:1117
 msgid "_Auto-Connect"
-msgstr ""
+msgstr "_Automaticky připojit"
 
 #: src/fe-gtk/menu.c:1138
 #, c-format
@@ -4149,7 +4057,7 @@ msgstr "Získat seznam kanálů"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
-msgstr ""
+msgstr " byl přeložen bez podpory pluginů."
 
 #: src/fe-gtk/menu.c:1470
 msgid ""
@@ -4217,19 +4125,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Odpovědi CTCP - Speciální kódy:\n"
-"\n"
-"%d  =  data (kompletní ctcp)\n"
-"%e  =  jméno aktuální sítě\n"
-"%m  =  informace o počítači\n"
-"%s  =  nick, který poslal ctcp\n"
-"%t  =  čas/datum\n"
-"%2  =  slovo 2\n"
-"%3  =  slovo 3\n"
-"&2  =  slovo 2 do konce řádku\n"
-"&3  =  slovo 3 do konce řádku\n"
-"\n"
+msgstr "Odpovědi CTCP - Speciální kódy:\n\n%d  =  data (kompletní ctcp)\n%e  =  jméno aktuální sítě\n%m  =  informace o počítači\n%s  =  nick, který poslal ctcp\n%t  =  čas/datum\n%2  =  slovo 2\n%3  =  slovo 3\n&2  =  slovo 2 do konce řádku\n&3  =  slovo 3 do konce řádku\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4284,7 +4180,7 @@ msgstr "Odpovědi CTCP - %s"
 
 #: src/fe-gtk/menu.c:1757
 msgid "He_xChat"
-msgstr ""
+msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
@@ -4369,7 +4265,7 @@ msgstr "Graf"
 
 #: src/fe-gtk/menu.c:1799
 msgid "_Fullscreen"
-msgstr ""
+msgstr "_Celá obrazovka"
 
 #: src/fe-gtk/menu.c:1801
 msgid "_Server"
@@ -4393,7 +4289,7 @@ msgstr "Seznam kanálů"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
-msgstr ""
+msgstr "Označen _Pryč"
 
 #: src/fe-gtk/menu.c:1810
 msgid "_Usermenu"
@@ -4475,7 +4371,7 @@ msgstr "_Pluginy a skripty"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Surový log"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
@@ -4533,7 +4429,7 @@ msgstr "_O programu"
 
 #: src/fe-gtk/menu.c:2356
 msgid "_Attach"
-msgstr ""
+msgstr "_Připojit"
 
 #: src/fe-gtk/notifygui.c:123 src/fe-gtk/plugingui.c:64
 msgid "Name"
@@ -4558,12 +4454,12 @@ msgstr "před %d minutami"
 
 #: src/fe-gtk/notifygui.c:195
 msgid "An hour ago"
-msgstr ""
+msgstr "Před hodinou"
 
 #: src/fe-gtk/notifygui.c:197
 #, c-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "Před %d hodinami"
 
 #: src/fe-gtk/notifygui.c:212
 msgid "Online"
@@ -4627,11 +4523,11 @@ msgstr "Připojen k %u sítím a %u kanálům - %s"
 
 #: src/fe-gtk/plugin-tray.c:549
 msgid "_Restore Window"
-msgstr ""
+msgstr "_Obnovit okno"
 
 #: src/fe-gtk/plugin-tray.c:551
 msgid "_Hide Window"
-msgstr ""
+msgstr "_Skrýt okno"
 
 #: src/fe-gtk/plugin-tray.c:555
 msgid "_Blink on"
@@ -4652,15 +4548,15 @@ msgstr "Zvýrazněná zpráva"
 #. blink_item (BIT_FILEOFFER, submenu, _("File Offer"));
 #: src/fe-gtk/plugin-tray.c:561
 msgid "_Change status"
-msgstr ""
+msgstr "_Změnit stav"
 
 #: src/fe-gtk/plugin-tray.c:567
 msgid "_Away"
-msgstr ""
+msgstr "_Pryč"
 
 #: src/fe-gtk/plugin-tray.c:570
 msgid "_Back"
-msgstr ""
+msgstr "_Zpět"
 
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
@@ -4680,7 +4576,7 @@ msgstr ""
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
-msgstr ""
+msgstr "%u zpráv kanálu. - %s"
 
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
@@ -4725,11 +4621,11 @@ msgstr "_Načíst..."
 
 #: src/fe-gtk/plugingui.c:259
 msgid "_Unload"
-msgstr ""
+msgstr "_Odebrat"
 
 #: src/fe-gtk/plugingui.c:262
 msgid "_Reload"
-msgstr ""
+msgstr "_Znovu načíst"
 
 #: src/fe-gtk/rawlog.c:80 src/fe-gtk/rawlog.c:136 src/fe-gtk/textgui.c:475
 #: src/fe-gtk/urlgrab.c:218
@@ -4739,11 +4635,11 @@ msgstr "Uložit jako..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "Surový Log (%s) - %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
-msgstr ""
+msgstr "Vyčistit surový log"
 
 #: src/fe-gtk/servlistgui.c:301 src/fe-gtk/servlistgui.c:499
 msgid "New Network"
@@ -4752,20 +4648,19 @@ msgstr "Nová síť"
 #: src/fe-gtk/servlistgui.c:756
 #, c-format
 msgid "Really remove network \"%s\" and all its servers?"
-msgstr ""
-"Skutečně chcete odstranit síť \"%s\" a všechny servery, které obsahuje?"
+msgstr "Skutečně chcete odstranit síť \"%s\" a všechny servery, které obsahuje?"
 
 #: src/fe-gtk/servlistgui.c:1125 src/fe-gtk/servlistgui.c:1556
 msgid "User name cannot be left blank."
-msgstr ""
+msgstr "Uživatelské jméno nemůže být prázdné."
 
 #: src/fe-gtk/servlistgui.c:1578
 msgid "You cannot have an empty nick name."
-msgstr ""
+msgstr "Nemůžeš mít prázdnou přezdívku."
 
 #: src/fe-gtk/servlistgui.c:1585
 msgid "You must have two unique nick names."
-msgstr ""
+msgstr "Musíš mít dvě unikátní přezdívky."
 
 #: src/fe-gtk/servlistgui.c:1636
 msgid ""
@@ -4780,11 +4675,11 @@ msgstr "Upravit %s - %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
-msgstr ""
+msgstr "Servery"
 
 #: src/fe-gtk/servlistgui.c:1732
 msgid "Autojoin channels"
-msgstr ""
+msgstr "Automaticky připojit kanály"
 
 #: src/fe-gtk/servlistgui.c:1733
 msgid "Connect commands"
@@ -4796,11 +4691,11 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
+msgstr "%n=přezdívka\n%p=heslo\n%r=reálné jméno\n%u=uživatelské jméno"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
-msgstr ""
+msgstr "Klíč (heslo)"
 
 #: src/fe-gtk/servlistgui.c:1853
 msgid "_Edit"
@@ -4852,7 +4747,7 @@ msgstr "_Uživatelské jméno:"
 
 #: src/fe-gtk/servlistgui.c:1885
 msgid "Login method:"
-msgstr ""
+msgstr "Metoda přihlášení:"
 
 #: src/fe-gtk/servlistgui.c:1891 src/fe-gtk/setup.c:655
 msgid "Password:"
@@ -4889,7 +4784,7 @@ msgstr "Přeskočit seznam serverů při startu"
 
 #: src/fe-gtk/servlistgui.c:2130
 msgid "Show favorites only"
-msgstr ""
+msgstr "Zobrazit pouze oblíbené"
 
 #: src/fe-gtk/servlistgui.c:2160
 msgid "_Edit..."
@@ -4903,13 +4798,11 @@ msgstr "_Setřídit"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Seřadí seznam sítí podle abecedy. Pro posun použijte klávesy SHIFT-NAHORU a "
-"SHIFT-DOLŮ."
+msgstr "Seřadí seznam sítí podle abecedy. Pro posun použijte klávesy SHIFT-NAHORU a SHIFT-DOLŮ."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
-msgstr ""
+msgstr "_Oblíbit"
 
 #: src/fe-gtk/servlistgui.c:2177
 msgid "Mark or unmark this network as a favorite."
@@ -4937,11 +4830,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:94
 msgid "Azerbaijani"
-msgstr "Ázerbájdžán"
+msgstr "Ázerbájdžánština"
 
 #: src/fe-gtk/setup.c:95
 msgid "Basque"
-msgstr ""
+msgstr "Baskičtina"
 
 #: src/fe-gtk/setup.c:96
 msgid "Belarusian"
@@ -4949,23 +4842,23 @@ msgstr "Bělorusko"
 
 #: src/fe-gtk/setup.c:97
 msgid "Bulgarian"
-msgstr "Bulharsko"
+msgstr "Bulharština"
 
 #: src/fe-gtk/setup.c:99
 msgid "Chinese (Simplified)"
-msgstr ""
+msgstr "Zjednodušená čínstina"
 
 #: src/fe-gtk/setup.c:100
 msgid "Chinese (Traditional)"
-msgstr ""
+msgstr "Tradiční čínstina"
 
 #: src/fe-gtk/setup.c:101
 msgid "Czech"
-msgstr ""
+msgstr "Čestina"
 
 #: src/fe-gtk/setup.c:102
 msgid "Danish"
-msgstr ""
+msgstr "Dánština"
 
 #: src/fe-gtk/setup.c:103
 msgid "Dutch"
@@ -4973,11 +4866,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:104
 msgid "English (British)"
-msgstr ""
+msgstr "Angličtina (UK)"
 
 #: src/fe-gtk/setup.c:105
 msgid "English"
-msgstr ""
+msgstr "Angličtina"
 
 #: src/fe-gtk/setup.c:106
 msgid "Estonian"
@@ -4985,23 +4878,23 @@ msgstr "Estonsko"
 
 #: src/fe-gtk/setup.c:107
 msgid "Finnish"
-msgstr ""
+msgstr "Finština"
 
 #: src/fe-gtk/setup.c:108
 msgid "French"
-msgstr ""
+msgstr "Francouzština"
 
 #: src/fe-gtk/setup.c:109
 msgid "Galician"
-msgstr ""
+msgstr "Galština"
 
 #: src/fe-gtk/setup.c:110
 msgid "German"
-msgstr ""
+msgstr "Němčina"
 
 #: src/fe-gtk/setup.c:111
 msgid "Greek"
-msgstr ""
+msgstr "Řečtina"
 
 #: src/fe-gtk/setup.c:112
 msgid "Gujarati"
@@ -5013,19 +4906,19 @@ msgstr "Indie"
 
 #: src/fe-gtk/setup.c:114
 msgid "Hungarian"
-msgstr ""
+msgstr "Maďarština"
 
 #: src/fe-gtk/setup.c:115
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonéština"
 
 #: src/fe-gtk/setup.c:116
 msgid "Italian"
-msgstr ""
+msgstr "Italština"
 
 #: src/fe-gtk/setup.c:117
 msgid "Japanese"
-msgstr ""
+msgstr "Japonština"
 
 #: src/fe-gtk/setup.c:118
 msgid "Kannada"
@@ -5037,19 +4930,19 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:120
 msgid "Korean"
-msgstr ""
+msgstr "Korejština"
 
 #: src/fe-gtk/setup.c:121
 msgid "Latvian"
-msgstr ""
+msgstr "Litevština"
 
 #: src/fe-gtk/setup.c:122
 msgid "Lithuanian"
-msgstr ""
+msgstr "Lotyšština"
 
 #: src/fe-gtk/setup.c:123
 msgid "Macedonian"
-msgstr ""
+msgstr "Makedonština"
 
 #: src/fe-gtk/setup.c:124
 msgid "Malay"
@@ -5061,51 +4954,51 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:126
 msgid "Norwegian (Bokmal)"
-msgstr ""
+msgstr "Norština (Bokmal)"
 
 #: src/fe-gtk/setup.c:127
 msgid "Norwegian (Nynorsk)"
-msgstr ""
+msgstr "Norština (Nynorsk)"
 
 #: src/fe-gtk/setup.c:128
 msgid "Polish"
-msgstr ""
+msgstr "Polština"
 
 #: src/fe-gtk/setup.c:129
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugalština"
 
 #: src/fe-gtk/setup.c:130
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugalština (brazilská)"
 
 #: src/fe-gtk/setup.c:131
 msgid "Punjabi"
-msgstr ""
+msgstr "Pandžábi"
 
 #: src/fe-gtk/setup.c:132
 msgid "Russian"
-msgstr ""
+msgstr "Ruština"
 
 #: src/fe-gtk/setup.c:133
 msgid "Serbian"
-msgstr ""
+msgstr "Srbština"
 
 #: src/fe-gtk/setup.c:134
 msgid "Slovak"
-msgstr ""
+msgstr "Slovenština"
 
 #: src/fe-gtk/setup.c:135
 msgid "Slovenian"
-msgstr ""
+msgstr "Slovinština"
 
 #: src/fe-gtk/setup.c:136
 msgid "Spanish"
-msgstr ""
+msgstr "Španělština"
 
 #: src/fe-gtk/setup.c:137
 msgid "Swedish"
-msgstr ""
+msgstr "Švédština"
 
 #: src/fe-gtk/setup.c:138
 msgid "Thai"
@@ -5113,11 +5006,11 @@ msgstr "Thajsko"
 
 #: src/fe-gtk/setup.c:139
 msgid "Turkish"
-msgstr ""
+msgstr "Turečtina"
 
 #: src/fe-gtk/setup.c:140
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrajinština"
 
 #: src/fe-gtk/setup.c:141
 msgid "Vietnamese"
@@ -5133,11 +5026,11 @@ msgstr "Obecné"
 
 #: src/fe-gtk/setup.c:151
 msgid "Language:"
-msgstr ""
+msgstr "Jazyk:"
 
 #: src/fe-gtk/setup.c:152
 msgid "Main font:"
-msgstr ""
+msgstr "Hlavní font:"
 
 #: src/fe-gtk/setup.c:154
 msgid "Font:"
@@ -5145,7 +5038,7 @@ msgstr "Písmo:"
 
 #: src/fe-gtk/setup.c:157
 msgid "Text Box"
-msgstr ""
+msgstr "Textové pole"
 
 #: src/fe-gtk/setup.c:158
 msgid "Colored nick names"
@@ -5181,7 +5074,7 @@ msgstr "Nastavení průhlednosti"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "Průhlednost okna:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
@@ -5205,15 +5098,15 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:175
 msgid "Title Bar"
-msgstr ""
+msgstr "Titulkový pruh"
 
 #: src/fe-gtk/setup.c:176
 msgid "Show channel modes"
-msgstr ""
+msgstr "Zobrazit módy kanálů"
 
 #: src/fe-gtk/setup.c:177
 msgid "Show number of users"
-msgstr ""
+msgstr "Zobrazit počet uživatelů"
 
 #: src/fe-gtk/setup.c:184 src/fe-gtk/setup.c:224
 msgid "A-Z"
@@ -5225,7 +5118,7 @@ msgstr "Poslední řečené pořadí"
 
 #: src/fe-gtk/setup.c:191
 msgid "Input Box"
-msgstr ""
+msgstr "Vpisovací pole"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
@@ -5237,7 +5130,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:194
 msgid "Show nick box"
-msgstr ""
+msgstr "Zobrazovat pole přezdívek"
 
 #: src/fe-gtk/setup.c:195
 msgid "Show user mode icon in nick box"
@@ -5249,7 +5142,7 @@ msgstr "Kontrola pravopisu"
 
 #: src/fe-gtk/setup.c:197
 msgid "Dictionaries to use:"
-msgstr ""
+msgstr "Použité slovníky:"
 
 #: src/fe-gtk/setup.c:199
 msgid ""
@@ -5283,11 +5176,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:207
 msgid "nicks."
-msgstr ""
+msgstr "přezdívky."
 
 #: src/fe-gtk/setup.c:215
 msgid "Graphical"
-msgstr ""
+msgstr "Grafický"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
@@ -5347,7 +5240,7 @@ msgstr "Použít v textu písmo a barvy"
 
 #: src/fe-gtk/setup.c:257
 msgid "Show icons for user modes"
-msgstr ""
+msgstr "Zobrazovat ikony pro uživateské módy"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
@@ -5355,7 +5248,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
-msgstr ""
+msgstr "Barvit přezdívky v seznamu uživatelů"
 
 #: src/fe-gtk/setup.c:258
 msgid "Will color nicknames the same as in chat."
@@ -5375,7 +5268,7 @@ msgstr "Zobrazit seznam uživatelů:"
 
 #: src/fe-gtk/setup.c:263
 msgid "Away Tracking"
-msgstr ""
+msgstr "Sledování stavu pryč"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
@@ -5395,7 +5288,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:271
 msgid "Lag meter:"
-msgstr ""
+msgstr "Měřič prodlevy spojení:"
 
 #: src/fe-gtk/setup.c:272
 msgid "Throttle meter:"
@@ -5419,21 +5312,21 @@ msgstr "Pouze požadované záložky"
 
 #: src/fe-gtk/setup.c:294
 msgid "Automatic"
-msgstr ""
+msgstr "Automatický"
 
 #: src/fe-gtk/setup.c:295
 msgid "In an extra tab"
-msgstr ""
+msgstr "V samostatném panelu"
 
 #: src/fe-gtk/setup.c:296
 msgid "In the front tab"
-msgstr ""
+msgstr "V panelu v popředí"
 
 #. 0 tabs
 #. 1 reserved
 #: src/fe-gtk/setup.c:304
 msgid "Tree"
-msgstr ""
+msgstr "Strom"
 
 #. {ST_HEADER,	N_("Channel Switcher"),0,0,0},
 #: src/fe-gtk/setup.c:311
@@ -5466,11 +5359,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:318
 msgid "Middle click to close tab"
-msgstr ""
+msgstr "Prostřední tlačítko zavíra záložku"
 
 #: src/fe-gtk/setup.c:319
 msgid "Smaller text"
-msgstr ""
+msgstr "Menší text"
 
 #: src/fe-gtk/setup.c:320
 msgid "Focus new tabs:"
@@ -5478,7 +5371,7 @@ msgstr "Zaměřit se na nové záložky:"
 
 #: src/fe-gtk/setup.c:321
 msgid "Placement of notices:"
-msgstr ""
+msgstr "Umísťování poznámek:"
 
 #: src/fe-gtk/setup.c:322
 msgid "Show channel switcher at:"
@@ -5514,23 +5407,23 @@ msgstr "Otevřít DCC, ignorace, oznámení, atd. v záložkách nebo oknech?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
-msgstr ""
+msgstr "Zprávy"
 
 #: src/fe-gtk/setup.c:336
 msgid "Scrollback"
-msgstr ""
+msgstr "Historie"
 
 #: src/fe-gtk/setup.c:344
 msgid "Ask for confirmation"
-msgstr ""
+msgstr "Dotázat se na potvrzení"
 
 #: src/fe-gtk/setup.c:345
 msgid "Ask for download folder"
-msgstr ""
+msgstr "Dotázat se na adresář pro stahování"
 
 #: src/fe-gtk/setup.c:346
 msgid "Save without interaction"
-msgstr ""
+msgstr "Uložit bez interakce"
 
 #: src/fe-gtk/setup.c:352
 msgid "Files and Directories"
@@ -5569,9 +5462,8 @@ msgid "Chat window"
 msgstr "Okno hovoru"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Maximální rychlost přenosu souboru (bytů za sekundu)"
+msgstr ""
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5604,7 +5496,7 @@ msgstr "Upozornění"
 
 #: src/fe-gtk/setup.c:403 src/fe-gtk/setup.c:485
 msgid "Show notifications on:"
-msgstr ""
+msgstr "Zobrazit notifikace když:"
 
 #: src/fe-gtk/setup.c:404 src/fe-gtk/setup.c:442
 msgid "Blink tray icon on:"
@@ -5649,7 +5541,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:419 src/fe-gtk/setup.c:463
 msgid "Tray Behavior"
-msgstr ""
+msgstr "Chování panelu nástrojů"
 
 #: src/fe-gtk/setup.c:420 src/fe-gtk/setup.c:464
 msgid "Enable system tray icon"
@@ -5657,19 +5549,19 @@ msgstr "Povolit ikonu panelu nástrojů"
 
 #: src/fe-gtk/setup.c:421 src/fe-gtk/setup.c:465
 msgid "Minimize to tray"
-msgstr ""
+msgstr "Minimalizovat do panelu nástrojů"
 
 #: src/fe-gtk/setup.c:422 src/fe-gtk/setup.c:466
 msgid "Close to tray"
-msgstr ""
+msgstr "Zavřít do panelu nástrojů"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically mark away/back"
-msgstr ""
+msgstr "Automaticky označit pryč/zpět"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically change status when hiding to tray."
-msgstr ""
+msgstr "Automaticky změnit stav při schování do panelu nástrojů."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
@@ -5750,7 +5642,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:536 src/fe-gtk/setup.c:569
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Různé"
 
 #: src/fe-gtk/setup.c:537
 msgid "Display MODEs in raw form"
@@ -5758,7 +5650,7 @@ msgstr "Zobrazit módy v jejich podobě"
 
 #: src/fe-gtk/setup.c:538
 msgid "WHOIS on notify"
-msgstr ""
+msgstr "WHOIS při notifikaci"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
@@ -5778,23 +5670,23 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:547
 msgid "*!*@*.host"
-msgstr ""
+msgstr "*!*@*.host"
 
 #: src/fe-gtk/setup.c:548
 msgid "*!*@domain"
-msgstr ""
+msgstr "*!*@doména"
 
 #: src/fe-gtk/setup.c:549
 msgid "*!*user@*.host"
-msgstr ""
+msgstr "*!*uživatel@*.host"
 
 #: src/fe-gtk/setup.c:550
 msgid "*!*user@domain"
-msgstr ""
+msgstr "*!*uživatel@doména"
 
 #: src/fe-gtk/setup.c:556
 msgid "Auto Copy Behavior"
-msgstr ""
+msgstr "Automatické kopírování"
 
 #: src/fe-gtk/setup.c:557
 msgid "Automatically copy selected text"
@@ -5812,8 +5704,8 @@ msgstr "Automaticky zahrnout časové značky"
 
 #: 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,17 +5714,17 @@ 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
 msgid "Real name:"
-msgstr ""
+msgstr "Skutečné jméno:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Alternative fonts:"
-msgstr ""
+msgstr "Alternativní fonty:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
@@ -5848,7 +5740,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
-msgstr ""
+msgstr "Použít čas serveru, je-li podporován"
 
 #: src/fe-gtk/setup.c:575
 msgid ""
@@ -5858,7 +5750,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
-msgstr ""
+msgstr "Automaticky připojit k serverům při odpojení"
 
 #: src/fe-gtk/setup.c:577
 msgid "Auto reconnect delay:"
@@ -5870,20 +5762,21 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:579
 msgid "Ban Type:"
-msgstr ""
+msgstr "Druh zákazu:"
 
 #: 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
 msgid "Logging"
-msgstr "Přihlašování"
+msgstr "Protokolování"
 
 #: src/fe-gtk/setup.c:587
 msgid "Display scrollback from previous session"
-msgstr ""
+msgstr "Zobrazit historii z předchozího sezení"
 
 #: src/fe-gtk/setup.c:588
 msgid "Scrollback lines:"
@@ -5936,11 +5829,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -5948,7 +5841,7 @@ msgstr "HTTP"
 
 #: src/fe-gtk/setup.c:618
 msgid "Auto"
-msgstr ""
+msgstr "Auto"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
@@ -5976,7 +5869,7 @@ msgstr "Užitečné pouze v případě počítačů s více adresami."
 
 #: src/fe-gtk/setup.c:637
 msgid "File Transfers"
-msgstr ""
+msgstr "Přenosy souborů"
 
 #: src/fe-gtk/setup.c:638
 msgid "Get my address from the IRC server"
@@ -5984,11 +5877,9 @@ msgstr "Vzít moji adresu ze serveru 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 ""
-"Zeptat se IRC serveru na skutečnou adresu. Použít tuto pokud máte nějakou "
-"192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Zeptat se IRC serveru na skutečnou adresu. Použít tuto pokud máte nějakou 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6035,9 +5926,8 @@ msgid "Proxy Authentication"
 msgstr "Autentikace Proxy"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Použít autentizaci (pouze HTTP nebo Socks5)"
+msgstr "Použít ověření (jen HTTP nebo SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6045,11 +5935,11 @@ msgstr "Uživatelské jméno:"
 
 #: src/fe-gtk/setup.c:662
 msgid "Identd Server"
-msgstr ""
+msgstr "Server identd"
 
 #: src/fe-gtk/setup.c:663
 msgid "Enabled"
-msgstr ""
+msgstr "Povoleno"
 
 #: src/fe-gtk/setup.c:663
 msgid "Server will respond with the networks username"
@@ -6107,7 +5997,7 @@ msgstr "Pozadí:"
 
 #: src/fe-gtk/setup.c:1555
 msgid "Selected Text"
-msgstr ""
+msgstr "Označený text"
 
 #: src/fe-gtk/setup.c:1560
 msgid "Interface Colors"
@@ -6135,7 +6025,7 @@ msgstr "Zvýraznění:"
 
 #: src/fe-gtk/setup.c:1567
 msgid "Spell checker:"
-msgstr ""
+msgstr "Kontrolor pravopisu:"
 
 #: src/fe-gtk/setup.c:1569
 msgid "Color Stripping"
@@ -6171,7 +6061,7 @@ msgstr "Uživatelské rozhraní"
 
 #: src/fe-gtk/setup.c:1873
 msgid "Appearance"
-msgstr ""
+msgstr "Vzhled"
 
 #: src/fe-gtk/setup.c:1874
 msgid "Input box"
@@ -6195,7 +6085,7 @@ msgstr "Chatování"
 
 #: src/fe-gtk/setup.c:1882
 msgid "Sounds"
-msgstr ""
+msgstr "Zvuky"
 
 #: src/fe-gtk/setup.c:1884
 msgid "Advanced"
@@ -6211,7 +6101,7 @@ msgstr "Přenosy souboru"
 
 #: src/fe-gtk/setup.c:1889
 msgid "Identd"
-msgstr ""
+msgstr "Identd"
 
 #: src/fe-gtk/setup.c:2019
 msgid "Categories"
@@ -6221,13 +6111,10 @@ msgstr "Kategorie"
 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 ""
-"Strom není možné umístit nahoru nebo dospod!\n"
-"Změňte prosím nejprve rozložení <b>Záložek</b> v nabídce <b>Zobrazit</b>."
+msgstr "Strom není možné umístit nahoru nebo dospod!\nZměňte prosím nejprve rozložení <b>Záložek</b> v nabídce <b>Zobrazit</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
@@ -6240,11 +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 ""
-"*UPOZORNĚNÍ*\n"
-"Automatické přijmutí DCC do vašeho domovského adresáře\n"
-"může být nebezpečné a zneužitelné. Např.:\n"
-"Někdo vám může poslat soubor .bash_profile"
+msgstr "*UPOZORNĚNÍ*\nAutomatické přijmutí DCC do vašeho domovského adresáře\nmůže být nebezpečné a zneužitelné. Např.:\nNěkdo vám může poslat soubor .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6253,26 +6136,26 @@ msgstr "Nastavení - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
-msgstr ""
+msgstr "<i>(žádné návrhy)</i>"
 
 #: src/fe-gtk/sexy-spell-entry.c:585
 msgid "More..."
-msgstr ""
+msgstr "Více..."
 
 #. + Add to Dictionary
 #: src/fe-gtk/sexy-spell-entry.c:657
 #, c-format
 msgid "Add \"%s\" to Dictionary"
-msgstr ""
+msgstr "Přidat \"%s\" do slovníku"
 
 #. - Ignore All
 #: src/fe-gtk/sexy-spell-entry.c:702
 msgid "Ignore All"
-msgstr ""
+msgstr "Ignorovat všechny"
 
 #: src/fe-gtk/sexy-spell-entry.c:737
 msgid "Spelling Suggestions"
-msgstr ""
+msgstr "Návrhy oprav"
 
 #: src/fe-gtk/sexy-spell-entry.c:1310
 #, c-format
@@ -6310,7 +6193,7 @@ msgstr "Vyzkoušet všechny"
 
 #: src/fe-gtk/textgui.c:481
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
@@ -6358,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
@@ -6369,15 +6252,9 @@ msgstr ""
 #: plugins/sysinfo/sysinfo.c:239
 #, c-format
 msgid "%s plugin loaded\n"
-msgstr ""
+msgstr "%s plugin nahrán\n"
 
 #: plugins/sysinfo/sysinfo.c:247
 #, c-format
 msgid "%s plugin unloaded\n"
-msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
+msgstr "%s plugin odebrán\n"
diff --git a/po/da.po b/po/da.po
index af03ac6d..bfbab46a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Birger Langkjer <birger.langkjer@image.dk>, 1999
 # bviktor, 2012
 # bviktor, 2012
 # Daniel Nylander <po@danielnylander.se>, 2007-2008,2010
-# Dennis Skov Midjord <dennisskovhermannsen@gmail.com>, 2012-2013
-# Dennis Skov Midjord <dennisskovhermannsen@gmail.com>, 2014,2017
+# Incendia <dennisskovhermannsen@gmail.com>, 2012-2013
+# Incendia <dennisskovhermannsen@gmail.com>, 2014,2017
 # Henrik Hansen <hh@mailserver.dk>, 1999
 # Keld Simonsen, <keld2keldix.com>, 2011
 # Louis Tim Larsen <louis@louis.dk>, 2014
@@ -19,15 +19,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: 2018-03-07 02:52+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-11-27 22:25+0000\n"
 "Last-Translator: scootergrisen\n"
-"Language-Team: Danish (http://www.transifex.com/hexchat/hexchat/language/"
-"da/)\n"
-"Language: da\n"
+"Language-Team: Danish (http://www.transifex.com/hexchat/hexchat/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -39,26 +38,20 @@ msgstr "HexChat"
 #: data/misc/io.github.Hexchat.appdata.xml.in:9
 #: data/misc/io.github.Hexchat.desktop.in.in:4
 msgid "IRC Client"
-msgstr "IRC Klient"
+msgstr "IRC-klient"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:11
 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 er en IRC klient, der er nem at bruge, men som alligevel også kan "
-"udvides. Den tillader dig sikkert at forbinde til flere netværk og tale med "
-"brugere privat eller i kanaler ved brug af en tilpasselig grænseflade. Du "
-"kan endda overflytte filer."
+msgstr "HexChat er en IRC-klient, der er nem at bruge, men som alligevel også kan udvides. Den tillader dig sikkert at forbinde til flere netværk og tale med brugere privat eller i kanaler ved brug af en tilpasselig grænseflade. Du kan endda overføre filer."
 
 #: 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 understøtter funktioner som: DCC, SASL, proxyer, stavekontrol, "
-"underretninger, logning, tilpassede temaer og Python-/Perl-scripts."
+msgstr "HexChat understøtter funktioner som: DCC, SASL, proxyer, stavekontrol, underretninger, logning, tilpassede temaer og Python-/Perl-scripts."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -315,9 +308,7 @@ msgstr "Du har ikke skriveadgang til %s. Intet fra denne session kan gemmes."
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* At køre IRC som root er dumt! Du bør oprette\n"
-"  en almindelig bruger og bruge den til at logge ind.\n"
+msgstr "* At køre IRC som root er dumt! Du bør oprette\n  en almindelig bruger og bruge den til at logge ind.\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
@@ -442,9 +433,7 @@ msgstr "ADDBUTTON <navn> <handling>, tilføj en knap under brugerlisten"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NytNetværk> <nyserver/6667>, tilføjer et nyt netværk med en ny "
-"server til netværkslisten"
+msgstr "ADDSERVER <NytNetværk> <nyserver/6667>, tilføjer et nyt netværk med en ny server til netværkslisten"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -452,9 +441,7 @@ msgstr "ALLCHAN <kommando>, sender en kommando til alle de kanaler du er i"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <kommando>, sender en kommando til alle kanaler på den nuværende "
-"server"
+msgstr "ALLCHANL <kommando>, sender en kommando til alle kanaler på den nuværende server"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -473,10 +460,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 <maske> [<udelukkelsestype>], udelukker alle, der matcher masken, fra "
-"den aktuelle kanal. Hvis de allerede er på kanalen vil dette ikke sparke dem "
-"ud (kræver kanaloperatorstatus)"
+msgstr "BAN <maske> [<udelukkelsestype>], udelukker alle, der matcher masken, fra den aktuelle kanal. Hvis de allerede er på kanalen vil dette ikke sparke dem ud (kræver kanaloperatorstatus)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -484,46 +468,37 @@ msgstr "CHANOPT [-quiet] <variabel> [<værdi>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kodning>], hent eller sæt kodningen, der bruges til den nuværende "
-"forbindelse"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kodning>], hent eller sæt kodningen, der bruges til den nuværende forbindelse"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY[-]<mængde>], Rydder det aktive tekstvindue eller "
-"kommandohistorie"
+msgstr "CLEAR [ALL|HISTORY[-]<mængde>], Rydder det aktive tekstvindue eller kommandohistorie"
 
 #: 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 ""
-"CLOSE [-m], lukker den nuværende fane. Vinduet lukkes, hvis dette er den "
-"eneste åbne fane. Er \"-m\"-flaget angivet, lukkes alle anmodninger."
+msgstr "CLOSE [-m], lukker den nuværende fane. Vinduet lukkes, hvis dette er den eneste åbne fane. Er \"-m\"-flaget angivet, lukkes alle anmodninger."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <kode|jokertegn>, finder en landekode, eksempelvis: dk = danmark"
+msgstr "COUNTRY [-s] <kode|jokertegn>, finder en landekode, eksempelvis: dk = danmark"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <kaldenavn> <meddelelse>, sender CTCP-meddelelsen til kaldenavnet, "
-"typiske meddelelser er VERSION og USERINFO"
+msgstr "CTCP <kaldenavn> <meddelelse>, sender CTCP-meddelelsen til kaldenavnet, typiske meddelelser er VERSION og USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanal>], forlader aktuelle eller angiven kanal og deltager igen med "
-"det samme"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanal>], forlader aktuelle eller angiven kanal og deltager igen med det samme"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -536,26 +511,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 <kaldenavn>                     - acceptér en tilbudt fil\n"
-"DCC SEND [-maxcps=#] <kaldenavn> [fil]  - sender en fil til nogen\n"
-"DCC PSEND [-maxcps=#] <kaldenavn> [fil] - sender en fil ved at bruge passiv-"
-"tilstand\n"
-"DCC LIST                                - vis DCC-liste\n"
-"DCC CHAT <kaldenavn>                    - tilbyd DCC-CHAT til nogen\n"
-"DCC PCHAT <kaldenavn>                   - tilbyder DCC-CHAT ved at bruge "
-"passiv-tilstand\n"
-"DCC CLOSE <type> <kaldenavn> <fil>         eksempel:\n"
-"         /dcc close send johnhansen fil.tar.gz"
+msgstr "\nDCC GET <kaldenavn>                     - acceptér en tilbudt fil\nDCC SEND [-maxcps=#] <kaldenavn> [fil]  - sender en fil til nogen\nDCC PSEND [-maxcps=#] <kaldenavn> [fil] - sender en fil ved at bruge passiv-tilstand\nDCC LIST                                - vis DCC-liste\nDCC CHAT <kaldenavn>                    - tilbyd DCC-CHAT til nogen\nDCC PCHAT <kaldenavn>                   - tilbyder DCC-CHAT ved at bruge passiv-tilstand\nDCC CLOSE <type> <kaldenavn> <fil>         eksempel:\n         /dcc close send johnhansen fil.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 <kaldenavn>, fjerner halvkanaloperatørstatus fra kaldenavnet på den "
-"aktuelle kanal (kræver kanaloperatørstatus)"
+msgstr "DEHOP <kaldenavn>, fjerner halvkanaloperatørstatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørstatus)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -565,17 +527,13 @@ msgstr "DELBUTTON <navn>, fjerner en knap under brugerlisten"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <kaldenavn>, fjerner kanaloperatørsstatus fra kaldenavnet på den "
-"aktuelle kanal (kræver kanaloperatørsstatus)"
+msgstr "DEOP <kaldenavn>, fjerner kanaloperatørsstatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <kaldenavn>, fjerner stemmestatus fra kaldenavnet på den aktuelle "
-"kanal (kræver kanaloperatørsstatus)"
+msgstr "DEVOICE <kaldenavn>, fjerner stemmestatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -597,9 +555,7 @@ msgstr "ECHO <tekst>, udskriver tekst lokalt"
 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] <kommando>, kører kommandoen. Hvis flaget -o er brugt, sendes "
-"output til den aktuelle kanal, ellers skrives den ud i det aktuelle tekstfelt"
+msgstr "EXEC [-o] <kommando>, kører kommandoen. Hvis flaget -o er brugt, sendes output til den aktuelle kanal, ellers skrives den ud i det aktuelle tekstfelt"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -609,9 +565,7 @@ msgstr "EXECCONT, sender SIGCONT til processen"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], dræber en kørende eksekvering i den aktuelle session. Hvis -9 "
-"angives bliver processen SIGKILL'et"
+msgstr "EXECKILL [-9], dræber en kørende eksekvering i den aktuelle session. Hvis -9 angives bliver processen SIGKILL'et"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -631,8 +585,7 @@ msgstr "FLUSHQ, tømmer den aktuelle servers sendekø"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <vært> [<port>], tunnellerer via en vært, standardværdi på port er 23"
+msgstr "GATE <vært> [<port>], tunnellerer via en vært, standardværdi på port er 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -640,9 +593,7 @@ msgstr "GHOST <kaldenavn> [adgangskode], Dræber et kaldenavnsspøgelse"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <kaldenavn>, giver halvkanaloperatørsstatus til kaldenavn (kræver "
-"kanaloperatørsstatus)"
+msgstr "HOP <kaldenavn>, giver halvkanaloperatørsstatus til kaldenavn (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -655,20 +606,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 <maske> <typer..> <tilvalg..>\n"
-"    maske - værtsmaske, der skal ignoreres, eksempelvis: *!*@*.aol.com\n"
-"    typer - datatyper, der skal ignoreres, en eller alle af:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    alternativer - NOSAVE, QUIET"
+msgstr "IGNORE <maske> <typer..> <tilvalg..>\n    maske - værtsmaske, der skal ignoreres, eksempelvis: *!*@*.aol.com\n    typer - datatyper, der skal ignoreres, en eller alle af:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    alternativer - 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 <kaldenavn> [<kanal>], indbyder nogen til en kanal, "
-"standardalternativet er den aktuelle kanal (kræver kanaloperatørsstatus)"
+msgstr "INVITE <kaldenavn> [<kanal>], indbyder nogen til en kanal, standardalternativet er den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -677,17 +621,13 @@ msgstr "JOIN <kanal>, deltag i kanalen"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <kaldenavn> [begrundelse], sparker kaldenavn ud fra den aktuelle kanal "
-"(kræver kanaloperatørsstatus)"
+msgstr "KICK <kaldenavn> [begrundelse], sparker kaldenavn ud fra den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <kaldenavn> [begrundelse], udelukker og sparker derefter kaldenavn "
-"ud fra den aktuelle kanal (kræver kanaloperatørsstatus)"
+msgstr "KICKBAN <kaldenavn> [begrundelse], udelukker og sparker derefter kaldenavn ud fra den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -699,15 +639,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] [--] <streng>, søger efter en streng i bufferen\n"
-"    Brug -h for at fremhæve de(n) fundne streng(e)\n"
-"    Brug -m for at skelne mellem store og små bogstaver\n"
-"    Brug -r, når strengen er et regulært udtryk\n"
-"    Brug -- (dobbelt bindestreg), for at afslutte tilvalg, når du f.eks. "
-"søger efter strengen '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <streng>, søger efter en streng i bufferen\n    Brug -h for at fremhæve de(n) fundne streng(e)\n    Brug -m for at skelne mellem store og små bogstaver\n    Brug -r, når strengen er et regulært udtryk\n    Brug -- (dobbelt bindestreg), for at afslutte tilvalg, når du f.eks. søger efter strengen '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -716,50 +649,36 @@ msgstr "LOAD [-e] <fil>, indlæser et plugin eller et script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Masse-deop'er alle kanalhalvoperatører i den nuværende kanal (kræver "
-"kanaloperatørstatus)"
+msgstr "MDEHOP, Masse-deop'er alle kanalhalvoperatører i den nuværende kanal (kræver kanaloperatørstatus)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Masse-deop'er alle kanaloperatører i den nuværende kanal (kræver "
-"kanaloperatørstatus)"
+msgstr "MDEOP, Masse-deop'er alle kanaloperatører i den nuværende kanal (kræver kanaloperatørstatus)"
 
 #: 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 <handling>, sender handlingen til den nuværende kanal (handlinger er "
-"skrevet i tredjeperson, f.eks. /me hopper)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <handling>, sender handlingen til den nuværende kanal (handlinger er skrevet i tredjeperson, f.eks. /me hopper)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
-"MHOP, Masse-op'er alle brugere i den nuværende kanal (kræver "
-"kanaloperatørsstatus)"
+msgstr "MHOP, Masse-op'er alle brugere i den nuværende kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Massesparker alle undtagen dig selv ud af den aktuelle kanal (kræver "
-"kanaloperatørsstatus)"
+msgstr "MKICK, Massesparker alle undtagen dig selv ud af den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Masse-op'er alle brugere i den nuværende kanal (kræver "
-"kanaloperatørsstatus)"
+msgstr "MOP, Masse-op'er alle brugere i den nuværende kanal (kræver kanaloperatørsstatus)"
 
 #: 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"
-msgstr ""
-"MSG <kaldenavn> <meddelelse>, sender en privat meddelelse. Send \".\" for at "
-"skrive til sidste kaldenavn, eller præfiks med \"=\" for dcc-chat"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <kaldenavn> <meddelelse>, sender en privat meddelelse. Send \".\" for at skrive til sidste kaldenavn, eller præfiks med \"=\" for dcc-chat"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -785,22 +704,16 @@ msgstr "NOTICE <kaldenavn/kanal> <meddelelse>, sender en notits"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n netværk1[,netværk2,...]] [<kaldenavn>], viser din "
-"notifikationsliste eller tilføjet nogen til den"
+msgstr "NOTIFY [-n netværk1[,netværk2,...]] [<kaldenavn>], viser din notifikationsliste eller tilføjet nogen til den"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <kaldenavn>, giver kanaloperatørsstatus til kaldenavnet (kræver "
-"kanaloperatørsstatus)"
+msgstr "OP <kaldenavn>, giver kanaloperatørsstatus til kaldenavnet (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<begrundelse>], forlader kanalen, ved standard er det den "
-"nuværende kanal"
+msgstr "PART [<kanal>] [<begrundelse>], forlader kanalen, ved standard er det den nuværende kanal"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -810,17 +723,13 @@ msgstr "PING <kaldenavn | kanal>, CTCP pinger nick eller kanal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <kaldenavn> [meddelelse], åbner et nyt privat meddelelse-"
-"vindue til nogen og eventuelt sender en meddelelse"
+msgstr "QUERY [-nofocus] <kaldenavn> [meddelelse], åbner et nyt privat meddelelse-vindue til nogen og eventuelt sender en meddelelse"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <maske> [<stilletype>], sæt alle, der matcher masken, på stille i den "
-"aktuelle kanal, hvis serveren understøtter det."
+msgstr "QUIET <maske> [<stilletype>], sæt alle, der matcher masken, på stille i den aktuelle kanal, hvis serveren understøtter det."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -832,30 +741,23 @@ msgstr "QUOTE <tekst>, sender teksten i rå form til serveren"
 
 #: 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] [<vært>] [<port>] [<adgangskode>], kan kaldes blot som /"
-"RECONNECT for at genoprette forbindelse til den aktuelle server eller med /"
-"RECONNECT ALL for at genoprette forbindelse til alle de åbne servere"
+msgstr "RECONNECT [-ssl] [<vært>] [<port>] [<adgangskode>], kan kaldes blot som /RECONNECT for at genoprette forbindelse til den aktuelle server eller med /RECONNECT ALL for at genoprette forbindelse til alle de åbne servere"
 
 #: 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 [<vært>] [<port>] [<adgangskode>], kan kaldes blot som /RECONNECT "
-"for at genoprette forbindelse til den aktuelle server eller med /RECONNECT "
-"ALL for at genoprette forbindelse til alle de åbne servere"
+msgstr "RECONNECT [<vært>] [<port>] [<adgangskode>], kan kaldes blot som /RECONNECT for at genoprette forbindelse til den aktuelle server eller med /RECONNECT ALL for at genoprette forbindelse til alle de åbne servere"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <tekst>, send rådata til HexChat, som var den modtaget fra IRC-serveren"
+msgstr "RECV <tekst>, send rådata til HexChat, som var den modtaget fra IRC-serveren"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -871,32 +773,23 @@ msgstr "SEND <kaldenavn> [<fil>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <vært> <port> <kanal>, opretter forbindelse til og deltager "
-"i en kanal"
+msgstr "SERVCHAN [-ssl] <vært> <port> <kanal>, opretter forbindelse til og deltager i en kanal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <vært> <port> <kanal>, opretter forbindelse til og deltager i en "
-"kanal"
+msgstr "SERVCHAN <vært> <port> <kanal>, opretter forbindelse til og deltager i en kanal"
 
 #: 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] <vært> [<port>] [<adgangskode>], opretter forbindelse til en "
-"server. Standardporten er 6667 for normale forbindelser og 6697 for ssl-"
-"forbindelser"
+msgstr "SERVER [-ssl] <vært> [<port>] [<adgangskode>], opretter forbindelse til en server. Standardporten er 6667 for normale forbindelser og 6697 for ssl-forbindelser"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <vært> [<port>] [<adgangskode>], opretter forbindelse til en server. "
-"Standardporten er 6667"
+msgstr "SERVER <vært> [<port>] [<adgangskode>], opretter forbindelse til en server. Standardporten er 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -908,9 +801,7 @@ msgstr "SETCURSOR [-|+]<position>, genpositionerer markøren i inputboksen"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nyt navn>, skift navnet på et faneblad, tab_trunc-grænse gælder "
-"fortsat"
+msgstr "SETTAB <nyt navn>, skift navnet på et faneblad, tab_trunc-grænse gælder fortsat"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -918,10 +809,9 @@ msgstr "SETTEXT <ny tekst>, erstat teksten i inputboksen"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<emne>], sætter emne, hvis et bliver skrevet. Hvis ikke vises det "
-"nuværende emne"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<emne>], sætter emne, hvis et bliver skrevet. Hvis ikke vises det nuværende emne"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -931,13 +821,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> <fil1> [<fil2>] Blink bakke mellem to ikoner.\n"
-"TRAY -f <filnavn>                  Sæt bakke til et fast ikon.\n"
-"TRAY -i <nummer>                    Blink bakke med et internt ikon.\n"
-"TRAY -t <tekst>                      Sæt bakkens værktøjstip.\n"
-"TRAY -b <titel> <tekst>              Sæt bakkens ballon."
+msgstr "\nTRAY -f <timeout> <fil1> [<fil2>] Blink bakke mellem to ikoner.\nTRAY -f <filnavn>                  Sæt bakke til et fast ikon.\nTRAY -i <nummer>                    Blink bakke med et internt ikon.\nTRAY -t <tekst>                      Sæt bakkens værktøjstip.\nTRAY -b <titel> <tekst>              Sæt bakkens ballon."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -953,11 +837,9 @@ msgstr "UNLOAD <navn>, fjerner et plugin eller et script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <maske> [<maske>...], fjerner stille for de angivne masker, hvis "
-"serveren understøtter det."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <maske> [<maske>...], fjerner stille for de angivne masker, hvis serveren understøtter det."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -965,15 +847,13 @@ msgstr "URL <url>, åbner en URL i din browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <kaldenavn1> <kaldenavn2> osv., fremhæver kaldenavn(e) i "
-"kanalens brugerliste"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <kaldenavn1> <kaldenavn2> osv., fremhæver kaldenavn(e) i kanalens brugerliste"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <kaldenavn>, giver stemmestatus til nogen (kræver kanaloperatørsstatus)"
+msgstr "VOICE <kaldenavn>, giver stemmestatus til nogen (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -982,9 +862,7 @@ msgstr "WALLCHAN <meddelelse>, skriver meddelelsen til alle kanaler"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <meddelelse>, sender meddelelsen til alle kanaloperatører på den "
-"nuværende kanal"
+msgstr "WALLCHOP <meddelelse>, sender meddelelsen til alle kanaloperatører på den nuværende kanal"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1000,9 +878,7 @@ msgstr "Anvendelse: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Der er ingen hjælp til den kommando.\n"
+msgstr "\nDer er ingen hjælp til den kommando.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1071,9 +947,7 @@ msgstr "Er du sikker på, dette er en SSL-kompatibel server og port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Kan ikke oversætte værtsnavnet %s\n"
-"Tjek dine IP-indstillinger!\n"
+msgstr "Kan ikke oversætte værtsnavnet %s\nTjek dine IP-indstillinger!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1089,13 +963,11 @@ msgstr "Skifter til næste server i %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Advarsel: tegnsættet \"%s\" er ukendt. Ingen konvertering vil blive anvendt "
-"for netværket %s."
+msgstr "Advarsel: tegnsættet \"%s\" er ukendt. Ingen konvertering vil blive anvendt for netværket %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
-msgstr "%C18*%O$t%C18$1%O føjet til notifikationsliste."
+msgstr "%C18*%O$t%C18$1%O tilføjet til notifikationsliste."
 
 #: src/common/textevents.h:10
 msgid "%C22*%O$t%C22$1%O: %C18$2%O on %C24$4%O by %C26$3%O"
@@ -1250,9 +1122,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC-CHAT til %C18$1%O afbrudt."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC-CHAT-forbindelse etableret til %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 "%C24*%O$tDCC-CHAT-forbindelse etableret til %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1285,11 +1157,9 @@ msgstr "%C16,17 Type Til/fra Status Størrelse Pla Fil"
 
 #: 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"
-msgstr ""
-"%C20*%O$tModtog en forkert udformet DCC-anmodning fra %C18$1%O.$a010%C23*%O"
-"$tIndhold af pakke: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tModtog en forkert udformet DCC-anmodning fra %C18$1%O.$a010%C23*%O$tIndhold af pakke: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1306,13 +1176,12 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' til %C18$1%O afbrudt."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' fra %C18$3%O fuldført %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' fra %C18$3%O fuldført %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV-forbindelse etableret til %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 "%C24*%O$tDCC RECV-forbindelse etableret til %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1324,10 +1193,9 @@ msgstr "%C20*%O$tDCC RECV: Kan ikke åbne '%C23$1%C' til skrivning (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tFilen '%C24$1%C' findes allerede. Gemmer den i stedet som "
-"'%C23$2%O'."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tFilen '%C24$1%C' findes allerede. Gemmer den i stedet som '%C23$2%O'."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1340,13 +1208,12 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' til %C18$1%O afbrudt."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' til %C18$2%C fuldført %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' til %C18$2%C fuldført %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND-forbindelse etableret til %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 "%C24*%O$tDCC SEND-forbindelse etableret til %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1378,7 +1245,7 @@ msgstr "%C24*%O$tFandt din IP: %C30[%C24$1%C30]%O"
 
 #: src/common/textevents.h:232
 msgid "%O%C18$1%O added to ignore list."
-msgstr "%O%C18$1%O føjet til ignorerliste."
+msgstr "%O%C18$1%O tilføjet til ignorerliste."
 
 #: src/common/textevents.h:235
 msgid "%OIgnore on %C18$1%O changed."
@@ -1404,8 +1271,7 @@ msgstr "%OIgnorerliste er tom."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tKan ikke deltage i %C22$1%C (%C20kanalen er kun per invitation%O)"
+msgstr "%C20*%O$tKan ikke deltage i %C22$1%C (%C20kanalen er kun per invitation%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1443,9 +1309,7 @@ msgstr "%C23*%O$t%C28$1%C er fejlbehæftet. Prøver igen med %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tKaldenavn er fejlbehæftet eller allerede i brug. Brug /NICK for at "
-"prøve et andet."
+msgstr "%C20*%O$tKaldenavn er fejlbehæftet eller allerede i brug. Brug /NICK for at prøve et andet."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1582,9 +1446,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O passiv %C23$2%O, indlogning: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Rigtig vært: %C23$2%O, rigtig IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Rigtig vært: %C23$2%O, rigtig IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1629,9 +1491,7 @@ msgstr "**** BEGYNDER LOGNING KL. %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Kan ikke åbne logfil(er) til skrivning. Tjek\n"
-"tilladelserne på %s"
+msgstr "* Kan ikke åbne logfil(er) til skrivning. Tjek\ntilladelserne på %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -1946,7 +1806,7 @@ msgstr "Kanalen som den sættes på"
 
 #: src/common/text.c:1213
 msgid "Full name"
-msgstr "Fulde navn"
+msgstr "Fuldt navn"
 
 #: src/common/text.c:1218
 msgid "Channel Membership/\"is an IRC operator\""
@@ -2128,9 +1988,7 @@ msgstr "Udelukkelsestid"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Kan ikke læse lydfil:\n"
-"%s"
+msgstr "Kan ikke læse lydfil:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3489,18 +3347,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Kan ikke få adgang til fil: %s\n"
-"%s.\n"
-"Genoptagelse ikke mulig."
+msgstr "Kan ikke få adgang til fil: %s\n%s.\nGenoptagelse ikke mulig."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Filen i downloadmappen er større end filen som blev tilbudt. Genoptagelse "
-"ikke mulig."
+msgstr "Filen i downloadmappen er større end filen som blev tilbudt. Genoptagelse ikke mulig."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3646,10 +3499,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Kunne ikke åbne skrifttype:\n"
-"\n"
-"%s"
+msgstr "Kunne ikke åbne skrifttype:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3667,100 +3517,72 @@ msgstr "Sendekø for netværket: %d byte"
 
 #: 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 \\\\"
-msgstr ""
-"Kør kommando-handlingen kører dataene i data 1 som var det indtastet i "
-"indtastningsboksen hvor du trykkede tastesekvensen. Dermed kan den indeholde "
-"tekst (som vil blive sendt til kanalen/personen), kommandoer eller "
-"brugerkommandoer. Når det køres bruges, alle \\n-tegn i data 1 til at "
-"afgrænse kommandoer, så det er muligt at køre mere end én kommando. Hvis du "
-"vil have et \\ i teksten i tekstkørslen så indtast \\\\"
+"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 "Kør kommando-handlingen kører dataene i data 1 som var det indtastet i indtastningsboksen hvor du trykkede tastesekvensen. Dermed kan den indeholde tekst (som vil blive sendt til kanalen/personen), kommandoer eller brugerkommandoer. Når det køres bruges, alle \\n-tegn i data 1 til at afgrænse kommandoer, så det er muligt at køre mere end én kommando. Hvis du vil have et \\ i teksten i tekstkørslen så indtast \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Kommandoen Skift side skifter mellem sider i notesbogen. Sæt data 1 til "
-"siden som du vil skifte til. Hvis data 2 er sat til noget så vil skiftet "
-"være relativt til den aktuelle position. Sæt data 1 til auto for at skifte "
-"til siden med den seneste og vigtigste aktivitet (anmodninger først, så "
-"kanaler med fremhævning, kanaler med dialoger, kanaler med andre data)"
+msgstr "Kommandoen Skift side skifter mellem sider i notesbogen. Sæt data 1 til siden som du vil skifte til. Hvis data 2 er sat til noget så vil skiftet være relativt til den aktuelle position. Sæt data 1 til auto for at skifte til siden med den seneste og vigtigste aktivitet (anmodninger først, så kanaler med fremhævning, kanaler med dialoger, kanaler med andre data)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Kommandoen Indsæt i buffer vil indsætte indholdet af data 1 i feltet, hvor "
-"tastkombinationen tryktes ved nuværende markørposition"
+msgstr "Kommandoen Indsæt i buffer vil indsætte indholdet af data 1 i feltet, hvor tastkombinationen tryktes ved nuværende markørposition"
 
 #: 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."
-msgstr ""
-"Kommandoen Rul side ruller tekst-widget'en én side eller én linje op eller "
-"ned. Sæt data 1 til enten Top, Bottom, Up, Down, +1 eller -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 "Kommandoen Rul side ruller tekst-widget'en én side eller én linje op eller ned. Sæt data 1 til enten Top, Bottom, Up, Down, +1 eller -1."
 
 #: 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 ""
-"Kommandoen Sæt buffer sætter posten hvor nøglesekvensen blev indtastet til "
-"indholdet af data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Kommandoen Sæt buffer sætter posten hvor nøglesekvensen blev indtastet til indholdet af 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 ""
-"Kommandoen Seneste kommando gør at feltet indeholder den senest angivne "
-"kommando - samme som at trykke opadpil i skallen"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Kommandoen Seneste kommando gør at feltet indeholder den senest angivne kommando - samme som at trykke opadpil i skallen"
 
 #: 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 ""
-"Kommandoen Næste kommando gør at feltet indeholder næste kommando som blev "
-"angivet - samme som at trykke på ned i en skal"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Kommandoen Næste kommando gør at feltet indeholder næste kommando som blev angivet - samme som at trykke på ned i en skal"
 
 #: 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 ""
-"Denne kommando ændre teksten i posten til at færdiggøre et ufuldstændigt "
-"kaldenavn eller kommando. Hvis data 1 er sat, så vil dobbelttryk i en streng "
-"vælge det sidste kaldenavn, ikke det næste"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Denne kommando ændre teksten i posten til at færdiggøre et ufuldstændigt kaldenavn eller kommando. Hvis data 1 er sat, så vil dobbelttryk i en streng vælge det sidste kaldenavn, ikke det næste"
 
 #: 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 ""
-"Denne kommando ruller op og ned i listen over kaldenavne. Hvis data 1 er sat "
-"til noget som helst ruller det op, ellers ruller det ned"
+"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 "Denne kommando ruller op og ned i listen over kaldenavne. Hvis data 1 er sat til noget som helst ruller det op, ellers ruller det ned"
 
 #: 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 ""
-"Denne kommando kontrollerer det senest angivne ord i feltet op mod "
-"erstatningslisten og erstatter det hvis det finder en træffer"
+msgstr "Denne kommando kontrollerer det senest angivne ord i feltet op mod erstatningslisten og erstatter det hvis det finder en træffer"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3887,9 +3709,7 @@ msgstr "Forbindelse til %s færdig."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"Der er ikke indtastet nogen kanal (chatrum) i serverlistevinduet til "
-"automatisk deltagelse for dette netværk."
+msgstr "Der er ikke indtastet nogen kanal (chatrum) i serverlistevinduet til automatisk deltagelse for dette netværk."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3937,8 +3757,7 @@ msgstr "Intet emne er sat"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Denne server har stadig %d tilknyttede kanaler eller dialoger. Luk dem alle?"
+msgstr "Denne server har stadig %d tilknyttede kanaler eller dialoger. Luk dem alle?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -3959,7 +3778,7 @@ msgstr "Er du sikker på, at du vil afslutte?"
 
 #: src/fe-gtk/maingui.c:1207
 msgid "Some file transfers are still active."
-msgstr "En del filoverføringer er stadigvæk aktive."
+msgstr "En del filoverførsler er stadigvæk aktive."
 
 #: src/fe-gtk/maingui.c:1225
 msgid "_Minimize to Tray"
@@ -3995,7 +3814,7 @@ msgstr "Farverne 8-15"
 
 #: src/fe-gtk/maingui.c:1504
 msgid "_Settings"
-msgstr "Ops_ætning"
+msgstr "_Indstillinger"
 
 #: src/fe-gtk/maingui.c:1506
 msgid "_Log to Disk"
@@ -4169,9 +3988,7 @@ msgstr "%d kaldenavne valgt."
 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 ""
-"Menulinjen er skjult nu. Du kan vise den igen ved at trykke på Control+F9 "
-"eller højreklik på en tom del af det primære tekstområde."
+msgstr "Menulinjen er skjult nu. Du kan vise den igen ved at trykke på Control+F9 eller højreklik på en tom del af det primære tekstområde."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4229,8 +4046,7 @@ msgstr "Markeringslinje nulstillet manuelt."
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"Markeringslinje nulstillet pga. at tilbagerulningsgrænsen blev overskredet."
+msgstr "Markeringslinje nulstillet pga. at tilbagerulningsgrænsen blev overskredet."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
@@ -4268,25 +4084,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Brugerkommandoer - specielle koder:\n"
-"\n"
-"%c  =  aktuelle kanal\n"
-"%e  =  aktuelle netværksnavn\n"
-"%m  =  maskininfo\n"
-"%n  =  dit kaldenavn\n"
-"%t  =  klokkeslæt/dato\n"
-"%v  =  HexChat version\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 til slutningen af linjen\n"
-"&3  =  ord 3 til slutningen af linjen\n"
-"\n"
-"eksempelvis:\n"
-"/kommando john hej\n"
-"\n"
-"%2 vil være \"john\"\n"
-"&2 vil være \"john hej\"."
+msgstr "Brugerkommandoer - specielle koder:\n\n%c  =  aktuelle kanal\n%e  =  aktuelle netværksnavn\n%m  =  maskininfo\n%n  =  dit kaldenavn\n%t  =  klokkeslæt/dato\n%v  =  HexChat version\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til slutningen af linjen\n&3  =  ord 3 til slutningen af linjen\n\neksempelvis:\n/kommando john hej\n\n%2 vil være \"john\"\n&2 vil være \"john hej\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4301,18 +4099,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Brugerlisteknapper - specielle koder:\n"
-"\n"
-"%a  =  alle valgte kaldenavne\n"
-"%c  =  aktuelle kanal\n"
-"%e  =  aktuelle netværksnavn\n"
-"%h  =  valgte kaldenavns værtsnavn\n"
-"%m  =  maskininfo\n"
-"%n  =  dit kaldenavn\n"
-"%s  =  valgte kaldenavn\n"
-"%t  =  klokkeslæt/dato\n"
-"%u  =  valgte brugers konto"
+msgstr "Brugerlisteknapper - specielle koder:\n\n%a  =  alle valgte kaldenavne\n%c  =  aktuelle kanal\n%e  =  aktuelle netværksnavn\n%h  =  valgte kaldenavns værtsnavn\n%m  =  maskininfo\n%n  =  dit kaldenavn\n%s  =  valgte kaldenavn\n%t  =  klokkeslæt/dato\n%u  =  valgte brugers konto"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4327,18 +4114,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Dialogknapper - specielle koder:\n"
-"\n"
-"%a  =  alle valgte kaldenavne\n"
-"%c  =  aktuelle kanal\n"
-"%e  =  aktuelle netværksnavn\n"
-"%h  =  valgte kaldenavns værtsnavn\n"
-"%m  =  maskininfo\n"
-"%n  =  dit kaldenavn\n"
-"%s  =  valgte kaldenavn\n"
-"%t  =  klokkeslæt/dato\n"
-"%u  =  valgte brugers konto"
+msgstr "Dialogknapper - specielle koder:\n\n%a  =  alle valgte kaldenavne\n%c  =  aktuelle kanal\n%e  =  aktuelle netværksnavn\n%h  =  valgte kaldenavns værtsnavn\n%m  =  maskininfo\n%n  =  dit kaldenavn\n%s  =  valgte kaldenavn\n%t  =  klokkeslæt/dato\n%u  =  valgte brugers konto"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4354,19 +4130,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP-svar - specialkoder:\n"
-"\n"
-"%d  =  data (hele ctcp-kommandoen)\n"
-"%e  =  aktuelt netværksnavn\n"
-"%m  =  maskininformation\n"
-"%s  =  kaldenavnet som sendte ctcp-kommandoen\n"
-"%t  =  tid/dato\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 til slutningen på linjen\n"
-"&3  =  ord 3 til slutningen på linjen\n"
-"\n"
+msgstr "CTCP-svar - specialkoder:\n\n%d  =  data (hele ctcp-kommandoen)\n%e  =  aktuelt netværksnavn\n%m  =  maskininformation\n%s  =  kaldenavnet som sendte ctcp-kommandoen\n%t  =  tid/dato\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til slutningen på linjen\n&3  =  ord 3 til slutningen på linjen\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4378,14 +4142,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL-behandlere - specielle koder:\n"
-"\n"
-"%s  =  URL-strengen\n"
-"\n"
-"Et ! foran kommandoen\n"
-"indikerer at den skal sendes\n"
-"til en skal i stedet for HexChat"
+msgstr "URL-behandlere - specielle koder:\n\n%s  =  URL-strengen\n\nEt ! foran kommandoen\nindikerer at den skal sendes\ntil en skal i stedet for HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4546,7 +4303,7 @@ msgstr "_Brugermenu"
 #. 40
 #: src/fe-gtk/menu.c:1812
 msgid "S_ettings"
-msgstr "Ops_ætning"
+msgstr "_Indstillinger"
 
 #: src/fe-gtk/menu.c:1813 src/fe-gtk/plugin-tray.c:577
 msgid "_Preferences"
@@ -4914,9 +4671,7 @@ msgstr "Du skal have to unikke kaldenavne."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Måden hvorpå du identificerer dig overfor serveren. Brug connect-kommandoer "
-"for brugerdefinerede loginmetoder."
+msgstr "Måden hvorpå du identificerer dig overfor serveren. Brug connect-kommandoer for brugerdefinerede loginmetoder."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4941,11 +4696,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Kaldenavn\n"
-"%p=Adgangskode\n"
-"%r=Rigtige navn\n"
-"%u=Brugernavn"
+msgstr "%n=Kaldenavn\n%p=Adgangskode\n%r=Rigtige navn\n%u=Brugernavn"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5052,9 +4803,7 @@ msgstr "_Sortér"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Sorterer netværkslisten i alfabetisk rækkefølge. Brug tasterne Skift+Op og "
-"Skift+Ned for at flytte en række."
+msgstr "Sorterer netværkslisten i alfabetisk rækkefølge. Brug tasterne Skift+Op og Skift+Ned for at flytte en række."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5404,9 +5153,7 @@ msgstr "Ordbøger, der skal bruges:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Brug sprogkoder (som i \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
-"Adskil flere poster med kommaer."
+msgstr "Brug sprogkoder (som i \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nAdskil flere poster med kommaer."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5720,9 +5467,8 @@ msgid "Chat window"
 msgstr "Chatvindue"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Maksimale hastigheder for filoverførsler (byte pr. sekund)"
+msgstr "Maksimum hastigheder for filoverførsel (byte pr. sekund)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5776,17 +5522,13 @@ msgstr "Lav en biplyd ved:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Afspil systemlyden \"Instant Message Notification\" ved de valgte "
-"begivenheder"
+msgstr "Afspil systemlyden \"Instant Message Notification\" ved de valgte begivenheder"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Afspil \"message-new-instant\" fra freedesktop.org-lydtemaet ved de valgte "
-"begivenheder"
+msgstr "Afspil \"message-new-instant\" fra freedesktop.org-lydtemaet ved de valgte begivenheder"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5861,9 +5603,7 @@ msgstr "Kaldenavne som altid skal fremhæves:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separér flere ord med kommategn.\n"
-"Jokertegn accepteres."
+msgstr "Separér flere ord med kommategn.\nJokertegn accepteres."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5919,8 +5659,7 @@ msgstr "WHOIS ved notifikation"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Sender et /WHOIS, når en bruger fra din notifikationsliste kommer online."
+msgstr "Sender et /WHOIS, når en bruger fra din notifikationsliste kommer online."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5962,10 +5701,7 @@ msgstr "Kopiér automatisk den valgte tekst"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Kopiér den valgte tekst til udklipsholder, når der ikke længere trykkes på "
-"venstre museknap. Ellers vil Ctrl-Skift-C kopiere den valgte tekst til "
-"udklipsholderen."
+msgstr "Kopiér den valgte tekst til udklipsholder, når der ikke længere trykkes på venstre museknap. Ellers vil Ctrl-Skift-C kopiere den valgte tekst til udklipsholderen."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -5973,11 +5709,9 @@ msgstr "Inkluder automatisk tidsstempler"
 
 #: 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."
-msgstr ""
-"Inkluder automatisk tidsstempler i kopierede linjer af tekst. Ellers "
-"inkluder tidsstempler hvis Shift-tasten holdes nede ved valg."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Inkluder automatisk tidsstempler i kopierede linjer af tekst. Ellers inkluder tidsstempler hvis Shift-tasten holdes nede ved valg."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5985,11 +5719,9 @@ msgstr "Inkluder automatisk farve information"
 
 #: 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."
-msgstr ""
-"Inkluder automatisk farveinformation i kopierede linjer af tekst. Ellers "
-"inkluder farveinformation hvis Ctrl-tasten holdes nede ved valg."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Inkluder automatisk farveinformation i kopierede linjer af tekst. Ellers inkluder farveinformation hvis Ctrl-tasten holdes nede ved valg."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6019,9 +5751,7 @@ msgstr "Bruger servertid hvis det understøttes"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Vis tidsstempler hentet fra server hvis den understøtter time-server-"
-"udvidelsen."
+msgstr "Vis tidsstempler hentet fra server hvis den understøtter time-server-udvidelsen."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6041,10 +5771,9 @@ msgstr "Udelukkelsestype:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Prøv at bruge denne udelukkelsesmaske, når der udelukkes eller sættes på "
-"stille. (kræver irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Prøv at bruge denne udelukkelsesmaske, når der udelukkes eller sættes på stille. (kræver irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6105,11 +5834,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6153,11 +5882,9 @@ msgstr "Hent min IP-adresse fra IRC-serveren"
 
 #: 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 ""
-"Spørger IRC-serveren om din virkelige adresse. Brug dette, hvis du har en "
-"adresse af typen 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Spørger IRC-serveren om din virkelige adresse. Brug dette, hvis du har en adresse af typen 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6204,7 +5931,6 @@ msgid "Proxy Authentication"
 msgstr "Proxy-godkendelse"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
 msgstr "Brug godkendelse (kun HTTP eller SOCKS5)"
 
@@ -6228,9 +5954,7 @@ msgstr "Server vil svare med netværkenes brugernavn"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Du skal have tilladelser til at lytte til denne port. Hvis ikke 113 (0 "
-"bruger denne som standard) så skal du konfigurerer port-forwarding."
+msgstr "Du skal have tilladelser til at lytte til denne port. Hvis ikke 113 (0 bruger denne som standard) så skal du konfigurerer port-forwarding."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6392,22 +6116,15 @@ msgstr "Kategorier"
 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 ""
-"Du kan ikke placere træet i toppen eller i bunden!\n"
-"Skift venligst først til <b>Faneblade</b>-layout i <b>Vis</b>-menuen."
+msgstr "Du kan ikke placere træet i toppen eller i bunden!\nSkift venligst først til <b>Faneblade</b>-layout i <b>Vis</b>-menuen."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Tilvalget rigtige navn må ikke være tomt. Falder tilbage til \"rigtige navn"
-"\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Tilvalget rigtige navn må ikke være tomt. Falder tilbage til \"rigtige navn\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Nogle indstillinger som blev ændret kræver en genstart, før de træder i "
-"kraft."
+msgstr "Nogle indstillinger som blev ændret kræver en genstart, før de træder i kraft."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6415,11 +6132,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 ""
-"*ADVARSEL*\n"
-"At auto-acceptering af DCC til din hjemmemappe\n"
-"kan være farligt og kan udnyttes. Eksempelvis:\n"
-"Nogen kunne sende dig en .bash_profile"
+msgstr "*ADVARSEL*\nAt auto-acceptering af DCC til din hjemmemappe\nkan være farligt og kan udnyttes. Eksempelvis:\nNogen kunne sende dig en .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6438,7 +6151,7 @@ msgstr "Mere..."
 #: src/fe-gtk/sexy-spell-entry.c:657
 #, c-format
 msgid "Add \"%s\" to Dictionary"
-msgstr "Føj \"%s\" til ordbog"
+msgstr "Tilføj \"%s\" til ordbog"
 
 #. - Ignore All
 #: src/fe-gtk/sexy-spell-entry.c:702
@@ -6533,12 +6246,9 @@ msgstr "Sysinfo: %s er sat til: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: gyldige indstillinger er: announce eller hide_* for hver stykke "
-"information. F.eks. hide_os. Uden en værdi vil det vise aktuelle (eller "
-"standard) indstilling.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: gyldige indstillinger er: announce eller hide_* for hver stykke information. F.eks. hide_os. Uden en værdi vil det vise aktuelle (eller standard) indstilling.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6553,9 +6263,3 @@ msgstr "%s plugin indlæst\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s plugin fjernet\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/de.po b/po/de.po
index 1fcc7228..6ea54e8b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,42 +1,49 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # SSL <albkert@gmail.com>, 2013
 # Alf Gaida <agaida@siduction.org>, 2014
-# Wuzzy <almikes@aol.com>, 2015-2017
+# Wuzzy <almikes@aol.com>, 2015-2018
+# Aray <dataray@web.de>, 2014
 # Benedikt Roth <Benedikt.Roth@gmx.net>, 2000
 # Christian Meyer <linux@chrisim.de>, 2000
 # Aray <dataray@web.de>, 2014
+# evil_pro <evil_pro@live.at>, 2012-2013,2017
 # evil_pro <evil_pro@live.at>, 2013,2017
 # evil_pro <evil_pro@live.at>, 2012
 # Jakob Kramer <jakob.kramer@gmx.de>, 2012-2013
 # Karl Eichwalder <ke@gnu.franken.de>, 2003
 # Klaas <klaasdemter@googlemail.com>, 2013
+# Klaas <klaasdemter@googlemail.com>, 2013
 # RJ ., 2012
 # Marcel Metz <mmetz@adrian-broher.net>, 2013
 # Matthias Warkus <mawa@iname.com>, 1999
 # RJ ., 2014
 # Richard Schwab <mail@w.tf-w.tf>, 2013-2014
+# RJ ., 2012,2014
 # sfan5 <sfan5@ymail.com>, 2017
+# sfan5 <sfan5@ymail.com>, 2017
+# SSL <albkert@gmail.com>, 2013
+# Synchunk, 2015
 # Synchunk, 2015
 # Tamer Fahmy <e9526976@stud2.tuwien.ac.at>, 1999
+# TheX <xerus@live.de>, 2013
 # TingPing <tingping@tingping.se>, 2017-2018
 # TheX <xerus@live.de>, 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: 2018-03-09 00:18+0000\n"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: German (http://www.transifex.com/hexchat/hexchat/language/"
-"de/)\n"
-"Language: de\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-04-23 21:28+0000\n"
+"Last-Translator: Wuzzy <almikes@aol.com>\n"
+"Language-Team: German (http://www.transifex.com/hexchat/hexchat/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -55,19 +62,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 ""
-"HexChar ist ein einfach zu benutzender, aber dennoch erweiterbarer IRC-"
-"Client. Er erlaubt es, sicher mehreren Netzwerken beizutreten und sich "
-"mithilfe der anpassbaren Benutzerschnittstelle privat oder auch in Kanälen "
-"zu unterhalten. Sogar Dateiübertragungen sind möglich."
+msgstr "HexChar ist ein einfach zu benutzender, aber dennoch erweiterbarer IRC-Client. Er erlaubt es, sicher mehreren Netzwerken beizutreten und sich mithilfe der anpassbaren Benutzerschnittstelle privat oder auch in Kanälen zu unterhalten. Sogar Dateiübertragungen sind möglich."
 
 #: 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 unterstützt Features wie: DCC, SASL, Proxies, Rechtschreibprüfung, "
-"Benachrichtigungen, Logging, Benutzerdesigns und Python/Perl-Skripte"
+msgstr "HexChat unterstützt Features wie: DCC, SASL, Proxies, Rechtschreibprüfung, Benachrichtigungen, Logging, Benutzerdesigns und Python/Perl-Skripte"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -84,7 +85,7 @@ msgstr "IM;Chat;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -318,17 +319,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Sie haben keinen Schreibzugriff auf %s. Von dieser Sitzung kann nichts "
-"gespeichert werden."
+msgstr "Sie haben keinen Schreibzugriff auf %s. Von dieser Sitzung kann nichts gespeichert werden."
 
 #: 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 als Root laufen zu lassen ist dumm! Sie sollten\n"
-"  ein Benutzerkonto anlegen und dieses zum Einloggen verwenden.\n"
+msgstr "* IRC als Root laufen zu lassen ist dumm! Sie sollten\n  ein Benutzerkonto anlegen und dieses zum Einloggen verwenden.\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
@@ -350,9 +347,7 @@ msgstr "CTCP-Flut von %s, %s wird jetzt ignoriert\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Sie werden gerade von %s mit MSG-Nachrichten überhäuft. Die Einstellung "
-"gui_autoopen_dialog wird ausgeschaltet.\n"
+msgstr "Sie werden gerade von %s mit MSG-Nachrichten überhäuft. Die Einstellung gui_autoopen_dialog wird ausgeschaltet.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -449,40 +444,29 @@ msgstr "Dieses Plugin kann nicht entladen werden.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <Name> <Aktion>, fügt einen Knopf unter der Benutzerliste hinzu"
+msgstr "ADDBUTTON <Name> <Aktion>, fügt einen Knopf unter der Benutzerliste hinzu"
 
 #: src/common/outbound.c:3933
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NeuesNetzwerk> <NeuerServer/6667>, fügt der Netzwerkliste ein "
-"neues Netzwerk mit neuem Server hinzu"
+msgstr "ADDSERVER <NeuesNetzwerk> <NeuerServer/6667>, fügt der Netzwerkliste ein neues Netzwerk mit neuem Server hinzu"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <Befehl>, sendet einen Befehl an alle Channels, in denen Sie sich "
-"befinden"
+msgstr "ALLCHAN <Befehl>, sendet einen Befehl an alle Channels, in denen Sie sich befinden"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <Befehl>, sendet einen Befehl an alle Channels auf dem aktuellen "
-"Server"
+msgstr "ALLCHANL <Befehl>, sendet einen Befehl an alle Channels auf dem aktuellen Server"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <Befehl>, sendet einen Befehl an alle Server auf denen Sie sich "
-"befinden"
+msgstr "ALLSERV <Befehl>, sendet einen Befehl an alle Server auf denen Sie sich befinden"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<Grund>] kündigt Sie als abwesend an (benutzen Sie /BACK, um das "
-"rückgängig zu machen)"
+msgstr "AWAY [<Grund>] kündigt Sie als abwesend an (benutzen Sie /BACK, um das rückgängig zu machen)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -493,10 +477,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 <Maske> [<Banntyp>], bannt jeden mit der entsprechenden Maske aus dem "
-"aktuellen Channel. Wenn diese bereits im Channel sind, werden sie nicht "
-"gekickt (Erfordert Op-Status)"
+msgstr "BAN <Maske> [<Banntyp>], bannt jeden mit der entsprechenden Maske aus dem aktuellen Channel. Wenn diese bereits im Channel sind, werden sie nicht gekickt (Erfordert Op-Status)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -504,47 +485,37 @@ msgstr "CHANOPT [-quiet] <Variable> [<Wert>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<encoding>], hole oder setze die Codierung für die momentane "
-"Verbindung"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<encoding>], hole oder setze die Codierung für die momentane Verbindung"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY][-]<anzahl>, Leert das aktuelle Textfenster oder die "
-"Befehlschronik"
+msgstr "CLEAR [ALL|HISTORY][-]<anzahl>, Leert das aktuelle Textfenster oder die Befehlschronik"
 
 #: 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 ""
-"CLOSE [-m], Schließt den aktuellen Tab, welches das Fenster schließt, falls "
-"dies das einzige geöffnete Tab war, oder, mit dem „-m“-Flag, schließt es "
-"alle Dialogfenster."
+msgstr "CLOSE [-m], Schließt den aktuellen Tab, welches das Fenster schließt, falls dies das einzige geöffnete Tab war, oder, mit dem „-m“-Flag, schließt es alle Dialogfenster."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <Code|Wildcard>, findet einen Ländercode, z.B.: de = Deutschland"
+msgstr "COUNTRY [-s] <Code|Wildcard>, findet einen Ländercode, z.B.: de = Deutschland"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <Nick> <Nachricht>, sendet die CTCP-Nachricht an den Nick, übliche "
-"Nachrichten sind VERSION und USERINFO"
+msgstr "CTCP <Nick> <Nachricht>, sendet die CTCP-Nachricht an den Nick, übliche Nachrichten sind VERSION und USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<Channel>], verlässt den aktuellen oder angegebenen Channel und "
-"betritt ihn direkt wieder"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<Channel>], verlässt den aktuellen oder angegebenen Channel und betritt ihn direkt wieder"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -557,26 +528,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>                       - akzeptiere eine angebotene Datei\n"
-"DCC SEND [-maxcps=#] <Nick> [Datei]  - Sendet eine Datei an jemanden\n"
-"DCC PSEND [-maxcps=#] <Nick> [Datei] - Sendet eine Datei im passiven Modus "
-"an jemanden\n"
-"DCC LIST                             - zeigt die DCC-Liste\n"
-"DCC CHAT <Nick>                      - bietet jemandem einen DCC-CHAT an\n"
-"DCC PCHAT <Nick>                     - bietet jemandem einen DCC-CHAT im "
-"passiven Modus an\n"
-"DCC CLOSE <Typ> <Nick> <Datei>       - Schließt einen DCC-Transfer\n"
-"         Beispiel: /dcc close send markus datei.zip"
+msgstr "\nDCC GET <Nick>                       - akzeptiere eine angebotene Datei\nDCC SEND [-maxcps=#] <Nick> [Datei]  - Sendet eine Datei an jemanden\nDCC PSEND [-maxcps=#] <Nick> [Datei] - Sendet eine Datei im passiven Modus an jemanden\nDCC LIST                             - zeigt die DCC-Liste\nDCC CHAT <Nick>                      - bietet jemandem einen DCC-CHAT an\nDCC PCHAT <Nick>                     - bietet jemandem einen DCC-CHAT im passiven Modus an\nDCC CLOSE <Typ> <Nick> <Datei>       - Schließt einen DCC-Transfer\n         Beispiel: /dcc close send markus datei.zip"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <Nick>, entfernt den HalbOp-Status bei Nick im aktuellen Channel "
-"(Erfordert Op-Status)"
+msgstr "DEHOP <Nick>, entfernt den HalbOp-Status bei Nick im aktuellen Channel (Erfordert Op-Status)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -586,17 +544,13 @@ msgstr "DELBUTTON <Name>, entfernt einen Knopf unter der Benutzerliste"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <Nick>, entfernt den Op-Status bei Nick im aktuellen Channel (Erfordert "
-"Op-Status)"
+msgstr "DEOP <Nick>, entfernt den Op-Status bei Nick im aktuellen Channel (Erfordert Op-Status)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <Nick>, entfernt den Voice-Status bei Nick im aktuellen Channel "
-"(Erfordert Op-Status)"
+msgstr "DEVOICE <Nick>, entfernt den Voice-Status bei Nick im aktuellen Channel (Erfordert Op-Status)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -608,7 +562,7 @@ msgstr "DNS <Nick|Host|IP>, löst eine IP-Adresse oder einen Hostnamen auf"
 
 #: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
-msgstr ""
+msgstr "DOAT <Kanal,Liste,/Netzwerk> <Befehl>"
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
@@ -618,9 +572,7 @@ msgstr "ECHO <Text>, Zeigt Text lokal an"
 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] <Befehl>, führt den Befehl aus. Wenn -o angegeben wurde, wird die "
-"Ausgabe in das aktuelle Fenster gesendet, ansonsten wird sie lokal gezeigt"
+msgstr "EXEC [-o] <Befehl>, führt den Befehl aus. Wenn -o angegeben wurde, wird die Ausgabe in das aktuelle Fenster gesendet, ansonsten wird sie lokal gezeigt"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -630,9 +582,7 @@ msgstr "EXECCONT, sendet das Signal SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], killt einen laufenden exec in der aktuellen Sitzung. Wenn -9 "
-"angegeben wurde, wird der Prozess SIGKILLed"
+msgstr "EXECKILL [-9], killt einen laufenden exec in der aktuellen Sitzung. Wenn -9 angegeben wurde, wird der Prozess SIGKILLed"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -673,20 +623,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 <Maske> <Typen> <Optionen>\n"
-"    Maske    - Hostmaske, die zu ignorieren ist, z.B.: *!*@*.aol.com\n"
-"    Typen    - Datentypen, die zu ignorieren sind, einer oder alle von:\n"
-"               PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    Optionen - NOSAVE, QUIET"
+msgstr "IGNORE <Maske> <Typen> <Optionen>\n    Maske    - Hostmaske, die zu ignorieren ist, z.B.: *!*@*.aol.com\n    Typen    - Datentypen, die zu ignorieren sind, einer oder alle von:\n               PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    Optionen - 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>], lädt jemanden in einen Channel ein, standardmäßig "
-"den aktuellen (Erfordert Op-Status)"
+msgstr "INVITE <Nick> [<Channel>], lädt jemanden in einen Channel ein, standardmäßig den aktuellen (Erfordert Op-Status)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -695,16 +638,13 @@ msgstr "JOIN <Channel>, betritt einen Channel"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <Nick>, kickt den Nick aus dem aktuellen Channel (Erfordert Op-Status)"
+msgstr "KICK <Nick>, kickt den Nick aus dem aktuellen Channel (Erfordert Op-Status)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <Nick>, bannt den Nick und kickt ihn dann aus dem aktuellen Channel "
-"(Erfordert Op-Status)"
+msgstr "KICKBAN <Nick>, bannt den Nick und kickt ihn dann aus dem aktuellen Channel (Erfordert Op-Status)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -716,14 +656,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] [--] <Zeichenkette>, sucht nach einer Zeichenkette im "
-"buffer\\n Nutze -h um gefundene Zeichenkette(n) hervorzuheben\\n Nutze -m um "
-"Groß/Kleinschreibung zu beachten\\n Nutze -r when die Zeichenkette ein "
-"regulärer Ausdruck ist\\n Nutze -- (doppel minus) um Optionen abzuschließen "
-"um zB. nach der Zeichenkette '-r' zu suchen"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <Zeichenkette>, sucht nach einer Zeichenkette im buffer\\n Nutze -h um gefundene Zeichenkette(n) hervorzuheben\\n Nutze -m um Groß/Kleinschreibung zu beachten\\n Nutze -r when die Zeichenkette ein regulärer Ausdruck ist\\n Nutze -- (doppel minus) um Optionen abzuschließen um zB. nach der Zeichenkette '-r' zu suchen"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -732,43 +666,35 @@ msgstr "LOAD [-e] <Datei>, lädt ein Plugin oder ein Skript"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Nimmt allen HalbOps im aktuellen Channel den HalbOp-Status "
-"(Erfordert Op-Status)"
+msgstr "MDEHOP, Nimmt allen HalbOps im aktuellen Channel den HalbOp-Status (Erfordert Op-Status)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Nimmt allen Ops im aktuellen Channel den Op-Status (Erfordert Op-"
-"Status)"
+msgstr "MDEOP, Nimmt allen Ops im aktuellen Channel den Op-Status (Erfordert Op-Status)"
 
 #: 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 <Aktion>, sendet die Aktion in den aktuellen Channel (Aktionen werden in "
-"der 3. Person geschrieben, wie /me springt)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <Aktion>, sendet die Aktion in den aktuellen Channel (Aktionen werden in der 3. Person geschrieben, wie /me springt)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MHOP, nimmt einen Massen-Hop für alle Benutzer im aktuellen Kanal vor (erfordert Op-Status)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Kickt alle außer Ihnen im aktuellen Channel (erfordert Op-Status)"
+msgstr "MKICK, Kickt alle außer Ihnen im aktuellen Channel (erfordert Op-Status)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, gibt allen Benutzern im aktuellen Channel Op (Erfordert Op-Status)"
+msgstr "MOP, gibt allen Benutzern im aktuellen Channel Op (Erfordert Op-Status)"
 
 #: 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 "MSG <nick> <Nachricht>, sendet eine Privatnachricht"
 
 #: src/common/outbound.c:4054
@@ -781,9 +707,7 @@ msgstr "NCTCP <Nick> <Nachricht>, Sendet eine CTCP-Notiz"
 
 #: src/common/outbound.c:4057
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
-msgstr ""
-"NEWSERVER [-noconnect] <Hostname> [<Port>], verbindet mit einem Server in "
-"einem neuen Reiter"
+msgstr "NEWSERVER [-noconnect] <Hostname> [<Port>], verbindet mit einem Server in einem neuen Reiter"
 
 #: src/common/outbound.c:4058
 msgid "NICK <nickname>, sets your nick"
@@ -797,9 +721,7 @@ msgstr "NOTIZ <nick/channel> <message>, sendet eine Notiz"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], zeigt Ihre "
-"Benachrichtigungsliste oder fügt jemanden hinzu"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], zeigt Ihre Benachrichtigungsliste oder fügt jemanden hinzu"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -808,8 +730,7 @@ msgstr "OP <Nick>, gibt Nick Op-Status (Erfordert Op-Status)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<Channel>] [<Grund>], verlässt den Channel, standardmäßig den aktuellen"
+msgstr "PART [<Channel>] [<Grund>], verlässt den Channel, standardmäßig den aktuellen"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -819,17 +740,13 @@ msgstr "PING <Nick | Channel>, pingt den Nick oder Channel per CTCP an"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <Nick >, öffnet ein neues Dialogfenster [im Hintergrund] zu "
-"jemandem und sendet optional eine Nachricht."
+msgstr "QUERY [-nofocus] <Nick >, öffnet ein neues Dialogfenster [im Hintergrund] zu jemandem und sendet optional eine Nachricht."
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask>[<quiettype>], stellt jeden im aktuellen Kanal ruhig, der auf "
-"diese Maske passt, wenn der Server Ruhigstellen unterstützt."
+msgstr "QUIET <mask>[<quiettype>], stellt jeden im aktuellen Kanal ruhig, der auf diese Maske passt, wenn der Server Ruhigstellen unterstützt."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -841,31 +758,23 @@ msgstr "QUOTE <Text>, sendet den Text in Rohform an den Server"
 
 #: 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>] [<Passwort>], Kann einfach als /RECONNECT "
-"aufgerufen werden um sich mit dem aktuellen Server wiederzuverbinden, oder "
-"als /RECONNECT ALL um sich mit allen aktiven Servern wiederzuverbinden"
+msgstr "RECONNECT [-ssl] [<Host>] [<Port>] [<Passwort>], Kann einfach als /RECONNECT aufgerufen werden um sich mit dem aktuellen Server wiederzuverbinden, oder als /RECONNECT ALL um sich mit allen aktiven Servern wiederzuverbinden"
 
 #: 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>] [<Passwort>], Kann einfach als /RECONNECT "
-"aufgerufen werden um sich mit dem aktuellen Server wiederzuverbinden, oder "
-"als /RECONNECT ALL um sich mit allen aktiven Servern wiederzuverbinden"
+msgstr "RECONNECT [<Host>] [<Port>] [<Passwort>], Kann einfach als /RECONNECT aufgerufen werden um sich mit dem aktuellen Server wiederzuverbinden, oder als /RECONNECT ALL um sich mit allen aktiven Servern wiederzuverbinden"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <Text>, sendet Rohdaten an HexChat, als ob sie vom IRC-Server empfangen "
-"wurden"
+msgstr "RECV <Text>, sendet Rohdaten an HexChat, als ob sie vom IRC-Server empfangen wurden"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -881,8 +790,7 @@ msgstr "SEND <Nick> [<Datei>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <Host> <Port> <Channel>, verbindet und betritt einen Channel"
+msgstr "SERVCHAN [-ssl] <Host> <Port> <Channel>, verbindet und betritt einen Channel"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -892,18 +800,13 @@ msgstr "SERVCHAN <Host> <Port> <Channel>, verbindet und betritt einen Channel"
 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] <host> [<port>] [<password>], Verbindet zu einem Server, der "
-"standard Port ist 6667 für normale Verbindungen, und 6697 für ssl "
-"Verbindungen"
+msgstr "SERVER [-ssl] <host> [<port>] [<password>], Verbindet zu einem Server, der standard Port ist 6667 für normale Verbindungen, und 6697 für ssl Verbindungen"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <Host> [<Port>] [<Passwort>], verbindet mit einem Server, der "
-"Standard-Port ist 6667"
+msgstr "SERVER <Host> [<Port>] [<Passwort>], verbindet mit einem Server, der Standard-Port ist 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -911,15 +814,11 @@ msgstr "SET [-e] [-off|-on] [-quiet] <Variable> [<Wert>]"
 
 #: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
-"SETCURSOR [-|+]<Position>, ändert die Position des Cursors in der "
-"Eingabezeile"
+msgstr "SETCURSOR [-|+]<Position>, ändert die Position des Cursors in der Eingabezeile"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <neue Bezeichnung>, ändert die Bezeichnung eines Reiters, tab_trunc-"
-"Limit besteht weiterhin"
+msgstr "SETTAB <neue Bezeichnung>, ändert die Bezeichnung eines Reiters, tab_trunc-Limit besteht weiterhin"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -927,10 +826,9 @@ msgstr "SETTEXT <neuer Text>, Text in der Eingabezeile ersetzen"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<Thema>], setzt das Thema, wenn eins angegeben wurde, oder zeigt das "
-"aktuelle"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<Thema>], setzt das Thema, wenn eins angegeben wurde, oder zeigt das aktuelle"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -940,28 +838,15 @@ 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 <Zeitüberschreitung> <Datei1> [<Datei2>] Wechselt im "
-"Benachrichtigungsbereich zwischen zwei Symbolen.\n"
-"TRAY -f <Dateiname>                  Setzt Benachrichtigungssymbol auf ein "
-"festes Symbol.\n"
-"TRAY -i <Nummer>                    Blinkt im Benachrichtigungsbereich mit "
-"einem internen Symbol.\n"
-"TRAY -t <Text>                      Setzt den Tooltip für den "
-"Benachrichtigungsbereich.\n"
-"TRAY -b <Titel> <Text>              Setzt den Ballontext für den "
-"Benachrichtigungsbereich."
+msgstr "\nTRAY -f <Zeitüberschreitung> <Datei1> [<Datei2>] Wechselt im Benachrichtigungsbereich zwischen zwei Symbolen.\nTRAY -f <Dateiname>                  Setzt Benachrichtigungssymbol auf ein festes Symbol.\nTRAY -i <Nummer>                    Blinkt im Benachrichtigungsbereich mit einem internen Symbol.\nTRAY -t <Text>                      Setzt den Tooltip für den Benachrichtigungsbereich.\nTRAY -b <Titel> <Text>              Setzt den Ballontext für den Benachrichtigungsbereich."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <Maske> [<Maske>...], entfernt den Bann für eine spezielle Hostmaske"
+msgstr "UNBAN <Maske> [<Maske>...], entfernt den Bann für eine spezielle Hostmaske"
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
-msgstr ""
-"UNIGNORE <Maske> [QUIET], hört auf, die angegebene Hostmaske zu ignorieren"
+msgstr "UNIGNORE <Maske> [QUIET], hört auf, die angegebene Hostmaske zu ignorieren"
 
 #: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
@@ -969,11 +854,9 @@ msgstr "UNLOAD <Name>, entfernt ein Plugin oder Skript"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mask> [<mask>...], hebt eine Maske auf, die für automatische "
-"Ruhigstellung benutzt wird, wenn der Server es unterstützt."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mask> [<mask>...], hebt eine Maske auf, die für automatische Ruhigstellung benutzt wird, wenn der Server es unterstützt."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -981,10 +864,9 @@ msgstr "URL <url>, öffnet einen URL in Ihrem Browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <Nick1> <Nick2> ... <Nickn>, markiert Nick(s) in der "
-"Channel-Benutzerliste"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <Nick1> <Nick2> ... <Nickn>, markiert Nick(s) in der Channel-Benutzerliste"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -997,8 +879,7 @@ msgstr "WALLCHAN <Nachricht>, schreibt eine Nachricht in alle Channels"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <Nachricht>, sendet eine Nachricht an alle Ops im aktuellen Channel"
+msgstr "WALLCHOP <Nachricht>, sendet eine Nachricht an alle Ops im aktuellen Channel"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1014,9 +895,7 @@ msgstr "Benutzung: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Keine Hilfe für diesen Befehl verfügbar.\n"
+msgstr "\nKeine Hilfe für diesen Befehl verfügbar.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1069,7 +948,7 @@ msgstr "Keine Timer installiert.\n"
 #. 00000 00000000 0000000 abc
 #: src/common/plugin-timer.c:150
 msgid " Ref#  Seconds  Repeat  Command \n"
-msgstr ""
+msgstr " Ref# Sekund. Wieder Befehl  \n"
 
 #: src/common/plugin-timer.c:155
 #, c-format
@@ -1085,9 +964,7 @@ msgstr "Sind Sie sicher, dass dies ein SSL-fähiger Server und Port ist?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Kann Hostname %s nicht auflösen\n"
-"Prüfe Ihre IP-Einstellungen!\n"
+msgstr "Kann Hostname %s nicht auflösen\nPrüfe Ihre IP-Einstellungen!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1103,9 +980,7 @@ msgstr "Zum nächsten Server wird gesprungen in %s …\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Warnung: Zeichensatz »%s« ist unbekannt. Es wird keine Konvertierung für "
-"Netzwerk %s vorgenommen."
+msgstr "Warnung: Zeichensatz »%s« ist unbekannt. Es wird keine Konvertierung für Netzwerk %s vorgenommen."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1249,8 +1124,7 @@ msgstr "%C24*%O$tEin CTCP %C24$1%C von %C18$2%O wurde erhalten."
 
 #: src/common/textevents.h:130
 msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
-msgstr ""
-"%C24*%C$tEin CTCP %C24$1%C von %C18$2%C (nach %C22$3%C) wurde erhalten.%O"
+msgstr "%C24*%C$tEin CTCP %C24$1%C von %C18$2%C (nach %C22$3%C) wurde erhalten.%O"
 
 #: src/common/textevents.h:136
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
@@ -1265,9 +1139,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT mit %C18$1%O abgebrochen."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC-CHAT-Verbindung mit %C18$1%C %C30[%C24$2%C30]%O aufgebaut."
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC-CHAT-Verbindung mit %C18$1%C %C30[%C24$2%C30]%O aufgebaut."
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1287,9 +1161,7 @@ msgstr "%C24*%O$tEin CHAT an %C18$1%O wird bereits angeboten."
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
-"%C20*%O$tEin DCC-$1-Verbindungsversuch mit %C18$2%O ist "
-"gescheitert(%C20$3%O)."
+msgstr "%C20*%O$tEin DCC-$1-Verbindungsversuch mit %C18$2%O ist gescheitert(%C20$3%O)."
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1298,15 +1170,13 @@ msgstr "%C23*%O$t»%C23$1%C« von %C18$2%O empfangen."
 #: src/common/textevents.h:166
 #, c-format
 msgid "%C16,17 Type  To/From    Status  Size    Pos     File"
-msgstr ""
+msgstr "%C16,17 Typ   Zu/Von     Status  Größe   Pos     Datei"
 
 #: 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"
-msgstr ""
-"%C20*%O$tFehlformatierte DCC Anforderung von %C18$1%O.$a010%C23*%O$tInhalt "
-"des Pakets: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tFehlformatierte DCC Anforderung von %C18$1%O.$a010%C23*%O$tInhalt des Pakets: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1323,12 +1193,11 @@ msgstr "%C23*%O$tDCC RECV »%C23$2%O« nach %C18$1%O abgebrochen."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV »%C23$1%O« von %C18$3%O abgeschlossen %C30[%C24$4%O cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC RECV »%C23$1%O« von %C18$3%O abgeschlossen %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC-RECV-Verbindung mit %C18$1 aufgebaut %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1337,16 +1206,13 @@ msgstr "%C20*%O$tDCC RECV »%C23$1%O« von %C18$3%O fehlgeschlagen (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: »%C23$1%C« konnte zum Schreiben nicht geöffnet werden "
-"(%C20$2%O)."
+msgstr "%C20*%O$tDCC RECV: »%C23$1%C« konnte zum Schreiben nicht geöffnet werden (%C20$2%O)."
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tDie Datei »%C24$1%C« existiert bereits, sie wird stattdessen als "
-"»%C23$2%O« gespeichert."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tDie Datei »%C24$1%C« existiert bereits, sie wird stattdessen als »%C23$2%O« gespeichert."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1359,14 +1225,12 @@ msgstr "%C23*%O$tDCC SEND »%C23$2%C« nach %C18$1%O abgebrochen."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND »%C23$1%C« nach %C18$2%C abgeschlossen %C30[%C24$3%C cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC SEND »%C23$1%C« nach %C18$2%C abgeschlossen %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC-SEND-Verbindung mit %C18$1 hergestellt %C30[%O%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC-SEND-Verbindung mit %C18$1 hergestellt %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1378,14 +1242,11 @@ msgstr "%C24*%O$t%C18$1%C hat »%C23$2%C« (%C24$3%O Bytes) angeboten."
 
 #: src/common/textevents.h:214
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 »%C23$2%C« nach %C18$3%O steckt fest. Es wird abgebrochen."
+msgstr "%C20*%O$tDCC $1 »%C23$2%C« nach %C18$3%O steckt fest. Es wird abgebrochen."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tZeitüberschreitung: DCC $1 »%C23$2%C« nach %C18$3%O dauerte zu "
-"lange. Es wird abgebrochen."
+msgstr "%C20*%O$tZeitüberschreitung: DCC $1 »%C23$2%C« nach %C18$3%O dauerte zu lange. Es wird abgebrochen."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1410,12 +1271,12 @@ msgstr "%OIgnorierstatus auf %C18$1%O geändert."
 #: src/common/textevents.h:238
 #, c-format
 msgid "%C16,17"
-msgstr ""
+msgstr "%C16,17"
 
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
+msgstr "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1427,9 +1288,7 @@ msgstr "%ODie Ignorierliste ist leer."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Der Channel ist nur auf "
-"Einladung zu betreten%O)."
+msgstr "%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Der Channel ist nur auf Einladung zu betreten%O)."
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1442,9 +1301,7 @@ msgstr "%C23*$t$1 ($3%C23) ist beigetreten."
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
-"%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Erfordert Schlüsselwort"
-"%O)."
+msgstr "%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Erfordert Schlüsselwort%O)."
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
@@ -1460,8 +1317,7 @@ msgstr "%C29*%O$t%C29MOTD übersprungen%O"
 
 #: src/common/textevents.h:277
 msgid "%C23*%O$t%C28$1%C is already in use. Retrying with %C18$2%O..."
-msgstr ""
-"%C23*%O$t%C28$1%C wird bereits verwendet. Erneurter Versuch mit %C18$2%O …"
+msgstr "%C23*%O$t%C28$1%C wird bereits verwendet. Erneurter Versuch mit %C18$2%O …"
 
 #: src/common/textevents.h:280
 msgid "%C23*%O$t%C28$1%C is erroneous. Retrying with %C18$2%O..."
@@ -1470,9 +1326,7 @@ msgstr "%C23*%O$t%C28$1%C ist fehlerhaft. Erneuter Versuch mit %C18$2%O …"
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tDer Nickname ist fehlerhaft oder wird bereits verwendet. Benutzen "
-"Sie »/NICK«, um einen anderen auszuprobieren."
+msgstr "%C20*%O$tDer Nickname ist fehlerhaft oder wird bereits verwendet. Benutzen Sie »/NICK«, um einen anderen auszuprobieren."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1497,7 +1351,7 @@ msgstr "$tDie Benachrichtigungsliste ist leer."
 #: src/common/textevents.h:307
 #, c-format
 msgid "%C16,17  Notify List"
-msgstr ""
+msgstr "%C16,17  Benachrichtigungsliste"
 
 #: src/common/textevents.h:310
 msgid "%C23*%O$t%C23$1%O users in notify list."
@@ -1527,9 +1381,7 @@ msgstr "%C24*%O$tPing-Antwort von %C18$1%C: %C24$2%O Sekunde(n)"
 
 #: src/common/textevents.h:331
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr ""
-"%C20*%O$tKeine Ping-Antwort für %C24$1%O Sekunden. Die Verbindung wird "
-"getrennt."
+msgstr "%C20*%O$tKeine Ping-Antwort für %C24$1%O Sekunden. Die Verbindung wird getrennt."
 
 #: src/common/textevents.h:346
 msgid "%C24*%O$tA process is already running"
@@ -1566,8 +1418,7 @@ msgstr "%C29*%O$tSuche nach %C29$1%O"
 
 #: src/common/textevents.h:385
 msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
-msgstr ""
-"%C23*%O$tDer vorherige Verbindungsversucht wurde abgebrochen (%C24$1%O)."
+msgstr "%C23*%O$tDer vorherige Verbindungsversucht wurde abgebrochen (%C24$1%O)."
 
 #: src/common/textevents.h:388
 msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
@@ -1587,9 +1438,7 @@ msgstr "%C20*%O$tUnbekannter Host. Vielleicht haben Sie sich vertippt?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Benutzerobergrenze "
-"erreicht%O)."
+msgstr "%C20*%O$t%C22$1%C kann nicht beigetreten werden (%C20Benutzerobergrenze erreicht%O)."
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1614,9 +1463,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O untätig %C23$2%O, signon: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Wahrer Host: %C23$2%O, wahre IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Wahrer Host: %C23$2%O, wahre IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1624,8 +1471,7 @@ msgstr "%C19*%O$tSie sprechen jetzt in %C22$2%O"
 
 #: src/common/textevents.h:442
 msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
-msgstr ""
-"%C19*%O$tSie wurden aus %C22$2%C von %C26$3%O hinausgeworfen (%C20$4%O)."
+msgstr "%C19*%O$tSie wurden aus %C22$2%C von %C26$3%O hinausgeworfen (%C20$4%O)."
 
 #: src/common/textevents.h:445
 msgid "%C19*%O$tYou have left channel %C22$3%O"
@@ -2159,9 +2005,7 @@ msgstr "Bannzeit"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Kann diese Sounddatei nicht lesen:\n"
-"%s"
+msgstr "Kann diese Sounddatei nicht lesen:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3379,9 +3223,7 @@ msgstr "Sie müssen mindestens einen Bann auswählen"
 #: src/fe-gtk/banlist.c:568
 #, c-format
 msgid "Are you sure you want to remove all listed items in %s?"
-msgstr ""
-"Sind Sie sicher, dass Sie alle Einträge entfernen wollen, die in %s "
-"aufgelistet sind?"
+msgstr "Sind Sie sicher, dass Sie alle Einträge entfernen wollen, die in %s aufgelistet sind?"
 
 #: src/fe-gtk/banlist.c:726
 msgid "Type"
@@ -3401,14 +3243,12 @@ msgstr "Datum"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Sie können die Bannliste nur öffnen, während Sie sich in einem Channelreiter "
-"befinden."
+msgstr "Sie können die Bannliste nur öffnen, während Sie sich in einem Channelreiter befinden."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
 msgid "Ban List (%s) - %s"
-msgstr ""
+msgstr "Ban-Liste (%s) – %s"
 
 #: src/fe-gtk/banlist.c:843 src/fe-gtk/notifygui.c:429
 msgid "Remove"
@@ -3446,7 +3286,7 @@ msgstr "_Thementext kopieren"
 #: src/fe-gtk/chanlist.c:720
 #, c-format
 msgid "Channel List (%s) - %s"
-msgstr ""
+msgstr "Kanalliste (%s) – %s"
 
 #: src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3524,18 +3364,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Kann nicht auf die Datei %s zugreifen\n"
-"%s.\n"
-"Fortsetzen nicht möglich."
+msgstr "Kann nicht auf die Datei %s zugreifen\n%s.\nFortsetzen nicht möglich."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Datei im Downloadverzeichnis ist größer als die angebotene Datei. Fortsetzen "
-"nicht möglich."
+msgstr "Datei im Downloadverzeichnis ist größer als die angebotene Datei. Fortsetzen nicht möglich."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3544,7 +3379,7 @@ msgstr "Kann dieselbe Datei nicht von zwei Leuten fortsetzen."
 #: src/fe-gtk/dccgui.c:803
 #, c-format
 msgid "Uploads and Downloads - %s"
-msgstr "Uploads und Downloads - %s"
+msgstr "Uploads und Downloads – %s"
 
 #: src/fe-gtk/dccgui.c:820 src/fe-gtk/dccgui.c:1063 src/fe-gtk/notifygui.c:124
 msgid "Status"
@@ -3601,7 +3436,7 @@ msgstr "Verzeichnis öffnen …"
 #: src/fe-gtk/dccgui.c:1050
 #, c-format
 msgid "DCC Chat List - %s"
-msgstr "DCC Chatliste - %s"
+msgstr "DCC Chatliste – %s"
 
 #: src/fe-gtk/dccgui.c:1065
 msgid "Recv"
@@ -3665,8 +3500,7 @@ msgstr "URL oder Befehl in einem bestehenden HexChat öffnen bzw. ausführen"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Minimiert starten. STUFE 0=Normal 1=Minimiert 2=Im Benachrichtigungsbereich"
+msgstr "Minimiert starten. STUFE 0=Normal 1=Minimiert 2=Im Benachrichtigungsbereich"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3682,10 +3516,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Kann Schriftartdatei nicht öffnen:\n"
-"\n"
-"%s"
+msgstr "Kann Schriftartdatei nicht öffnen:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3703,99 +3534,72 @@ msgstr "Netzwerk-Sendewarteschlange: %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 \\\\"
-msgstr ""
-"Die Aktion Run Command führt die Daten in »Data 1« aus, als ob sie in die "
-"Eingabezeile eingegeben worden wären, in der die Tastenfolge gedrückt wurde. "
-"Daher kann »Data 1« Text, der in den Channel/Dialog gesendet wird, Befehle "
-"oder benutzerdefinierte Befehle enthalten. \\n trennt Befehle, so dass es "
-"möglich ist, mehrere Befehle auszuführen. Wenn Sie ein \\ im Text benötigen, "
-"geben Sie \\\\ ein."
+"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 "Die Aktion Run Command führt die Daten in »Data 1« aus, als ob sie in die Eingabezeile eingegeben worden wären, in der die Tastenfolge gedrückt wurde. Daher kann »Data 1« Text, der in den Channel/Dialog gesendet wird, Befehle oder benutzerdefinierte Befehle enthalten. \\n trennt Befehle, so dass es möglich ist, mehrere Befehle auszuführen. Wenn Sie ein \\ im Text benötigen, geben Sie \\\\ ein."
 
 #: 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 "
 "other data)"
-msgstr ""
-"Der »Seite ändern«-Befehl wechselt zwischen den Seiten im Notizblock. Setzen "
-"Sie »Data 1« auf die Seite, zu der Sie wechseln möchtesn. Wenn »Data 2« "
-"festgelegt wurde, wird der Wechsel relativ zur aktuellen Position erfolgen. "
-"Setzen Sie »Data 1«, um automatisch zu der Seite mit den neuesten und "
-"wichtigsten Aktivitäten (Privatchats zuerst, dann Kanäle mit Highlight, "
-"Kanäle mit Dialog, Kanäle mit anderen Daten) zu wechseln."
+msgstr "Der »Seite ändern«-Befehl wechselt zwischen den Seiten im Notizblock. Setzen Sie »Data 1« auf die Seite, zu der Sie wechseln möchtesn. Wenn »Data 2« festgelegt wurde, wird der Wechsel relativ zur aktuellen Position erfolgen. Setzen Sie »Data 1«, um automatisch zu der Seite mit den neuesten und wichtigsten Aktivitäten (Privatchats zuerst, dann Kanäle mit Highlight, Kanäle mit Dialog, Kanäle mit anderen Daten) zu wechseln."
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Die Aktion Insert in Buffer fügt den Inhalt von »Data 1«, in die Zeile der "
-"Historie, in dem die Tastenfolge gedrückt wurde, an der gegenwärtigen Cursor-"
-"Position ein."
+msgstr "Die Aktion Insert in Buffer fügt den Inhalt von »Data 1«, in die Zeile der Historie, in dem die Tastenfolge gedrückt wurde, an der gegenwärtigen Cursor-Position ein."
 
 #: 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."
-msgstr ""
-"Der Bildlauf-Befehl verschiebt das Text-Widget um eine Seite oder eine Zeile "
-"aufwärts oder abwärts. Setzen Sie »Data 1« entweder auf Anfang, Ende oder "
-"Auf, Ab um +1 oder -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 "Der Bildlauf-Befehl verschiebt das Text-Widget um eine Seite oder eine Zeile aufwärts oder abwärts. Setzen Sie »Data 1« entweder auf Anfang, Ende oder Auf, Ab um +1 oder -1."
 
 #: 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 ""
-"Die Aktion Set Buffer setzt die Zeile der Historie, in der die "
-"Tastenkombination gedrückt wurde, auf den Wert von »Data 1«."
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Die Aktion Set Buffer setzt die Zeile der Historie, in der die Tastenkombination gedrückt wurde, auf den Wert von »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"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
 msgstr "Die Aktion Last Command blättert eine Zeile in der Historie hoch."
 
 #: 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 "Die Aktion Next Command blättert eine Zeile in der Historie abwärts."
 
 #: 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 ""
-"Diese Aktion vervollständigt einen unvöllständigen Nick oder Befehl. Wenn "
-"»Data 1« gesetzt ist, springt 2× [Tab] auf die letzte, nicht die nächste "
-"Möglichkeit."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Diese Aktion vervollständigt einen unvöllständigen Nick oder Befehl. Wenn »Data 1« gesetzt ist, springt 2× [Tab] auf die letzte, nicht die nächste Möglichkeit."
 
 #: 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 ""
-"Diese Aktion blättert durch die Liste der Nicknamen. Wenn »Data 1« gesetzt "
-"ist, wird hochgeblättert, sonst runter. "
+"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 "Diese Aktion blättert durch die Liste der Nicknamen. Wenn »Data 1« gesetzt ist, wird hochgeblättert, sonst runter. "
 
 #: 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 ""
-"Diese Aktion vergleicht das zuletzt Eingegebene mit der Textersetzungsliste "
-"und ersetzt es, wenn sie eine Entsprechung findet."
+msgstr "Diese Aktion vergleicht das zuletzt Eingegebene mit der Textersetzungsliste und ersetzt es, wenn sie eine Entsprechung findet."
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3828,7 +3632,7 @@ msgstr "Markiere eine Zeile, für Hilfestellung über die jeweilige Aktion."
 #: src/fe-gtk/fkeys.c:812
 #, c-format
 msgid "Keyboard Shortcuts - %s"
-msgstr "Tastenkombinationen - %s"
+msgstr "Tastenkombinationen – %s"
 
 #: src/fe-gtk/gtkutil.c:130
 msgid "Cannot write to that file."
@@ -3865,9 +3669,7 @@ msgstr "Nicht mehr ignorieren"
 
 #: src/fe-gtk/ignoregui.c:293
 msgid "Are you sure you want to remove all ignores?"
-msgstr ""
-"Sind Sie sicher, dass alle Einträge in Ihrer Ignorierliste entfernt werden "
-"sollen?"
+msgstr "Sind Sie sicher, dass alle Einträge in Ihrer Ignorierliste entfernt werden sollen?"
 
 #: src/fe-gtk/ignoregui.c:303
 msgid "Enter mask to ignore:"
@@ -3876,7 +3678,7 @@ msgstr "Maske zum Ignorieren eingeben:"
 #: src/fe-gtk/ignoregui.c:350
 #, c-format
 msgid "Ignore list - %s"
-msgstr ""
+msgstr "Ignorierliste – %s"
 
 #: src/fe-gtk/ignoregui.c:360
 msgid "Ignore Stats:"
@@ -3913,7 +3715,7 @@ msgstr "Channelname zu kurz, bitte erneut versuchen."
 #: src/fe-gtk/joind.c:133
 #, c-format
 msgid "Connection Complete - %s"
-msgstr "Verbindung hergestellt - %s"
+msgstr "Verbindung hergestellt – %s"
 
 #: src/fe-gtk/joind.c:162
 #, c-format
@@ -3924,7 +3726,7 @@ msgstr "Verbindung zu %s fertiggestellt."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
+msgstr "Im Serverlistenfenster wurde kein Channel (Chatraum) eingegeben, der in diesem Netzwerk automatisch betreten werden soll."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3940,17 +3742,15 @@ msgstr "Diesen Channel _betreten"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Wenn Sie den Namen des Channels wissen, den Sie betreten willst, geben Sie "
-"ihn hier ein."
+msgstr "Wenn Sie den Namen des Channels wissen, den Sie betreten willst, geben Sie ihn hier ein."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "Kanalliste ö_ffnen."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "Die Abholung der Kanalliste könnte eine Minute oder zwei dauern."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3974,8 +3774,7 @@ msgstr "Kein Thema gesetzt"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Diesem Server sind noch %d Channels oder Dialoge zugeordnet. Alle schließen?"
+msgstr "Diesem Server sind noch %d Channels oder Dialoge zugeordnet. Alle schließen?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4128,8 +3927,7 @@ msgstr "Alle _hervorheben"
 
 #: src/fe-gtk/maingui.c:2920
 msgid "Highlight all occurrences, and underline the current occurrence."
-msgstr ""
-"Hebe alle Vorkommnisse hervor und unterstreiche das aktuelle Vorkommnis."
+msgstr "Hebe alle Vorkommnisse hervor und unterstreiche das aktuelle Vorkommnis."
 
 #: src/fe-gtk/maingui.c:2922
 msgid "Mat_ch case"
@@ -4207,9 +4005,7 @@ msgstr "%d Nicks ausgewählt."
 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 ""
-"Die Menüzeile ist jetzt versteckt. Sie können sie durch Druck auf F9 oder "
-"Rechtsklick in einem freien Bereich des Textfeldes wieder sichtbar machen."
+msgstr "Die Menüzeile ist jetzt versteckt. Sie können sie durch Druck auf F9 oder Rechtsklick in einem freien Bereich des Textfeldes wieder sichtbar machen."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4246,7 +4042,7 @@ msgstr "_Automatisches Verbinden"
 #: src/fe-gtk/menu.c:1138
 #, c-format
 msgid "User menu - %s"
-msgstr ": Benutzermenü - %s"
+msgstr "Benutzermenü – %s"
 
 #. sep
 #: src/fe-gtk/menu.c:1147
@@ -4267,9 +4063,7 @@ msgstr "Markierungslinie manuell zurücksetzen"
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"Markierungslinie wurde zurückgesetzt, weil die Begrenzung des Scrollbalkens "
-"überschritten wurde."
+msgstr "Markierungslinie wurde zurückgesetzt, weil die Begrenzung des Scrollbalkens überschritten wurde."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
@@ -4281,7 +4075,7 @@ msgstr "Status der Markierungslinie unbekannt."
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
-msgstr ""
+msgstr "Kanalliste abholen"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
@@ -4307,25 +4101,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Benutzerbefehle - Spezielle Codes:\n"
-"\n"
-"%c  =  aktueller Channel\n"
-"%e = aktuelles Netzwerk\n"
-"%m  =  Computerinfo\n"
-"%n  =  Ihr Nick\n"
-"%t  =  Zeit/Datum\n"
-"%v  =  HexChat-Version\n"
-"%2  =  Wort 2\n"
-"%3  =  Wort 3\n"
-"&2  =  Wort 2 bis zum Ende der Zeile\n"
-"&3  =  Wort 3 bis zum Ende der Zeile\n"
-"\n"
-"z.B.:\n"
-"/cmd john hallo\n"
-"\n"
-"%2 wäre \"john\"\n"
-"&2 wäre \"john hallo\"."
+msgstr "Benutzerbefehle - Spezielle Codes:\n\n%c  =  aktueller Channel\n%e = aktuelles Netzwerk\n%m  =  Computerinfo\n%n  =  Ihr Nick\n%t  =  Zeit/Datum\n%v  =  HexChat-Version\n%2  =  Wort 2\n%3  =  Wort 3\n&2  =  Wort 2 bis zum Ende der Zeile\n&3  =  Wort 3 bis zum Ende der Zeile\n\nz.B.:\n/cmd john hallo\n\n%2 wäre \"john\"\n&2 wäre \"john hallo\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4340,18 +4116,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Benutzerlisten-Knöpfe – Spezielle Codes:\n"
-"\n"
-"%a  =  alle ausgewählten Nicks\n"
-"%c  =  aktueller Channel\n"
-"%e = aktuelles Netzwerk\n"
-"%h  =  die Hostmaske des ausgewählten Nicks\n"
-"%m  =  Computerinfo\n"
-"%n  =  Ihr Nick\n"
-"%s  =  ausgewählter Nick\n"
-"%t  =  Zeit/Datum\n"
-"%u = ausgewähltes Benutzerkonto"
+msgstr "Benutzerlisten-Knöpfe – Spezielle Codes:\n\n%a  =  alle ausgewählten Nicks\n%c  =  aktueller Channel\n%e = aktuelles Netzwerk\n%h  =  die Hostmaske des ausgewählten Nicks\n%m  =  Computerinfo\n%n  =  Ihr Nick\n%s  =  ausgewählter Nick\n%t  =  Zeit/Datum\n%u = ausgewähltes Benutzerkonto"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4366,18 +4131,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Dialog-Knöpfe – Spezielle Codes:\n"
-"\n"
-"%a  =  alle ausgewählten Nicks\n"
-"%c  =  aktueller Channel\n"
-"%e = aktuelles Netzwerk\n"
-"%h  =  die Hostmaske des ausgewählten Nicks\n"
-"%m  =  Computerinfo\n"
-"%n  =  Ihr Nick\n"
-"%s  =  ausgewählter Nick\n"
-"%t  =  Zeit/Datum\n"
-"%u = ausgewähltes Benutzerkonto"
+msgstr "Dialog-Knöpfe – Spezielle Codes:\n\n%a  =  alle ausgewählten Nicks\n%c  =  aktueller Channel\n%e = aktuelles Netzwerk\n%h  =  die Hostmaske des ausgewählten Nicks\n%m  =  Computerinfo\n%n  =  Ihr Nick\n%s  =  ausgewählter Nick\n%t  =  Zeit/Datum\n%u = ausgewähltes Benutzerkonto"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4393,19 +4147,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP-Antworten - Spezielle Codes:\n"
-"\n"
-"%d  =  Daten (Der gesamte CTCP)\n"
-"%e = aktuelles Netzwerk\n"
-"%m  =  Computerinfo\n"
-"%s  =  Der Nick des Absenders\n"
-"%t  =  Zeit/Datum\n"
-"%2  =  Wort 2\n"
-"%3  =  Wort 3\n"
-"&2  =  Wort 2 bis zum Ende der Zeile\n"
-"&3  =  Wort 3 bis zum Ende der Zeile\n"
-"\n"
+msgstr "CTCP-Antworten - Spezielle Codes:\n\n%d  =  Daten (Der gesamte CTCP)\n%e = aktuelles Netzwerk\n%m  =  Computerinfo\n%s  =  Der Nick des Absenders\n%t  =  Zeit/Datum\n%2  =  Wort 2\n%3  =  Wort 3\n&2  =  Wort 2 bis zum Ende der Zeile\n&3  =  Wort 3 bis zum Ende der Zeile\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4417,24 +4159,17 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Befehle für URLs - Spezielle Codes:\n"
-"\n"
-"%s  =  die URL\n"
-"\n"
-"Ein »!« am Anfang des Befehls sagt\n"
-"aus, dass der Befehl in der Shell\n"
-"statt in HexChat ausgeführt wird"
+msgstr "Befehle für URLs - Spezielle Codes:\n\n%s  =  die URL\n\nEin »!« am Anfang des Befehls sagt\naus, dass der Befehl in der Shell\nstatt in HexChat ausgeführt wird"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
 msgid "User Defined Commands - %s"
-msgstr ""
+msgstr "Benutzerdefinierte Befehle – %s"
 
 #: src/fe-gtk/menu.c:1538
 #, c-format
 msgid "Userlist Popup menu -  %s"
-msgstr ""
+msgstr "Benutzerlisten-Popup-Menü – %s"
 
 #: src/fe-gtk/menu.c:1546
 #, c-format
@@ -4448,7 +4183,7 @@ msgstr "Ersetzen durch"
 #: src/fe-gtk/menu.c:1554
 #, c-format
 msgid "URL Handlers - %s"
-msgstr ""
+msgstr "URL-Handler – %s"
 
 #: src/fe-gtk/menu.c:1574
 #, c-format
@@ -4458,12 +4193,12 @@ msgstr "Benutzerlistenknöpfe - %s"
 #: src/fe-gtk/menu.c:1582
 #, c-format
 msgid "Dialog buttons - %s"
-msgstr ""
+msgstr "Dialog-Buttons – %s"
 
 #: src/fe-gtk/menu.c:1591
 #, c-format
 msgid "CTCP Replies - %s"
-msgstr ""
+msgstr "CTCP-Antworten – %s"
 
 #: src/fe-gtk/menu.c:1757
 msgid "He_xChat"
@@ -4471,7 +4206,7 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "Netzwerkli_ste"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4479,23 +4214,23 @@ msgstr "_Neu"
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr ""
+msgstr "Server-Registerkarte"
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr ""
+msgstr "Kanal-Registerkarte"
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr ""
+msgstr "Serverfenster"
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr ""
+msgstr "Kanalfenster"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr ""
+msgstr "Plugin oder Skript _laden"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4520,7 +4255,7 @@ msgstr "Ben_utzerliste"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr ""
+msgstr "Benutzerli_sten-Buttons"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4568,11 +4303,11 @@ msgstr "_Wiederverbinden"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr ""
+msgstr "Einem Kanal _beitreten"
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr ""
+msgstr "Kanal_liste"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
@@ -4593,39 +4328,39 @@ msgstr "_Optionen"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr ""
+msgstr "Auto-Ersetzen"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "CTCP-Antworten"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "Dialog-Buttons"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Tastenkürzel"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "Textereignisse"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "URL-Handler"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "Benutzerbefehle"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "Benutzerlisten-Buttons"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
-msgstr ""
+msgstr "Benutzerlisten-Popup"
 
 #. 52
 #: src/fe-gtk/menu.c:1825
@@ -4634,36 +4369,36 @@ msgstr "_Fenster"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "_Ban-Liste"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "Direct Chat"
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "Dateiüber_tragungen"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
-msgstr ""
+msgstr "Freundesliste"
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "Ignorierliste"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "_Plugins und Skripte"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Rohprotokoll"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "_URL-Sammler"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
@@ -4683,7 +4418,7 @@ msgstr "Text _löschen"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr ""
+msgstr "Test speichern"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4691,7 +4426,7 @@ msgstr "Suche"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr ""
+msgstr "Text suchen"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
@@ -4767,7 +4502,7 @@ msgstr "Eine kommagetrennte Liste von Netzen wird akzeptiert"
 #: src/fe-gtk/notifygui.c:409
 #, c-format
 msgid "Friends List - %s"
-msgstr ""
+msgstr "Freundesliste – %s"
 
 #: src/fe-gtk/notifygui.c:433
 msgid "Open Dialog"
@@ -4806,7 +4541,7 @@ msgstr ": Private Nachricht von: %s (%s)"
 #: src/fe-gtk/plugin-tray.c:177
 #, c-format
 msgid "Connected to %u networks and %u channels - %s"
-msgstr ""
+msgstr "Verbunden mit %u Netzwerken und %u Kanälen – %s"
 
 #: src/fe-gtk/plugin-tray.c:549
 msgid "_Restore Window"
@@ -4848,42 +4583,42 @@ msgstr "_Zurück"
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
-msgstr ""
+msgstr "Hervorgehobene Nachricht von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:637
 #, c-format
 msgid "%u highlighted messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u hervorgehobene Nachrichten, neueste von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
-msgstr ""
+msgstr "Kanalnachricht von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
-msgstr ""
+msgstr "%u Kanalnachricht. – %s"
 
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr ""
+msgstr "Private Mitteilung von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u private Mitteilungen, neueste von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
-msgstr ""
+msgstr "Dateiangebot von: %s (%s) – %s"
 
 #: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u Dateiangebote, neuestes von: %s (%s) – %s"
 
 #: src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4900,7 +4635,7 @@ msgstr "Wählen Sie ein Plugin oder Skript zum Laden"
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr ""
+msgstr "Plugins und Skripte – %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4922,7 +4657,7 @@ msgstr "Speichern als …"
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "Rohprotokoll (%s) – %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4953,14 +4688,12 @@ msgstr "Sie benötigen zwei einzigartige Nicknamen."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Die Art, wie Sie sich auf dem Server identifizieren. Für spezielle Login-"
-"Methoden, benutzen sie das Autoperform."
+msgstr "Die Art, wie Sie sich auf dem Server identifizieren. Für spezielle Login-Methoden, benutzen sie das Autoperform."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
 msgid "Edit %s - %s"
-msgstr ""
+msgstr "%s bearbeiten – %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4980,11 +4713,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Spitzname\n"
-"%p=Passwort\n"
-"%r=Wahrer Name\n"
-"%u=Benutzername"
+msgstr "%n=Spitzname\n%p=Passwort\n%r=Wahrer Name\n%u=Benutzername"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5057,7 +4786,7 @@ msgstr "Zeichensatz:"
 #: src/fe-gtk/servlistgui.c:1977
 #, c-format
 msgid "Network List - %s"
-msgstr ""
+msgstr "Netzwerkliste – %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
@@ -5091,7 +4820,7 @@ msgstr "_Sortieren"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "Sortiert die Netzwerkliste in alphabetischer Reihenfolge. Benutze Umschalt+Oben und Umschalt+Unten, um eine Zeile weiterzugehen."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5367,19 +5096,19 @@ msgstr "Transparenzseinstellungen"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "Fensterundurchsichtigkeit:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "Zeitstempel"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "Zeitstempel aktivieren"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "Zeitstempelformat:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5415,7 +5144,7 @@ msgstr "Eingabefeld"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "Textfeld-Schrift und -farben benutzen"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5441,9 +5170,7 @@ msgstr "Zu benutzende Wörterbücher:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Sprachcodes (wie in »%LOCALAPPDATA%\\enchant\\myspell\\dicts«) benutzen.\n"
-"Trennen Sie mehrere Einträge durch Kommata."
+msgstr "Sprachcodes (wie in »%LOCALAPPDATA%\\enchant\\myspell\\dicts«) benutzen.\nTrennen Sie mehrere Einträge durch Kommata."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5479,11 +5206,11 @@ msgstr "Grafisch"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Z, Ops zuerst"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Z-A, Ops zuletzt"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5495,19 +5222,19 @@ msgstr "Unsortiert"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "Links (oben)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "Links (unten)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "Rechts (oben)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "Rechts (unten)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5567,7 +5294,7 @@ msgstr "Abwesenheitsverfolgung"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "Den Abwesenheitsstatus von Benutzern verfolgen und sie in einer anderen Farbe anzeigen"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5758,7 +5485,7 @@ msgstr "Chatfenster"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "Maximale Dateiübertragungsgeschwindigkeiten (Byte pro Sekunde)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5812,17 +5539,13 @@ msgstr "Piepsen bei:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Den Sofortnachrichtenbenachrichtigungssystemton bei folgenden Ereignissen "
-"abspielen:"
+msgstr "Den Sofortnachrichtenbenachrichtigungssystemton bei folgenden Ereignissen abspielen:"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Den »message-new-instant«-Ton aus dem freedesktop.org-Soundthema bei "
-"ausgewählten Ereignissen abspielen"
+msgstr "Den »message-new-instant«-Ton aus dem freedesktop.org-Soundthema bei ausgewählten Ereignissen abspielen"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5860,8 +5583,7 @@ msgstr "Automatisch als abwesend/zurück markieren"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically change status when hiding to tray."
-msgstr ""
-"Status automatisch wechseln, wenn das Programm in den Tray geschlossen wird."
+msgstr "Status automatisch wechseln, wenn das Programm in den Tray geschlossen wird."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
@@ -5876,9 +5598,7 @@ msgstr "Hervorgehobene Nachrichten"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Hervorgehobene Nachrichten sind solche, in denen der eigene Nick fällt, aber "
-"auch:"
+msgstr "Hervorgehobene Nachrichten sind solche, in denen der eigene Nick fällt, aber auch:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5900,9 +5620,7 @@ msgstr "Immer hervorzuhebende Nicks:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Mehrere Wörter durch Kommata trennen.\n"
-"Wildcards werden unterstützt."
+msgstr "Mehrere Wörter durch Kommata trennen.\nWildcards werden unterstützt."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -6000,17 +5718,17 @@ msgstr "Ausgewählten Text automatisch kopieren"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Gewählten Text in die Zwischenablage kopieren, wenn die linke Maustaste losgelassen wird. Ansonsten wird Strg+Umschalt+C den ausgewählten Text in die Zwischenablage kopieren."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+msgstr "Zeitstempel automatisch einbinden"
 
 #: 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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Automatisch Zeitstempel in den kopierten Textzeilen einbinden. Ansonsten werden Zeitstempel eingebunden, wenn die Umschalttaste während der Auswahl gedrückt gehalten wird."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -6018,9 +5736,9 @@ msgstr "Automatisch Farbinformationen mitkopieren"
 
 #: 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Automatisch Farbinformationen im ausgewählten Text mitkopieren. Sonst werden Farbinformationen kopiert, wenn die Strg-Taste beim Auswählen gedrückt gehalten wird."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6032,8 +5750,7 @@ msgstr "Alternative Schriftarten:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr ""
-"Mehre Einträge mit Kommata trennen (keine Leerzeichen davor oder dahinter)."
+msgstr "Mehre Einträge mit Kommata trennen (keine Leerzeichen davor oder dahinter)."
 
 #: src/fe-gtk/setup.c:574
 msgid "Display lists in compact mode"
@@ -6051,9 +5768,7 @@ msgstr "Benutze Serverzeit, wenn unterstützt"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Zeitstempel vom Server holen, wenn die Zeitservererweiterung unterstützt "
-"wird."
+msgstr "Zeitstempel vom Server holen, wenn die Zeitservererweiterung unterstützt wird."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6073,10 +5788,9 @@ msgstr "Bannart:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Versuchen, diese Bannmaske zu benutzen, wenn gebannt oder ruhiggestellt "
-"wird. (benötigt irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Versuchen, diese Bannmaske zu benutzen, wenn gebannt oder ruhiggestellt wird. (benötigt irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6137,11 +5851,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6153,15 +5867,15 @@ msgstr "Automatisch"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "Alle Verbindungen"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "Nur IRC-Server"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "Nur DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6185,11 +5899,9 @@ msgstr "Meine IP vom IRC-Server holen"
 
 #: 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 ""
-"Fragt den IRC-Server nach Ihrer wahren IP-Adresse. Benutzen Sie dies, falls "
-"Sie eine 192.168.*.*-Adresse haben!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Fragt den IRC-Server nach Ihrer wahren IP-Adresse. Benutzen Sie dies, falls Sie eine 192.168.*.*-Adresse haben!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6201,11 +5913,11 @@ msgstr "Behaupten Sie, diese Adresse zu verwenden, wenn Sie Dateien anbieten."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "Erster DCC-Lausch-Port:"
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "Letzter DCC-Lausch-Port:"
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -6237,7 +5949,7 @@ msgstr "Proxy-Authentifizierung"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "Authentifizierung benutzen (Nur HTTP oder SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6259,10 +5971,7 @@ msgstr "Der Server wird mit dem Netzwerk-Benutzernamen antworten"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Sie müssen Erlaubnis dafür haben, um an diesem Port lauschen zu dürfen. Wenn "
-"das nicht 113 ist (0 ist die Standardeinstellung dafür), dann müssen Sie "
-"Port-Forwarding konfigurieren."
+msgstr "Sie müssen Erlaubnis dafür haben, um an diesem Port lauschen zu dürfen. Wenn das nicht 113 ist (0 ist die Standardeinstellung dafür), dann müssen Sie Port-Forwarding konfigurieren."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6424,16 +6133,11 @@ msgstr "Kategorien"
 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 ""
-"Sie können die Baumansicht nicht oben oder unten anzeigen! Bitte\n"
-"wechseln Sie erst im <b>Ansicht</b>-Menü zur <b>Reiter</b>-Ansicht."
+msgstr "Sie können die Baumansicht nicht oben oder unten anzeigen! Bitte\nwechseln Sie erst im <b>Ansicht</b>-Menü zur <b>Reiter</b>-Ansicht."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Das Feld für den echten Namen darf nicht leer sein. Es wird »realname« "
-"verwendet."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Das Feld für den echten Namen darf nicht leer sein. Es wird »realname« verwendet."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
@@ -6445,17 +6149,12 @@ 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 ""
-"*WARNUNG*\n"
-"Automatisches Annehmen von DCCs in Ihr Home-\n"
-"Verzeichnis kann gefährlich sein und ist\n"
-"ausnutzbar. Zum Beispiel könnte Ihnen jemand\n"
-"ein .bash_profile schicken."
+msgstr "*WARNUNG*\nAutomatisches Annehmen von DCCs in Ihr Home-\nVerzeichnis kann gefährlich sein und ist\nausnutzbar. Zum Beispiel könnte Ihnen jemand\nein .bash_profile schicken."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
 msgid "Preferences - %s"
-msgstr ""
+msgstr "Optionen – %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
@@ -6521,7 +6220,7 @@ msgstr "OK"
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
 msgid "URL Grabber - %s"
-msgstr ""
+msgstr "URL-Sammler – %s"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Clear list"
@@ -6550,9 +6249,7 @@ msgstr "Öffne eine irc:://Server:Port/Channel-URL"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: Information konnte nicht gehollt werden. Entweder nicht unterstützt "
-"oder Fehler."
+msgstr "Sysinfo: Information konnte nicht gehollt werden. Entweder nicht unterstützt oder Fehler."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6566,12 +6263,9 @@ msgstr "Sysinfo: %s ist gesetzt auf %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Gültige Einstellungen sind: announce und hide_* für jede "
-"Informationseinheit. Z.B. hide_os. Ohne Wert wird die aktuelle (oder "
-"Standard-)Einstellung gezeigt.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Gültige Einstellungen sind: announce und hide_* für jede Informationseinheit. Z.B. hide_os. Ohne Wert wird die aktuelle (oder Standard-)Einstellung gezeigt.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6586,9 +6280,3 @@ msgstr "Plugin %s geladen\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Plugin %s entladen\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/el.po b/po/el.po
index e54d62c1..c61f17a3 100644
--- a/po/el.po
+++ b/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"
diff --git a/po/en_GB.po b/po/en_GB.po
index 23d67003..4acd694a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,28 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Alfred Daw <sacarasc@gmail.com>, 2013
-# Sir_Burpalot <doctor.z01db3rg@gmail.com>, 2014,2016-2017
+# Alfred Daw <sacarasc@gmail.com>, 2012-2013
+# Sir_Burpalot <doctor.z01db3rg@gmail.com>, 2014,2016-2018
 # Gareth Owen <gowen72@yahoo.com>, 2004
 # Ivan Srbulov <Srbulov.Ivan@gmail.com>, 2013
 # Richard Hitt <rbh00@netcom.com>, 2013
 # Alfred Daw <sacarasc@gmail.com>, 2012
 # TheEndermen <theendermenofdoom@gmail.com>, 2012
+# TheEndermen <theendermenofdoom@gmail.com>, 2012
 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-16 15:03+0000\n"
 "Last-Translator: Sir_Burpalot <doctor.z01db3rg@gmail.com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/hexchat/"
-"hexchat/language/en_GB/)\n"
-"Language: en_GB\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/hexchat/hexchat/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -41,18 +41,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 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 customisable interface. You can even transfer files."
+msgstr "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 customisable interface. You can even transfer files."
 
 #: 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 supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
-"logging, custom themes, and Python/Perl scripts."
+msgstr "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -303,16 +298,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"You do not have write access to %s. Nothing from this session can be saved."
+msgstr "You do not have write access to %s. Nothing from this session can be saved."
 
 #: 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 ""
-"* Running IRC as root is stupid! You should\n"
-"  create a User Account and use that to login.\n"
+msgstr "* Running IRC as root is stupid! You should\n  create a User Account and use that to login.\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
@@ -437,9 +429,7 @@ msgstr "ADDBUTTON <name> <action>, adds a button under the user-list"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
-"server to the network list"
+msgstr "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new server to the network list"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -466,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 <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>], bans everyone matching the mask from the current channel. If they are already on the channel this doesn't kick them (needs chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -477,25 +464,21 @@ msgstr "CHANOPT [-quiet] <variable> [<value>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"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 "CHARSET [<encoding>], get or set the encoding used for the current connection"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
-"history"
+msgstr "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command history"
 
 #: 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 ""
-"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 "CLOSE [-m], Closes the current tab, closing the window if this is the only open tab, or with the \"-m\" flag, closes all queries."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -505,15 +488,13 @@ msgstr "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <message>, send the CTCP message to nick, common messages are "
-"VERSION and USERINFO"
+msgstr "CTCP <nick> <message>, send the CTCP message to nick, common messages are VERSION and USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"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>], parts the current or given channel and immediately rejoins"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -526,24 +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>                      - accept an offered file\n"
-"DCC SEND [-maxcps=#] <nick> [file]  - send a file to someone\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - send a file using passive mode\n"
-"DCC LIST                            - show DCC list\n"
-"DCC CHAT <nick>                     - offer DCC CHAT to someone\n"
-"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 "\nDCC GET <nick>                      - accept an offered file\nDCC SEND [-maxcps=#] <nick> [file]  - send a file to someone\nDCC PSEND [-maxcps=#] <nick> [file] - send a file using passive mode\nDCC LIST                            - show DCC list\nDCC CHAT <nick>                     - offer DCC CHAT to someone\nDCC PCHAT <nick>                    - offer DCC CHAT using passive mode\nDCC CLOSE <type> <nick> <file>         example:\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>, removes chanhalf-op status from the nick on the current "
-"channel (needs chanop)"
+msgstr "DEHOP <nick>, removes chanhalf-op status from the nick on the current channel (needs chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -553,17 +523,13 @@ msgstr "DELBUTTON <name>, deletes a button from under the user-list"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, removes chanop status from the nick on the current channel "
-"(needs chanop)"
+msgstr "DEOP <nick>, removes chanop status from the nick on the current channel (needs chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, removes voice status from the nick on the current channel "
-"(needs chanop)"
+msgstr "DEVOICE <nick>, removes voice status from the nick on the current channel (needs chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -585,9 +551,7 @@ msgstr "ECHO <text>, Prints text locally"
 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>, 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>, runs the command. If -o flag is used then output is sent to current channel, else is printed to current text box"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -597,9 +561,7 @@ msgstr "EXECCONT, sends the process SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], kills a running exec in the current session. If -9 is given "
-"the process is SIGKILL'ed"
+msgstr "EXECKILL [-9], kills a running exec in the current session. If -9 is given the process is SIGKILL'ed"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -640,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 <mask> <types..> <options..>\n"
-"    mask - host mask to ignore, eg: *!*@*.aol.com\n"
-"    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 - host mask to ignore, eg: *!*@*.aol.com\n    types - types of data to ignore, one or all of:\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>], invites someone to a channel, by default the "
-"current channel (needs chanop)"
+msgstr "INVITE <nick> [<channel>], invites someone to a channel, by default the current channel (needs chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -662,16 +617,13 @@ msgstr "JOIN <channel>, joins the channel"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
+msgstr "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
-"(needs chanop)"
+msgstr "KICKBAN <nick> [reason], bans then kicks the nick from the current channel (needs chanop)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -683,15 +635,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] [--] <string>, searches for a string in the buffer\n"
-"    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 "LASTLOG [-h] [-m] [-r] [--] <string>, searches for a string in the buffer\n    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'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -700,8 +645,7 @@ msgstr "LOAD [-e] <file>, loads a plugin or script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
+msgstr "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -709,11 +653,9 @@ msgstr "MDEOP, Mass deop's all chanops in the current channel (needs 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>, 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 "ME <action>, sends the action to the current channel (actions are written in the 3rd person, like /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -722,8 +664,7 @@ msgstr "MHOP, Mass hop's all users in the current channel (needs chanop)"
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
+msgstr "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -731,11 +672,9 @@ msgstr "MOP, Mass op's all users in the current channel (needs 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"
-msgstr ""
-"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 "MSG <nick> <message>, sends a private message, message \".\" to send to last nick or prefix with \"=\" for dcc chat"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -761,9 +700,7 @@ msgstr "NOTICE <nick/channel> <message>, sends a notice"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
-"adds someone to it"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or adds someone to it"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -772,8 +709,7 @@ msgstr "OP <nick>, gives chanop status to the nick (needs chanop)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<channel>] [<reason>], leaves the channel, by default the current one"
+msgstr "PART [<channel>] [<reason>], leaves the channel, by default the current one"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -783,17 +719,13 @@ msgstr "PING <nick | channel>, CTCP pings nick or channel"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
-"and optionally sends a message"
+msgstr "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone and optionally sends a message"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
-"channel if supported by the server."
+msgstr "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current channel if supported by the server."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -805,31 +737,23 @@ msgstr "QUOTE <text>, sends the text in raw form to the server"
 
 #: 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 to all the open servers"
-msgstr ""
-"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>], Can be called just as /RECONNECT to reconnect to the current server or with /RECONNECT ALL to reconnect to all the open servers"
 
 #: 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>], 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>], Can be called just as /RECONNECT to reconnect to the current server or with /RECONNECT ALL to reconnect to all the open servers"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <text>, send raw data to HexChat, as if it was received from the IRC "
-"server"
+msgstr "RECV <text>, send raw data to HexChat, as if it was received from the IRC server"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -855,17 +779,13 @@ msgstr "SERVCHAN <host> <port> <channel>, connects and joins a channel"
 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] <host> [<port>] [<password>], connects to a server, the "
-"default port is 6667 for normal connections, and 6697 for ssl connections"
+msgstr "SERVER [-ssl] <host> [<port>] [<password>], connects to a server, the default port is 6667 for normal connections, and 6697 for ssl connections"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<password>], connects to a server, the default port "
-"is 6667"
+msgstr "SERVER <host> [<port>] [<password>], connects to a server, the default port is 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -885,9 +805,9 @@ msgstr "SETTEXT <new text>, replace the text in the input box"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"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>], sets the topic if one is given, else shows the current topic"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -897,13 +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 <timeout> <file1> [<file2>] Blink tray between two icons.\n"
-"TRAY -f <filename>                  Set tray to a fixed icon.\n"
-"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 "\nTRAY -f <timeout> <file1> [<file2>] Blink tray between two icons.\nTRAY -f <filename>                  Set tray to a fixed icon.\nTRAY -i <number>                    Blink tray with an internal icon.\nTRAY -t <text>                      Set the tray tooltip.\nTRAY -b <title> <text>              Set the tray balloon."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -919,11 +833,9 @@ msgstr "UNLOAD <name>, unloads a plugin or script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"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 "UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the server."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -931,9 +843,9 @@ msgstr "URL <url>, opens a URL in your browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"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 "USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -946,8 +858,7 @@ msgstr "WALLCHAN <message>, writes the message to all channels"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <message>, sends the message to all chanops on the current channel"
+msgstr "WALLCHOP <message>, sends the message to all chanops on the current channel"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -963,9 +874,7 @@ msgstr "Usage: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"No help available on that command.\n"
+msgstr "\nNo help available on that command.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1034,9 +943,7 @@ msgstr "Are you sure this is a SSL capable server and port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Cannot resolve hostname %s\n"
-"Check your IP Settings!\n"
+msgstr "Cannot resolve hostname %s\nCheck your IP Settings!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1052,9 +959,7 @@ msgstr "Cycling to next server in %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Warning: \"%s\" character set is unknown. No conversion will be applied for "
-"network %s."
+msgstr "Warning: \"%s\" character set is unknown. No conversion will be applied for network %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1213,9 +1118,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
+msgid ""
 "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1248,11 +1153,9 @@ msgstr "%C16,17 Type  To/From    Status  Size    Pos     File"
 
 #: 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"
-msgstr ""
-"%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 "%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1269,13 +1172,12 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
+msgid ""
 "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1287,9 +1189,9 @@ msgstr "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%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 "%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1302,13 +1204,12 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
+msgid ""
 "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1404,8 +1305,7 @@ msgstr "%C23*%O$t%C28$1%C is errorneous. Retrying with %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
+msgstr "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1542,8 +1442,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1588,9 +1487,7 @@ msgstr "**** BEGIN LOGGING AT %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Can't open log file(s) for writing. Check the\n"
-"permissions on %s"
+msgstr "* Can't open log file(s) for writing. Check the\npermissions on %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2087,9 +1984,7 @@ msgstr "Ban time"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Cannot read sound file:\n"
-"%s"
+msgstr "Cannot read sound file:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3448,18 +3343,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Cannot access file: %s\n"
-"%s.\n"
-"Resuming not possible."
+msgstr "Cannot access file: %s\n%s.\nResuming not possible."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"File in download directory is larger than file offered. Resuming not "
-"possible."
+msgstr "File in download directory is larger than file offered. Resuming not possible."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3605,10 +3495,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Failed to open font:\n"
-"\n"
-"%s"
+msgstr "Failed to open font:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3626,101 +3513,72 @@ msgstr "Network send queue: %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 \\\\"
-msgstr ""
-"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 "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 \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"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 "
-"other data)."
+msgstr "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 other data)."
 
 #: src/fe-gtk/fkeys.c:145
 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."
-msgstr ""
-"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 "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."
 
 #: 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"
@@ -3847,9 +3705,7 @@ msgstr "Connection to %s complete."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"In the server list window, no channel (chat room) has been entered to be "
-"automatically joined for this network."
+msgstr "In the server list window, no channel (chat room) has been entered to be automatically joined for this network."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3897,9 +3753,7 @@ msgstr "No topic is set"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"This server still has %d channels or dialogues associated with it. Close "
-"them all?"
+msgstr "This server still has %d channels or dialogues associated with it. Close them all?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4130,9 +3984,7 @@ msgstr "%d nicks selected."
 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 ""
-"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 "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."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4228,25 +4080,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"User Commands - Special codes:\n"
-"\n"
-"%c  =  current channel\n"
-"%e  =  current network name\n"
-"%m  =  machine info\n"
-"%n  =  your nick\n"
-"%t  =  time/date\n"
-"%v  =  HexChat version\n"
-"%2  =  word 2\n"
-"%3  =  word 3\n"
-"&2  =  word 2 to the end of line\n"
-"&3  =  word 3 to the end of line\n"
-"\n"
-"eg:\n"
-"/cmd john hello\n"
-"\n"
-"%2 would be \"john\"\n"
-"&2 would be \"john hello\"."
+msgstr "User Commands - Special codes:\n\n%c  =  current channel\n%e  =  current network name\n%m  =  machine info\n%n  =  your nick\n%t  =  time/date\n%v  =  HexChat version\n%2  =  word 2\n%3  =  word 3\n&2  =  word 2 to the end of line\n&3  =  word 3 to the end of line\n\neg:\n/cmd john hello\n\n%2 would be \"john\"\n&2 would be \"john hello\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4261,18 +4095,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Userlist Buttons - Special codes:\n"
-"\n"
-"%a  =  all selected nicks\n"
-"%c  =  current channel\n"
-"%e  =  current network name\n"
-"%h  =  selected nick's hostname\n"
-"%m  =  machine info\n"
-"%n  =  your nick\n"
-"%s  =  selected nick\n"
-"%t  =  time/date\n"
-"%u  =  selected users account"
+msgstr "Userlist Buttons - Special codes:\n\n%a  =  all selected nicks\n%c  =  current channel\n%e  =  current network name\n%h  =  selected nick's hostname\n%m  =  machine info\n%n  =  your nick\n%s  =  selected nick\n%t  =  time/date\n%u  =  selected users account"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4287,18 +4110,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Dialogue Buttons - Special codes:\n"
-"\n"
-"%a  =  all selected nicks\n"
-"%c  =  current channel\n"
-"%e  =  current network name\n"
-"%h  =  selected nick's hostname\n"
-"%m  =  machine info\n"
-"%n  =  your nick\n"
-"%s  =  selected nick\n"
-"%t  =  time/date\n"
-"%u  =  selected users account"
+msgstr "Dialogue Buttons - Special codes:\n\n%a  =  all selected nicks\n%c  =  current channel\n%e  =  current network name\n%h  =  selected nick's hostname\n%m  =  machine info\n%n  =  your nick\n%s  =  selected nick\n%t  =  time/date\n%u  =  selected users account"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4314,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 Replies - Special codes:\n"
-"\n"
-"%d  =  data (the whole ctcp)\n"
-"%e  =  current network name\n"
-"%m  =  machine info\n"
-"%s  =  nick who sent the ctcp\n"
-"%t  =  time/date\n"
-"%2  =  word 2\n"
-"%3  =  word 3\n"
-"&2  =  word 2 to the end of line\n"
-"&3  =  word 3 to the end of line\n"
-"\n"
+msgstr "CTCP Replies - Special codes:\n\n%d  =  data (the whole ctcp)\n%e  =  current network name\n%m  =  machine info\n%s  =  nick who sent the ctcp\n%t  =  time/date\n%2  =  word 2\n%3  =  word 3\n&2  =  word 2 to the end of line\n&3  =  word 3 to the end of line\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4338,14 +4138,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL Handlers - Special codes:\n"
-"\n"
-"%s  =  the URL string\n"
-"\n"
-"Putting a ! in front of the command\n"
-"indicates it should be sent to a\n"
-"shell instead of HexChat"
+msgstr "URL Handlers - Special codes:\n\n%s  =  the URL string\n\nPutting a ! in front of the command\nindicates it should be sent to a\nshell instead of HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4874,9 +4667,7 @@ msgstr "You must have two unique nick names."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"The way you identify yourself to the server. For custom login methods use "
-"connect commands."
+msgstr "The way you identify yourself to the server. For custom login methods use connect commands."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4901,11 +4692,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Nick name\n"
-"%p=Password\n"
-"%r=Real name\n"
-"%u=User name"
+msgstr "%n=Nick name\n%p=Password\n%r=Real name\n%u=User name"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5012,9 +4799,7 @@ msgstr "_Sort"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
-"keys to move a row."
+msgstr "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down keys to move a row."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5364,9 +5149,7 @@ msgstr "Dictionaries to use:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
-"Separate multiple entries with commas."
+msgstr "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSeparate multiple entries with commas."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5680,9 +5463,8 @@ msgid "Chat window"
 msgstr "Chat window"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Maximum File Transfer Speeds (Bytes per Second)"
+msgstr "Maximum File Transfer Speeds (Byte per Second)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5736,17 +5518,13 @@ msgstr "Make a beep sound on:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Play the \"Instant Message Notification\" system sound upon the selected "
-"events"
+msgstr "Play the \"Instant Message Notification\" system sound upon the selected events"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Play \"message-new-instant\" from the \"freedesktop.org\" sound theme upon "
-"the selected events"
+msgstr "Play \"message-new-instant\" from the \"freedesktop.org\" sound theme upon the selected events"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5799,8 +5577,7 @@ msgstr "Highlighted Messages"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Highlighted messages are ones where your nickname is mentioned, but also:"
+msgstr "Highlighted messages are ones where your nickname is mentioned, but also:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5822,9 +5599,7 @@ msgstr "Nick names to always highlight:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separate multiple words with commas.\n"
-"Wildcards are accepted."
+msgstr "Separate multiple words with commas.\nWildcards are accepted."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5922,9 +5697,7 @@ msgstr "Automatically copy selected text"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Copy selected text to clipboard when left mouse button is released. "
-"Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
+msgstr "Copy selected text to clipboard when left mouse button is released. Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -5932,11 +5705,9 @@ msgstr "Automatically include timestamps"
 
 #: 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."
-msgstr ""
-"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 "Automatically include timestamps in copied lines of text. Otherwise, include timestamps if the Shift key is held down while selecting."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5944,12 +5715,9 @@ msgstr "Automatically include colour information"
 
 #: 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."
-msgstr ""
-"Automatically include colour information in copied lines of text.  "
-"Otherwise, include colour 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 "Automatically include colour information in copied lines of text.  Otherwise, include colour information if the Ctrl key is held down while selecting."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -5979,9 +5747,7 @@ msgstr "Use server time if supported"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Display timestamps obtained from server if it supports the time-server "
-"extension."
+msgstr "Display timestamps obtained from server if it supports the time-server extension."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6001,9 +5767,9 @@ msgstr "Ban Type:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"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 "Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6064,11 +5830,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6112,11 +5878,9 @@ msgstr "Get my address from the IRC server"
 
 #: 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 ""
-"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 "Asks the IRC server for your real address. Use this if you have a 192.168.*.* address!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6163,9 +5927,8 @@ msgid "Proxy Authentication"
 msgstr "Proxy Authentication"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Use authentication (HTTP or Socks5 only)"
+msgstr "Use authentication (HTTP or SOCKS5 only)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6187,9 +5950,7 @@ msgstr "Server will respond with the networks username"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"You must have permissions to listen on this port. If not 113 (0 defaults to "
-"this) then you must configure port-forwarding."
+msgstr "You must have permissions to listen on this port. If not 113 (0 defaults to this) then you must configure port-forwarding."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6351,15 +6112,11 @@ msgstr "Categories"
 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 ""
-"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 "You cannot place the tree on the top or bottom!\nPlease change to the <b>Tabs</b> layout in the <b>View</b> menu first."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"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 "The Real name option cannot be left blank. Falling back to \"realname\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
@@ -6371,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 ""
-"*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
@@ -6489,12 +6242,9 @@ msgstr "Sysinfo: %s is set to: %d\n"
 #: 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"
-msgstr ""
-"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 "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"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6509,9 +6259,3 @@ msgstr "%s plugin loaded\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s plugin unloaded\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/es.po b/po/es.po
index 04221962..aeb64033 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,32 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Alejandro López-Valencia, 2017
+# Alejandro López-Valencia, 2016-2017
+# Pedro A. López-Valencia, 2017
 # bviktor, 2012
 # bviktor, 2012
 # Gato Loko, 2016
 # Gato Loko, 2016-2017
-# Alejandro López-Valencia, 2016
-# Alejandro López-Valencia, 2016
-# Víctor <vegadark@protonmail.com>, 2013-2014
-# Víctor <vegadark@protonmail.com>, 2012-2013
-# Víctor <vegadark@protonmail.com>, 2014-2017
-# Víctor <vegadark@protonmail.com>, 2014
+# hard ware, 2018
+# Pedro A. López-Valencia, 2016
+# Pedro A. López-Valencia, 2016
+# Víctor Vega <vegadark@protonmail.com>, 2013-2014
+# Víctor Vega <vegadark@protonmail.com>, 2012-2013
+# Víctor Vega <vegadark@protonmail.com>, 2014-2017
+# Víctor Vega <vegadark@protonmail.com>, 2014,2018-2019
+# Víctor Vega <vegadark@protonmail.com>, 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-23 18:37+0000\n"
-"Last-Translator: Gato Loko\n"
-"Language-Team: Spanish (http://www.transifex.com/hexchat/hexchat/language/"
-"es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2019-01-28 21:28+0000\n"
+"Last-Translator: Víctor Vega <vegadark@protonmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/hexchat/hexchat/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -45,26 +47,21 @@ 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 es un cliente de IRC fácil de usar. Le permite unirse a múltiples "
-"redes de manera segura y hablar con los usuarios en privado o en los canales "
-"usando una interfaz personalizable. Incluso puede enviar archivos."
+msgstr "HexChat es un cliente de IRC fácil de usar. Permite unirse a múltiples redes de manera segura y hablar con los usuarios en privado o en los canales usando una interfaz personalizable. Incluso puede enviar archivos."
 
 #: 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 soporta características como: DCC, SASL, proxies, autocorrector, "
-"alertas, registro automático, temas personalizados, y scripts en Python/Perl."
+msgstr "HexChat soporta características como: DCC, SASL, proxies, autocorrector, alertas, registro automático, temas personalizados, y scripts en Python/Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
-msgstr "Ventana principal de conversación"
+msgstr "Ventana principal de charla"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:5
 msgid "Chat with other people online"
-msgstr "Chatea con otras personas en línea"
+msgstr "Charlar con otras personas en línea"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:6
 msgid "IM;Chat;"
@@ -73,7 +70,7 @@ msgstr "IM;Chat;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -81,7 +78,7 @@ msgstr "Abrir en modo seguro"
 
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:3
 msgid "HexChat Theme Manager"
-msgstr "Administrador de temas"
+msgstr "Administrador de temas de HexChat"
 
 #. 0 means unlimited
 #. STRINGS
@@ -103,7 +100,7 @@ msgstr "ON"
 
 #: src/common/chanopt.c:83
 msgid "{unset}"
-msgstr "(sin establecer)"
+msgstr "{sin establecer}"
 
 #: src/common/chanopt.c:128 src/common/text.c:1325 src/fe-gtk/notifygui.c:125
 #: src/fe-gtk/setup.c:1886
@@ -133,7 +130,7 @@ msgstr "Activo"
 #. cyan
 #: src/common/dcc.c:74
 msgid "Failed"
-msgstr "Ha fallado"
+msgstr "Fallido"
 
 #. red
 #: src/common/dcc.c:75
@@ -168,7 +165,7 @@ msgstr "Error"
 #: src/common/dcc.c:2487
 #, c-format
 msgid "%s is offering \"%s\". Do you want to accept?"
-msgstr "%s está ofreciendo \"%s\". ¿Deseas aceptar?"
+msgstr "%s está ofreciendo «%s». ¿Desea aceptar?"
 
 #: src/common/dcc.c:2704
 msgid "No active DCCs\n"
@@ -188,7 +185,7 @@ msgstr "Información del _usuario (WhoIs)"
 
 #: src/common/hexchat.c:888
 msgid "_Add to Friends List"
-msgstr "_Añadir a lista de amigos"
+msgstr "_Añadir a la lista de amigos"
 
 #: src/common/hexchat.c:889
 msgid "_Ignore"
@@ -204,7 +201,7 @@ msgstr "Dar Op"
 
 #: src/common/hexchat.c:893
 msgid "Take Ops"
-msgstr "Tomar Op"
+msgstr "Quitar Op"
 
 #: src/common/hexchat.c:894
 msgid "Give Voice"
@@ -212,15 +209,15 @@ msgstr "Dar voz"
 
 #: src/common/hexchat.c:895
 msgid "Take Voice"
-msgstr "Tomar voz"
+msgstr "Quitar voz"
 
 #: src/common/hexchat.c:897
 msgid "Kick/Ban"
-msgstr "Echar/Banear"
+msgstr "Expulsar/Banear"
 
 #: src/common/hexchat.c:898 src/common/hexchat.c:935
 msgid "Kick"
-msgstr "Echar"
+msgstr "Expulsar"
 
 #: src/common/hexchat.c:899 src/common/hexchat.c:900 src/common/hexchat.c:901
 #: src/common/hexchat.c:902 src/common/hexchat.c:903 src/common/hexchat.c:934
@@ -231,7 +228,7 @@ msgstr "Banear"
 #: src/common/hexchat.c:904 src/common/hexchat.c:905 src/common/hexchat.c:906
 #: src/common/hexchat.c:907
 msgid "KickBan"
-msgstr "Echar y banear"
+msgstr "Expulsar y banear"
 
 #: src/common/hexchat.c:917
 msgid "Leave Channel"
@@ -239,11 +236,11 @@ msgstr "Abandonar canal"
 
 #: src/common/hexchat.c:918
 msgid "Join Channel..."
-msgstr "Entrar al canal..."
+msgstr "Unirse al canal..."
 
 #: src/common/hexchat.c:919 src/fe-gtk/menu.c:1411
 msgid "Enter Channel to Join:"
-msgstr "Introduzca el canal al que quiere entrar:"
+msgstr "Introduce el canal a unirte:"
 
 #: src/common/hexchat.c:920
 msgid "Server Links"
@@ -259,7 +256,7 @@ msgstr "Ocultar la versión"
 
 #: src/common/hexchat.c:932
 msgid "Op"
-msgstr "Op"
+msgstr "Dar Op"
 
 #: src/common/hexchat.c:933
 msgid "DeOp"
@@ -272,7 +269,7 @@ msgstr "adiós"
 #: src/common/hexchat.c:937
 #, c-format
 msgid "Enter reason to kick %s:"
-msgstr "Introduzca razón para expulsar a %s:"
+msgstr "Introduce el motivo para expulsar a %s:"
 
 #: src/common/hexchat.c:938
 msgid "Send File"
@@ -292,7 +289,7 @@ msgstr "Enviar"
 
 #: src/common/hexchat.c:950
 msgid "Chat"
-msgstr "Charla"
+msgstr "Chat"
 
 #: src/common/hexchat.c:951 src/fe-gtk/banlist.c:847 src/fe-gtk/dccgui.c:889
 #: src/fe-gtk/ignoregui.c:387 src/fe-gtk/urlgrab.c:214
@@ -307,16 +304,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"No tienes acceso de escritura para %s. Los cambios que hagas no se guardarán."
+msgstr "No tienes acceso de escritura a %s. No se guardará nada de esta sesión."
 
 #: 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 ""
-"* ¡Ejecutar IRC como root es peligroso!. Debería crear una\n"
-"  cuenta de usuario normal y usarla para conectarse.\n"
+msgstr "* ¡Ejecutar IRC como root es peligroso! Debería\n  crear una cuenta de usuario y usarla 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
@@ -333,13 +327,12 @@ msgstr "NO   "
 #: src/common/ignore.c:370
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr "Está recibiendo demasiados CTCP de %s, ignorando a %s\n"
+msgstr "Estás siendo inundado de CTCP de %s, ignorando a %s\n"
 
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Está siendo inundado de MSG por %s, ajustando gui_autoopen_dialog OFF.\n"
+msgstr "Estás siendo inundado de MSG de %s, poniendo gui_autoopen_dialog a OFF.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -362,20 +355,20 @@ msgstr "Buscando %s..."
 #: src/common/notify.c:559
 #, c-format
 msgid "  %-20s online\n"
-msgstr "  %-20s conectados\n"
+msgstr "  %-20s en línea\n"
 
 #: src/common/notify.c:561
 #, c-format
 msgid "  %-20s offline\n"
-msgstr "  %-20s desconectados\n"
+msgstr "  %-20s fuera de línea\n"
 
 #: src/common/outbound.c:69
 msgid "No channel joined. Try /join #<channel>\n"
-msgstr "No ha entrado en ningún canal. Intente /join #<canal>\n"
+msgstr "No se ha unido a ningún canal. Intente /join #<canal>\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr "No está conectado. Intente /server <equipo> [<puerto>]\n"
+msgstr "No está conectado. Intente /server <host> [<puerto>]\n"
 
 #: src/common/outbound.c:277
 #, c-format
@@ -394,7 +387,7 @@ msgstr "Ausencia ya marcada: %s\n"
 
 #: src/common/outbound.c:405
 msgid "Already marked back.\n"
-msgstr "Regreso ya marcado.\n"
+msgstr "Ausencia ya desmarcada.\n"
 
 #: src/common/outbound.c:1839
 msgid "I need /bin/sh to run!\n"
@@ -423,46 +416,38 @@ msgstr "Argumento desconocido '%s' ignorado."
 
 #: src/common/outbound.c:3148 src/common/outbound.c:3178
 msgid "Quiet is not supported by this server."
-msgstr "Silenciar no está soportado por este servidor."
+msgstr "Silenciar no está soportado en este servidor."
 
 #. error
 #: src/common/outbound.c:3625 src/common/outbound.c:3650
 msgid "No such plugin found.\n"
-msgstr "No se encontró la extensión.\n"
+msgstr "Complemento no encontrado.\n"
 
 #: src/common/outbound.c:3630 src/fe-gtk/plugingui.c:191
 msgid "That plugin is refusing to unload.\n"
-msgstr "Esta extensión se niega a ser desactivada.\n"
+msgstr "El complemento no permite ser descargado.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <nombre> <acción>, añade un botón debajo de la lista de usuarios"
+msgstr "ADDBUTTON <nombre> <acción>, añade un botón debajo de la lista de usuarios"
 
 #: src/common/outbound.c:3933
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <RedNueva> <servidor/6667>, añade una red nueva con un servidor "
-"nuevo a la lista de redes"
+msgstr "ADDSERVER <RedNueva> <servidor/6667>, añade una red nueva con un servidor nuevo a la lista de redes"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <cmd>, envía una orden a todos los canales a los que se ha unido"
+msgstr "ALLCHAN <cmd>, envía una orden a todos los canales a los que se ha unido"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <comando>, envía un comando a todos los canales en el servidor "
-"actual"
+msgstr "ALLCHANL <orden>, envía una orden a todos los canales del servidor actual"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <cmd>, envía una orden a todos los servidores a los que se ha "
-"conectado"
+msgstr "ALLSERV <cmd>, envía una orden a todos los servidores a los que se ha conectado"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -470,17 +455,14 @@ msgstr "AWAY [<motivo>], establece tu ausencia (utiliza /BACK para quitarla)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
-msgstr "BACK, te pone conectado (no ausente)"
+msgstr "BACK, establece tu regreso (no ausente)"
 
 #: src/common/outbound.c:3943
 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>], banea a todos aquellos que concuerden con la "
-"máscara del canal actual. Si ya están en el canal esto no les expulsa (es "
-"necesario ser operador del canal)"
+msgstr "BAN <máscara> [<tipo de baneo>], banea del canal actual a todos aquellos que concuerden con la máscara. Si ya están en el canal esto no les expulsa (es necesario ser operador del canal)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -488,45 +470,37 @@ msgstr "CHANOPT [-quiet] <variable> [<valor>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<codificación>], da o configura la codificación usada para la "
-"conexión actual"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<codificación>], obtiene o configura la codificación usada en la conexión actual"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<amount>], limpia el texto en la ventana activa o el "
-"comando de registro"
+msgstr "CLEAR [ALL|HISTORY|[-]<valor>], limpia la ventana de texto actual o el historial de órdenes"
 
 #: 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 ""
-"CLOSE [-m], Cierra la pestaña activa, incluyendo la ventana si esta es la "
-"única abierta. Con la opción \"-m\" cierra todas las pestañas de consulta "
-"(QUERY)."
+msgstr "CLOSE [-m], Cierra la pestaña activa, incluyendo la ventana si esta es la única abierta. Con la opción «-m» cierra todas las pestañas de consulta (QUERY)."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <código|comodín>, busca un código de país, ej: au = Australia"
+msgstr "COUNTRY [-s] <código|comodín>, busca un código de país, ej: 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 <apodo> <mensaje>, envía el mensaje CTCP al apodo, los mensajes comunes "
-"son VERSION y USERINFO"
+msgstr "CTCP <apodo> <mensaje>, envía el mensaje CTCP al apodo, los mensajes 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>], abandona el canal e inmediatamente ingresa al mismo"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canal>], abandona el canal actual o el dado y se reincorpora inmediatamente"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -539,26 +513,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 <apodo>                         - recibe un archivo ofrecido\n"
-"DCC SEND [-maxcps=#] <apodo> [archivo]  - envía un archivo a una persona\n"
-"DCC PSEND [-maxcps=#] <apodo> [archivo] - envía un archivo usando modo "
-"pasivo\n"
-"DCC LIST                                - muestra la lista DCC\n"
-"DCC CHAT <apodo>                        - ofrece el DCC CHAT a alguien\n"
-"DCC PCHAT <apodo>                       - ofrece el DCC CHAT usando modo "
-"pasivo\n"
-"DCC CLOSE <tipo> <apodo> <archivo>      - ejemplo:\n"
-"             /dcc close send juanperez archivo.tar.gz"
+msgstr "\nDCC GET <apodo>                         - acepta un archivo\nDCC SEND [-maxcps=#] <apodo> [archivo]  - envía un archivo a alguien\nDCC PSEND [-maxcps=#] <apodo> [archivo] - envía un archivo usando el modo pasivo\nDCC LIST                                - muestra la lista DCC\nDCC CHAT <apodo>                        - ofrece una CHARLA DCC a alguien\nDCC PCHAT <apodo>                       - ofrece una CHARLA DCC usando el modo pasivo\nDCC CLOSE <tipo> <apodo> <archivo>      - ejemplo:\n             /dcc close send juanperez archivo.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 <apodo>, quita el estado de semi-operador del canal al apodo en el "
-"canal actual (necesita ser operador del canal)"
+msgstr "DEHOP <apodo>, quita el estado de semioperador del canal al apodo en el canal actual (necesita ser operador del canal)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -568,42 +529,35 @@ msgstr "DELBUTTON <nombre>, borra un botón de debajo de la lista de usuarios"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <apodo>, quita el estado de operador al apodo en el canal actual "
-"(necesita ser operador del canal)"
+msgstr "DEOP <apodo>, quita el estado de operador al apodo en el canal actual (necesita ser operador del canal)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <apodo>, quita el estado de voz del apodo en el canal actual "
-"(necesita ser operador del canal)"
+msgstr "DEVOICE <apodo>, quita el estado de voz del apodo en el canal actual (necesita ser operador del canal)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
-msgstr "DISCON, Se desconecta del servidor"
+msgstr "DISCON, se desconecta del servidor"
 
 #: src/common/outbound.c:3976
 msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
-msgstr "DNS <apodo|equipo|ip>, resuelve una dirección IP o un nombre de host"
+msgstr "DNS <apodo|host|ip>, resuelve una dirección IP o un nombre de host"
 
 #: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
-msgstr "DOAT <canal,lista,/red> <command>"
+msgstr "DOAT <canal,lista,/red> <comando>"
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
-msgstr "ECHO <texto>, Imprime texto localmente"
+msgstr "ECHO <texto>, imprime texto localmente"
 
 #: src/common/outbound.c:3981
 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] <orden>, ejecuta la orden. Si se usa la bandera -o entonces la "
-"salida es enviada al canal actual, si no, se imprime en la caja de texto "
-"actual"
+msgstr "EXEC [-o] <orden>, ejecuta la orden. Si se usa la bandera -o entonces la salida es enviada al canal actual, si no, se imprime en el cuadro de texto actual"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -613,9 +567,7 @@ msgstr "EXECCONT, envía al proceso la señal de continuar"
 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 ejecutable corriendo en la sesión actual. Si de "
-"indica -9 el proceso es matado por la fuerza"
+msgstr "EXECKILL [-9], finaliza un ejecutable de la sesión actual. Si se indica -9 el proceso es finalizado por la fuerza"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -623,7 +575,7 @@ msgstr "EXECSTOP, envía al proceso la señal de detenerse"
 
 #: src/common/outbound.c:3989
 msgid "EXECWRITE, sends data to the processes stdin"
-msgstr "EXECWRITE, envía los datos a la entrada estándar del proceso"
+msgstr "EXECWRITE, envía los datos a los procesos stdin"
 
 #: src/common/outbound.c:3993
 msgid "EXPORTCONF, exports HexChat settings"
@@ -635,23 +587,19 @@ msgstr "FLUSHQ, borra la cola de envío actual del servidor"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <equipo> [<puerto>], utiliza un proxy a través de un equipo, el puerto "
-"predeterminado es el 23"
+msgstr "GATE <host> [<puerto>], utiliza un proxy a través de un host, el puerto predeterminado es el 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr "GHOST <nick> [contraseña], libera la sesión fantasma de un nick"
+msgstr "GHOST <apodo> [contraseña], libera la sesión fantasma de un apodo"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <apodo>, otorga estado de semi-operador al apodo (necesita ser operador "
-"del canal)"
+msgstr "HOP <apodo>, pone estado de semioperador al apodo (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
-msgstr "ID <contraseña> "
+msgstr "ID <contraseña>, se identifica con NickServ"
 
 #: src/common/outbound.c:4011
 msgid ""
@@ -660,39 +608,28 @@ 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..> <opciones..>\n"
-"    máscara - máscara de equipos a ignorar, ej: *!*@*.aol.com\n"
-"    tipos - tipos de datos a ignorar, uno o todos de:\n"
-"            PRIV, CHAN, NOTI, CTCP, INVI, ALL\n"
-"    opciones - NOSAVE, QUIET"
+msgstr "IGNORE <máscara> <tipos..> <opciones..>\n    máscara - máscara de hosts a ignorar, ej: *!*@*.aol.com\n    tipos - tipos de datos a ignorar, uno o todos 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 <apodo> [<canal>], invita a alguien a un canal, por omisión el canal "
-"actual (necesita ser operador del canal)"
+msgstr "INVITE <apodo> [<canal>], invita a alguien a un canal, por omisión el canal actual (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
-msgstr "JOIN <canal>, entra al canal"
+msgstr "JOIN <canal>, se une al canal"
 
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <apodo> [motivo], expulsa al usuario del canal actual (necesita ser "
-"operador del canal)"
+msgstr "KICK <apodo> [motivo], expulsa del canal actual al apodo (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <apodo> [motivo], banea y luego expulsa al usuario del canal actual "
-"(necesita ser operador del canal)"
+msgstr "KICKBAN <apodo> [motivo], banea y luego expulsa del canal actual al apodo (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -704,63 +641,46 @@ 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] [--] <cadena>, busca una cadena en el búfer\\n Usa -h "
-"para resaltar la cadena(s) encontrada\\n Usa -m para coincidir\\n Usa -r "
-"cuando la cadena es una expresión regular\\n Usa -- (guión doble) para poner "
-"fin a las opciones de búsqueda, por ejemplo, la cadena '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <cadena>, busca una cadena en el búfer\n    Usa -h para resaltar la(s) cadena(s) encontrada(s)\n    Usa -m para coincidencias\n    Usa -r cuando la cadena es una expresión regular\n    Usa -- (guion doble) para poner fin a las opciones de búsqueda, por ejemplo, la cadena '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
-msgstr "LOAD [-e] <archivo>, carga un complemento (plugin) o un guión (script)"
+msgstr "LOAD [-e] <archivo>, carga un complemento o guion (script)"
 
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Quita masivamente el estado de semi-operador en el canal actual "
-"(necesita ser operador del canal)"
+msgstr "MDEHOP, quita masivamente el estado de semioperador en el canal actual (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Quita masivamente el estado de operador en el canal actual (necesita "
-"ser operador del canal)"
+msgstr "MDEOP, quita masivamente el estado de operador en el canal actual (necesita ser operador del 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 <acción>, envía la acción al canal actual (las acciones están escritas en "
-"tercera 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 <acción>, envía la acción al canal actual (las acciones están escritas en tercera persona del inglés, como /me salta)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MHOP, pone masivamente el estado de semioperador en el canal actual (necesita ser operador del canal)"
 
 #: 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 usted en el canal actual "
-"(necesita ser operador del canal)"
+msgstr "MKICK, Expulsa masivamente del canal actual a todos excepto a usted (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Otorga masivamente el estado de operador del canal actual (necesita ser "
-"operador del canal)"
+msgstr "MOP, pone masivamente el estado de operador del canal actual (necesita ser operador del 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"
-msgstr ""
-"MSG <nick> <mensaje>, envía un mensaje privado, escribe \".\" para enviarlo "
-"al último nick o pon el prefijo \"=\" para el chat dcc"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <apodo> <mensaje>, envía un mensaje privado, mensaje «.» para enviarselo al último apodo o ponga el prefijo «=» para una charla dcc"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -768,11 +688,11 @@ msgstr "NAMES [canal], lista los apodos en el canal"
 
 #: src/common/outbound.c:4056
 msgid "NCTCP <nick> <message>, Sends a CTCP notice"
-msgstr "NCTCP <apodo> <mensaje>, Envía una noticia CTCP"
+msgstr "NCTCP <apodo> <mensaje>, envía un aviso CTCP"
 
 #: src/common/outbound.c:4057
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
-msgstr "NEWSERVER [-noconnect] <nombre del equipo> [<puerto>]"
+msgstr "NEWSERVER [-noconnect] <nombre de host> [<puerto>]"
 
 #: src/common/outbound.c:4058
 msgid "NICK <nickname>, sets your nick"
@@ -780,47 +700,38 @@ msgstr "NICK <apodo>, establece su apodo"
 
 #: src/common/outbound.c:4061
 msgid "NOTICE <nick/channel> <message>, sends a notice"
-msgstr "NOTICE <nick/channel> <message>, envía un notice"
+msgstr "NOTICE <apodo/canal> <mensaje>, envía un aviso"
 
 #: src/common/outbound.c:4063
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n red1[,red2,...]] [<nick>], muestra tu lista de notificaciones o "
-"agrega a alguien en ella"
+msgstr "NOTIFY [-n red1[,red2,...]] [<apodo>], muestra tu lista de notificaciones o agrega a alguien en ella"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <apodo>, otorga el estado de operador del canal al apodo (necesita ser "
-"operador del canal)"
+msgstr "OP <apodo>, pone el estado de operador del canal al apodo (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<canal>] [<razón>], abandona el canal, por omisión el canal actual"
+msgstr "PART [<canal>] [<razón>], abandona un canal, por defecto, el canal actual"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr "PING <apodo | canal>, Envía pings CTCP al apodo o canal"
+msgstr "PING <apodo | canal>, envía pings CTCP al apodo o canal"
 
 #: src/common/outbound.c:4071
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <nick> [mensaje], abre una ventana de mensaje privado a "
-"alguien y opcionalmente envía un mensaje"
+msgstr "QUERY [-nofocus] <apodo> [mensaje], abre una nueva ventana privada de mensajes a alguien y, opcionalmente, envía un mensaje"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <máscara> [<tipo de silencio>], silencia a todos aquellos que "
-"concuerden con la máscara del canal actual si es soportado por el servidor."
+msgstr "QUIET <máscara> [<tipo de silencio>], silencia a todos los que coincidan con la máscara en el canal actual, si el servidor lo soporta."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -828,43 +739,35 @@ msgstr "QUIT [<razón>], se desconecta del servidor actual"
 
 #: src/common/outbound.c:4077
 msgid "QUOTE <text>, sends the text in raw form to the server"
-msgstr "QUOTE <texto>, envía el texto en formato plano hacia el servidor"
+msgstr "QUOTE <texto>, envía el texto en bruto al 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>] [<puerto>] [<contraseña>], Puede ser llamado "
-"sólo como /RECONNECT para reconectarse al servidor actual o con /"
-"RECONNECT_ALL para reconectarse a todos los servidores abiertos"
+msgstr "RECONNECT [-ssl] [<host>] [<puerto>] [<contraseña>], puede ser invocado como /RECONNECT para reconectarse al servidor actual o con /RECONNECT ALL para reconectarse a todos los servidores 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 [<equipo>] [<puerto>] [<contraseña>], Puede ser llamado sólo como /"
-"RECONNECT para reconectarse al servidor actual o con /RECONNECT ALL para "
-"reconectarse a todos los servidores abiertos"
+msgstr "RECONNECT [<host>] [<puerto>] [<contraseña>], puede ser invocado como /RECONNECT para reconectarse al servidor actual o con /RECONNECT ALL para reconectarse a todos los servidores abiertos"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <texto>, envía datos en crudo a HexChat, como si fueran recibidos del "
-"servidor de IRC"
+msgstr "RECV <texto>, envía datos en bruto a HexChat, como si los recibiese del servidor IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
-msgstr "RELOAD >nombre>, carga nuevamente un plugin o script"
+msgstr "RELOAD <nombre>, recarga un complemento o script"
 
 #: src/common/outbound.c:4088
 msgid "SAY <text>, sends the text to the object in the current window"
-msgstr "SAY <texto>, envía el texto hacia un objeto de la ventana actual"
+msgstr "SAY <texto>, envía el texto al objeto en la ventana actual"
 
 #: src/common/outbound.c:4089
 msgid "SEND <nick> [<file>]"
@@ -872,29 +775,23 @@ msgstr "SEND <apodo> [<archivo>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <equipo> <puerto> <canal>, Lo conecta y entra en un canal"
+msgstr "SERVCHAN [-ssl] <host> <puerto> <canal>, se conecta y entra al canal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr "SERVCHAN <host> <port> <channel>, Le conecta y entra en un canal"
+msgstr "SERVCHAN <host> <puerto> <canal>, se conecta y entra al canal"
 
 #: 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] <host> [<puerto>] [<contraseña>], conecta a un servidor, el "
-"puerto predeterminado es 6667 para conexiones normales y 6697 para "
-"conexiones ssl"
+msgstr "SERVER [-ssl] <host> [<puerto>] [<contraseña>], se conecta a un servidor, el puerto predeterminado es 6667 para conexiones normales y 6697 para conexiones ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <equipo> [<puerto>] [<contraseña>], lo conecta a un servidor, el "
-"puerto predeterminado es 6667"
+msgstr "SERVER <host> [<puerto>] [<contraseña>], se conecta a un servidor, el puerto predeterminado es 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -906,9 +803,7 @@ msgstr "SETCURSOR [-|+]<posición>, reposicionar el cursor en cuadro de entrada"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nombre nuevo>, cambia el nombre a una pestaña, el límite tab_trunc "
-"todavía aplica"
+msgstr "SETTAB <nombre nuevo>, cambia el nombre a una pestaña, el límite tab_trunc sigue siendo válido"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -916,10 +811,9 @@ msgstr "SETTEXT <texto nuevo>, reemplaza el texto en el cuadro de entrada"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<asunto>], Establece el asunto si se provee uno, si no, muestra el "
-"topic actual"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tema>], establece el tema si se proporciona uno, de lo contrario muestra el tema actual"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -929,18 +823,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 <tiempo de espera> <archivo1> [<archivo2>] La bandeja parpadea entre "
-"dos íconos.\\n TRAY -f <nombre de archivo> Configura la bandeja a un ícono "
-"fijo.\\n TRAY -i <número> La bandeja parpadea con un ícono interno.\\n TRAY -"
-"t <texto> Configura el tooltip de la bandeja.\\n TRAY -b <título> <texto> "
-"Configura el ícono de la bandeja."
+msgstr "\nTRAY -f <tiempo de espera> <archivo1> [<archivo2>] La bandeja parpadea entre dos iconos.\nTRAY -f <nombre de archivo> Configura en la bandeja como icono fijo.\nTRAY -i <número> La bandeja parpadea con un icono interno.\nTRAY -t <texto> Configura la descripción de la bandeja.\nTRAY -b <título> <texto> Configura el globo de la bandeja."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <máscara> [<máscara>...], reincorpora las máscaras especificadas."
+msgstr "UNBAN <máscara> [<máscara>...], desbanea las máscaras especificadas."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -948,15 +835,13 @@ msgstr "UNIGNORE <máscara> [QUIET]"
 
 #: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
-msgstr "UNLOAD <nombre>, desactiva una extensión (plugin) o un guión (script)"
+msgstr "UNLOAD <nombre>, descarga un complemento o guion (script)"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <máscara> [<máscara>...], quita el silencio de la máscara "
-"especificada si es soportado por el servidor."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <máscara> [<máscara>...], quita el silencio a la máscara especificada, si el servidor lo soporta."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -964,32 +849,27 @@ msgstr "URL <url>, abre una URL en su navegador"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <apodo1> <apodo2> etc, resalta el (los) apodo(s) en la "
-"lista de usuarios del canal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <apodo1> <apodo2> etc, resalta apodo(s) de la lista de usuarios del canal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <apodo>, le otorga el estado de voz a alguien (necesita ser operador "
-"del canal)"
+msgstr "VOICE <apodo>, pone el estado de voz a alguien (necesita ser operador del canal)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
-msgstr "WALLCHAN <mensaje>, escribe el mensaje a todos los canales"
+msgstr "WALLCHAN <mensaje>, escribe el mensaje en todos los canales"
 
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mensaje>, envía el mensaje a todos los operadores del canal en el "
-"canal actual"
+msgstr "WALLCHOP <mensaje>, envía el mensaje a todos los operadores del canal en el canal actual"
 
 #: src/common/outbound.c:4166
 #, c-format
 msgid "User Command for: %s\n"
-msgstr "Comando de usuario para: %s\n"
+msgstr "Orden de usuario para: %s\n"
 
 #: src/common/outbound.c:4193
 #, c-format
@@ -1000,9 +880,7 @@ msgstr "Uso: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"No hay ayuda disponible para esa orden.\n"
+msgstr "\nNo hay ayuda disponible para esa orden.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1014,17 +892,16 @@ msgstr "Argumentos erróneos para la orden de usuario.\n"
 
 #: src/common/outbound.c:4743
 msgid "Too many recursive usercommands, aborting."
-msgstr "Demasiados comandos recursivos de usuario, abortando."
+msgstr "Demasiadas órdenes de usuario recursivas, abortando."
 
 #: src/common/outbound.c:4832
 #, c-format
 msgid "Unknown Command %s. Try /help\n"
-msgstr "Orden %s desconocida. Intenta /help\n"
+msgstr "Orden %s desconocida. Intente /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Ningún símbolo hexchat_plugin_init; ¿es realmente un plugin de HexChat?"
+msgstr "Sin distintivo hexchat_plugin_init; ¿realmente es un complemento de HexChat?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1034,7 +911,7 @@ msgstr "*\tSolicitud de servicio de ident de %s como %s"
 #: src/common/plugin-identd.c:238
 #, c-format
 msgid "*\tError starting identd server: %s"
-msgstr "*\tError al iniciar el servidor de identd: %s"
+msgstr "*\tError al iniciar el servidor identd: %s"
 
 #: src/common/plugin-identd.c:262
 msgid "IDENTD <port> <username>"
@@ -1056,7 +933,7 @@ msgstr "No hay temporizadores instalados.\n"
 #. 00000 00000000 0000000 abc
 #: src/common/plugin-timer.c:150
 msgid " Ref#  Seconds  Repeat  Command \n"
-msgstr "Ref#  Segundos  Repeticiones  Comando\n"
+msgstr " Ref#  Segundos  Repeticiones  Orden \n"
 
 #: src/common/plugin-timer.c:155
 #, c-format
@@ -1065,20 +942,18 @@ 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 "¿Está seguro de que es un servidor y un puerto con SSL?\n"
+msgstr "¿Está seguro de que se trata de un servidor y puerto compatibles con SSL?\n"
 
 #: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"No se pudo resolver el nombre de equipo %s\n"
-"¡Verifique su configuración de IP!\n"
+msgstr "No se pudo resolver el nombre de host %s\n¡Verifique su configuración IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
-msgstr "Ha fallado el proxy traversal.\n"
+msgstr "Ha fallado el proxy transversal.\n"
 
 #: src/common/servlist.c:547
 #, c-format
@@ -1090,9 +965,7 @@ msgstr "Ciclando al siguiente servidor en %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Atención: el conjunto de caracteres \"%s\" es desconocido. No se\n"
-"aplicará conversión para la red %s."
+msgstr "Advertencia: el conjunto de caracteres «%s» es desconocido. No se aplicará ninguna conversión a la red %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1100,19 +973,19 @@ msgstr "%C18*%O$t%C18$1%O añadido a lista de notificaciones."
 
 #: src/common/textevents.h:10
 msgid "%C22*%O$t%C22$1%O: %C18$2%O on %C24$4%O by %C26$3%O"
-msgstr "%C22*%O$t%C22$1%O: %C18$2%O en %C24$4%O por %C26$3%O"
+msgstr "%C22*%O$t%C22$1%O: %C18$2%O el %C24$4%O por %C26$3%O"
 
 #: src/common/textevents.h:13
 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)."
-msgstr "%C22*%O$tNo puedes entrar a %C22$1 %O(%C20Estás baneado%O)."
+msgstr "%C22*%O$tNo puede entrar a %C22$1 %O(%C20Está baneado%O)."
 
 #: src/common/textevents.h:19
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
-msgstr "%C29*%O$tCapacidades admitidas: %C29$2%O"
+msgstr "%C29*%O$tCapacidades reconocidas: %C29$2%O"
 
 #: src/common/textevents.h:22
 msgid "%C29*%O$tCapabilities removed: %C29$2%O"
-msgstr "%C29*%O$tCapacidades removidas: %C29$2%O"
+msgstr "%C29*%O$tCapacidades eliminadas: %C29$2%O"
 
 #: src/common/textevents.h:25
 msgid "%C23*%O$tCapabilities supported: %C29$2%O"
@@ -1120,15 +993,15 @@ msgstr "%C23*%O$tCapacidades soportadas: %C29$2%O"
 
 #: src/common/textevents.h:28
 msgid "%C23*%O$tCapabilities requested: %C29$1%O"
-msgstr "%C23*%O$tCapacidades requeridas: %C29$1%O"
+msgstr "%C23*%O$tCapacidades solicitadas: %C29$1%O"
 
 #: src/common/textevents.h:31
 msgid "%C24*%O$t%C28$1%O is now known as %C18$2%O"
-msgstr "%C24*%O$t%C28$1%O ahora se conoce como %C18$2%O"
+msgstr "%C24*%O$t%C28$1%O ahora es conocido como %C18$2%O"
 
 #: src/common/textevents.h:40
 msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O pone ban a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O banea a %C18$2%O"
 
 #: src/common/textevents.h:43
 msgid "%C22*%O$tChannel %C22$1%O created on %C24$2%O"
@@ -1136,7 +1009,7 @@ msgstr "%C22*%O$tCanal %C22$1%O creado el %C24$2%O"
 
 #: src/common/textevents.h:46
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O quita semi-op a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O quita semiop a %C18$2%O"
 
 #: src/common/textevents.h:49
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
@@ -1148,11 +1021,11 @@ msgstr "%C22*%O$t%C26$1%O quita voz a %C18$2%O"
 
 #: src/common/textevents.h:55
 msgid "%C22*%O$t%C26$1%C sets exempt on %C18$2%O"
-msgstr "%C22*%O$t%C26 $1%C pone excepción a %C18$2%O"
+msgstr "%C22*%O$t%C26 $1%C pone exención a %C18$2%O"
 
 #: src/common/textevents.h:58
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O da semi-op a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O da semiop a %C18$2%O"
 
 #: src/common/textevents.h:61
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
@@ -1160,11 +1033,11 @@ msgstr "%C22*%O$t%C26$1%C pone modo +I a %C18$2%O"
 
 #: src/common/textevents.h:64
 msgid "%UChannel          Users   Topic"
-msgstr "%UTema de los usuarios del canal"
+msgstr "%UCanal          Usuarios  Tema"
 
 #: src/common/textevents.h:70
 msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
-msgstr "%C22*%O$t%C26$1%O pone modo %C24$2$3%O a %C22$4%O"
+msgstr "%C22*%O$t%C26$1%O pone modo %C24$2$3%O en %C22$4%O"
 
 #: src/common/textevents.h:73
 msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
@@ -1180,11 +1053,11 @@ msgstr "%C22*%O$t%C26$1%O pone silencio a %C18$2%O"
 
 #: src/common/textevents.h:88
 msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O quita excepción a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O quita exención a %C18$2%O"
 
 #: src/common/textevents.h:91
 msgid "%C22*%O$t%C26$1%O removes invite exempt on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O pone modo -I a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O quita modo -I en %C18$2%O"
 
 #: src/common/textevents.h:94
 msgid "%C22*%O$t%C26$1%O removes channel keyword"
@@ -1200,15 +1073,15 @@ msgstr "%C22*%O$t%C26$1%O pone la contraseña del canal a %C24$2%O"
 
 #: src/common/textevents.h:103
 msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
-msgstr "%C22*%O$t%C26$1%O pone el límite del canal a %C24$2%O"
+msgstr "%C22*%O$t%C26$1%O pone el límite de usuarios del canal a %C24$2%O"
 
 #: src/common/textevents.h:106
 msgid "%C22*%O$t%C26$1%O removes ban on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O quita el ban a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O quita el baneo a %C18$2%O"
 
 #: src/common/textevents.h:109
 msgid "%C22*%O$t%C26$1%O removes quiet on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O quita el silencio a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O quita silencio a %C18$2%O"
 
 #: src/common/textevents.h:112
 msgid "%C22*%O$tChannel %C22$1%O url: %C24$2"
@@ -1236,43 +1109,44 @@ msgstr "%C24*%O$tRecibido un CTCP %C24$1%C de %C18$2%O"
 
 #: src/common/textevents.h:130
 msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
-msgstr "%C24*%C$tRecibido un CTCP %C24$1%C de %C18$2%C (a %C22$3%C)%O"
+msgstr "%C24*%C$tRecibido un CTCP %C24$1%C de %C18$2%C (en %C22$3%C)%O"
 
 #: src/common/textevents.h:136
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
-msgstr "%C24*%O$tRecibido un Sonido CTCP %C24$1%C de %C18$2%O"
+msgstr "%C24*%O$tRecibido un sonido CTCP %C24$1%C de %C18$2%O"
 
 #: src/common/textevents.h:139
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
-msgstr "%C24*%O$tRecibido un Sonido CTCP %C24$1%C de %C18$2%C (a %C22$3%O)"
+msgstr "%C24*%O$tRecibido un sonido CTCP %C24$1%C de %C18$2%C (en %C22$3%O)"
 
 #: src/common/textevents.h:142
 msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
-msgstr "%C23*%O$tDCC CHAT a %C18$1%O cancelado."
+msgstr "%C23*%O$tCHARLA DCC con %C18$1%O cancelada."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr "%C24*%O$tConexión DCC CHAT establecida con %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 "%C24*%O$tCHARLA DCC conexión establecida con %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
-msgstr "%C20*%O$tDCC CHAT a %C18$1%O perdido (%C20$4%O)"
+msgstr "%C20*%O$tCHARLA DCC con %C18$1%O perdida (%C20$4%O)"
 
 #: src/common/textevents.h:151
 msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
-msgstr "%C24*%O$tRecibida una petición DCC CHAT de %C18$1%O"
+msgstr "%C24*%O$tRecibida una petición de CHARLA DCC de %C18$1%O"
 
 #: src/common/textevents.h:154
 msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
-msgstr "%C24*%O$tEnviando petición DCC CHAT a %C18$1%O"
+msgstr "%C24*%O$tOfreciendo CHARLA DCC a %C18$1%O"
 
 #: src/common/textevents.h:157
 msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
-msgstr "%C24*%O$tYa se envió una petición de CHAT a %C18$1%O"
+msgstr "%C24*%O$tYa se envió una petición de CHARLA a %C18$1%O"
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr "%C20*%O$tDCC $1 intento de conexión con %C18$2%O fallido (%C20$3%O)"
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1285,11 +1159,9 @@ msgstr "%C16,17 Tipo  Hacia/Desde    Estado  Tamaño    Pos     Archivo"
 
 #: 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"
-msgstr ""
-"%C20*%O$tRecibida una petición DCC malformada de %C18$1%O.$a010%C23*%O"
-"$tContenido del paquete: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tRecibida una petición DCC malformada de %C18$1%O.$a010%C23*%O$tContenido del paquete: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1297,7 +1169,7 @@ msgstr "%C24*%O$tOfreciendo '%C24$1%O' a %C18$2%O"
 
 #: src/common/textevents.h:175
 msgid "%C23*%O$tNo such DCC offer."
-msgstr "%C23*%O$tNingún DCC para ofrecer."
+msgstr "%C23*%O$tNo se ofreció ningún DCC."
 
 #: src/common/textevents.h:178
 msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
@@ -1306,28 +1178,26 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' a %C18$1%O cancelado."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O completado %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O completado %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr "%C24*%O$tDCC RECV conexión establecida a %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 "%C24*%O$tDCC RECV conexión establecida con %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
-msgstr "%C20*%O$tDCC RECV '%C23$1%O' de %C18$3%O falló (%C20$4%O)"
+msgstr "%C20*%O$tDCC RECV '%C23$1%O' de %C18$3%O fallido (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: No se puede abrir '%C23$1%C' para escritura (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV: No se pudo abrir '%C23$1%C' como escritura (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tEl archivo '%C24$1%C' ya existe, guardándolo como '%C23$2%O' en su "
-"lugar."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tEl archivo '%C24$1%C' ya existe, guardándo como '%C23$2%O' en su lugar."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1340,16 +1210,16 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' a %C18$1%O cancelado."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' a %C18$2%C completado %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' a %C18$2%C completado %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr "%C24*%O$tDCC SEND conexión establecida a %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 "%C24*%O$tDCC SEND conexión establecida con %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
-msgstr "%C20*%O$tDCC SEND '%C23$1%C' a %C18$2%C falló (%C20$3%O)"
+msgstr "%C20*%O$tDCC SEND '%C23$1%C' a %C18$2%C fallido (%C20$3%O)"
 
 #: src/common/textevents.h:211
 msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
@@ -1386,12 +1256,12 @@ msgstr "%OIgnorar a %C18$1%O cambiado."
 #: src/common/textevents.h:238
 #, c-format
 msgid "%C16,17"
-msgstr ""
+msgstr "%C16,17"
 
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
+msgstr "%C16,17 Host                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1403,12 +1273,11 @@ msgstr "%OLa lista de ignorados está vacía."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tNo se puede entrar %C22$1%C (%C20El canal es sólo de invitación%O)"
+msgstr "%C20*%O$tNo se pudo unir a %C22$1%C (%C20El canal es solo para invitados%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
-msgstr "%C24*%O$tHas sido invitado a %C22$1%O por %C18$2%O (%C29$3%O)"
+msgstr "%C24*%O$tHa sido invitado a %C22$1%O por %C18$2%O (%C29$3%O)"
 
 #: src/common/textevents.h:256
 #, c-format
@@ -1417,7 +1286,7 @@ msgstr "%C23*$t$1 ($3%C23) se ha unido"
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr "%C20*%O$tNo se puede entrar %C22$1%C (%C20Se necesita contraseña%O)"
+msgstr "%C20*%O$tNo se pudo unir a %C22$1%C (%C20Se necesita contraseña%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
@@ -1425,11 +1294,11 @@ msgstr "%C22*%O$t%C26$1%C ha expulsado a %C18$2%C de %C22$3%C (%C24$4%O)"
 
 #: src/common/textevents.h:265
 msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
-msgstr "%C19*%O$t%C19Has sido baneado por %C26$1%C (%C20$2%O)"
+msgstr "%C19*%O$t%C19Has sido expulsado por %C26$1%C (%C20$2%O)"
 
 #: src/common/textevents.h:274
 msgid "%C29*%O$t%C29MOTD Skipped%O"
-msgstr "%C29*%O$t%C29MOTD ignorado%O"
+msgstr "%C29*%O$t%C29MOTD omitido%O"
 
 #: src/common/textevents.h:277
 msgid "%C23*%O$t%C28$1%C is already in use. Retrying with %C18$2%O..."
@@ -1442,9 +1311,7 @@ msgstr "%C23*%O$t%C28$1%C es erróneo. Intentando con %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tEl nick es erróneo o ya está en uso. Usa /NICK para intentar con "
-"otro."
+msgstr "%C20*%O$tEl apodo es erróneo o ya está en uso. Use /NICK para probar con otro."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1452,7 +1319,7 @@ msgstr "%C20*%O$tNo hay ningún DCC."
 
 #: src/common/textevents.h:289
 msgid "%C23*%O$tNo process is currently running"
-msgstr "%C23*%O$tActualmente no hay ningún proceso activo"
+msgstr "%C23*%O$tNo se está ejecutando ningún proceso"
 
 #: src/common/textevents.h:298
 msgid "%C23*%O$tNotify: %C18$1%C is away (%C24$2%O)"
@@ -1469,7 +1336,7 @@ msgstr "$tLa lista de notificaciones está vacía."
 #: src/common/textevents.h:307
 #, c-format
 msgid "%C16,17  Notify List"
-msgstr ""
+msgstr "%C16,17  Lista de notificaciones"
 
 #: src/common/textevents.h:310
 msgid "%C23*%O$t%C23$1%O users in notify list."
@@ -1477,11 +1344,11 @@ msgstr "%C23*%O$t%C23$1%O usuarios en la lista de notificaciones."
 
 #: src/common/textevents.h:313
 msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
-msgstr "%C23*%O$tNotificación: %C18$1%C está desconectado (%C29$3%O)"
+msgstr "%C23*%O$tNotificación: %C18$1%C está fuera de línea (%C29$3%O)"
 
 #: src/common/textevents.h:316
 msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
-msgstr "%C23*%O$tNotificación: %C18$1%C está conectado (%C29$3%O)"
+msgstr "%C23*%O$tNotificación: %C18$1%C está en línea (%C29$3%O)"
 
 #: src/common/textevents.h:322
 #, c-format
@@ -1499,11 +1366,11 @@ msgstr "%C24*%O$tRespuesta ping de %C18$1%C: %C24$2%O segundo(s)"
 
 #: src/common/textevents.h:331
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr "%C20*%O$tSin respuesta ping de %C24$1%O segundos, disconectando."
+msgstr "%C20*%O$tSin respuesta ping de %C24$1%O segundos, desconectando."
 
 #: src/common/textevents.h:346
 msgid "%C24*%O$tA process is already running"
-msgstr "%C24*%O$tYa está activo un proceso"
+msgstr "%C24*%O$tYa se está ejecutando el proceso"
 
 #: src/common/textevents.h:349
 #, c-format
@@ -1540,7 +1407,7 @@ msgstr "%C23*%O$tDetenido el anterior intento de conexión (%C24$1%O)"
 
 #: src/common/textevents.h:388
 msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
-msgstr "%C22*%O$tTema para %C22$1%C es: $2%O"
+msgstr "%C22*%O$tTema de %C22$1%C: $2%O"
 
 #: src/common/textevents.h:391
 msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
@@ -1548,16 +1415,15 @@ msgstr "%C22*%O$t%C26$1%C ha cambiado el tema a: $2%O"
 
 #: src/common/textevents.h:394
 msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
-msgstr "%C22*%O$tTema para %C22$1%C puesto por %C26$2%C (%C24$3%O)"
+msgstr "%C22*%O$tTema de %C22$1%C puesto por %C26$2%C (%C24$3%O)"
 
 #: src/common/textevents.h:397
 msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C20*%O$tHost desconocido. ¿Lo escribiste mal?"
+msgstr "%C20*%O$tHost desconocido. ¿Lo escribió mal?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tNo se puede entrar %C22$1%C (%C20Se alcanzó el límite de usuarios%O)"
+msgstr "%C20*%O$tNo se pudo unir a %C22$1%C (%C20Se alcanzó el límite de usuarios%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1573,41 +1439,40 @@ msgstr "%C23*%O$t%C28[%C18$1%C28] %OFin de la lista WHOIS."
 
 #: src/common/textevents.h:421
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
-msgstr "%C23*%O$t%C28[%C18$1%C28]%O inactividad %C23$2%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O inactivo %C23$2%O"
 
 #: src/common/textevents.h:424
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
-msgstr "%C23*%O$t%C28[%C18$1%C28]%O inactividad %C23$2%O, entró el: %C23$3%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O inactivo %C23$2%O, entró el: %C23$3%O"
 
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Host Real: %C23$2%O, IP Real: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Host real: %C23$2%O, IP real: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
-msgstr "%C19*%O$tHablando con %C22$2%O"
+msgstr "%C19*%O$tUnido a %C22$2%O"
 
 #: src/common/textevents.h:442
 msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
-msgstr "%C19*%O$tHas sido expulsado de %C22$2%C por %C26$3%O (%C20$4%O)"
+msgstr "%C19*%O$tHa sido expulsado de %C22$2%C por %C26$3%O (%C20$4%O)"
 
 #: src/common/textevents.h:445
 msgid "%C19*%O$tYou have left channel %C22$3%O"
-msgstr "%C19*%O$tHas abandonado el canal %C22$3%O"
+msgstr "%C19*%O$tHa abandonado el canal %C22$3%O"
 
 #: src/common/textevents.h:448
 msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
-msgstr "%C19*%O$tHas abandonado el canal %C22$3%C (%C24$4%O)"
+msgstr "%C19*%O$tHa abandonado el canal %C22$3%C (%C24$4%O)"
 
 #: src/common/textevents.h:454
 msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
-msgstr "%C20*%O$tHas invitado a %C18$1%O al canal %C22$2%O (%C24$3%O)"
+msgstr "%C20*%O$tHa invitado a %C18$1%O al canal %C22$2%O (%C24$3%O)"
 
 #: src/common/textevents.h:460
 msgid "%C20*%O$tYou are now known as %C18$2%O"
-msgstr "%C20*%O$tAhora eres conocido como %C18$2%O"
+msgstr "%C20*%O$tAhora es conocido como %C18$2%O"
 
 #: src/common/text.c:348
 msgid "Loaded log from"
@@ -1628,17 +1493,15 @@ msgstr "**** INICIANDO CONEXIÓN EN %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* No se puede abrir el registro(s) de escritura. Revisa los\n"
-"permisos en %s"
+msgstr "* Imposible abrir el registro(s) de escritura. Revise los\npermisos en %s"
 
 #: src/common/text.c:960
 msgid "Left message"
-msgstr "Mensaje de ausencia"
+msgstr "Dejar mensaje"
 
 #: src/common/text.c:961
 msgid "Right message"
-msgstr "El mensaje"
+msgstr "Mensaje correcto"
 
 #: src/common/text.c:966 src/common/text.c:1350 src/common/text.c:1388
 #: src/common/text.c:1393 src/common/text.c:1434
@@ -1652,15 +1515,15 @@ msgstr "Nombre de usuario"
 
 #: src/common/text.c:972
 msgid "The nick of the joining person"
-msgstr "El apodo de la persona que entra"
+msgstr "El apodo de la persona que se une"
 
 #: src/common/text.c:973
 msgid "The channel being joined"
-msgstr "El canal al que está entrando"
+msgstr "El canal al que se está uniendo"
 
 #: src/common/text.c:974 src/common/text.c:1042 src/common/text.c:1093
 msgid "The host of the person"
-msgstr "El equipo de la persona"
+msgstr "El host de la persona"
 
 #: src/common/text.c:975
 msgid "The account of the person"
@@ -1691,7 +1554,7 @@ msgstr "Modo carácter"
 
 #: src/common/text.c:982 src/common/text.c:989 src/common/text.c:995
 msgid "Identified text"
-msgstr "Texto de info"
+msgstr "Texto identificado"
 
 #: src/common/text.c:987
 msgid "The text"
@@ -1710,11 +1573,11 @@ msgstr "Nombre del servidor"
 
 #: src/common/text.c:1000
 msgid "Acknowledged Capabilities"
-msgstr "Capacidades admitidas"
+msgstr "Capacidades reconocidas"
 
 #: src/common/text.c:1005
 msgid "Removed Capabilities"
-msgstr "Capacidades removidas"
+msgstr "Capacidades eliminadas"
 
 #: src/common/text.c:1010
 msgid "Server Capabilities"
@@ -1722,7 +1585,7 @@ msgstr "Capacidades del servidor"
 
 #: src/common/text.c:1014
 msgid "Requested Capabilities"
-msgstr "Capacidades requeridas"
+msgstr "Capacidades solicitadas"
 
 #: src/common/text.c:1018 src/common/text.c:1080
 msgid "Old nickname"
@@ -1734,20 +1597,20 @@ msgstr "Nuevo apodo"
 
 #: src/common/text.c:1023
 msgid "Nick of person who changed the topic"
-msgstr "Apodo de la persona que ha cambiado el topic"
+msgstr "Apodo de la persona que ha cambiado el tema"
 
 #: src/common/text.c:1024 src/common/text.c:1030 src/fe-gtk/chanlist.c:779
 #: src/fe-gtk/chanlist.c:881 src/fe-gtk/setup.c:337
 msgid "Topic"
-msgstr "Topic"
+msgstr "Tema"
 
 #: src/common/text.c:1034 src/common/text.c:1087
 msgid "The nickname of the kicker"
-msgstr "El apodo del que expulsa"
+msgstr "El apodo del que expulsó"
 
 #: src/common/text.c:1035 src/common/text.c:1085
 msgid "The person being kicked"
-msgstr "La persona que esta siendo expulsada"
+msgstr "La persona que fue expulsada"
 
 #: src/common/text.c:1036 src/common/text.c:1043 src/common/text.c:1047
 #: src/common/text.c:1052 src/common/text.c:1086 src/common/text.c:1094
@@ -1761,11 +1624,11 @@ msgstr "La razón"
 
 #: src/common/text.c:1041 src/common/text.c:1092
 msgid "The nick of the person leaving"
-msgstr "El apodo de la persona que abandona"
+msgstr "El apodo de la persona que abandonó"
 
 #: src/common/text.c:1048 src/common/text.c:1054
 msgid "The time"
-msgstr "El tiempo"
+msgstr "La fecha"
 
 #: src/common/text.c:1053
 msgid "The creator"
@@ -1781,7 +1644,7 @@ msgstr "Razón"
 
 #: src/common/text.c:1060 src/common/text.c:1212 src/common/text.c:1313
 msgid "Host"
-msgstr "Equipo"
+msgstr "Host"
 
 #: src/common/text.c:1064 src/common/text.c:1069 src/common/text.c:1074
 msgid "Who it's from"
@@ -1789,11 +1652,11 @@ msgstr "De quién viene"
 
 #: src/common/text.c:1065
 msgid "The time in x.x format (see below)"
-msgstr "El tiempo en el formato x.x (vea debajo)"
+msgstr "La fecha en formato x.x (ver debajo)"
 
 #: src/common/text.c:1075 src/common/text.c:1112
 msgid "The Channel it's going to"
-msgstr "El canal se va a"
+msgstr "El canal al que va"
 
 #: src/common/text.c:1099
 msgid "The sound"
@@ -1809,7 +1672,7 @@ msgstr "El evento CTCP"
 
 #: src/common/text.c:1116
 msgid "The nick of the person who set the key"
-msgstr "El apodo de la persona que establece la clave"
+msgstr "El apodo de la persona que puso la clave"
 
 #: src/common/text.c:1117
 msgid "The key"
@@ -1817,7 +1680,7 @@ msgstr "La clave"
 
 #: src/common/text.c:1121
 msgid "The nick of the person who set the limit"
-msgstr "El apodo de la persona que establece el límite"
+msgstr "El apodo de la persona que puso el límite"
 
 #: src/common/text.c:1122
 msgid "The limit"
@@ -1825,39 +1688,39 @@ msgstr "El limite"
 
 #: src/common/text.c:1126
 msgid "The nick of the person who did the op'ing"
-msgstr "El apodo de la persona que otorgó los permisos de operador"
+msgstr "El apodo de la persona que dio el op"
 
 #: src/common/text.c:1127
 msgid "The nick of the person who has been op'ed"
-msgstr "El apodo de la persona que ha sido convertida en operador"
+msgstr "El apodo de la persona que recibió el op"
 
 #: src/common/text.c:1131
 msgid "The nick of the person who has been halfop'ed"
-msgstr "El apodo de la persona que ha sido convertida en semi-operador"
+msgstr "El apodo de la persona que recibió el semiop"
 
 #: src/common/text.c:1132
 msgid "The nick of the person who did the halfop'ing"
-msgstr "El apodo de la persona que otorgó los permisos de semi-operador"
+msgstr "El apodo de la persona que dio el semiop"
 
 #: src/common/text.c:1136
 msgid "The nick of the person who did the voice'ing"
-msgstr "El apodo de la persona que otorgó los permisos de voz"
+msgstr "El apodo de la persona que dio la voz"
 
 #: src/common/text.c:1137
 msgid "The nick of the person who has been voice'ed"
-msgstr "El apodo de la persona que ha sido convertida en voz"
+msgstr "El apodo de la persona que recibió la voz"
 
 #: src/common/text.c:1141
 msgid "The nick of the person who did the banning"
-msgstr "El apodo de la persona que realizó el veto (banning)"
+msgstr "El apodo de la persona que puso el baneo"
 
 #: src/common/text.c:1142 src/common/text.c:1174
 msgid "The ban mask"
-msgstr "La máscara de vetos"
+msgstr "La máscara de baneo"
 
 #: src/common/text.c:1146
 msgid "The nick of the person who did the quieting"
-msgstr "El nick del usuario que otorgó el silencio"
+msgstr "El apodo del usuario que puso el silencio"
 
 #: src/common/text.c:1147 src/common/text.c:1179
 msgid "The quiet mask"
@@ -1865,40 +1728,39 @@ msgstr "La máscara de silencio"
 
 #: src/common/text.c:1151
 msgid "The nick who removed the key"
-msgstr "El apodo de quien ha eliminado la clave"
+msgstr "El apodo de quién eliminó la clave"
 
 #: src/common/text.c:1155
 msgid "The nick who removed the limit"
-msgstr "El apodo de quien ha eliminado el límite"
+msgstr "El apodo de quién eliminó el límite"
 
 #: src/common/text.c:1159
 msgid "The nick of the person who did the deop'ing"
-msgstr "El apodo de la persona que ha revocado los permisos de operador"
+msgstr "El apodo de la persona que quitó el op"
 
 #: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
-msgstr "El apodo de la persona a la que se la quitado el permiso de operador"
+msgstr "El apodo de la persona a la que se quitó el op"
 
 #: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
-msgstr "El apodo de la persona que ha revocado los permisos de semi-operador"
+msgstr "El apodo de la persona que quitó el semiop"
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
-msgstr ""
-"El apodo de la persona a la que se la quitado los permisos de semi-operador"
+msgstr "El apodo de la persona a la que se quitó el semiop"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
-msgstr "El apodo de la persona que ha revocado lo permisos de voz"
+msgstr "El apodo de la persona que quitó la voz"
 
 #: src/common/text.c:1169
 msgid "The nick of the person who has been devoice'ed"
-msgstr "El apodo de la persona a la que se la quitado los permisos de voz"
+msgstr "El apodo de la persona a la que se quitó la voz"
 
 #: src/common/text.c:1173
 msgid "The nick of the person who did the unban'ing"
-msgstr "El apodo de la persona que ha revocado el ban"
+msgstr "El apodo de la persona que quitó el baneo"
 
 #: src/common/text.c:1178
 msgid "The nick of the person who did the unquiet'ing"
@@ -1906,7 +1768,7 @@ msgstr "El apodo de la persona que quitó el silencio"
 
 #: src/common/text.c:1183
 msgid "The nick of the person who did the exempt"
-msgstr "El apodo de la persona que otorgó la excepción"
+msgstr "El apodo de la persona que puso la excención"
 
 #: src/common/text.c:1184 src/common/text.c:1189
 msgid "The exempt mask"
@@ -1914,11 +1776,11 @@ msgstr "La máscara de excención"
 
 #: src/common/text.c:1188
 msgid "The nick of the person removed the exempt"
-msgstr "El apodo de la persona que ha quitado la exención"
+msgstr "El apodo de la persona que quitó la exención"
 
 #: src/common/text.c:1193
 msgid "The nick of the person who did the invite"
-msgstr "El apodo de la persona que ha realizado la invitación"
+msgstr "El apodo de la persona que dio la invitación"
 
 #: src/common/text.c:1194 src/common/text.c:1199
 msgid "The invite mask"
@@ -1926,11 +1788,11 @@ msgstr "La máscara de invitación"
 
 #: src/common/text.c:1198
 msgid "The nick of the person removed the invite"
-msgstr "El apodo de la persona que ha removido la invitación"
+msgstr "El apodo de la persona que quitó la invitación"
 
 #: src/common/text.c:1203
 msgid "The nick of the person setting the mode"
-msgstr "El apodo de la persona que ha establecido el modo"
+msgstr "El apodo de la persona que puso el modo"
 
 #: src/common/text.c:1204
 msgid "The mode's sign (+/-)"
@@ -1950,7 +1812,7 @@ msgstr "Nombre completo"
 
 #: src/common/text.c:1218
 msgid "Channel Membership/\"is an IRC operator\""
-msgstr "Membresía de canal/es un operador de IRC"
+msgstr "Membresía del canal/«es un operador de IRC»"
 
 #: src/common/text.c:1223
 msgid "Server Information"
@@ -1966,7 +1828,7 @@ msgstr "Tiempo de conexión"
 
 #: src/common/text.c:1239
 msgid "Away reason"
-msgstr "Razón de ausencia"
+msgstr "Razón de la ausencia"
 
 #: src/common/text.c:1248 src/common/text.c:1254 src/common/text.c:1262
 #: src/common/text.c:1278 src/common/text.c:1470
@@ -1979,11 +1841,11 @@ msgstr "Cuenta"
 
 #: src/common/text.c:1260
 msgid "Real user@host"
-msgstr "Verdadero usuario@equipo"
+msgstr "Real usuario@host"
 
 #: src/common/text.c:1261
 msgid "Real IP"
-msgstr "Verdadera IP"
+msgstr "Real IP"
 
 #: src/common/text.c:1266 src/common/text.c:1293 src/common/text.c:1299
 #: src/common/text.c:1329 src/common/text.c:1334 src/common/text.c:1493
@@ -1996,7 +1858,7 @@ msgstr "Mecanismo"
 
 #: src/common/text.c:1276 src/common/text.c:1284
 msgid "Raw Numeric or Identifier"
-msgstr "Identificador o número en crudo"
+msgstr "Identificador o número en bruto"
 
 #: src/common/text.c:1282 src/common/text.c:1288 src/common/text.c:1456
 #: src/fe-gtk/menu.c:1547 src/fe-gtk/menu.c:1795 src/fe-gtk/setup.c:216
@@ -2093,11 +1955,11 @@ msgstr "Receptor"
 
 #: src/common/text.c:1474
 msgid "Hostmask"
-msgstr "Máscara de equipo"
+msgstr "Máscara de host"
 
 #: src/common/text.c:1479
 msgid "Hostname"
-msgstr "Nombre de equipo"
+msgstr "Nombre de host"
 
 #: src/common/text.c:1484
 msgid "The Packet"
@@ -2113,24 +1975,22 @@ msgstr "Apodo de la persona que ha sido invitada"
 
 #: src/common/text.c:1499
 msgid "Banmask"
-msgstr "Máscara de veto"
+msgstr "Máscara de baneo"
 
 #: src/common/text.c:1500
 msgid "Who set the ban"
-msgstr "Quien ha establecido el veto"
+msgstr "Quién ha puesto el baneo"
 
 #: src/common/text.c:1501
 msgid "Ban time"
-msgstr "Tiempo de veto"
+msgstr "Fecha del baneo"
 
 #: src/common/text.c:2266
 #, c-format
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"No se puede leer el archivo de sonido:\n"
-"%s"
+msgstr "No se puede leer el archivo de sonido:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -2142,7 +2002,7 @@ msgstr "Conexión rechazada"
 
 #: src/common/util.c:127
 msgid "No route to host"
-msgstr "No hay ruta hacia el equipo"
+msgstr "No hay ruta hacia el host"
 
 #: src/common/util.c:129
 msgid "Connection timed out"
@@ -3270,7 +3130,7 @@ msgstr "No se pudo completar NombreTieneDueño"
 
 #: src/common/dbus/dbus-client.c:153 src/common/dbus/dbus-client.c:170
 msgid "Failed to complete Command"
-msgstr "No se pudo completar el Comando"
+msgstr "No se pudo completar la orden"
 
 #: src/common/dbus/dbus-plugin.c:31
 msgid "remote access"
@@ -3278,7 +3138,7 @@ msgstr "acceso remoto"
 
 #: src/common/dbus/dbus-plugin.c:32
 msgid "plugin for remote access using DBUS"
-msgstr "complemento para acceso remoto usando DBUS"
+msgstr "complemento de acceso remoto usando DBUS"
 
 #: src/common/dbus/dbus-plugin.c:899
 #, c-format
@@ -3300,11 +3160,11 @@ msgstr "Baneos"
 
 #: src/fe-gtk/banlist.c:58
 msgid "Exempts"
-msgstr "Excepciones"
+msgstr "Exenciones"
 
 #: src/fe-gtk/banlist.c:59
 msgid "Exempt"
-msgstr "Exento"
+msgstr "Exención"
 
 #: src/fe-gtk/banlist.c:67
 msgid "Invites"
@@ -3320,7 +3180,7 @@ msgstr "Silenciados"
 
 #: src/fe-gtk/banlist.c:77
 msgid "Quiet"
-msgstr "Silenciado"
+msgstr "Silenciar"
 
 #. poor way to get which is selected but it works
 #: src/fe-gtk/banlist.c:354 src/fe-gtk/banlist.c:388
@@ -3330,7 +3190,7 @@ msgstr "Copiar máscara"
 #: src/fe-gtk/banlist.c:357
 #, c-format
 msgid "%s on %s by %s"
-msgstr "%s a %s por %s"
+msgstr "%s el %s por %s"
 
 #: src/fe-gtk/banlist.c:389
 msgid "Copy entry"
@@ -3343,12 +3203,12 @@ msgstr "No conectado."
 
 #: src/fe-gtk/banlist.c:538 src/fe-gtk/banlist.c:621
 msgid "You must select some bans."
-msgstr "Debe seleccionar algún baneado"
+msgstr "Debe seleccionar algún baneado."
 
 #: src/fe-gtk/banlist.c:568
 #, c-format
 msgid "Are you sure you want to remove all listed items in %s?"
-msgstr "¿Estás seguro que quieres borrar toda la lista en %s?"
+msgstr "¿Seguro de que desea eliminar todos los elementos de la lista de %s?"
 
 #: src/fe-gtk/banlist.c:726
 msgid "Type"
@@ -3360,7 +3220,7 @@ msgstr "Máscara"
 
 #: src/fe-gtk/banlist.c:728
 msgid "From"
-msgstr "De"
+msgstr "Por"
 
 #: src/fe-gtk/banlist.c:729
 msgid "Date"
@@ -3368,7 +3228,7 @@ msgstr "Fecha"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr "Sólo puedes abrir la lista de bans mientras hay pestaña de canal."
+msgstr "Sólo puede abrir la lista de baneos en una pestaña de canal."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3381,7 +3241,7 @@ msgstr "Quitar"
 
 #: src/fe-gtk/banlist.c:845
 msgid "Crop"
-msgstr "Achicar"
+msgstr "Mantener"
 
 #: src/fe-gtk/banlist.c:849
 msgid "Refresh"
@@ -3398,7 +3258,7 @@ msgstr "Seleccione un archivo de salida"
 
 #: src/fe-gtk/chanlist.c:624 src/fe-gtk/chanlist.c:812
 msgid "_Join Channel"
-msgstr "_Entrar al canal"
+msgstr "_Unirse al canal"
 
 #: src/fe-gtk/chanlist.c:626
 msgid "_Copy Channel Name"
@@ -3419,7 +3279,7 @@ msgstr "_Buscar"
 
 #: src/fe-gtk/chanlist.c:800
 msgid "_Download List"
-msgstr "Descargar lista"
+msgstr "_Descargar lista"
 
 #: src/fe-gtk/chanlist.c:806
 msgid "Save _List..."
@@ -3432,11 +3292,11 @@ msgstr "Mostrar solo:"
 
 #: src/fe-gtk/chanlist.c:831
 msgid "channels with"
-msgstr "canales con"
+msgstr "canales de"
 
 #: src/fe-gtk/chanlist.c:844
 msgid "to"
-msgstr "de"
+msgstr "a"
 
 #: src/fe-gtk/chanlist.c:856
 msgid "users."
@@ -3445,7 +3305,7 @@ msgstr "usuarios."
 #. =============================================================
 #: src/fe-gtk/chanlist.c:862
 msgid "Look in:"
-msgstr "Ver en:"
+msgstr "Buscar en:"
 
 #: src/fe-gtk/chanlist.c:874
 msgid "Channel name"
@@ -3462,7 +3322,7 @@ msgstr "Búsqueda simple"
 
 #: src/fe-gtk/chanlist.c:902
 msgid "Pattern Match (Wildcards)"
-msgstr "Patrón de comparación (comodines)"
+msgstr "Patrón (con comodines)"
 
 #: src/fe-gtk/chanlist.c:903
 msgid "Regular Expression"
@@ -3481,7 +3341,7 @@ msgstr "Enviar archivo a %s"
 #. unknown error
 #: src/fe-gtk/dccgui.c:525
 msgid "That file is not resumable."
-msgstr "Ese archivo no se puede retomar"
+msgstr "Ese archivo no se puede reanudar."
 
 #: src/fe-gtk/dccgui.c:529
 #, c-format
@@ -3489,22 +3349,17 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"No se pudo acceder al archivo: %s\n"
-"%s.\n"
-"No es posible retomar."
+msgstr "No se pudo acceder al archivo: %s\n%s.\nNo es posible reanudar."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"El archivo en el directorio de descarga es más grande que el archivo "
-"afrecido. No es posible retomar."
+msgstr "El archivo del directorio de descarga es más grande que el archivo ofrecido. No es posible reanudar."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
-msgstr "No se puede retomar el mismo archivo de dos personas."
+msgstr "No se puede reanudar el mismo archivo desde dos personas."
 
 #: src/fe-gtk/dccgui.c:803
 #, c-format
@@ -3529,7 +3384,7 @@ msgstr "Ambos"
 
 #: src/fe-gtk/dccgui.c:857
 msgid "Uploads"
-msgstr "Subidos"
+msgstr "Subidas"
 
 #: src/fe-gtk/dccgui.c:863
 msgid "Downloads"
@@ -3557,7 +3412,7 @@ msgstr "Aceptar"
 
 #: src/fe-gtk/dccgui.c:888
 msgid "Resume"
-msgstr "Continuar"
+msgstr "Reanudar"
 
 #: src/fe-gtk/dccgui.c:890
 msgid "Open Folder..."
@@ -3566,7 +3421,7 @@ msgstr "Abrir carpeta..."
 #: src/fe-gtk/dccgui.c:1050
 #, c-format
 msgid "DCC Chat List - %s"
-msgstr "Lista de conversación DCC - %s"
+msgstr "Lista de charlas DCC - %s"
 
 #: src/fe-gtk/dccgui.c:1065
 msgid "Recv"
@@ -3598,19 +3453,19 @@ msgstr "Guardar"
 
 #: src/fe-gtk/fe-gtk.c:81 src/fe-text/fe-text.c:467
 msgid "Don't auto connect to servers"
-msgstr "No reconectarse al servidor automáticamente"
+msgstr "No conectar automáticamente a los servidores"
 
 #: src/fe-gtk/fe-gtk.c:82 src/fe-text/fe-text.c:468
 msgid "Use a different config directory"
-msgstr "usar un directorio de configuración diferente"
+msgstr "Usar un directorio de configuración diferente"
 
 #: src/fe-gtk/fe-gtk.c:83 src/fe-text/fe-text.c:469
 msgid "Don't auto load any plugins"
-msgstr "No activar automáticamente ningún complemento"
+msgstr "No cargar automáticamente ningún complemento"
 
 #: src/fe-gtk/fe-gtk.c:84 src/fe-text/fe-text.c:470
 msgid "Show plugin/script auto-load directory"
-msgstr "Mostrar directorio de carga automática de plugin/script"
+msgstr "Mostrar directorio de carga automática de complementos y scripts"
 
 #: src/fe-gtk/fe-gtk.c:85 src/fe-text/fe-text.c:471
 msgid "Show user config directory"
@@ -3618,7 +3473,7 @@ msgstr "Mostrar directorio de configuración de usuario"
 
 #: src/fe-gtk/fe-gtk.c:86 src/fe-gtk/fe-gtk.c:93 src/fe-text/fe-text.c:474
 msgid "Open an irc://server:port/channel?key URL"
-msgstr "Abrir una URL irc://server:port/channel?key"
+msgstr "Abrir una dirección irc://server:port/channel?key"
 
 #: src/fe-gtk/fe-gtk.c:87 src/fe-gtk/setup.c:268
 msgid "Execute command:"
@@ -3626,11 +3481,11 @@ msgstr "Ejecutar orden:"
 
 #: src/fe-gtk/fe-gtk.c:89
 msgid "Open URL or execute command in an existing HexChat"
-msgstr "Abrir URL o ejecutar un comando en una sesión existente de HexChat"
+msgstr "Abrir URL o ejecutar una orden en una sesión existente de HexChat"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr "Comenzar minimizado. Nivel 0=Normal 1=Iconificado 2=Bandeja"
+msgstr "Iniciar minimizado. Nivel 0=Normal 1=Iconificado 2=Bandeja"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3646,10 +3501,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"ha fallado la apertura de la tipografía:\n"
-"\n"
-"%s"
+msgstr "Error al abrir la fuente:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3667,133 +3519,96 @@ msgstr "Cola de envío de red: %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 \\\\"
-msgstr ""
-"La acción Orden de Comando ejecuta los datos en Datos 1 como si hubiera sido "
-"escrito en el cuadro de entrada donde se haya pulsado la secuencia de "
-"teclas. Por lo tanto, puede contener texto (que se envía al canal/persona), "
-"órdenes o comandos de usuario. Cuando se ejecutan todos los \\n caracteres "
-"en Datos 1 son usados para delimitar comandos separados así que es posible "
-"ejecutar más de un solo comando. Si quieres un \\ en el texto actual, "
-"seguidamente escribe \\\\"
+"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 "La acción Run Command ejecuta los datos de Data 1 como si hubieran sido escritos en el cuadro de entrada, donde se introducen las secuencias. Por lo tanto, puede contener texto (que se enviará al canal/persona), órdenes de sistema o de usuario. Cuando se ejecuta, se usan los caracteres \\n de Data 1 para delimitar órdenes, por lo que es posible ejecutar más de una orden. Si quiere poner un caracter \\ en el texto, entonces introduzca \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"El comando Change Page alterna entre páginas en la notebook. Configure Data "
-"1 a la página que desea alternar. Si Data 2 no está configurada, el "
-"interruptor será relativo a la posición actual. Configure Data 1 a auto para "
-"alternar a la página con la actividad reciente más importante (privados "
-"primero, después canales con resaltado, canales con diálogo, canales sin "
-"ningún dato)"
+msgstr "La orden Change Page alterna entre las páginas del selector de canal. Configure en Data 1 la página a la que desea cambiar. Si Data 2 no está configurado, el cambio será relativo a la posición actual. Configure Data 1 en auto para cambiar a la página con la actividad más reciente e importante (primero privados, después canales con resaltado, canales con diálogo, canales con otros datos)"
 
 #: src/fe-gtk/fkeys.c:145
 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 comando ^BInsert in Buffer^B insertará el contenido de Data 1 en la "
-"entrada donde la secuencia de teclas fué presionada en la posición actual "
-"del cursor"
+msgstr "La ordenInsert in Buffer insertará el contenido de Data 1 en la posición actual del cursor, en la entrada donde esté tecleando"
 
 #: 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."
-msgstr ""
-"El comando Scroll Page desplaza el control de texto hacia arriba o abajo una "
-"página o una línea. Establece Dato 1 ya sea arriba, abajo +1 o -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 "La orden Scroll Page desplaza el cuadro de texto arriba o abajo, una página o una línea. Configure Data 1 como Top, Bottom, Up, Down, +1 ó -1."
 
 #: 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 comando ^BSet Buffer^B establece la entrada donde la secuencia de teclas "
-"fué introducida a los contenidos de Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "La orden Set Buffer introduce el contenido de Data 1 en la entrada donde esté tecleando"
 
 #: 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 comando ^BLast Command^B establece la entrada para contener el último "
-"comando ingresado  al igual que presionar la tecla arriba en la línea de "
-"comandos"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "La orden Last Command pone en la entrada la última orden ingresada, es lo mismo que presionar la tecla arriba en en la línea de órdenes"
 
 #: 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 comando ^BNext Command^B establece la entrada para que contenga el "
-"siguiente comando ingresado al igual que al presionar la tecla abajo en la "
-"línea de comandos"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "La orden Next Command pone en la entrada la siguiente orden ingresada, es lo mismo que presionar la tecla abajo en en la línea de órdenes"
 
 #: 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 el texto en la entrada para completar un apodo "
-"incompleto o un comando. Si Data 1 esta establecido entonces al presionar "
-"dos veces la tecla TAB sobre una cadena seleccionará el último apodo, no el "
-"siguiente."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Esta orden cambia el texto en la entrada para completar una orden o apodo incompleto. Si se configura Data 1, entonces la doble tabulación en una cadena seleccionará el último apodo, no 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 ""
-"Este comando desplaza hacia arriba y abajo la lista de apodos. Si Data 1 "
-"esta establecido a cualquiera entonces se desplazará hacia arriba, sino se "
-"desplazará hacia abajo"
+"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 "Esta orden desplaza hacia arriba y abajo la lista de apodos. Si se configura Data 1 con algo, entonces se desplazará hacia arriba, sino se desplazará hacia abajo"
 
 #: 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 comprueba la última palabra introducida en la entrada contra la "
-"lista de reemplazos y la reemplaza si encuentra una coincidencia"
+msgstr "Esta orden comprueba la última palabra introducida en la entrada contra la lista de reemplazos y la reemplaza si encuentra una coincidencia"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
-msgstr "Este comando mueve una vez la solapa superior hacia la izquierda"
+msgstr "Esta orden mueve una vez la pestaña superior hacia la izquierda"
 
 #: src/fe-gtk/fkeys.c:163
 msgid "This command moves the front tab right by one"
-msgstr "Este comando mueve una posición la solapa superior hacia la derecha"
+msgstr "Esta orden mueve una posición la pestaña superior hacia la derecha"
 
 #: src/fe-gtk/fkeys.c:165
 msgid "This command moves the current tab family to the left"
-msgstr "Este comando mueve la familia actual de solapas hacia la izquierda"
+msgstr "Esta orden mueve la familia actual de pestañas hacia la izquierda"
 
 #: src/fe-gtk/fkeys.c:167
 msgid "This command moves the current tab family to the right"
-msgstr "Este comando mueve la familia actual de solapas hacia la izquierda"
+msgstr "Esta orden mueve la familia actual de pestañas hacia la izquierda"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Colocar la linea de entrada en el historial pero sin enviarla al servidor"
+msgstr "Colocar la linea de entrada en el historial pero sin enviarla al servidor"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Ha ocurrido un error cargando la configuración de las combinaciones de teclas"
+msgstr "Ha ocurrido un error cargando la configuración de las combinaciones de teclas"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3802,11 +3617,11 @@ msgstr "Selecciona una fila para obtener ayuda en su acción."
 #: src/fe-gtk/fkeys.c:812
 #, c-format
 msgid "Keyboard Shortcuts - %s"
-msgstr "atajos de teclado - %s"
+msgstr "Atajos de teclado - %s"
 
 #: src/fe-gtk/gtkutil.c:130
 msgid "Cannot write to that file."
-msgstr "No se puede escribir hacia ese archivo."
+msgstr "No se puede escribir en ese archivo."
 
 #: src/fe-gtk/gtkutil.c:134
 msgid "Cannot read that file."
@@ -3823,7 +3638,7 @@ msgstr "Privado"
 
 #: src/fe-gtk/ignoregui.c:161
 msgid "Notice"
-msgstr "Noticia"
+msgstr "Aviso"
 
 #: src/fe-gtk/ignoregui.c:162
 msgid "CTCP"
@@ -3839,7 +3654,7 @@ msgstr "No ignorar"
 
 #: src/fe-gtk/ignoregui.c:293
 msgid "Are you sure you want to remove all ignores?"
-msgstr "¿Estás seguro que quieres borrar todos los ignorados?"
+msgstr "¿Seguro de que quieres borrar todos los ignorados?"
 
 #: src/fe-gtk/ignoregui.c:303
 msgid "Enter mask to ignore:"
@@ -3864,7 +3679,7 @@ msgstr "Privado:"
 
 #: src/fe-gtk/ignoregui.c:370
 msgid "Notice:"
-msgstr "Noticia:"
+msgstr "Aviso:"
 
 #: src/fe-gtk/ignoregui.c:371
 msgid "CTCP:"
@@ -3880,7 +3695,7 @@ msgstr "Añadir..."
 
 #: src/fe-gtk/joind.c:91
 msgid "Channel name too short, try again."
-msgstr "Nombre de canal muy corto, intente de nuevo."
+msgstr "Nombre de canal muy corto, pruebe de nuevo."
 
 #: src/fe-gtk/joind.c:133
 #, c-format
@@ -3896,9 +3711,7 @@ msgstr "Conexión a %s completa."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"No se ha definido ningún canal en la lista de servidores para ingresar "
-"automaticamente al unirse a esta red."
+msgstr "En la ventana de la lista de servidores, no se ha introducido ningún canal (sala de chat) en esta red al que unirse automáticamente."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3910,23 +3723,23 @@ msgstr "_Nada, me uniré a un canal después."
 
 #: src/fe-gtk/joind.c:191
 msgid "_Join this channel:"
-msgstr "Entrar a este canal:"
+msgstr "Unirme a este canal:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr "Si conoce el nombre del canal al que se desea unir, escribalo aquí."
+msgstr "Si conoce el nombre del canal al que desea unirse, introdúzcalo aquí."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "Abrir la lista de canales."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr "Recuperando la lista de canales, puede tomar un minuto o dos."
+msgstr "Recuperando la lista de canales, puede tardar un minuto o dos."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
-msgstr "Siempre mostrar este diálogo después de la conexión."
+msgstr "Mostrar siempre este diálogo después de conectar."
 
 #: src/fe-gtk/maingui.c:386
 msgid "Dialog with"
@@ -3935,20 +3748,18 @@ msgstr "Diálogo con"
 #: src/fe-gtk/maingui.c:682
 #, c-format
 msgid "Topic for %s is: %s"
-msgstr "Topic para %s es: %s"
+msgstr "El tema de %s es: %s"
 
 #: src/fe-gtk/maingui.c:687
 msgid "No topic is set"
-msgstr "No está definido ningun topic"
+msgstr "No hay tema establecido"
 
 #: src/fe-gtk/maingui.c:1076
 #, c-format
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Este servidor aún tiene %d canales o diálogos asociados con él. ¿Desea "
-"cerrarlos todos?"
+msgstr "Este servidor aún tiene %d canales o diálogos asociados en él. ¿Desea cerrarlos todos?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -3973,7 +3784,7 @@ msgstr "Algunas transferencias todavía están activas."
 
 #: src/fe-gtk/maingui.c:1225
 msgid "_Minimize to Tray"
-msgstr "_Minimizar a la bandeja"
+msgstr "_Minimizar en la bandeja"
 
 #: src/fe-gtk/maingui.c:1441
 msgid "Insert Attribute or Color Code"
@@ -4009,11 +3820,11 @@ msgstr "_Configuración"
 
 #: src/fe-gtk/maingui.c:1506
 msgid "_Log to Disk"
-msgstr "_Registro en el disco"
+msgstr "_Registrar en el disco"
 
 #: src/fe-gtk/maingui.c:1507
 msgid "_Reload Scrollback"
-msgstr "_Recargar scrollback"
+msgstr "Recargar registro de _mensajes"
 
 #: src/fe-gtk/maingui.c:1510
 msgid "Strip _Colors"
@@ -4025,7 +3836,7 @@ msgstr "_Ocultar mensajes de entrada/salida"
 
 #: src/fe-gtk/maingui.c:1520
 msgid "_Extra Alerts"
-msgstr "Alertas _extra"
+msgstr "_Alertas extra"
 
 #: src/fe-gtk/maingui.c:1522
 msgid "Beep on _Message"
@@ -4033,11 +3844,11 @@ msgstr "Pitar en _mensajes"
 
 #: src/fe-gtk/maingui.c:1524
 msgid "Blink Tray _Icon"
-msgstr "Parpadear _ícono de bandeja"
+msgstr "Parpadear _icono en la bandeja"
 
 #: src/fe-gtk/maingui.c:1526
 msgid "Blink Task _Bar"
-msgstr "Parpadear _barra de tareas"
+msgstr "Parpadear en la _barra de tareas"
 
 #: src/fe-gtk/maingui.c:1566 src/fe-gtk/menu.c:2351
 msgid "_Detach"
@@ -4057,15 +3868,15 @@ msgstr "Filtrar colores"
 
 #: src/fe-gtk/maingui.c:2044
 msgid "No outside messages"
-msgstr "No hay mensajes externos"
+msgstr "Sin mensajes externos"
 
 #: src/fe-gtk/maingui.c:2045
 msgid "Topic Protection"
-msgstr "Protección del topic"
+msgstr "Protección del tema"
 
 #: src/fe-gtk/maingui.c:2046
 msgid "Invite Only"
-msgstr "Sólo para invitados"
+msgstr "Solo para invitados"
 
 #: src/fe-gtk/maingui.c:2047
 msgid "Moderated"
@@ -4073,7 +3884,7 @@ msgstr "Moderado"
 
 #: src/fe-gtk/maingui.c:2048
 msgid "Ban List"
-msgstr "Lista de prohibidos"
+msgstr "Lista de baneos"
 
 #: src/fe-gtk/maingui.c:2050
 msgid "Keyword"
@@ -4085,7 +3896,7 @@ msgstr "Límite de usuarios"
 
 #: src/fe-gtk/maingui.c:2579
 msgid "Enter new nickname:"
-msgstr "Ingrese el apodo nuevo:"
+msgstr "Introduzca el apodo nuevo:"
 
 #: src/fe-gtk/maingui.c:2802
 msgid "No results found."
@@ -4093,7 +3904,7 @@ msgstr "No se encontraron resultados."
 
 #: src/fe-gtk/maingui.c:2898
 msgid "Search hit end or not found."
-msgstr "Se terminó la búsqueda o no se encontró."
+msgstr "Finalizó la búsqueda o no se encontró."
 
 #: src/fe-gtk/maingui.c:2914
 msgid "_Highlight all"
@@ -4101,7 +3912,7 @@ msgstr "_Resaltar todo"
 
 #: src/fe-gtk/maingui.c:2920
 msgid "Highlight all occurrences, and underline the current occurrence."
-msgstr "Resaltar todas las apariciones, y subrayar la aparición actual."
+msgstr "Resalta todos los resultados y subraya el resultado actual."
 
 #: src/fe-gtk/maingui.c:2922
 msgid "Mat_ch case"
@@ -4109,7 +3920,7 @@ msgstr "Mayúsculas y minúsculas"
 
 #: src/fe-gtk/maingui.c:2927
 msgid "Perform a case-sensitive search."
-msgstr "Ejecutar una búsqueda sensitiva."
+msgstr "Realiza una búsqueda sensible a mayúsculas y minúsculas."
 
 #: src/fe-gtk/maingui.c:2929
 msgid "_Regex"
@@ -4117,11 +3928,11 @@ msgstr "Expresión regular"
 
 #: src/fe-gtk/maingui.c:2934
 msgid "Regard search string as a regular expression."
-msgstr "Considerar la cadena de búsqueda como una expresión regular."
+msgstr "Considera la cadena de búsqueda como una expresión regular."
 
 #: src/fe-gtk/menu.c:115
 msgid "Host unknown"
-msgstr "Equipo desconocido"
+msgstr "Host desconocido"
 
 #: src/fe-gtk/menu.c:116
 msgid "Account unknown"
@@ -4173,16 +3984,13 @@ msgstr "Mensaje de ausencia:"
 #: src/fe-gtk/menu.c:737
 #, c-format
 msgid "%d nicks selected."
-msgstr "%d nicks seleccionados."
+msgstr "%d apodos seleccionados."
 
 #: src/fe-gtk/menu.c:862
 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 ""
-"La barra de menú ahora está oculta. Puedes mostrarla otra vez presionando "
-"Ctrl+F9 o pulsando el botón derecho en una parte en blanco del área de texto "
-"principal."
+msgstr "La barra de menú ahora está oculta. Puede volver a mostrarla presionando Ctrl+F9 o pulsando el botón derecho en una parte libre del área de texto principal."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4194,11 +4002,11 @@ msgstr "Copiar URL seleccionada"
 
 #: src/fe-gtk/menu.c:1034 src/fe-gtk/menu.c:1394
 msgid "Join Channel"
-msgstr "Entrar al canal"
+msgstr "Unirse al canal"
 
 #: src/fe-gtk/menu.c:1038
 msgid "Part Channel"
-msgstr "Invitar Canal"
+msgstr "Salir del canal"
 
 #: src/fe-gtk/menu.c:1040
 msgid "Cycle Channel"
@@ -4206,15 +4014,15 @@ msgstr "Ciclar canal"
 
 #: src/fe-gtk/menu.c:1077
 msgid "_Autojoin"
-msgstr "_Autoentrar"
+msgstr "_Entrar automáticamente"
 
 #: src/fe-gtk/menu.c:1079
 msgid "Autojoin Channel"
-msgstr "Autoentrar al canal"
+msgstr "Entrar automáticamente al canal"
 
 #: src/fe-gtk/menu.c:1113 src/fe-gtk/menu.c:1117
 msgid "_Auto-Connect"
-msgstr "_Autoconectar"
+msgstr "_Conectar automáticamente"
 
 #: src/fe-gtk/menu.c:1138
 #, c-format
@@ -4228,28 +4036,27 @@ msgstr "Editar este menú"
 
 #: src/fe-gtk/menu.c:1293
 msgid "Marker line disabled."
-msgstr "Línea de señalador deshabilitada."
+msgstr "Línea de marcador deshabilitada."
 
 #: src/fe-gtk/menu.c:1299
 msgid "Marker line never set."
-msgstr "Línea de señalador no configurada."
+msgstr "Línea de marcador no configurada."
 
 #: src/fe-gtk/menu.c:1303
 msgid "Marker line reset manually."
-msgstr "Línea de señalador reiniciada manualmente."
+msgstr "Línea de marcador reiniciada manualmente."
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"Línea de señalador reiniciada porque excedió el límite del desplazador."
+msgstr "Línea de marcador reiniciada porque excedió el límite del registro de mensajes."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
-msgstr "Línea de señalador reiniciada por el comando CLEAR."
+msgstr "Línea de marcador reiniciada por la orden CLEAR."
 
 #: src/fe-gtk/menu.c:1309
 msgid "Marker line state unknown."
-msgstr "Estado desconocido de la línea de señalador."
+msgstr "Estado desconocido de la línea de marcador."
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
@@ -4257,7 +4064,7 @@ msgstr "Recuperar lista de canales"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
-msgstr "ha sido programado sin soporte para plugins."
+msgstr " ha sido programado sin soporte para complementos."
 
 #: src/fe-gtk/menu.c:1470
 msgid ""
@@ -4279,25 +4086,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Comandos de Usuario - Códigos especiales:\n"
-"\n"
-"%c  =  canal actual\n"
-"%e  =  nombre de red actual\n"
-"%m  =  información de máquina\n"
-"%n  =  tu nick\n"
-"%t  =  hora/fecha\n"
-"%v  =  versión de HexChat\n"
-"%2  =  palabra 2\n"
-"%3  =  palabra 3\n"
-"&2  =  palabra 2 hasta el final\n"
-"&3  =  palabra 3 hasta el final\n"
-"\n"
-"eg:\n"
-"/comando juan hola\n"
-"\n"
-"%2 sería \"juan\"\n"
-"&2 sería \"juan hola\"."
+msgstr "Órdenes de Usuario - Códigos especiales:\n\n%c  =  canal actual\n%e  =  nombre de red actual\n%m  =  información de máquina\n%n  =  su apodo\n%t  =  hora/fecha\n%v  =  versión de HexChat\n%2  =  palabra 2\n%3  =  palabra 3\n&2  =  palabra 2 hasta el final de la línea\n&3  =  palabra 3 hasta el final de la línea\n\nej:\n/cmd juan hola\n\n%2 sería «juan»\n&2 sería «juan hola»."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4312,18 +4101,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botones de lista de usuarios - Códigos especiales:\n"
-"\n"
-"%a  =  todos los nicks seleccionados\n"
-"%c  =  canal actual\n"
-"%e  =  red actual\n"
-"%h  =  host de nicks seleccionados\n"
-"%m  =  información de máquina\n"
-"%n  =  tu nick\n"
-"%s  =  nick seleccionado\n"
-"%t  =  hora/fecha\n"
-"%u = cuentas de los usuarios seleccionados"
+msgstr "Botones de lista de usuarios - Códigos especiales:\n\n%a  =  todos los apodos seleccionados\n%c  =  canal actual\n%e  =  nobre de la red actual\n%h  =  nombre de host del apodo seleccionado\n%m  =  información de máquina\n%n  =  su apodo\n%s  =  apodo seleccionado\n%t  =  hora/fecha\n%u  =  cuentas de los usuarios seleccionados"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4338,18 +4116,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botones de diálogo - Códigos especiales:\n"
-"\n"
-"%a  =  todos los nicks seleccionados\n"
-"%c  =  canal actual\n"
-"%e  =  red actual\n"
-"%h  =  host de nicks seleccionados\n"
-"%m  =  información de máquina\n"
-"%n  =  tu nick\n"
-"%s  =  nick seleccionado\n"
-"%t  =  hora/fecha\n"
-"%u = cuentas de los usuarios seleccionados"
+msgstr "Botones de diálogo - Códigos especiales:\n\n%a  =  todos los apodos seleccionados\n%c  =  canal actual\n%e  =  nobre de la red actual\n%h  =  nombre de host del apodo seleccionado\n%m  =  información de máquina\n%n  =  su apodo\n%s  =  apodo seleccionado\n%t  =  hora/fecha\n%u  =  cuentas de los usuarios seleccionados"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4365,19 +4132,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Respuestas CTCP - Códigos especiales:\n"
-"\n"
-"%d  =  datos (el ctcp completo)\n"
-"%e  =  red actual\n"
-"%m  =  información de máquina\n"
-"%s  =  nick que envió el ctcp\n"
-"%t  =  hora/fecha\n"
-"%2  =  palabra 2\n"
-"%3  =  palabra 3\n"
-"&2  =  palabra 2 hasta el final\n"
-"&3  =  palabra 3 hasta el final\n"
-"\n"
+msgstr "Respuestas CTCP - Códigos especiales:\n\n%d  =  datos (el ctcp completo)\n%e  =  nobre de la red actual\n%m  =  información de máquina\n%s  =  apodo que envió el ctcp\n%t  =  hora/fecha\n%2  =  palabra 2\n%3  =  palabra 3\n&2  =  palabra 2 hasta el final de la línea\n&3  =  palabra 3 hasta el final de la línea\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4389,14 +4144,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Manejadores de URL - Códigos especiales:\n"
-"\n"
-"%s  =  la cadena de URL\n"
-"\n"
-"Poniendo un ! en frente del comando\n"
-"indica que debe de ser enviado a una\n"
-"shell en lugar de HexChat"
+msgstr "Manejadores de URL - Códigos especiales:\n\n%s  =  cadena de la URL\n\nPoniendo una ! delante de la orden\nindica que se debe enviar a una\nshell en lugar de a HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4406,7 +4154,7 @@ msgstr "Órdenes definidas por el usuario - %s"
 #: src/fe-gtk/menu.c:1538
 #, c-format
 msgid "Userlist Popup menu -  %s"
-msgstr ""
+msgstr "Menú emergente de lista de usuarios - %s"
 
 #: src/fe-gtk/menu.c:1546
 #, c-format
@@ -4443,7 +4191,7 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "Li_sta de redes"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4467,7 +4215,7 @@ msgstr "Ventana de canal"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr "Cargar p_lugin o script"
+msgstr "Cargar comp_lemento o script"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4492,11 +4240,11 @@ msgstr "Lista de _usuarios"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr "Botones de lista de _usuarios"
+msgstr "Botone_s de lista de usuarios"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
-msgstr "Botones del modo del canal"
+msgstr "B_otones de modo del canal"
 
 #: src/fe-gtk/menu.c:1786
 msgid "_Channel Switcher"
@@ -4504,11 +4252,11 @@ msgstr "Selector de _canal"
 
 #: src/fe-gtk/menu.c:1788
 msgid "_Tabs"
-msgstr "Solapas"
+msgstr "Pes_tañas"
 
 #: src/fe-gtk/menu.c:1789
 msgid "T_ree"
-msgstr "Árbol"
+msgstr "Á_rbol"
 
 #: src/fe-gtk/menu.c:1791
 msgid "_Network Meters"
@@ -4552,12 +4300,12 @@ msgstr "_Ausencia marcada"
 
 #: src/fe-gtk/menu.c:1810
 msgid "_Usermenu"
-msgstr "Menú de usuario"
+msgstr "Menú de _usuario"
 
 #. 40
 #: src/fe-gtk/menu.c:1812
 msgid "S_ettings"
-msgstr "C_onfiguración"
+msgstr "Configuración"
 
 #: src/fe-gtk/menu.c:1813 src/fe-gtk/plugin-tray.c:577
 msgid "_Preferences"
@@ -4569,35 +4317,35 @@ msgstr "Reemplazos automáticos"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "Respuestas CTCP"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "Botones de diálogo"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Atajos de teclado"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "Texto de eventos"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "Manejadores de URL"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "Órdenes de usuario"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "Botones de lista de usuarios"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
-msgstr ""
+msgstr "Ventana de lista de usuarios"
 
 #. 52
 #: src/fe-gtk/menu.c:1825
@@ -4606,44 +4354,44 @@ msgstr "_Ventana"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "Lista de baneos"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "Charla directa"
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "Transferencias de archivos"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
-msgstr ""
+msgstr "Lista de amigos"
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "Lista de ignorados"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "Com_plementos y scripts"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Registro en bruto"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "Capturador de _URL"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
-msgstr "Reiniciar la línea de marcado"
+msgstr "Reiniciar la línea de marcador"
 
 #: src/fe-gtk/menu.c:1837
 msgid "Move to Marker Line"
-msgstr "Desplazar a la línea de señalador"
+msgstr "Ir a la línea de marcador"
 
 #: src/fe-gtk/menu.c:1838
 msgid "_Copy Selection"
@@ -4655,7 +4403,7 @@ msgstr "_Limpiar texto"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr "Guardar texto..."
+msgstr "Guardar texto"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4663,15 +4411,15 @@ msgstr "Buscar"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr "Buscar texto..."
+msgstr "Buscar texto"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
-msgstr "Siguiente búsqueda"
+msgstr "Buscar siguiente"
 
 #: src/fe-gtk/menu.c:1845
 msgid "Search Previous"
-msgstr "Búsqueda previa"
+msgstr "Buscar anterior"
 
 #: src/fe-gtk/menu.c:1848 src/fe-gtk/menu.c:2343
 msgid "_Help"
@@ -4700,7 +4448,7 @@ msgstr "Visto por última vez"
 
 #: src/fe-gtk/notifygui.c:168
 msgid "Offline"
-msgstr "Desconectado"
+msgstr "Fuera de línea"
 
 #: src/fe-gtk/notifygui.c:188 src/fe-gtk/setup.c:286
 msgid "Never"
@@ -4722,11 +4470,11 @@ msgstr "Hace %d horas"
 
 #: src/fe-gtk/notifygui.c:212
 msgid "Online"
-msgstr "Conectado"
+msgstr "En línea"
 
 #: src/fe-gtk/notifygui.c:343
 msgid "Enter nickname to add:"
-msgstr "Introduzica el apodo a añadir:"
+msgstr "Introduzca el apodo a añadir:"
 
 #: src/fe-gtk/notifygui.c:372
 msgid "Notify on these networks:"
@@ -4734,7 +4482,7 @@ msgstr "Notificar en estas redes:"
 
 #: src/fe-gtk/notifygui.c:383
 msgid "Comma separated list of networks is accepted."
-msgstr "Lista de redes separada por comas es aceptada."
+msgstr "Se acepta una lista de redes separadas por comas."
 
 #: src/fe-gtk/notifygui.c:409
 #, c-format
@@ -4753,7 +4501,7 @@ msgstr "Mensaje resaltado de: %s (%s)"
 #: src/fe-gtk/plugin-notification.c:123
 #, c-format
 msgid "Channel message from: %s (%s)"
-msgstr "Mensaje de canal de: %s (%s)"
+msgstr "Mensaje en el canal de: %s (%s)"
 
 #: src/fe-gtk/plugin-notification.c:144
 #, c-format
@@ -4763,12 +4511,12 @@ msgstr "Archivo de: %s (%s)"
 #: src/fe-gtk/plugin-notification.c:149
 #, c-format
 msgid "Invited to channel by: %s (%s)"
-msgstr "Has sido invitado al canal por: %s (%s)"
+msgstr "Invitado al canal por: %s (%s)"
 
 #: src/fe-gtk/plugin-notification.c:154
 #, c-format
 msgid "Notice from: %s (%s)"
-msgstr "Notificación de: %s (%s)"
+msgstr "Aviso de: %s (%s)"
 
 #: src/fe-gtk/plugin-notification.c:158
 #, c-format
@@ -4794,7 +4542,7 @@ msgstr "_Parpadeo encendido"
 
 #: src/fe-gtk/plugin-tray.c:556 src/fe-gtk/setup.c:705
 msgid "Channel Message"
-msgstr "Mensaje de canal"
+msgstr "Mensaje en el canal"
 
 #: src/fe-gtk/plugin-tray.c:557 src/fe-gtk/setup.c:706
 msgid "Private Message"
@@ -4820,42 +4568,42 @@ msgstr "_Conectado"
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
-msgstr "Mensaje resaltado desde: %s (%s) - %s"
+msgstr "Mensaje resaltado de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:637
 #, c-format
 msgid "%u highlighted messages, latest from: %s (%s) - %s"
-msgstr "%u mensajes resaltados, el último desde: %s (%s) - %s"
+msgstr "%u mensajes resaltados, el último de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
-msgstr "Mensaje de canal de: %s (%s) - %s"
+msgstr "Mensaje en el canal de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
-msgstr "%u mensajes de canal. - %s"
+msgstr "%u mensajes en el canal. - %s"
 
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr "Mensaje privado desde: %s (%s) - %s"
+msgstr "Mensaje privado de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
-msgstr "%u mensajes privados, el último desde: %s (%s) - %s"
+msgstr "%u mensajes privados, el último de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
-msgstr "Archivo desde: %s (%s) - %s"
+msgstr "Archivo de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
-msgstr "%u archivos, el último desde: %s (%s) - %s"
+msgstr "%u archivos, el último de: %s (%s) - %s"
 
 #: src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4867,12 +4615,12 @@ msgstr "Descripción"
 
 #: src/fe-gtk/plugingui.c:164
 msgid "Select a Plugin or Script to load"
-msgstr "Seleccione una extensión o guión a cargar"
+msgstr "Seleccione qué complemento o guion cargar"
 
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr "complementos y guiones - %s"
+msgstr "Complementos y guiones - %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4880,7 +4628,7 @@ msgstr "_Cargar..."
 
 #: src/fe-gtk/plugingui.c:259
 msgid "_Unload"
-msgstr "_Desactivar"
+msgstr "_Decargar"
 
 #: src/fe-gtk/plugingui.c:262
 msgid "_Reload"
@@ -4894,11 +4642,11 @@ msgstr "Guardar como..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr "Registro plano (%s) - %s"
+msgstr "Registro en bruto (%s) - %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
-msgstr "Limpiar Registro Plano"
+msgstr "Limpiar el registro en bruto"
 
 #: src/fe-gtk/servlistgui.c:301 src/fe-gtk/servlistgui.c:499
 msgid "New Network"
@@ -4907,7 +4655,7 @@ msgstr "Nueva red"
 #: src/fe-gtk/servlistgui.c:756
 #, c-format
 msgid "Really remove network \"%s\" and all its servers?"
-msgstr "¿Realmente desea eliminar la red \"%s\" y todos sus servidores?"
+msgstr "¿Realmente desea eliminar la red «%s» y todos sus servidores?"
 
 #: src/fe-gtk/servlistgui.c:1125 src/fe-gtk/servlistgui.c:1556
 msgid "User name cannot be left blank."
@@ -4915,19 +4663,17 @@ msgstr "El nombre de usuario no puede estar en blanco."
 
 #: src/fe-gtk/servlistgui.c:1578
 msgid "You cannot have an empty nick name."
-msgstr "No puedes tener un nick en blanco."
+msgstr "No puede tener un apodo en blanco."
 
 #: src/fe-gtk/servlistgui.c:1585
 msgid "You must have two unique nick names."
-msgstr "Debes tener dos nicks únicos."
+msgstr "Debe tener dos apodos únicos."
 
 #: src/fe-gtk/servlistgui.c:1636
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"La manera en que te identificas al servidor. Para usar un método distinto "
-"utiliza comandos de conexión."
+msgstr "La manera en que se identifica al servidor. Para usar un método distinto utilice las órdenes de conexión."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4940,11 +4686,11 @@ msgstr "Servidores"
 
 #: src/fe-gtk/servlistgui.c:1732
 msgid "Autojoin channels"
-msgstr "Autoentrar a los canales"
+msgstr "Unirse automáticamente a los canales"
 
 #: src/fe-gtk/servlistgui.c:1733
 msgid "Connect commands"
-msgstr "Comandos de conexión"
+msgstr "Órdenes de conexión"
 
 #: src/fe-gtk/servlistgui.c:1745
 msgid ""
@@ -4952,15 +4698,11 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Nick\n"
-"%p=Contraseña\n"
-"%r=Nombre real\n"
-"%u=Nombre de usuario"
+msgstr "%n=Apodo\n%p=Contraseña\n%r=Nombre real\n%u=Nombre de usuario"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
-msgstr "Llave (contraseña)"
+msgstr "Clave (contraseña)"
 
 #: src/fe-gtk/servlistgui.c:1853
 msgid "_Edit"
@@ -4980,11 +4722,11 @@ msgstr "Conectar a esta red automáticamente"
 
 #: src/fe-gtk/servlistgui.c:1869
 msgid "Bypass proxy server"
-msgstr "Evadir servidor proxy"
+msgstr "Eludir servidor proxy"
 
 #: src/fe-gtk/servlistgui.c:1870
 msgid "Use SSL for all the servers on this network"
-msgstr "Usar SSL con todos los servidores de esta red"
+msgstr "Usar SSL en todos los servidores de esta red"
 
 #: src/fe-gtk/servlistgui.c:1874
 msgid "Accept invalid SSL certificates"
@@ -5012,7 +4754,7 @@ msgstr "Nombre de _usuario:"
 
 #: src/fe-gtk/servlistgui.c:1885
 msgid "Login method:"
-msgstr "Método de inicio:"
+msgstr "Método de inicio de sesión:"
 
 #: src/fe-gtk/servlistgui.c:1891 src/fe-gtk/setup.c:655
 msgid "Password:"
@@ -5020,8 +4762,7 @@ msgstr "Contraseña:"
 
 #: src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
-"Contraseña usada para iniciar sesión. En caso de duda, dejar en blanco."
+msgstr "Contraseña usada para iniciar sesión. En caso de duda, dejar en blanco."
 
 #: src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
@@ -5034,7 +4775,7 @@ msgstr "Lista de redes - %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
-msgstr "Información sobre usuario"
+msgstr "Informacion de usuario"
 
 #: src/fe-gtk/servlistgui.c:2013
 msgid "Third choice:"
@@ -5064,11 +4805,11 @@ msgstr "Ordenar"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "Ordena la lista de redes en orden alfabético. Use las teclas Mayús+Arriba y Mayús+Abajo para mover una fila."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
-msgstr "_Favor"
+msgstr "_Favorita"
 
 #: src/fe-gtk/servlistgui.c:2177
 msgid "Mark or unmark this network as a favorite."
@@ -5300,11 +5041,11 @@ msgstr "Fuente principal:"
 
 #: src/fe-gtk/setup.c:154
 msgid "Font:"
-msgstr "Tipografía:"
+msgstr "Fuente:"
 
 #: src/fe-gtk/setup.c:157
 msgid "Text Box"
-msgstr "Caja de texto"
+msgstr "Cuadro de texto"
 
 #: src/fe-gtk/setup.c:158
 msgid "Colored nick names"
@@ -5316,19 +5057,19 @@ msgstr "Dar a cada persona en el IRC un color diferente"
 
 #: src/fe-gtk/setup.c:159
 msgid "Indent nick names"
-msgstr "Indentar apodos"
+msgstr "Sangría en apodos"
 
 #: src/fe-gtk/setup.c:159
 msgid "Make nick names right-justified"
-msgstr "Justificar los apodos a la derecha."
+msgstr "Justificar los apodos a la derecha"
 
 #: src/fe-gtk/setup.c:160
 msgid "Show marker line"
-msgstr "Mostrar señalador"
+msgstr "Mostrar línea de marcador"
 
 #: src/fe-gtk/setup.c:160
 msgid "Insert a red line after the last read text."
-msgstr "Insertar una línea roja después del último texto leído"
+msgstr "Insertar una línea roja después del último texto leído."
 
 #: src/fe-gtk/setup.c:161
 msgid "Background image:"
@@ -5344,23 +5085,23 @@ msgstr "Opacidad de ventana:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr "Marcas de fecha/hora"
+msgstr "Marcas de tiempo"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr "Habilitar marcas de hora"
+msgstr "Habilitar marcas de tiempo"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr "Formato de inserción de hora:"
+msgstr "Formato de marcas de tiempo:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
-msgstr "Ver el strftime del artículo MSDN para más información."
+msgstr "Ver strftime del artículo MSDN para más información."
 
 #: src/fe-gtk/setup.c:172 src/fe-gtk/setup.c:599
 msgid "See the strftime manpage for details."
-msgstr "Ver el strftime de la página del manual para más información."
+msgstr "Ver strftime en la página del manual para más información."
 
 #: src/fe-gtk/setup.c:175
 msgid "Title Bar"
@@ -5384,11 +5125,11 @@ msgstr "Última orden dada"
 
 #: src/fe-gtk/setup.c:191
 msgid "Input Box"
-msgstr "Caja de entrada"
+msgstr "Cuadro de entrada"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr "Usar la tipografía y colores de la caja de texto"
+msgstr "Usar fuentes y colores del cuadro de entrada"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5396,36 +5137,33 @@ msgstr "Renderizar colores y atributos"
 
 #: src/fe-gtk/setup.c:194
 msgid "Show nick box"
-msgstr "Mostrar cuadro de nick"
+msgstr "Mostrar cuadro de apodos"
 
 #: src/fe-gtk/setup.c:195
 msgid "Show user mode icon in nick box"
-msgstr "Usar el ícono del modo de usuario en la caja del nick"
+msgstr "Mostrar iconos de modo en el cuadro de apodos"
 
 #: src/fe-gtk/setup.c:196
 msgid "Spell checking"
-msgstr "Corrección ortográfica"
+msgstr "Corrector ortográfico"
 
 #: src/fe-gtk/setup.c:197
 msgid "Dictionaries to use:"
-msgstr "Diccionarios para usar:"
+msgstr "Diccionarios que se usarán:"
 
 #: src/fe-gtk/setup.c:199
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Usa códigos de lenguaje (como en \"%LOCALAPPDATA%\\enchant\\myspell\\dicts"
-"\").\n"
-"Separa múltiples entradas con comas."
+msgstr "Usar códigos de idioma (como en «%LOCALAPPDATA%\\enchant\\myspell\\dicts»).\nSeparar varias entradas con comas."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
-msgstr "Usa códigos de lenguaje. Separa múltiples entradas con comas."
+msgstr "Usar códigos de idioma. Separar varias entradas con comas."
 
 #: src/fe-gtk/setup.c:204
 msgid "Nick Completion"
-msgstr "Completar apodo"
+msgstr "Completar apodos"
 
 #: src/fe-gtk/setup.c:205
 msgid "Nick completion suffix:"
@@ -5433,7 +5171,7 @@ msgstr "Sufijo al completar el apodo:"
 
 #: src/fe-gtk/setup.c:206
 msgid "Nick completion sorted:"
-msgstr "Terminación de nicks ordenada:"
+msgstr "Orden al completar el apodo:"
 
 #: src/fe-gtk/setup.c:207
 msgid "Nick completion amount:"
@@ -5441,7 +5179,7 @@ msgstr "Cantidad al completar el apodo:"
 
 #: src/fe-gtk/setup.c:207
 msgid "Threshold of nicks to start listing instead of completing"
-msgstr "Cantidad de apodos para iniciar la lista en lugar de completar"
+msgstr "Límite de apodos para para comenzar a listar en lugar de completar"
 
 #: src/fe-gtk/setup.c:207
 msgid "nicks."
@@ -5453,11 +5191,11 @@ msgstr "Gráfico"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Z, operadores al principio"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Z-A, operadores al final"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5473,7 +5211,7 @@ msgstr "Izquierda (superior)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr "Izquierda (Inferior)"
+msgstr "Izquierda (inferior)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
@@ -5481,7 +5219,7 @@ msgstr "Derecha (superior)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr "Derecha (Inferior)"
+msgstr "Derecha (inferior)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5501,27 +5239,27 @@ msgstr "Lista de usuarios"
 
 #: src/fe-gtk/setup.c:255
 msgid "Show hostnames in user list"
-msgstr "Mostrar equipos en la lista de usuarios"
+msgstr "Mostrar nombres de host en la lista de usuarios"
 
 #: src/fe-gtk/setup.c:256
 msgid "Use the Text box font and colors"
-msgstr "Usar la tipografía y colores de la caja de texto"
+msgstr "Usar fuentes y colores del cuadro de texto"
 
 #: src/fe-gtk/setup.c:257
 msgid "Show icons for user modes"
-msgstr "Mostrar íconos para modos de usuario"
+msgstr "Mostrar iconos en modos de usuario"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr "Usa íconos gráficos en lugar de símbolos en la lista de usuarios."
+msgstr "Usar iconos gráficos en lugar de símbolos en la lista de usuarios."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
-msgstr "Colorear nicks en lista de usuarios"
+msgstr "Colorear apodos en la lista de usuarios"
 
 #: src/fe-gtk/setup.c:258
 msgid "Will color nicknames the same as in chat."
-msgstr "Coloreará los nicks al igual que en el chat."
+msgstr "Colorear los apodos igual que en la charla."
 
 #: src/fe-gtk/setup.c:259
 msgid "Show user count in channels"
@@ -5533,7 +5271,7 @@ msgstr "Lista de usuarios ordenada por:"
 
 #: src/fe-gtk/setup.c:261
 msgid "Show user list at:"
-msgstr "Mostrar lista de usuarios en:"
+msgstr "Mostrar lista de usuarios en la parte:"
 
 #: src/fe-gtk/setup.c:263
 msgid "Away Tracking"
@@ -5541,12 +5279,11 @@ msgstr "Seguimiento de ausencia"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Seguir el estado de ausencia de usuarios y marcarlos en un color diferente"
+msgstr "Seguir el estado de ausencia de los usuarios y marcarlos con un color diferente"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
-msgstr "En canales más pequeños que:"
+msgstr "En canales con menos de:"
 
 #: src/fe-gtk/setup.c:267
 msgid "Action Upon Double Click"
@@ -5562,7 +5299,7 @@ msgstr "Medidor de lag:"
 
 #: src/fe-gtk/setup.c:272
 msgid "Throttle meter:"
-msgstr "Medidor de regulación:"
+msgstr "Medidor de aceleración:"
 
 #: src/fe-gtk/setup.c:279
 msgid "Windows"
@@ -5570,7 +5307,7 @@ msgstr "Ventanas"
 
 #: src/fe-gtk/setup.c:280 src/fe-gtk/setup.c:302
 msgid "Tabs"
-msgstr "Solapas"
+msgstr "Pestañas"
 
 #: src/fe-gtk/setup.c:287
 msgid "Always"
@@ -5578,7 +5315,7 @@ msgstr "Siempre"
 
 #: src/fe-gtk/setup.c:288
 msgid "Only requested tabs"
-msgstr "Solo solapas solicitadas"
+msgstr "Solo pestañas solicitadas"
 
 #: src/fe-gtk/setup.c:294
 msgid "Automatic"
@@ -5586,11 +5323,11 @@ msgstr "Automático"
 
 #: src/fe-gtk/setup.c:295
 msgid "In an extra tab"
-msgstr "En una pestaña extra"
+msgstr "En una pestaña nueva"
 
 #: src/fe-gtk/setup.c:296
 msgid "In the front tab"
-msgstr "En la pestaña del frente"
+msgstr "En la pestaña actual"
 
 #. 0 tabs
 #. 1 reserved
@@ -5605,19 +5342,19 @@ msgstr "Cambiar tipo:"
 
 #: src/fe-gtk/setup.c:312
 msgid "Open an extra tab for server messages"
-msgstr "Abrir solapa extra para los mensajes del servidor"
+msgstr "Abrir los mensajes del servidor en una pestaña nueva"
 
 #: src/fe-gtk/setup.c:313
 msgid "Open a new tab when you receive a private message"
-msgstr "Abrir una pestaña nueva cuando recibas un mensaje privado"
+msgstr "Abrir los mensajes privados en una pestaña nueva"
 
 #: src/fe-gtk/setup.c:314
 msgid "Sort tabs in alphabetical order"
-msgstr "Ordenar solapas alfabéticamente"
+msgstr "Ordenar las pestañas en orden alfabético"
 
 #: src/fe-gtk/setup.c:315
 msgid "Show icons in the channel tree"
-msgstr "Mostrar íconos en el árbol de canales"
+msgstr "Mostrar iconos en el árbol de canales"
 
 #: src/fe-gtk/setup.c:316
 msgid "Show dotted lines in the channel tree"
@@ -5629,7 +5366,7 @@ msgstr "Usar la rueda del ratón para cambiar entre pestañas"
 
 #: src/fe-gtk/setup.c:318
 msgid "Middle click to close tab"
-msgstr "Haz clic con el botón del medio para cerrar la pestaña"
+msgstr "Haga clic con el botón del medio para cerrar la pestaña"
 
 #: src/fe-gtk/setup.c:319
 msgid "Smaller text"
@@ -5637,19 +5374,19 @@ msgstr "Texto pequeño"
 
 #: src/fe-gtk/setup.c:320
 msgid "Focus new tabs:"
-msgstr "Centrarse en nuevas solapas:"
+msgstr "Enfocar nuevas pestañas:"
 
 #: src/fe-gtk/setup.c:321
 msgid "Placement of notices:"
-msgstr "Colocación de avisos:"
+msgstr "Ubicación de avisos:"
 
 #: src/fe-gtk/setup.c:322
 msgid "Show channel switcher at:"
-msgstr "Mostrar tipo de canales en:"
+msgstr "Mostrar selector de canal en:"
 
 #: src/fe-gtk/setup.c:323
 msgid "Shorten tab labels to:"
-msgstr "Reducir solapas a:"
+msgstr "Reducir las pestañas a:"
 
 #: src/fe-gtk/setup.c:323
 msgid "letters."
@@ -5657,7 +5394,7 @@ msgstr "letras."
 
 #: src/fe-gtk/setup.c:325
 msgid "Tabs or Windows"
-msgstr "Ventana del último registro"
+msgstr "Pestañas o ventanas"
 
 #: src/fe-gtk/setup.c:326
 msgid "Open channels in:"
@@ -5673,7 +5410,7 @@ msgstr "Abrir utilidades en:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr "¿Abrir DCC, Ignorar, Notificar etc en solapas o en ventanas?"
+msgstr "¿Abrir DCC, Ignorar, Avisos etc en pestañas o en ventanas?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5681,7 +5418,7 @@ msgstr "Mensajes"
 
 #: src/fe-gtk/setup.c:336
 msgid "Scrollback"
-msgstr "Desplazar"
+msgstr "Registro de mensajes"
 
 #: src/fe-gtk/setup.c:344
 msgid "Ask for confirmation"
@@ -5689,7 +5426,7 @@ msgstr "Pedir confirmación"
 
 #: src/fe-gtk/setup.c:345
 msgid "Ask for download folder"
-msgstr "Pedir carpeta de descargas"
+msgstr "Preguntar la carpeta de descarga"
 
 #: src/fe-gtk/setup.c:346
 msgid "Save without interaction"
@@ -5713,11 +5450,11 @@ msgstr "Mover archivos completados a:"
 
 #: src/fe-gtk/setup.c:356
 msgid "Save nick name in filenames"
-msgstr "Guardar el apodo en los nombres de archivos"
+msgstr "Guardar el apodo en los nombres de archivo"
 
 #: src/fe-gtk/setup.c:358
 msgid "Auto Open DCC Windows"
-msgstr "Abrir las ventanas de diálogo automáticamente"
+msgstr "Abrir ventanas de diálogo automáticamente"
 
 #: src/fe-gtk/setup.c:359
 msgid "Send window"
@@ -5729,36 +5466,35 @@ msgstr "Ventana de recepción"
 
 #: src/fe-gtk/setup.c:361
 msgid "Chat window"
-msgstr "Ventana de canal"
+msgstr "Ventana de charla"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Velocidad máxima de transferencia de archivos (B/s)"
+msgstr "Velocidad máxima de transferencia de archivos (Byte por segundo)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
-msgstr "Una subida:"
+msgstr "Por archivo subido:"
 
 #: src/fe-gtk/setup.c:365 src/fe-gtk/setup.c:367
 msgid "Maximum speed for one transfer"
-msgstr "Velocidad máx. para una transferencia"
+msgstr "Velocidad máx. de transferencia por archivo"
 
 #: src/fe-gtk/setup.c:366
 msgid "One download:"
-msgstr "Una descarga"
+msgstr "Por archivo descargado:"
 
 #: src/fe-gtk/setup.c:368
 msgid "All uploads combined:"
-msgstr "Todas las subidas combinadas:"
+msgstr "Para todas las subidas:"
 
 #: src/fe-gtk/setup.c:369 src/fe-gtk/setup.c:371
 msgid "Maximum speed for all files"
-msgstr "Velocidad máx. para todo el tráfico"
+msgstr "Velocidad máx. de todas las transferencias"
 
 #: src/fe-gtk/setup.c:370
 msgid "All downloads combined:"
-msgstr "Todas las descargas combinadas:"
+msgstr "Para todas las descargas:"
 
 #: src/fe-gtk/setup.c:398 src/fe-gtk/setup.c:439 src/fe-gtk/setup.c:482
 #: src/fe-gtk/setup.c:505 src/fe-gtk/setup.c:1881
@@ -5771,48 +5507,44 @@ msgstr "Mostrar notificaciones de:"
 
 #: src/fe-gtk/setup.c:404 src/fe-gtk/setup.c:442
 msgid "Blink tray icon on:"
-msgstr "Parpadear ícono en la bandeja:"
+msgstr "Parpadeo del icono en la bandeja:"
 
 #: src/fe-gtk/setup.c:405 src/fe-gtk/setup.c:447 src/fe-gtk/setup.c:486
 #: src/fe-gtk/setup.c:508
 msgid "Blink task bar on:"
-msgstr "Parpadear barra de tareas:"
+msgstr "Parpadeo en barra de tareas:"
 
 #: src/fe-gtk/setup.c:407 src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:412
 #: src/fe-gtk/setup.c:451 src/fe-gtk/setup.c:454 src/fe-gtk/setup.c:456
 #: src/fe-gtk/setup.c:487 src/fe-gtk/setup.c:509
 msgid "Make a beep sound on:"
-msgstr "Hacer un sonido beep:"
+msgstr "Emitir un pitido:"
 
 #: src/fe-gtk/setup.c:407 src/fe-gtk/setup.c:451
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Reproduce el sonido de \"mensaje de notificación inmediato\" en los eventos "
-"seleccionados"
+msgstr "Reproducir el sonido «Notificación de mensaje instantáneo» en las alertas seleccionadas"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Reproduce el sonido de \"mensaje nuevo inmediato\" desde freedesktop.org en "
-"los eventos seleccionados"
+msgstr "Reproducir el sonido «message-new-instant» de freedesktop.org en las alertas seleccionadas"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
-msgstr "Reproducir un sonido GTK sobre los eventos seleccionados"
+msgstr "Reproducir un sonido GTK en las alertas seleccionadas"
 
 #: src/fe-gtk/setup.c:416 src/fe-gtk/setup.c:460 src/fe-gtk/setup.c:489
 #: src/fe-gtk/setup.c:511
 msgid "Omit alerts when marked as being away"
-msgstr "Omitir alertas cuando está ausente"
+msgstr "Omitir alertas cuando esté ausente"
 
 #: src/fe-gtk/setup.c:417 src/fe-gtk/setup.c:461 src/fe-gtk/setup.c:490
 #: src/fe-gtk/setup.c:512
 msgid "Omit alerts while the window is focused"
-msgstr "Omitir alertar cuando la ventana está activa"
+msgstr "Omitir alertas cuando la ventana esté activa"
 
 #: src/fe-gtk/setup.c:419 src/fe-gtk/setup.c:463
 msgid "Tray Behavior"
@@ -5820,27 +5552,27 @@ msgstr "Comportamiento de la bandeja"
 
 #: src/fe-gtk/setup.c:420 src/fe-gtk/setup.c:464
 msgid "Enable system tray icon"
-msgstr "Activar el ícono en la bandeja del sistema"
+msgstr "Activar el icono en la bandeja del sistema"
 
 #: src/fe-gtk/setup.c:421 src/fe-gtk/setup.c:465
 msgid "Minimize to tray"
-msgstr "Minimizar a la bandeja"
+msgstr "Minimizar en la bandeja"
 
 #: src/fe-gtk/setup.c:422 src/fe-gtk/setup.c:466
 msgid "Close to tray"
-msgstr "Cerrar a la bandeja"
+msgstr "Al cerrar, minimizar en la bandeja"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically mark away/back"
-msgstr "Automáticamente marcar ausente/en línea"
+msgstr "Cambiar el estado de ausencia automáticamente"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically change status when hiding to tray."
-msgstr "Cambiar automáticamente el estado cuando se oculte en la barra."
+msgstr "Cambia automáticamente el estado cuando se oculte en la bandeja."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
-msgstr "Solo mostrar notificaciones al estar oculto o en ícono"
+msgstr "Mostrar notificaciones solo cuando esté oculto o iconificado"
 
 #: src/fe-gtk/setup.c:426 src/fe-gtk/setup.c:469 src/fe-gtk/setup.c:492
 #: src/fe-gtk/setup.c:514
@@ -5851,63 +5583,61 @@ msgstr "Mensajes resaltados"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr "Los mensajes resaltados son cuando tu nick es mencionado, pero además:"
+msgstr "Se resaltarán los mensajes que mencionan su apodo, pero también se pueden resaltar:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
 msgid "Extra words to highlight:"
-msgstr "Palabras extra para resaltar:"
+msgstr "Resaltar las siguientes palabras:"
 
 #: src/fe-gtk/setup.c:430 src/fe-gtk/setup.c:473 src/fe-gtk/setup.c:496
 #: src/fe-gtk/setup.c:518
 msgid "Nick names not to highlight:"
-msgstr "Nicks para no resaltar:"
+msgstr "No resaltar estos apodos:"
 
 #: src/fe-gtk/setup.c:431 src/fe-gtk/setup.c:474 src/fe-gtk/setup.c:497
 #: src/fe-gtk/setup.c:519
 msgid "Nick names to always highlight:"
-msgstr "Nicks para resaltar siempre:"
+msgstr "Resaltar siempre estos apodos:"
 
 #: src/fe-gtk/setup.c:432 src/fe-gtk/setup.c:475 src/fe-gtk/setup.c:498
 #: src/fe-gtk/setup.c:520
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separa múltiples palabras con comas.\n"
-"Se aceptan comodines."
+msgstr "Separar varias palabras con comas.\nPuede usar comodines."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
-msgstr "Rebotar ícono en la bandeja:"
+msgstr "Rebotar icono en la bandeja:"
 
 #: src/fe-gtk/setup.c:527
 msgid "Default Messages"
-msgstr "Mensajes predeterminados:"
+msgstr "Mensajes predefinidos"
 
 #: src/fe-gtk/setup.c:528
 msgid "Quit:"
-msgstr "Salir:"
+msgstr "Al salir:"
 
 #: src/fe-gtk/setup.c:529
 msgid "Leave channel:"
-msgstr "Abandonar canal:"
+msgstr "Al abandonar un canal:"
 
 #: src/fe-gtk/setup.c:530
 msgid "Away:"
-msgstr "Ausente:"
+msgstr "Al marcar como ausente:"
 
 #: src/fe-gtk/setup.c:532
 msgid "Away"
-msgstr "Ausente"
+msgstr "Ausencia"
 
 #: src/fe-gtk/setup.c:533
 msgid "Show away once"
-msgstr "Mostrar fuera de linea (away) sólo una vez"
+msgstr "Mostrar ausencia solo una vez"
 
 #: src/fe-gtk/setup.c:533
 msgid "Show identical away messages only once."
-msgstr "Mostrar mensajes idénticos de ausente solo una vez."
+msgstr "Mostrar mensajes idénticos de ausencia solo una vez."
 
 #: src/fe-gtk/setup.c:534
 msgid "Automatically unmark away"
@@ -5915,40 +5645,39 @@ msgstr "Desmarcar ausencia automáticamente"
 
 #: src/fe-gtk/setup.c:534
 msgid "Unmark yourself as away before sending messages."
-msgstr "Desmarcarse como ausente antes de enviar mensajes"
+msgstr "Desmarcar ausencia antes de enviar mensajes."
 
 #: src/fe-gtk/setup.c:536 src/fe-gtk/setup.c:569
 msgid "Miscellaneous"
-msgstr "Miscelánea"
+msgstr "Varios"
 
 #: src/fe-gtk/setup.c:537
 msgid "Display MODEs in raw form"
-msgstr "Mostrar los MODOs en forma plana"
+msgstr "Mostrar los MODOs en bruto"
 
 #: src/fe-gtk/setup.c:538
 msgid "WHOIS on notify"
-msgstr "Ejecutar Whois en las notificaciones"
+msgstr "WHOIS en las notificaciones"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Envía un /WHOIS cuando un usuario de la lista de notificaciones se conecta"
+msgstr "Envía /WHOIS cuando un usuario de la lista de notificaciones se conecta."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
-msgstr "Ocultar mensajes de entrar/marchar"
+msgstr "Ocultar los mensajes de entrada y salida"
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide channel join/part messages by default."
-msgstr "Ocultar mensajes de entrada/salida del canal por defecto."
+msgstr "Por defecto oculta los mensajes cuando algien entra o sale del canal."
 
 #: src/fe-gtk/setup.c:540
 msgid "Hide nick change messages"
-msgstr "Ocultar mensajes de cambios de nick"
+msgstr "Ocultar los mensajes de cambio de apodo"
 
 #: src/fe-gtk/setup.c:547
 msgid "*!*@*.host"
-msgstr "*!*@*.equipo"
+msgstr "*!*@*.host"
 
 #: src/fe-gtk/setup.c:548
 msgid "*!*@domain"
@@ -5956,7 +5685,7 @@ msgstr "*!*@dominio"
 
 #: src/fe-gtk/setup.c:549
 msgid "*!*user@*.host"
-msgstr "*!*usuario@*.equipo"
+msgstr "*!*usuario@*.host"
 
 #: src/fe-gtk/setup.c:550
 msgid "*!*user@domain"
@@ -5964,37 +5693,37 @@ msgstr "*!*usuario@dominio"
 
 #: src/fe-gtk/setup.c:556
 msgid "Auto Copy Behavior"
-msgstr "Conducta de auto copiar"
+msgstr "Comportamiento de copia automática"
 
 #: src/fe-gtk/setup.c:557
 msgid "Automatically copy selected text"
-msgstr "Automáticamente copiar texto seleccionado"
+msgstr "Copiar automáticamente el texto seleccionado"
 
 #: src/fe-gtk/setup.c:558
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Copia el texto seleccionado al portapapeles cuando se suelta el botón izquierdo del ratón. Como alternativa, usar Ctrl+Mayús+C para copiar el texto."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+msgstr "Incluir automáticamente marcas de tiempo"
 
 #: 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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Incluir automáticamente las marcas de tiempo de las líneas de texto copiadas. Como alternativa, mantener presionada la tecla Mayús al seleccionar el texto."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
-msgstr "Automáticamente incluir información de color"
+msgstr "Incluir automáticamente información de color"
 
 #: 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Incluir automáticamente la información de color en las líneas de texto copiadas. Como alternativa, mantener presionada la tecla Ctrl al seleccionar el texto."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6006,7 +5735,7 @@ msgstr "Fuentes alternativas:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr "Separa múltiples entradas con comas y sin espacios entre ellas."
+msgstr "Separa varias entradas con comas y sin espacios entre ellas."
 
 #: src/fe-gtk/setup.c:574
 msgid "Display lists in compact mode"
@@ -6014,8 +5743,7 @@ msgstr "Mostrar listas en modo compacto"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Usar menos espacio entre lista de usuarios y las filas del árbol de canales."
+msgstr "Usar menos espaciado entre la lista de usuarios y las filas del árbol de canales."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -6025,31 +5753,29 @@ msgstr "Usar la hora del servidor si se puede"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Mostrar marcas de tiempo obtenidas del servidor si soporta la extensión hora-"
-"servidor."
+msgstr "Mostrar marcas de tiempo obtenidas del servidor si soporta la extensión time-server."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
-msgstr "Automáticamente reconectar a los servidores al desconectarse"
+msgstr "Reconectar automáticamente a los servidores al desconectarse"
 
 #: src/fe-gtk/setup.c:577
 msgid "Auto reconnect delay:"
-msgstr "Retraso de reconexión automática:"
+msgstr "Retardo de reconexión automática:"
 
 #: src/fe-gtk/setup.c:578
 msgid "Auto join delay:"
-msgstr "Retraso de auto entrada:"
+msgstr "Retardo de unión automática:"
 
 #: src/fe-gtk/setup.c:579
 msgid "Ban Type:"
-msgstr "Tipo de ban:"
+msgstr "Tipo de baneo:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Intentar usar esta máscara al banear o silenciar. (requiere irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Intentar usar esta máscara al banear o silenciar. (requiere irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6057,32 +5783,32 @@ msgstr "Registros"
 
 #: src/fe-gtk/setup.c:587
 msgid "Display scrollback from previous session"
-msgstr "Mostrar scrollback de la sesión anterior"
+msgstr "Mostrar registro de mensajes de sesiones anteriores"
 
 #: src/fe-gtk/setup.c:588
 msgid "Scrollback lines:"
-msgstr "Líneas de desplazamiento:"
+msgstr "Líneas de registro:"
 
 #: src/fe-gtk/setup.c:589
 msgid "Enable logging of conversations to disk"
-msgstr "Activar el registro de conversaciones al disco"
+msgstr "Activar el registro de conversaciones en el disco"
 
 #: src/fe-gtk/setup.c:590
 msgid "Log filename:"
-msgstr "Nombre de archivo de registro:"
+msgstr "Nombre del archivo de registro:"
 
 #: src/fe-gtk/setup.c:591
 #, c-format
 msgid "%s=Server %c=Channel %n=Network."
-msgstr "(%s=Servidor %c=Canal %n=Red)."
+msgstr "%s=Servidor %c=Canal %n=Red."
 
 #: src/fe-gtk/setup.c:594
 msgid "Insert timestamps in logs"
-msgstr "Insertar marcas de fecha/hora en los registros"
+msgstr "Insertar marcas de tiempo en los registros"
 
 #: src/fe-gtk/setup.c:595
 msgid "Log timestamp format:"
-msgstr "Formato de fecha/hora para el registro:"
+msgstr "Formato de las marcas de tiempo del registro:"
 
 #: src/fe-gtk/setup.c:602
 msgid "URLs"
@@ -6098,7 +5824,7 @@ msgstr "Activar capturador de URL"
 
 #: src/fe-gtk/setup.c:605
 msgid "Maximum number of URLs to grab:"
-msgstr "Número máximo de URLs para capturar"
+msgstr "Número máximo de URLs a capturar:"
 
 #: src/fe-gtk/setup.c:612
 msgid "(Disabled)"
@@ -6110,11 +5836,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6130,11 +5856,11 @@ msgstr "Todas las conexiones"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr "Sólo servidor IRC"
+msgstr "Solo servidor IRC"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "Solo DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6146,7 +5872,7 @@ msgstr "Asociar a:"
 
 #: src/fe-gtk/setup.c:635
 msgid "Only useful for computers with multiple addresses."
-msgstr "Sólo es útil para computadoras con direcciones múltiples."
+msgstr "Solo es útil en computadoras con múltiples direcciones."
 
 #: src/fe-gtk/setup.c:637
 msgid "File Transfers"
@@ -6158,11 +5884,9 @@ msgstr "Obtener mi IP del 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 ""
-"Pregunta su dirección real al servidor IRC. ¡Úselo si tiene una dirección "
-"del tipo 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Preguntar su dirección real al servidor IRC. ¡Úselo si tiene una dirección del tipo 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6170,19 +5894,19 @@ msgstr "Dirección IP DCC:"
 
 #: src/fe-gtk/setup.c:641
 msgid "Claim you are at this address when offering files."
-msgstr "Pretender estar en esta dirección cuando esta ofreciendo archivos."
+msgstr "Reclamar esta dirección cuando ofrezca archivos."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "Primer puerto de envío DCC:"
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "Último puerto de envío DCC:"
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
-msgstr "!Dejar los puertos en cero para el rango completo."
+msgstr "!Dejar los puertos a cero para el rango completo."
 
 #: src/fe-gtk/setup.c:646
 msgid "Proxy Server"
@@ -6190,7 +5914,7 @@ msgstr "Servidor proxy"
 
 #: src/fe-gtk/setup.c:647
 msgid "Hostname:"
-msgstr "Nombre de equipo:"
+msgstr "Nombre de host:"
 
 #: src/fe-gtk/setup.c:648 src/fe-gtk/setup.c:664
 msgid "Port:"
@@ -6202,16 +5926,15 @@ msgstr "Tipo:"
 
 #: src/fe-gtk/setup.c:650
 msgid "Use proxy for:"
-msgstr "Usar un servidor proxy para:"
+msgstr "Usar el servidor proxy para:"
 
 #: src/fe-gtk/setup.c:652
 msgid "Proxy Authentication"
-msgstr "Autenticación en el servidor proxy"
+msgstr "Autenticación del servidor proxy"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Usar autenticación (solo HTTP o Socks5)"
+msgstr "Usar autenticación (solo HTTP o SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6233,13 +5956,11 @@ msgstr "El servidor responderá con el nombre de usuario de la red"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Debes tener permisos para escuchar en este puerto. Si no es 113 (0 es "
-"predeterminado), entonces deberás configurar el puerto de reenvío."
+msgstr "Debe tener permisos para escuchar en este puerto. Si no es 113 (0 por defecto), entonces deberá configurar el puerto de reenvío."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
-msgstr "Seleccione un archivo de imagen"
+msgstr "Seleccionar archivo de imagen"
 
 #: src/fe-gtk/setup.c:1146
 msgid "Select Download Folder"
@@ -6247,11 +5968,11 @@ msgstr "Seleccionar carpeta de descargas"
 
 #: src/fe-gtk/setup.c:1156
 msgid "Select font"
-msgstr "Seleccionar tipografía"
+msgstr "Seleccionar fuente"
 
 #: src/fe-gtk/setup.c:1257
 msgid "Browse..."
-msgstr "Buscar..."
+msgstr "Explorar..."
 
 #: src/fe-gtk/setup.c:1395
 msgid "Open Data Folder"
@@ -6267,7 +5988,7 @@ msgstr "Colores de texto"
 
 #: src/fe-gtk/setup.c:1536
 msgid "mIRC colors:"
-msgstr "Colores de mIRC:"
+msgstr "Colores de mIRC:                "
 
 #: src/fe-gtk/setup.c:1544
 msgid "Local colors:"
@@ -6295,7 +6016,7 @@ msgstr "Dato nuevo:"
 
 #: src/fe-gtk/setup.c:1563
 msgid "Marker line:"
-msgstr "Línea de señalador:"
+msgstr "Marcador:"
 
 #: src/fe-gtk/setup.c:1564
 msgid "New message:"
@@ -6303,15 +6024,15 @@ msgstr "Mensaje nuevo:"
 
 #: src/fe-gtk/setup.c:1565
 msgid "Away user:"
-msgstr "Usuario ausente:"
+msgstr "Ausencia:"
 
 #: src/fe-gtk/setup.c:1566
 msgid "Highlight:"
-msgstr "Resaltar:"
+msgstr "Mensaje resaltado:"
 
 #: src/fe-gtk/setup.c:1567
 msgid "Spell checker:"
-msgstr "Corrector ortográfico:"
+msgstr "Corretor:"
 
 #: src/fe-gtk/setup.c:1569
 msgid "Color Stripping"
@@ -6323,7 +6044,7 @@ msgstr "Evento"
 
 #: src/fe-gtk/setup.c:1672
 msgid "Sound file"
-msgstr "Archivo de sonido:"
+msgstr "Archivo de sonido"
 
 #: src/fe-gtk/setup.c:1716
 msgid "Select a sound file"
@@ -6351,7 +6072,7 @@ msgstr "Apariencia"
 
 #: src/fe-gtk/setup.c:1874
 msgid "Input box"
-msgstr "Caja de entrada"
+msgstr "Cuadro de entrada"
 
 #: src/fe-gtk/setup.c:1875
 msgid "User list"
@@ -6359,7 +6080,7 @@ msgstr "Lista de usuarios"
 
 #: src/fe-gtk/setup.c:1876
 msgid "Channel switcher"
-msgstr "Interruptor de canal"
+msgstr "Selector de canal"
 
 #: src/fe-gtk/setup.c:1877
 msgid "Colors"
@@ -6367,7 +6088,7 @@ msgstr "Colores"
 
 #: src/fe-gtk/setup.c:1879
 msgid "Chatting"
-msgstr "Conversación"
+msgstr "Charlando"
 
 #: src/fe-gtk/setup.c:1882
 msgid "Sounds"
@@ -6397,21 +6118,15 @@ msgstr "Categorías"
 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 ""
-"¡No puedes colocar el árbol en la parte superior o inferior!\n"
-"Por favor cambiar al modo <b>Solapas</b> en el menú <b>Ver</b>."
+msgstr "¡No puede colocar el árbol en la parte superior o inferior!\nPor favor cambie al modo <b>Pestañas</b> en el menú <b>Ver</b>."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"La opción de nombre real no puede estar en blanco. Retrocede a \"nombre real"
-"\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "La opción de nombre real no puede estar en blanco. Retroceda a «nombre real»."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Algunas opciones que han cambiado requieren un reinicio para tener efecto."
+msgstr "Se cambiaron algunas configuraciones que requieren un reinicio para tener efecto."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6419,11 +6134,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 ""
-"*ADVERTENCIA*\n"
-"Aceptar automáticamente DCC hacia su directorio de inicio\n"
-"puede ser peligroso y es explotable. Por ejemplo: Alguien \n"
-"puede enviarle un archivo .bash_profile"
+msgstr "*ADVERTENCIA*\nAceptar automáticamente DCC hacia su directorio de usuario\npuede ser peligroso y es explotable. Por ejemplo: Alguien\npuede enviarle un archivo .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6432,7 +6143,7 @@ msgstr "Preferencias - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
-msgstr "<i>(ninguna sugerencia)</i>"
+msgstr "<i>(sin sugerencias)</i>"
 
 #: src/fe-gtk/sexy-spell-entry.c:585
 msgid "More..."
@@ -6442,7 +6153,7 @@ msgstr "Más..."
 #: src/fe-gtk/sexy-spell-entry.c:657
 #, c-format
 msgid "Add \"%s\" to Dictionary"
-msgstr "Añadir \"%s\" al diccionario"
+msgstr "Añadir «%s» al diccionario"
 
 #. - Ignore All
 #: src/fe-gtk/sexy-spell-entry.c:702
@@ -6456,7 +6167,7 @@ msgstr "Sugerencias de ortografía"
 #: src/fe-gtk/sexy-spell-entry.c:1310
 #, c-format
 msgid "enchant error for language: %s"
-msgstr "realzar error para el idioma: %s"
+msgstr "realzar error en el idioma: %s"
 
 #: src/fe-gtk/textgui.c:171
 msgid "There was an error parsing the string"
@@ -6469,7 +6180,7 @@ msgstr "Esta señal sólo ha pasado %d argumentos, $%d es inválido"
 
 #: src/fe-gtk/textgui.c:285 src/fe-gtk/textgui.c:307
 msgid "Print Texts File"
-msgstr "Imprimir archivos de textos"
+msgstr "Imprimir archivo de textos"
 
 #: src/fe-gtk/textgui.c:417
 msgid "$ Number"
@@ -6510,7 +6221,7 @@ msgstr "Copiar"
 
 #: src/fe-gtk/urlgrab.c:218
 msgid "Save list to a file"
-msgstr "Guardar lista en un archivo."
+msgstr "Guardar lista en un archivo"
 
 #: src/fe-gtk/userlistgui.c:108
 #, c-format
@@ -6519,7 +6230,7 @@ msgstr "%d ops, %d total"
 
 #: src/fe-text/fe-text.c:472
 msgid "Open an irc://server:port/channel URL"
-msgstr "Abrir una URL irc://server:port/channel"
+msgstr "Abrir una URL irc://servidor:puerto/canal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
@@ -6537,29 +6248,20 @@ msgstr "Sysinfo: %s está configurado para: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Ajustes válidos son: anunciar y ocultar_* para cada pieza de "
-"información. Por ejemplo, ocultar_os. Sin un valor se mostrará la "
-"configuración actual (o por defecto).\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Ajustes válidos son: anunciar y ocultar_* para cada pieza de información. Por ejemplo, ocultar_os. Sin un valor se mostrará la configuración actual (o por defecto).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
-msgstr "Sysinfo: Nombre de variable no válido\n"
+msgstr "Sysinfo: Nombre de variable no válida\n"
 
 #: plugins/sysinfo/sysinfo.c:239
 #, c-format
 msgid "%s plugin loaded\n"
-msgstr "%s plugin cargado\n"
+msgstr "%s complemento cargado\n"
 
 #: plugins/sysinfo/sysinfo.c:247
 #, c-format
 msgid "%s plugin unloaded\n"
-msgstr "%s plugin deshabilitado\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
+msgstr "%s complemento descargado\n"
diff --git a/po/et.po b/po/et.po
index c7f766f9..3308b663 100644
--- a/po/et.po
+++ b/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"
diff --git a/po/eu.po b/po/eu.po
index db25de0a..4deb17b0 100644
--- a/po/eu.po
+++ b/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"
diff --git a/po/fi.po b/po/fi.po
index a5cb8f5f..3048f622 100644
--- a/po/fi.po
+++ b/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"
diff --git a/po/fr.po b/po/fr.po
index de76ccb2..6ae5b8a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Benjamin Sonntag <benjamin@alternc.org>, 2007
 # Benjamin Sonntag <benjamin@sonntag.fr>, 2007,2012
 # Hugo Locurcio, 2014
 # Hugo Locurcio, 2014
+# Hugo Locurcio, 2013-2014
+# Misdre <misdre@hexchat.misdre.info>, 2013
 # Misdre <misdre@hexchat.misdre.info>, 2013
 # Misdre <misdre@hexchat.misdre.info>, 2013
 # Towinet, 2014,2016-2017
 # Hugo Locurcio, 2013
-# Yannick Le Guen <leguen.yannick@gmail.com>, 2014,2016-2017
+# Yannick Le Guen <leguen.yannick@gmail.com>, 2014,2016-2018,2020
 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-10-28 09:36+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2020-01-14 13:11+0000\n"
 "Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/hexchat/hexchat/language/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/hexchat/hexchat/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -43,20 +44,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 est un client IRC facile à utiliser et extensible. Il vous permet de "
-"rejoindre en toute sécurité plusieurs réseaux et de parler à d'autres "
-"utilisateurs en privé ou dans des canaux grâce à une interface "
-"personnalisable. Vous pouvez même transférer des fichiers."
+msgstr "HexChat est un client IRC facile à utiliser et extensible. Il vous permet de rejoindre en toute sécurité plusieurs réseaux et de parler à d'autres utilisateurs en privé ou dans des canaux grâce à une interface personnalisable. Vous pouvez même transférer des fichiers."
 
 #: 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 prend en charge des fonctionnalités telles que : DCC, SASL, serveurs "
-"mandataires, vérification orthographique, alertes, journalisation, thèmes "
-"personnalisés et scripts Python et Perl."
+msgstr "HexChat prend en charge des fonctionnalités telles que : DCC, SASL, serveurs mandataires, vérification orthographique, alertes, journalisation, thèmes personnalisés et scripts Python et Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -307,18 +301,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Vous n'avez pas les droits d'écriture vers %s. Rien ne sera enregistré de "
-"cette session."
+msgstr "Vous n'avez pas les droits d'écriture vers %s. Rien ne sera enregistré de cette session."
 
 #: 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 ""
-"* Utiliser IRC sous un compte root est idiot !\n"
-"  Vous devriez créer un compte utilisateur « standard » et\n"
-"  l'utiliser pour vous connecter.\n"
+msgstr "* Utiliser IRC sous un compte root est idiot !\n  Vous devriez créer un compte utilisateur « standard » et\n  l'utiliser pour vous connecter.\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
@@ -340,9 +329,7 @@ msgstr "Vous êtes arrosé de requêtes CTCP par %s, %s va être ignoré\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Vous êtes bombardé de MSG par %s, désactivation de l'option "
-"gui_autoopen_dialog.\n"
+msgstr "Vous êtes bombardé de MSG par %s, désactivation de l'option gui_autoopen_dialog.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -439,40 +426,29 @@ msgstr "Impossible de décharger ce greffon.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <nom> <action>, ajouter un bouton au-dessous de la liste des "
-"utilisateurs"
+msgstr "ADDBUTTON <nom> <action>, ajouter un bouton au-dessous de la liste des utilisateurs"
 
 #: src/common/outbound.c:3933
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <Nouveau Réseau> <nouveauserveur/6667>, ajoute un nouveau réseau "
-"avec un nouveau serveur dans sa liste."
+msgstr "ADDSERVER <Nouveau Réseau> <nouveauserveur/6667>, ajoute un nouveau réseau avec un nouveau serveur dans sa liste."
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <cmd>, envoyer une commande à tous les canaux sur lesquels vous êtes "
-"présent"
+msgstr "ALLCHAN <cmd>, envoyer une commande à tous les canaux sur lesquels vous êtes présent"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <cmd>, envoyer une commande à tous les canaux sur le serveur courant"
+msgstr "ALLCHANL <cmd>, envoyer une commande à tous les canaux sur le serveur courant"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <cmd>, envoyer une commande à tous les serveurs auxquels vous êtes "
-"connecté"
+msgstr "ALLSERV <cmd>, envoyer une commande à tous les serveurs auxquels vous êtes connecté"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<raison>], indique que vous êtes absent (utilisez /BACK pour le "
-"démettre)"
+msgstr "AWAY [<raison>], indique que vous êtes absent (utilisez /BACK pour le démettre)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -483,10 +459,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 <masque> [<typeban>], bannir du canal en cours tous ceux qui "
-"correspondent au masque. S'ils sont déjà sur ce canal, ils ne seront pas "
-"expulsés (nécessite d'être opérateur [chanop])"
+msgstr "BAN <masque> [<typeban>], bannir du canal en cours tous ceux qui correspondent au masque. S'ils sont déjà sur ce canal, ils ne seront pas expulsés (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -494,45 +467,36 @@ msgstr "CHANOPT [-quiet] <variable> [<valeur>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<encodage>], retourne ou modifie le jeu de caractère utilisé pour "
-"la connexion en cours"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<encodage>], retourne ou modifie le jeu de caractère utilisé pour la connexion en cours"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<nombre>], vider la fenêtre de texte actuelle ou "
-"l'historique de commandes"
+msgstr "CLEAR [ALL|HISTORY|[-]<nombre>], vider la fenêtre de texte actuelle ou l'historique de commandes"
 
 #: 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 ""
-"CLOSE [-m], ferme l'onglet actuel, en fermant la fenêtre s'il s'agit du seul "
-"onglet ouvert, ou si utilisé avec le paramètre « -m », ferme toutes les "
-"requêtes."
+msgstr "CLOSE [-m], ferme l'onglet actuel, en fermant la fenêtre s'il s'agit du seul onglet ouvert, ou si utilisé avec le paramètre « -m », ferme toutes les requêtes."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|joker>, rechercher un code de pays, par exemple : au = "
-"Australie"
+msgstr "COUNTRY [-s] <code|joker>, rechercher un code de pays, par exemple : au = Australie"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <pseudo> <message>, envoyer au pseudo un message CTCP, « VERSION » et "
-"« USERINFO » sont des messages usuels."
+msgstr "CTCP <pseudo> <message>, envoyer au pseudo un message CTCP, « VERSION » et « USERINFO » sont des messages usuels."
 
 #: 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 [<canal>], quitte et rejoint à nouveau le canal donné"
 
 #: src/common/outbound.c:3956
@@ -546,48 +510,29 @@ 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>                      - accepter un fichier proposé\n"
-"DCC SEND [-maxcps=#] <nick> [file]  - envoyer un fichier à quelqu'un\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - envoyer un fichier en mode passif\n"
-"DCC LIST                            - afficher les connexions DCC\n"
-"DCC CHAT <nick>                     - proposer une discussion DCC à "
-"quelqu'un\n"
-"DCC PCHAT <nick>                    - proposer une discussion DCC en mode "
-"passif\n"
-"DCC CLOSE <type> <nick> <file>         exemple :\n"
-"         /dcc close send paul file.tar.gz"
+msgstr "\nDCC GET <nick>                      - accepter un fichier proposé\nDCC SEND [-maxcps=#] <nick> [file]  - envoyer un fichier à quelqu'un\nDCC PSEND [-maxcps=#] <nick> [file] - envoyer un fichier en mode passif\nDCC LIST                            - afficher les connexions DCC\nDCC CHAT <nick>                     - proposer une discussion DCC à quelqu'un\nDCC PCHAT <nick>                    - proposer une discussion DCC en mode passif\nDCC CLOSE <type> <nick> <file>         exemple :\n         /dcc close send paul 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 <pseudo>, supprimer l'état demi-opérateur « chanhalf-op » d'un pseudo "
-"sur le canal actuel (nécessite être opérateur [chanop])"
+msgstr "DEHOP <pseudo>, supprimer l'état demi-opérateur « chanhalf-op » d'un pseudo sur le canal actuel (nécessite être opérateur [chanop])"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
-msgstr ""
-"DELBUTTON <nom>, supprimer un des boutons situés au-dessous de la liste des "
-"utilisateurs"
+msgstr "DELBUTTON <nom>, supprimer un des boutons situés au-dessous de la liste des utilisateurs"
 
 #: src/common/outbound.c:3972
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <pseudo>, supprimer l'état opérateur (« chanop ») d'un pseudo sur le "
-"canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "DEOP <pseudo>, supprimer l'état opérateur (« chanop ») d'un pseudo sur le canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <pseudo>, supprimer la parole donnée à un pseudo sur le canal actuel "
-"(nécessite d'être opérateur [chanop])"
+msgstr "DEVOICE <pseudo>, supprimer la parole donnée à un pseudo sur le canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -609,10 +554,7 @@ msgstr "ECHO <texte>, afficher un texte en local"
 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] <commande>, exécuter une commande. Si l'option -o est utilisée, la "
-"sortie est envoyée sur le canal actuel, sinon elle est affichée dans la zone "
-"de texte actuelle"
+msgstr "EXEC [-o] <commande>, exécuter une commande. Si l'option -o est utilisée, la sortie est envoyée sur le canal actuel, sinon elle est affichée dans la zone de texte actuelle"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -622,9 +564,7 @@ msgstr "EXECCONT, envoyer un signal « SIGCONT » au processus"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], tuer une exécution en cours dans la session actuelle. Si -9 "
-"est fourni, le processus est tué par le signal « SIGKILL »"
+msgstr "EXECKILL [-9], tuer une exécution en cours dans la session actuelle. Si -9 est fourni, le processus est tué par le signal « SIGKILL »"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -644,9 +584,7 @@ msgstr "FLUSHQ, vider la file d'envoi du serveur actuel"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <hôte> [<port>], utiliser un hôte comme serveur mandataire (proxy), le "
-"port 23 est utilisé par défaut"
+msgstr "GATE <hôte> [<port>], utiliser un hôte comme serveur mandataire (proxy), le port 23 est utilisé par défaut"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -654,9 +592,7 @@ msgstr "GHOST <pseudo> [<mot-de-passe>], tuer un pseudonyme fantôme"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <pseudo>, donner l'état de demi-opérateur de canal « chanhalf-op » au "
-"pseudo (nécessite d'être opérateur [chanop)]"
+msgstr "HOP <pseudo>, donner l'état de demi-opérateur de canal « chanhalf-op » au pseudo (nécessite d'être opérateur [chanop)]"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -669,20 +605,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 <masque> <types...> <options...>\n"
-"    masque  - masque d'hôtes à exclure, par ex. : *!*@*.aol.com\n"
-"    types   - types de données à exclure, un seul ou tous :\n"
-"              PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <masque> <types...> <options...>\n    masque  - masque d'hôtes à exclure, par ex. : *!*@*.aol.com\n    types   - types de données à exclure, un seul ou tous :\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 <pseudo> [<canal>], inviter quelqu'un sur un canal, par défaut le "
-"canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "INVITE <pseudo> [<canal>], inviter quelqu'un sur un canal, par défaut le canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -691,17 +620,13 @@ msgstr "JOIN <canal>, rejoindre le canal"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <pseudo> [raison], expulse le pseudo du canal actuel (nécessite d'être "
-"opérateur [chanop])"
+msgstr "KICK <pseudo> [raison], expulse le pseudo du canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <pseudo> [raison], bannit puis expulse le pseudo du canal actuel "
-"(nécessite d'être opérateur [chanop])"
+msgstr "KICKBAN <pseudo> [raison], bannit puis expulse le pseudo du canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -713,15 +638,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] [--] <chaîne>, cherche la chaîne dans le tampon\n"
-"    Utiliser -h pour mettre en surbrillance les chaînes trouvées\n"
-"    Utiliser -m pour respecter la casse\n"
-"    Utiliser -r si la chaîne est une Expression Rationnelle\n"
-"    Utiliser -- (double tiret) pour terminer les options, par exemple si "
-"vous cherchez '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <chaîne>, cherche la chaîne dans le tampon\n    Utiliser -h pour mettre en surbrillance les chaînes trouvées\n    Utiliser -m pour respecter la casse\n    Utiliser -r si la chaîne est une Expression Rationnelle\n    Utiliser -- (double tiret) pour terminer les options, par exemple si vous cherchez '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -730,23 +648,17 @@ msgstr "LOAD [-e] <fichier>, charger un greffon ou un script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, retirer globalement les droits d'opérateur à tous les demi-"
-"opérateurs (halfops) du canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "MDEHOP, retirer globalement les droits d'opérateur à tous les demi-opérateurs (halfops) du canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, retirer globalement tous les droits d'opérateur à tous les opérateurs "
-"du canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "MDEOP, retirer globalement tous les droits d'opérateur à tous les opérateurs du canal actuel (nécessite d'être opérateur [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>, envoyer l'action sur le canal actuel (les actions sont écrites "
-"à la 3ème personne, comme /me est content)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <action>, envoyer l'action sur le canal actuel (les actions sont écrites à la 3ème personne, comme /me est content)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -755,24 +667,17 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, jeter (kick) massivement tout le monde sauf vous hors du canal actuel "
-"(nécessite d'être opérateur [chanop])"
+msgstr "MKICK, jeter (kick) massivement tout le monde sauf vous hors du canal actuel (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, donner globalement les droits d'opérateur à tous les utilisateurs du "
-"canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "MOP, donner globalement les droits d'opérateur à tous les utilisateurs du canal actuel (nécessite d'être opérateur [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"
-msgstr ""
-"MSG <pseudo> <message>, envoie un message privé, envoyez un message à « . » "
-"pour envoyer au dernier pseudo utilisé ou préfixez avec « = » pour une "
-"conversation DCC"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <pseudo> <message>, envoie un message privé, envoyez un message à « . » pour envoyer au dernier pseudo utilisé ou préfixez avec « = » pour une conversation DCC"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -798,21 +703,16 @@ msgstr "NOTICE <pseudo/canal> <message>, envoie une notification"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n réseau1[,réseau2,…]] [<pseudo>], affiche la liste des "
-"notifications ou ajoute quelqu'un à cette liste."
+msgstr "NOTIFY [-n réseau1[,réseau2,…]] [<pseudo>], affiche la liste des notifications ou ajoute quelqu'un à cette liste."
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <pseudo>, donner l'état d'opérateur « chanop » au pseudo (nécessite "
-"d'être opérateur [chanop])"
+msgstr "OP <pseudo>, donner l'état d'opérateur « chanop » au pseudo (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<canal>] [<raison>], quitter le canal, par défaut le canal actuel"
+msgstr "PART [<canal>] [<raison>], quitter le canal, par défaut le canal actuel"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -822,18 +722,13 @@ msgstr "PING <pseudo | canal>, envoyer un ping CTCP au pseudo ou au canal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <pseudo> [message], ouvre une fenêtre de message privé vers "
-"le pseudo et envoie optionnellement un message"
+msgstr "QUERY [-nofocus] <pseudo> [message], ouvre une fenêtre de message privé vers le pseudo et envoie optionnellement un message"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <masque> [<quiettype>], rendre muet toutes les personnes qui "
-"correspondent au masque dans le canal courant si pris en charge par le "
-"serveur."
+msgstr "QUIET <masque> [<quiettype>], rendre muet toutes les personnes qui correspondent au masque dans le canal courant si pris en charge par le serveur."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -845,31 +740,23 @@ msgstr "QUOTE <texte>, transmettre le texte au serveur sous forme brute"
 
 #: 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] [<hôte>] [<port>] [<mot_de_passe>], peut être appelée "
-"exactement comme /RECONNECT pour se reconnecter au serveur actuel ou avec /"
-"RECONNECT ALL pour se reconnecter à tous les serveurs ouverts"
+msgstr "RECONNECT [-ssl] [<hôte>] [<port>] [<mot_de_passe>], peut être appelée exactement comme /RECONNECT pour se reconnecter au serveur actuel ou avec /RECONNECT ALL pour se reconnecter à tous les serveurs ouverts"
 
 #: 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 [<hôte>] [<port>] [<mot_de_passe>], peut être appelée exactement "
-"comme /RECONNECT pour se reconnecter au serveur actuel ou avec /RECONNECT "
-"ALL pour se reconnecter à tous les serveurs ouverts"
+msgstr "RECONNECT [<hôte>] [<port>] [<mot_de_passe>], peut être appelée exactement comme /RECONNECT pour se reconnecter au serveur actuel ou avec /RECONNECT ALL pour se reconnecter à tous les serveurs ouverts"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <texte>, envoie des données brutes à HexChat, comme si elles étaient "
-"reçues du serveur IRC."
+msgstr "RECV <texte>, envoie des données brutes à HexChat, comme si elles étaient reçues du serveur IRC."
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -885,8 +772,7 @@ msgstr "SEND <pseudo> [<fichier>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <hôte> <port> <canal>, se connecter et rejoindre un canal"
+msgstr "SERVCHAN [-ssl] <hôte> <port> <canal>, se connecter et rejoindre un canal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -896,18 +782,13 @@ msgstr "SERVCHAN <hôte> <port> <canal>, se connecter et rejoindre un canal"
 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] <hôte> [<port>] [<mot de passe>], se connecter à un serveur, "
-"le port par défaut est 6667 pour les connexions normales, et 6697 pour les "
-"connexions ssl"
+msgstr "SERVER [-ssl] <hôte> [<port>] [<mot de passe>], se connecter à un serveur, le port par défaut est 6667 pour les connexions normales, et 6697 pour les connexions ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <hôte> [<port>] [<mot_de_passe>], se connecter à un serveur, le port "
-"par défaut est 6667"
+msgstr "SERVER <hôte> [<port>] [<mot_de_passe>], se connecter à un serveur, le port par défaut est 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -915,14 +796,11 @@ msgstr "SET [-e] [-off|-on] [-quiet] <variable> [<valeur>]"
 
 #: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
-"SETCURSOR [-|+]<position>, repositionne le curseur dans la zone de saisie"
+msgstr "SETCURSOR [-|+]<position>, repositionne le curseur dans la zone de saisie"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nouveau nom>, change le nom d'un onglet, la limite tab_trunc "
-"s'applique toutefois."
+msgstr "SETTAB <nouveau nom>, change le nom d'un onglet, la limite tab_trunc s'applique toutefois."
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -930,10 +808,9 @@ msgstr "SETTEXT <nouveau texte>, remplace le texte dans la zone de saisie"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<sujet>], définir le sujet si on en fournit un, sinon afficher le "
-"sujet actuel"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<sujet>], définir le sujet si on en fournit un, sinon afficher le sujet actuel"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -943,24 +820,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 <délai> <fichier1> [<fichier2>] Définit les fichiers à utiliser pour "
-"faire clignoter l'icône de barre d'état.\n"
-"TRAY -f <fichier>                   Définit le fichier à utiliser pour "
-"l'icône de barre d'état.\n"
-"TRAY -i <numéro>                    Définit une icône interne pour le "
-"clignotement de la barre d'état.\n"
-"TRAY -t <texte>                     Définit le message d'aide de l'icône de "
-"barre d'état.\n"
-"TRAY -b <titre> <texte>             Définit le message flottant de l'icône "
-"de barre d'état."
+msgstr "\nTRAY -f <délai> <fichier1> [<fichier2>] Définit les fichiers à utiliser pour faire clignoter l'icône de barre d'état.\nTRAY -f <fichier>                   Définit le fichier à utiliser pour l'icône de barre d'état.\nTRAY -i <numéro>                    Définit une icône interne pour le clignotement de la barre d'état.\nTRAY -t <texte>                     Définit le message d'aide de l'icône de barre d'état.\nTRAY -b <titre> <texte>             Définit le message flottant de l'icône de barre d'état."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <masque> [<masque>…], supprime le bannissement pour les masques "
-"fournis."
+msgstr "UNBAN <masque> [<masque>…], supprime le bannissement pour les masques fournis."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -972,11 +836,9 @@ msgstr "UNLOAD <nom>, décharger un greffon ou un script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <masque> [<masque>…], enlève l'état « muet » pour les masques "
-"spécifiés si cela est pris en charge par le serveur."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <masque> [<masque>…], enlève l'état « muet » pour les masques spécifiés si cela est pris en charge par le serveur."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -984,16 +846,13 @@ msgstr "URL <url>, ouvrir une URL dans votre navigateur"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <pseudo1> <npseudo2> etc., mettre en surbrillance le(s) "
-"pseudonyme(s) dans la liste des utilisateurs du canal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <pseudo1> <npseudo2> etc., mettre en surbrillance le(s) pseudonyme(s) dans la liste des utilisateurs du canal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <pseudo>, donner la parole à quelqu'un (nécessite d'être opérateur "
-"[chanop])"
+msgstr "VOICE <pseudo>, donner la parole à quelqu'un (nécessite d'être opérateur [chanop])"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -1002,9 +861,7 @@ msgstr "WALLCHAN <message>, écrire le message sur tous les canaux"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <message>, envoyer le message à tous les opérateurs du canal actuel "
-"(chanops)"
+msgstr "WALLCHOP <message>, envoyer le message à tous les opérateurs du canal actuel (chanops)"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1020,9 +877,7 @@ msgstr "Utilisation : %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Aucune aide n'est disponible pour cette commande.\n"
+msgstr "\nAucune aide n'est disponible pour cette commande.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1043,9 +898,7 @@ msgstr "Commande %s inconnue. Essayez /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"La méthode hexchat_plugin_init n'a pas été trouvée. Est-ce réellement un "
-"greffon HexChat ?"
+msgstr "La méthode hexchat_plugin_init n'a pas été trouvée. Est-ce réellement un greffon HexChat ?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1064,9 +917,7 @@ msgstr "IDENTD <port> <username>"
 #: src/common/plugin-timer.c:75
 #, c-format
 msgid "Timer %d deleted.\n"
-msgstr ""
-"Minuteur %d effacé.\n"
-"\n"
+msgstr "Minuteur %d effacé.\n\n"
 
 #: src/common/plugin-timer.c:81
 msgid "No such ref number found.\n"
@@ -1095,9 +946,7 @@ msgstr "Êtes-vous sûr que ce serveur et ce port gèrent SSL ?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Résolution du nom d'hôte %s impossible.\n"
-"Veuillez vérifier vos réglages IP.\n"
+msgstr "Résolution du nom d'hôte %s impossible.\nVeuillez vérifier vos réglages IP.\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1113,9 +962,7 @@ msgstr "Passage au serveur suivant dans %s…\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Attention : le jeu de caractères « %s » est inconnu. Aucune conversion ne "
-"sera effectuée pour le réseau %s."
+msgstr "Attention : le jeu de caractères « %s » est inconnu. Aucune conversion ne sera effectuée pour le réseau %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1159,8 +1006,7 @@ msgstr "%C22*%O$tCanal %C22$1%O créé le %C24$2%O"
 
 #: src/common/textevents.h:46
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
-msgstr ""
-"%C22*%O$t%C26$1%O a enlevé l'état de semi-opérateur de canal à %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O a enlevé l'état de semi-opérateur de canal à %C18$2%O"
 
 #: src/common/textevents.h:49
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
@@ -1275,9 +1121,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tConversation DCC vers %C18$1%O annulée."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tConversation DCC, connexion établie avec %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 "%C24*%O$tConversation DCC, connexion établie avec %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1310,11 +1156,9 @@ 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"
-msgstr ""
-"%C20*%O$tRéception d'une requête DCC mal formée de %C18$1%O.$a010%C23*%O"
-"$tContenu de la trame : %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tRéception d'une requête DCC mal formée de %C18$1%O.$a010%C23*%O$tContenu de la trame : %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1331,11 +1175,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' à %C18$1%O annulé."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O terminé %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O terminé %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC RECV connexion établie vers %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1344,15 +1188,13 @@ msgstr "%C20*%O$tDCC RECV '%C23$1%O' de %C18$3%O échoué (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV : Impossible d'ouvrir '%C23$1%C' en écriture (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV : Impossible d'ouvrir '%C23$1%C' en écriture (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tLe fichier '%C24$1%C' existe déjà, il sera enregistré sous « "
-"%C23$2%O » à la place."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tLe fichier '%C24$1%C' existe déjà, il sera enregistré sous « %C23$2%O » à la place."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1365,11 +1207,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' vers %C18$1%O annulé."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' vers %C18$2%C terminé %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' vers %C18$2%C terminé %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC SEND connexion établie vers %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1386,8 +1228,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C' vers %C18$3%O bloqué, annulation."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C' vers %C18$3%O temps d'attente écoulé, annulation."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C' vers %C18$3%O temps d'attente écoulé, annulation."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1429,9 +1270,7 @@ msgstr "%OLa liste à ignorer est vide."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tImpossible de rejoindre le canal %C22$1%C (%C20Vous devez être "
-"invité%O)"
+msgstr "%C20*%O$tImpossible de rejoindre le canal %C22$1%C (%C20Vous devez être invité%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1444,8 +1283,7 @@ msgstr "%C23*$t$1 ($3%C23) vient de rentrer"
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
-"%C20*%O$tImpossible de rejoindre %C22$1%C (%C20Un mot de passe est demandé%O)"
+msgstr "%C20*%O$tImpossible de rejoindre %C22$1%C (%C20Un mot de passe est demandé%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
@@ -1470,9 +1308,7 @@ msgstr "%C23*%O$t%C28$1%C est erroné. Tentative avec %C18$2%O…"
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tPseudonyme erroné ou déjà utilisé. Utilisez /NICK pour en essayer "
-"un autre."
+msgstr "%C20*%O$tPseudonyme erroné ou déjà utilisé. Utilisez /NICK pour en essayer un autre."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1527,8 +1363,7 @@ msgstr "%C24*%O$tRéponse au ping de %C18$1%C : %C24$2%O seconde(s)"
 
 #: src/common/textevents.h:331
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr ""
-"%C20*%O$tPas de réponse au ping pendant %C24$1%O secondes, déconnexion."
+msgstr "%C20*%O$tPas de réponse au ping pendant %C24$1%O secondes, déconnexion."
 
 #: src/common/textevents.h:346
 msgid "%C24*%O$tA process is already running"
@@ -1585,9 +1420,7 @@ msgstr "%C20*%O$tHôte inconnu. Peut-être l'avez-vous mal orthographié ?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tImpossible de rejoindre %C22$1%C (%C20La limite d'utilisateurs est "
-"atteinte%O)"
+msgstr "%C20*%O$tImpossible de rejoindre %C22$1%C (%C20La limite d'utilisateurs est atteinte%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1612,9 +1445,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inactif %C23$2%O, connexion : %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Hôte réel : %C23$2%O, IP réelle : "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Hôte réel : %C23$2%O, IP réelle : %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1659,9 +1490,7 @@ msgstr "**** DÉBUT DU JOURNAL À %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Impossible d'ouvrir le(s) fichier(s) journaux en écriture.\n"
-"Veuillez vérifier les permissions de %s"
+msgstr "* Impossible d'ouvrir le(s) fichier(s) journaux en écriture.\nVeuillez vérifier les permissions de %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2158,9 +1987,7 @@ msgstr "Heure du bannissement"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Impossible de lire le fichier audio :\n"
-"%s"
+msgstr "Impossible de lire le fichier audio :\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3398,9 +3225,7 @@ msgstr "Date"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Vous pouvez ouvrir la fenêtre de la liste des bannissements uniquement "
-"lorsque vous vous trouvez dans un onglet de canal."
+msgstr "Vous pouvez ouvrir la fenêtre de la liste des bannissements uniquement lorsque vous vous trouvez dans un onglet de canal."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3521,24 +3346,17 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Impossible d'accéder au fichier : %s\n"
-"%s.\n"
-"Reprise impossible."
+msgstr "Impossible d'accéder au fichier : %s\n%s.\nReprise impossible."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Le fichier dans le répertoire des téléchargements est plus gros que le "
-"fichier proposé. La reprise est impossible."
+msgstr "Le fichier dans le répertoire des téléchargements est plus gros que le fichier proposé. La reprise est impossible."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
-msgstr ""
-"Impossible de reprendre le même fichier en provenance de deux personnes "
-"différentes."
+msgstr "Impossible de reprendre le même fichier en provenance de deux personnes différentes."
 
 #: src/fe-gtk/dccgui.c:803
 #, c-format
@@ -3680,10 +3498,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"L'ouverture de la police a échoué :\n"
-"\n"
-"%s"
+msgstr "L'ouverture de la police a échoué :\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3701,107 +3516,72 @@ msgstr "File d'envoi du serveur : %d octets"
 
 #: 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 \\\\"
-msgstr ""
-"La commande d'action Exécuter (Run) lance la donnée dans Data 1 telle que si "
-"elle avait été tapée dans la boîte de saisie dans laquelle vous pressez la "
-"séquence de touches. Ainsi elle peut contenir du texte (qui sera envoyé à la "
-"chaîne/personne), des commandes ou des commandes d'utilisateur. Lorsqu'elle "
-"est exécutée tous les caractères \\n dans Données 1 sont utilisés pour "
-"délimiter les commandes séparées, afin qu'il soit possible de faire "
-"fonctionner davantage qu'une commande. Si vous voulez un \\n dans le texte "
-"réel alors entrez \\\\"
+"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 "La commande d'action Exécuter (Run) lance la donnée dans Data 1 telle que si elle avait été tapée dans la boîte de saisie dans laquelle vous pressez la séquence de touches. Ainsi elle peut contenir du texte (qui sera envoyé à la chaîne/personne), des commandes ou des commandes d'utilisateur. Lorsqu'elle est exécutée tous les caractères \\n dans Données 1 sont utilisés pour délimiter les commandes séparées, afin qu'il soit possible de faire fonctionner davantage qu'une commande. Si vous voulez un \\n dans le texte réel alors entrez \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"La page changements (Change Page) commande le basculement entre les pages du "
-"carnet. Si Donnée 2 est paramétrée à n'importe quoi alors le commutateur "
-"sera relatif à la position actuelle. Paramétrer Donnée 1 à auto afin de "
-"commuter vers la page ayant l'activité la plus récente et la plus fréquente "
-"(requêtes d'abord, puis canaux mis en évidence, canaux avec des dialogues, "
-"canaux avec d'autres données)"
+msgstr "La page changements (Change Page) commande le basculement entre les pages du carnet. Si Donnée 2 est paramétrée à n'importe quoi alors le commutateur sera relatif à la position actuelle. Paramétrer Donnée 1 à auto afin de commuter vers la page ayant l'activité la plus récente et la plus fréquente (requêtes d'abord, puis canaux mis en évidence, canaux avec des dialogues, canaux avec d'autres données)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"La commande Insert in Buffer insérera le contenu de Données 1 dans la zone "
-"où la séquence de touches a été pressée à la position actuelle du curseur"
+msgstr "La commande Insert in Buffer insérera le contenu de Données 1 dans la zone où la séquence de touches a été pressée à la position actuelle du curseur"
 
 #: 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."
-msgstr ""
-"La commande Scroll Page fait défiler le widget textuel vers le haut ou vers "
-"le bas d'une page ou d'une ligne. Définir Data 1 soit à Top, Bottom, Up, "
-"Down, +1 ou -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 "La commande Scroll Page fait défiler le widget textuel vers le haut ou vers le bas d'une page ou d'une ligne. Définir Data 1 soit à Top, Bottom, Up, Down, +1 ou -1."
 
 #: 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 ""
-"La commande Set Buffer met le contenu de Données 1 dans la zone où la "
-"séquence de touches a été pressée"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "La commande Set Buffer met le contenu de Données 1 dans la zone où la séquence de touches a été pressée"
 
 #: 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 ""
-"La commande Last Command met dans la zone la dernière commande entrée - même "
-"comportement que la flèche vers le haut du pavé numérique dans un "
-"interpréteur de commandes"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "La commande Last Command met dans la zone la dernière commande entrée - même comportement que la flèche vers le haut du pavé numérique dans un interpréteur de commandes"
 
 #: 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 ""
-"La commande Next Command met dans la zone la prochaine commande entrée - "
-"même comportement que la flèche vers le bas du pavé numérique dans un "
-"interpréteur de commandes"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "La commande Next Command met dans la zone la prochaine commande entrée - même comportement que la flèche vers le bas du pavé numérique dans un interpréteur de commandes"
 
 #: 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 ""
-"Cette commande change le texte de la zone de saisie pour compléter un pseudo "
-"ou une commande incomplet. Si Données 1 est défini, alors un double appui "
-"dans une chaîne sélectionnera le dernier pseudo, pas le suivant"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Cette commande change le texte de la zone de saisie pour compléter un pseudo ou une commande incomplet. Si Données 1 est défini, alors un double appui dans une chaîne sélectionnera le dernier pseudo, pas le suivant"
 
 #: 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 ""
-"Cette commande parcourt vers le haut ou le bas la liste des pseudonymes. Si "
-"Données 1 est défini elle parcourt vers le haut, sinon elle parcourt vers le "
-"bas"
+"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 "Cette commande parcourt vers le haut ou le bas la liste des pseudonymes. Si Données 1 est défini elle parcourt vers le haut, sinon elle parcourt vers le bas"
 
 #: 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 ""
-"Cette commande vérifie si le dernier mot saisi dans la zone est présent dans "
-"la liste de remplacements et le remplace si elle trouve une correspondance"
+msgstr "Cette commande vérifie si le dernier mot saisi dans la zone est présent dans la liste de remplacements et le remplace si elle trouve une correspondance"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3821,14 +3601,11 @@ msgstr "Cette commande déplace l'ensemble des onglets vers la droite"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Placer la ligne de saisie dans l'historique mais ne pas l'afficher sur le "
-"serveur"
+msgstr "Placer la ligne de saisie dans l'historique mais ne pas l'afficher sur le serveur"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Il y a eu une erreur au chargement de la configuration des raccourcis clavier"
+msgstr "Il y a eu une erreur au chargement de la configuration des raccourcis clavier"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3931,9 +3708,7 @@ msgstr "Connecté à %s."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"Dans la fenêtre de liste des serveurs, aucun canal (salon de conversation) "
-"n'a été entré pour être rejoint automatiquement sur ce réseau."
+msgstr "Dans la fenêtre de liste des serveurs, aucun canal (salon de conversation) n'a été entré pour être rejoint automatiquement sur ce réseau."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3949,8 +3724,7 @@ msgstr "Re_joindre le canal :"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Si vous connaissez le nom du canal que vous désirez rejoindre, entrez-le ici."
+msgstr "Si vous connaissez le nom du canal que vous désirez rejoindre, entrez-le ici."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3982,9 +3756,7 @@ msgstr "Aucun sujet n'est défini"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ce serveur comporte déjà %d canaux ou dialogues qui lui sont associés. Faut-"
-"il tous les fermer ?"
+msgstr "Ce serveur comporte déjà %d canaux ou dialogues qui lui sont associés. Faut-il tous les fermer ?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4137,9 +3909,7 @@ msgstr "Mettre tout en _Surbrillance"
 
 #: src/fe-gtk/maingui.c:2920
 msgid "Highlight all occurrences, and underline the current occurrence."
-msgstr ""
-"Mettre en surbrillance toutes les occurrences et souligner l'occurrence "
-"actuelle."
+msgstr "Mettre en surbrillance toutes les occurrences et souligner l'occurrence actuelle."
 
 #: src/fe-gtk/maingui.c:2922
 msgid "Mat_ch case"
@@ -4217,10 +3987,7 @@ msgstr "%d pseudonymes sélectionnés."
 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 ""
-"La barre de menu est maintenant masquée. Vous pouvez l'afficher en appuyant "
-"sur Contrôle+F9 ou en faisant un clic droit sur une zone vide de la fenêtre "
-"principale."
+msgstr "La barre de menu est maintenant masquée. Vous pouvez l'afficher en appuyant sur Contrôle+F9 ou en faisant un clic droit sur une zone vide de la fenêtre principale."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4316,25 +4083,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Commandes utilisateur - Codes d'échappement :\n"
-"\n"
-"%c  =  canal actuel\n"
-"%e  =  nom du réseau actuel\n"
-"%m  =  informations de la machine\n"
-"%n  =  votre pseudo\n"
-"%t  =  heure/date\n"
-"%v  =  version de HexChat\n"
-"%2  =  mot 2\n"
-"%3  =  mot 3\n"
-"&2  =  du 2ème mot à la fin de la ligne\n"
-"&3  =  du 3ème mot à la fin de la ligne\n"
-"\n"
-"exemple :\n"
-"/cmd yves bonjour\n"
-"\n"
-"%2 sera \"yves\"\n"
-"&2 sera \"yves bonjour\"."
+msgstr "Commandes utilisateur - Codes d'échappement :\n\n%c  =  canal actuel\n%e  =  nom du réseau actuel\n%m  =  informations de la machine\n%n  =  votre pseudo\n%t  =  heure/date\n%v  =  version de HexChat\n%2  =  mot 2\n%3  =  mot 3\n&2  =  du 2ème mot à la fin de la ligne\n&3  =  du 3ème mot à la fin de la ligne\n\nexemple :\n/cmd yves bonjour\n\n%2 sera \"yves\"\n&2 sera \"yves bonjour\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4349,18 +4098,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Boutons de la liste d'utilisateurs - codes spéciaux :\n"
-"\n"
-"%a = tous les pseudos sélectionnés\n"
-"%c = canal actuel\n"
-"%e = nom du réseau actuel\n"
-"%h = hôte des pseudos sélectionnés\n"
-"%m = informations sur la machine\n"
-"%n = votre pseudo\n"
-"%s = pseudo sélectionné\n"
-"%t = date et heure\n"
-"%u = nom de compte des pseudos sélectionnés"
+msgstr "Boutons de la liste d'utilisateurs - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte des pseudos sélectionnés\n%m = informations sur la machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte des pseudos sélectionnés"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4375,18 +4113,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Boutons de dialogue - codes spéciaux :\n"
-"\n"
-"%a = tous les pseudos sélectionnés\n"
-"%c = canal actuel\n"
-"%e = nom du réseau actuel\n"
-"%h = hôte du pseudo sélectionné\n"
-"% = informations sur la machine\n"
-"%n = votre pseudo\n"
-"%s = pseudo sélectionné\n"
-"%t = date et heure\n"
-"%u = nom de compte du pseudo sélectionné"
+msgstr "Boutons de dialogue - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte du pseudo sélectionné\n% = informations sur la machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte du pseudo sélectionné"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4402,19 +4129,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Réponses CTCP - Codes d'échappement :\n"
-"\n"
-"%d  =  données (toute la réponse CTCP)\n"
-"%e  =  réseau actuel\n"
-"%m  =  informations sur la machine\n"
-"%s  =  pseudo ayant envoyé le CTCP\n"
-"%t  =  date/heure\n"
-"%2  =  2e mot\n"
-"%3  =  3e mot\n"
-"&2  =  du 2e mot à la fin de la ligne\n"
-"&3  =  du 3e mot à la fin de la ligne\n"
-"\n"
+msgstr "Réponses CTCP - Codes d'échappement :\n\n%d  =  données (toute la réponse CTCP)\n%e  =  réseau actuel\n%m  =  informations sur la machine\n%s  =  pseudo ayant envoyé le CTCP\n%t  =  date/heure\n%2  =  2e mot\n%3  =  3e mot\n&2  =  du 2e mot à la fin de la ligne\n&3  =  du 3e mot à la fin de la ligne\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4426,14 +4141,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Gestionnaire d'URL - Codes d'échappement :\n"
-"\n"
-"%s  =  la chaîne URL\n"
-"\n"
-"Si vous mettez un ! devant la commande\n"
-"cela signifie qu'elle sera envoyée\n"
-"au terminal plutôt qu'à HexChat."
+msgstr "Gestionnaire d'URL - Codes d'échappement :\n\n%s  =  la chaîne URL\n\nSi vous mettez un ! devant la commande\ncela signifie qu'elle sera envoyée\nau terminal plutôt qu'à HexChat."
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4962,9 +4670,7 @@ msgstr "Vous devez avoir deux pseudonymes uniques."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"La façon qui permet de vous identifier sur le serveur. Pour des méthodes "
-"d'identification personnalisées, utilisez des commandes de connexion."
+msgstr "La façon qui permet de vous identifier sur le serveur. Pour des méthodes d'identification personnalisées, utilisez des commandes de connexion."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4989,11 +4695,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Pseudonyme\n"
-"%p=Mot de passe\n"
-"%r=Nom réel\n"
-"%u=Nom d'utilisateur"
+msgstr "%n=Pseudonyme\n%p=Mot de passe\n%r=Nom réel\n%u=Nom d'utilisateur"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5057,8 +4759,7 @@ msgstr "Mot de passe :"
 
 #: src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
-"Le mot de passe utilisé pour se connecter. En cas de doute, le laisser blanc."
+msgstr "Le mot de passe utilisé pour se connecter. En cas de doute, le laisser blanc."
 
 #: src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
@@ -5101,9 +4802,7 @@ msgstr "_Trier"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Trie la liste des réseaux par ordre alphabétique. Utiliser les touches Maj"
-"+Haut et Maj+Bas pour déplacer une ligne."
+msgstr "Trie la liste des réseaux par ordre alphabétique. Utiliser les touches Maj+Haut et Maj+Bas pour déplacer une ligne."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5453,16 +5152,11 @@ msgstr "Dictionnaire à utiliser : "
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Utiliser des codes de langues (comme dans « %LOCALAPPDATA%\\enchant\\myspell"
-"\\dicts »).\n"
-"Séparer les entrées multiples avec des virgules."
+msgstr "Utiliser des codes de langues (comme dans « %LOCALAPPDATA%\\enchant\\myspell\\dicts »).\nSéparer les entrées multiples avec des virgules."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
-msgstr ""
-"Utiliser des codes de langue. Séparer les entrées multiples avec des "
-"virgules."
+msgstr "Utiliser des codes de langue. Séparer les entrées multiples avec des virgules."
 
 #: src/fe-gtk/setup.c:204
 msgid "Nick Completion"
@@ -5554,8 +5248,7 @@ msgstr "Afficher des icônes pour les modes utilisateurs"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Afficher des icônes plutôt que du texte dans la liste des utilisateurs."
+msgstr "Afficher des icônes plutôt que du texte dans la liste des utilisateurs."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5563,8 +5256,7 @@ msgstr "Colorer les pseudonymes de la liste d'utilisateurs"
 
 #: src/fe-gtk/setup.c:258
 msgid "Will color nicknames the same as in chat."
-msgstr ""
-"Les pseudonymes seront de la même couleur que dans la zone de conversation."
+msgstr "Les pseudonymes seront de la même couleur que dans la zone de conversation."
 
 #: src/fe-gtk/setup.c:259
 msgid "Show user count in channels"
@@ -5584,9 +5276,7 @@ msgstr "Suivi de l'absence"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Suivre le statut d'absence des utilisateurs et les afficher dans une couleur "
-"différente"
+msgstr "Suivre le statut d'absence des utilisateurs et les afficher dans une couleur différente"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5776,9 +5466,8 @@ msgid "Chat window"
 msgstr "Fenêtre de conversation"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Vitesses maximales des transferts de fichiers (octets par seconde)"
+msgstr "Vitesses de transfert de fichiers maximales (octets par seconde)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5832,17 +5521,13 @@ msgstr "Émettre un bip pour :"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Jouer le son système « Notification de messagerie instantanée » quand les "
-"événements sélectionnés surviennent"
+msgstr "Jouer le son système « Notification de messagerie instantanée » quand les événements sélectionnés surviennent"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Jouer « message-new-instant » depuis le thème de sons freedesktop.org quand "
-"les événements  sélectionnés surviennent"
+msgstr "Jouer « message-new-instant » depuis le thème de sons freedesktop.org quand les événements  sélectionnés surviennent"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5880,9 +5565,7 @@ msgstr "Gérer le statut absent/présent automatiquement"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically change status when hiding to tray."
-msgstr ""
-"Automatiquement changer d'état en cachant l'application dans la barre de "
-"tâches."
+msgstr "Automatiquement changer d'état en cachant l'application dans la barre de tâches."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
@@ -5897,8 +5580,7 @@ msgstr "Messages en surbrillance"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Les messages en surbrillance sont ceux où apparait votre pseudo, mais aussi :"
+msgstr "Les messages en surbrillance sont ceux où apparait votre pseudo, mais aussi :"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5920,9 +5602,7 @@ msgstr "Pseudos à toujours mettre en surbrillance :"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Séparer les mots avec une virgule.\n"
-"Les jokers sont acceptés."
+msgstr "Séparer les mots avec une virgule.\nLes jokers sont acceptés."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5978,9 +5658,7 @@ msgstr "WHOIS sur les notifications"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Envoyer un /WHOIS quand un utilisateur arrive, et qu'il est dans votre liste "
-"de notification."
+msgstr "Envoyer un /WHOIS quand un utilisateur arrive, et qu'il est dans votre liste de notification."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -6022,10 +5700,7 @@ msgstr "Copie automatiquement le texte sélectionné"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Copier le texte sélectionné vers le presse-papiers quand le bouton gauche de "
-"la souris est relâché. Autrement, Ctrl+Maj+C copie le texte sélectionné vers "
-"le presse-papiers."
+msgstr "Copier le texte sélectionné vers le presse-papiers quand le bouton gauche de la souris est relâché. Autrement, Ctrl+Maj+C copie le texte sélectionné vers le presse-papiers."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -6033,12 +5708,9 @@ msgstr "Automatiquement inclure l'horodatage"
 
 #: 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."
-msgstr ""
-"Automatiquement inclure l'horodatage dans les lignes de texte copiées. "
-"Sinon, inclure l'horodatage lorsque la touche Maj est pressée pendant la "
-"sélection."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Automatiquement inclure l'horodatage dans les lignes de texte copiées. Sinon, inclure l'horodatage lorsque la touche Maj est pressée pendant la sélection."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -6046,12 +5718,9 @@ msgstr "Ajouter automatiquement les informations de couleur"
 
 #: 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."
-msgstr ""
-"Inclure automatiquement les informations de couleur dans les lignes de texte "
-"copiées. Autrement, inclure les informations de couleur si la touche Ctrl "
-"est pressée lors de la sélection."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Inclure automatiquement les informations de couleur dans les lignes de texte copiées. Autrement, inclure les informations de couleur si la touche Ctrl est pressée lors de la sélection."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6063,9 +5732,7 @@ msgstr "Police alternative :"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr ""
-"Séparer plusieurs entrées avec des virgules sans espaces avant ou après la "
-"virgule."
+msgstr "Séparer plusieurs entrées avec des virgules sans espaces avant ou après la virgule."
 
 #: src/fe-gtk/setup.c:574
 msgid "Display lists in compact mode"
@@ -6073,9 +5740,7 @@ msgstr "Afficher des listes compactes"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Utiliser moins d'espace entre la liste des utilisateurs et l'arbre des "
-"canaux."
+msgstr "Utiliser moins d'espace entre la liste des utilisateurs et l'arbre des canaux."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -6085,9 +5750,7 @@ msgstr "Utiliser le temps serveur si pris en charge"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Afficher les horodatages obtenus depuis le serveur s'il prend en charge "
-"l'extension serveur de temps."
+msgstr "Afficher les horodatages obtenus depuis le serveur s'il prend en charge l'extension serveur de temps."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6107,10 +5770,9 @@ msgstr "Type de bannissement :"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Essayer d'utiliser ce masque de bannissement en banissant ou en rendant muet "
-"(requiert irc_who_join)."
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Essayer d'utiliser ce masque de bannissement en banissant ou en rendant muet (requiert irc_who_join)."
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6171,11 +5833,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6219,11 +5881,9 @@ msgstr "Obtenir mon adresse depuis le serveur 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 ""
-"Demander au serveur IRC votre adresse réelle. À utiliser si vous avez une "
-"adresse du style 192.168.*.* !"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Demander au serveur IRC votre adresse réelle. À utiliser si vous avez une adresse du style 192.168.*.* !"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6231,8 +5891,7 @@ msgstr "Adresse IP DCC :"
 
 #: src/fe-gtk/setup.c:641
 msgid "Claim you are at this address when offering files."
-msgstr ""
-"Prétendre que vous êtes à cette adresse quand vous proposez des fichiers."
+msgstr "Prétendre que vous êtes à cette adresse quand vous proposez des fichiers."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
@@ -6271,9 +5930,8 @@ msgid "Proxy Authentication"
 msgstr "Authentification par le proxy"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Utiliser l'authentification (HTTP ou Socks5 seulement)"
+msgstr "Utiliser l'authentification (HTTP ou SOCKS5 uniquement)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6295,10 +5953,7 @@ msgstr "Le serveur répondra par le nom d'utilisateur de réseaux"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Vous devez avoir les permissions pour écouter sur ce port. Si sa valeur "
-"n'est pas 113 (0 renvoie à cette valeur par défaut), vous devez alors "
-"configurer la redirection de port."
+msgstr "Vous devez avoir les permissions pour écouter sur ce port. Si sa valeur n'est pas 113 (0 renvoie à cette valeur par défaut), vous devez alors configurer la redirection de port."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6460,22 +6115,15 @@ msgstr "Catégories"
 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 ""
-"Vous ne pouvez pas placer l'arbre en haut ou en bas !\n"
-"Merci de passer en mode <b>Onglets</b> dans le menu <b>Vue</b> d'abord."
+msgstr "Vous ne pouvez pas placer l'arbre en haut ou en bas !\nMerci de passer en mode <b>Onglets</b> dans le menu <b>Vue</b> d'abord."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"L'option Nom réel ne peut être laissée blanche. Le nom réel \"realname\" "
-"sera utilisé."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "L'option Nom réel ne peut être laissée blanche. Le nom réel \"realname\" sera utilisé."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Certains réglages qui ont été modifiés nécessitent un redémarrage afin "
-"d'être effectifs."
+msgstr "Certains réglages qui ont été modifiés nécessitent un redémarrage afin d'être effectifs."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6483,11 +6131,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 ""
-"*ATTENTION*\n"
-"Accepter automatiquement les DCC dans votre répertoire personnel\n"
-"peut être dangereux et peut être exploité. Par exemple :\n"
-"quelqu'un pourrait vous envoyer un .bash_profile"
+msgstr "*ATTENTION*\nAccepter automatiquement les DCC dans votre répertoire personnel\npeut être dangereux et peut être exploité. Par exemple :\nquelqu'un pourrait vous envoyer un .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6587,9 +6231,7 @@ msgstr "Ouvrir une URL irc://serveur:port/canal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo : erreur lors de l'obtention des infos. Défaut de prise en charge ou "
-"erreur."
+msgstr "Sysinfo : erreur lors de l'obtention des infos. Défaut de prise en charge ou erreur."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6603,12 +6245,9 @@ msgstr "Sysinfo : %s est défini à : %d\n"
 #: 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"
-msgstr ""
-"Sysinfo : des réglages valables sont : announce (annoncer) et hide_* "
-"(cacher) pour chaque morceau d'information. Par exemple hide_os. S'il n'y a "
-"pas de valeur définie, il montrera le réglage actuel (ou par défaut).\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo : des réglages valables sont : announce (annoncer) et hide_* (cacher) pour chaque morceau d'information. Par exemple hide_os. S'il n'y a pas de valeur définie, il montrera le réglage actuel (ou par défaut).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6623,9 +6262,3 @@ msgstr "Greffon %s chargé\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Greffon %s déchargé\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/gl.po b/po/gl.po
index 609a819b..a8ef55e0 100644
--- a/po/gl.po
+++ b/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"
diff --git a/po/gu.po b/po/gu.po
index af3244d8..d3a9ae44 100644
--- a/po/gu.po
+++ b/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"
diff --git a/po/hi.po b/po/hi.po
index 62031daa..1847c9d5 100644
--- a/po/hi.po
+++ b/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"
diff --git a/po/hu.po b/po/hu.po
index 4d81f4b0..c99b6597 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,9 +1,10 @@
 # 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-2013
 # bviktor, 2013
 # bviktor, 2012
 # Gabor Hosszu <hosszu.gabor90@gmail.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-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: Hungarian (http://www.transifex.com/hexchat/hexchat/language/"
-"hu/)\n"
-"Language: hu\n"
+"Language-Team: Hungarian (http://www.transifex.com/hexchat/hexchat/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -303,9 +303,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Rootként IRC-zni nem okos dolog! Hozzon létre\n"
-"  egy felhasználót és úgy lépjen be.\n"
+msgstr "* Rootként IRC-zni nem okos dolog! Hozzon létre\n  egy felhasználót és úgy lépjen be.\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
@@ -359,8 +357,7 @@ msgstr "  %-20s offline\n"
 
 #: src/common/outbound.c:69
 msgid "No channel joined. Try /join #<channel>\n"
-msgstr ""
-"Nincs benn egy csatornán sem. Próbálja meg a /join #<csatorna> parancsot.\n"
+msgstr "Nincs benn egy csatornán sem. Próbálja meg a /join #<csatorna> parancsot.\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
@@ -403,8 +400,7 @@ msgstr "Bővítmény által megadott parancsok:"
 
 #: src/common/outbound.c:2303
 msgid "Type /HELP <command> for more information, or /HELP -l"
-msgstr ""
-"További információkért adja ki a /HELP <parancs> vagy /HELP -l parancsot"
+msgstr "További információkért adja ki a /HELP <parancs> vagy /HELP -l parancsot"
 
 #: src/common/outbound.c:2390
 #, c-format
@@ -432,9 +428,7 @@ msgstr "ADDBUTTON <név> <akció>, a felhasználólista alá helyez el egy gombo
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <ÚjHálózat> <újszerver/6667>, létrehoz egy új hálózatot egy új "
-"szerverrel a hálózatlistában"
+msgstr "ADDSERVER <ÚjHálózat> <újszerver/6667>, létrehoz egy új hálózatot egy új szerverrel a hálózatlistában"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -442,8 +436,7 @@ msgstr "ALLCHAN <parancs>, parancs küldése minden csatornára, ahol benn van"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <parancs>, parancs küldése minden csatornára az aktuális kiszolgálón"
+msgstr "ALLCHANL <parancs>, parancs küldése minden csatornára az aktuális kiszolgálón"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -462,10 +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 <maszk> [<kitiltástípus>], kitilt mindenkit, akire illik a maszk az "
-"adott csatornán. Ha már benn vannak a csatornán, nem rúgja ki őket (ehhez "
-"chanop-jog kell)"
+msgstr "BAN <maszk> [<kitiltástípus>], kitilt mindenkit, akire illik a maszk az adott csatornán. Ha már benn vannak a csatornán, nem rúgja ki őket (ehhez chanop-jog kell)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -473,10 +463,9 @@ msgstr "CHANOPT [-quiet] <változó> [<érték>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kódolás>], a jelenlegi kapcsolat karakterkódolásának lekérdezése "
-"vagy beállítása"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kódolás>], a jelenlegi kapcsolat karakterkódolásának lekérdezése vagy beállítása"
 
 #: src/common/outbound.c:3946
 msgid ""
@@ -492,24 +481,19 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <kód|helyettesítőkarakter>, országkód keresése, például au = "
-"Ausztrália"
+msgstr "COUNTRY [-s] <kód|helyettesítőkarakter>, országkód keresése, például au = Ausztrália"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <becenév> <üzenet>, CTCP üzenet küldése a becenévnek, gyakori üzenetek: "
-"VERSION és USERINFO"
+msgstr "CTCP <becenév> <üzenet>, CTCP üzenet küldése a becenévnek, gyakori üzenetek: VERSION és USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<csatorna>], kilép és azonnal visszalép az aktuális vagy a megadott "
-"csatornára"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<csatorna>], kilép és azonnal visszalép az aktuális vagy a megadott csatornára"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -522,24 +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 <becenév>                     - küldött fájl elfogadása\n"
-"DCC SEND [-maxcps=#] <becenév> [fájl] - fájlküldés\n"
-"DCC PSEND [-maxcps=#] <becenév> [fájl] - fájlküldés passzív módban\n"
-"DCC LIST                           - DCC lista mutatása\n"
-"DCC CHAT <becenév>                    - DCC CHAT meghívás\n"
-"DCC PCHAT <becenév>                   - DCC CHAT meghívás passzív módban\n"
-"DCC CLOSE <típus> <becenév> <fájl>         DCC átvitel bezárása; példa:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <becenév>                     - küldött fájl elfogadása\nDCC SEND [-maxcps=#] <becenév> [fájl] - fájlküldés\nDCC PSEND [-maxcps=#] <becenév> [fájl] - fájlküldés passzív módban\nDCC LIST                           - DCC lista mutatása\nDCC CHAT <becenév>                    - DCC CHAT meghívás\nDCC PCHAT <becenév>                   - DCC CHAT meghívás passzív módban\nDCC CLOSE <típus> <becenév> <fájl>         DCC átvitel bezárása; példa:\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 <becenév>, elveszi a fél-op státuszt az adott csatornán a becenévtől "
-"(op-jog szükséges)"
+msgstr "DEHOP <becenév>, elveszi a fél-op státuszt az adott csatornán a becenévtől (op-jog szükséges)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -549,17 +522,13 @@ msgstr "DELBUTTON <név>, gomb törlése a felhasználólista alól"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <becenév>, op-jog megvonása a becenévtől az adott csatornán (op-jog "
-"szükséges)"
+msgstr "DEOP <becenév>, op-jog megvonása a becenévtől az adott csatornán (op-jog szükséges)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <becenév>, megvonja a voice státuszt a becenévtől az adott csatornán "
-"(op-jog szükséges)"
+msgstr "DEVOICE <becenév>, megvonja a voice státuszt a becenévtől az adott csatornán (op-jog szükséges)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -581,9 +550,7 @@ msgstr "ECHO <szöveg>, szöveg helyi megjelenítése"
 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] <parancs>, parancs futtatása. Ha -o -val használja, a kimenet az "
-"aktuális csatornára megy, egyébként az aktuális szövegdobozba"
+msgstr "EXEC [-o] <parancs>, parancs futtatása. Ha -o -val használja, a kimenet az aktuális csatornára megy, egyébként az aktuális szövegdobozba"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -593,9 +560,7 @@ msgstr "EXECCONT, SIGCONT küldése a folyamatnak"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], futó exec kilövése az aktuális munkafolyamatban. Ha a -9 "
-"kapcsolóval használja, a folyamat SIGKILL szignált kap"
+msgstr "EXECKILL [-9], futó exec kilövése az aktuális munkafolyamatban. Ha a -9 kapcsolóval használja, a folyamat SIGKILL szignált kap"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -615,9 +580,7 @@ msgstr "FLUSHQ, törli az aktuális kiszolgáló küldési várakozási sorát"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <kiszolgáló> [<port>], a kiszolgáló beállítása proxyként, az "
-"alapértelmezett portszám a 23"
+msgstr "GATE <kiszolgáló> [<port>], a kiszolgáló beállítása proxyként, az alapértelmezett portszám a 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -638,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 <maszk> <típusok..> <opciók..>\n"
-"    maszk - a mellőzendő gépek maszkja, például *!*@*.aol.com\n"
-"    típusok - a mellőzendő adatok típusa, a következők legalább egyike:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opciók - NOSAVE, QUIET"
+msgstr "IGNORE <maszk> <típusok..> <opciók..>\n    maszk - a mellőzendő gépek maszkja, például *!*@*.aol.com\n    típusok - a mellőzendő adatok típusa, a következők legalább egyike:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opciók - 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 <becenév> [<csatorna>], meghívja a becenevet egy csatornára, "
-"alapértelmezésben az aktuálisra (op-jog szükséges)"
+msgstr "INVITE <becenév> [<csatorna>], meghívja a becenevet egy csatornára, alapértelmezésben az aktuálisra (op-jog szükséges)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -678,15 +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] [--] <szöveg>, szöveg keresése a pufferben\n"
-"    Használd a -h kapcsolót a találat(ok) kiemeléséhez\n"
-"    Használd az -m kapcsolót a kis/nagybetű érzékenységhez\n"
-"    Használd az -r kapcsolót reguláris kifejezés használatához\n"
-"    Használd a -- (dupla kötőjel) kapcsolót az opciók lezárásához, például "
-"ha az '-r' szövegre keresel"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <szöveg>, szöveg keresése a pufferben\n    Használd a -h kapcsolót a találat(ok) kiemeléséhez\n    Használd az -m kapcsolót a kis/nagybetű érzékenységhez\n    Használd az -r kapcsolót reguláris kifejezés használatához\n    Használd a -- (dupla kötőjel) kapcsolót az opciók lezárásához, például ha az '-r' szövegre keresel"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -695,23 +644,17 @@ msgstr "LOAD [-e] <fájl>, bővítmény vagy parancsfájl betöltése"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, minden fél-op-tól elveszi a fél-op jogot az adott csatornán (op-jog "
-"szükséges)"
+msgstr "MDEHOP, minden fél-op-tól elveszi a fél-op jogot az adott csatornán (op-jog szükséges)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, minden op-tól elveszi az op-jogot az adott csatornán (op-jog "
-"szükséges)"
+msgstr "MDEOP, minden op-tól elveszi az op-jogot az adott csatornán (op-jog szükséges)"
 
 #: 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 <akció>, az adott tevékenységet az aktuális csatornára küldi (az igék 3. "
-"személyben írandók, például: /me ugrál)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <akció>, az adott tevékenységet az aktuális csatornára küldi (az igék 3. személyben írandók, például: /me ugrál)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -720,19 +663,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, tömegesen kirúg mindenkit az adott csatornáról, kivéve Önt (op-jog "
-"szükséges)"
+msgstr "MKICK, tömegesen kirúg mindenkit az adott csatornáról, kivéve Önt (op-jog szükséges)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, tömeges op-jog adása mindenkinek az adott csatornán (op-jog szükséges)"
+msgstr "MOP, tömeges op-jog adása mindenkinek az adott csatornán (op-jog szükséges)"
 
 #: 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
@@ -759,9 +699,7 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n hálózat1[,hálózat2,...]] [<becenév>], megjeleníti az értesítési "
-"listát vagy hozzáad valakit"
+msgstr "NOTIFY [-n hálózat1[,hálózat2,...]] [<becenév>], megjeleníti az értesítési listát vagy hozzáad valakit"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -770,9 +708,7 @@ msgstr "OP <becenév>, op-jogot ad a becenévnek (op-jog szükséges)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<csatorna>] [<indoklás>], kilép a csatornáról, alapértelmezésben az "
-"aktuálisról"
+msgstr "PART [<csatorna>] [<indoklás>], kilép a csatornáról, alapértelmezésben az aktuálisról"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -800,31 +736,23 @@ msgstr "QUOTE <szöveg>, nyers formában küldi a szöveget a kiszolgálóra"
 
 #: 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] [<kiszolgáló>] [<port>] [<jelszó>], Ugyanúgy használható, "
-"mint a /RECONNECT (újracsatlakozás az aktuális kiszolgálóhoz) vagy /"
-"RECONNECT ALL (minden nyitott kiszolgálóhoz csatlakozik)"
+msgstr "RECONNECT [-ssl] [<kiszolgáló>] [<port>] [<jelszó>], Ugyanúgy használható, mint a /RECONNECT (újracsatlakozás az aktuális kiszolgálóhoz) vagy /RECONNECT ALL (minden nyitott kiszolgálóhoz csatlakozik)"
 
 #: 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>] [<jelszó>], Ugyanúgy használható, mint a /"
-"RECONNECT (újracsatlakozás az aktuális kiszolgálóhoz) vagy /RECONNECT ALL "
-"(minden nyitott kiszolgálóhoz csatlakozik)"
+msgstr "RECONNECT [<host>] [<port>] [<jelszó>], Ugyanúgy használható, mint a /RECONNECT (újracsatlakozás az aktuális kiszolgálóhoz) vagy /RECONNECT ALL (minden nyitott kiszolgálóhoz csatlakozik)"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <szöveg>, nyers adatok küldése a HexChat-nek, mintha az IRC "
-"kiszolgálótól érkezett volna"
+msgstr "RECV <szöveg>, nyers adatok küldése a HexChat-nek, mintha az IRC kiszolgálótól érkezett volna"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -840,30 +768,23 @@ msgstr "SEND <becenév> [<fájl>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <port> <csatorna>, csatlakozik és belép egy adott "
-"csatornára"
+msgstr "SERVCHAN [-ssl] <host> <port> <csatorna>, csatlakozik és belép egy adott csatornára"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <host> <port> <csatorna>, csatlakozik és belép az adott csatornára"
+msgstr "SERVCHAN <host> <port> <csatorna>, csatlakozik és belép az adott csatornára"
 
 #: 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] <host> [<port>] [<jelszó>], csatlakozik a kiszolgálóhoz, az "
-"alapértelmezett port 6667 normál kapcsolathoz, és 6697 SSL kapcsolathoz"
+msgstr "SERVER [-ssl] <host> [<port>] [<jelszó>], csatlakozik a kiszolgálóhoz, az alapértelmezett port 6667 normál kapcsolathoz, és 6697 SSL kapcsolathoz"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<jelszó>], csatlakozik az adott kiszolgálóhoz, az "
-"alapértelmezett port a 6667"
+msgstr "SERVER <host> [<port>] [<jelszó>], csatlakozik az adott kiszolgálóhoz, az alapértelmezett port a 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -875,9 +796,7 @@ msgstr "SETCURSOR [-|+]<pozíció>, a kurzor átmozgatása a beviteli mezőben"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <új név>, egy fül nevének megváltoztatása, a tab_trunc korlát "
-"továbbra is érvényes"
+msgstr "SETTAB <új név>, egy fül nevének megváltoztatása, a tab_trunc korlát továbbra is érvényes"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -885,10 +804,9 @@ msgstr "SETTEXT <új szöveg>, a beviteli mező szövegének cseréje"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<téma>], beállítja a témát, ha megadja, vagy megmutatja az aktuális "
-"témát"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<téma>], beállítja a témát, ha megadja, vagy megmutatja az aktuális témát"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -898,13 +816,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 <időkorlát> <fájl1> [<fájl2>] Villogjon a tálcán a két ikon között.\n"
-"TRAY -f <fájlnév>                  A tálca beállítása rögzített ikonra.\n"
-"TRAY -i <szám>                    Tálca villogtatása belső ikonnal.\n"
-"TRAY -t <szöveg>                      A tálca gyorstippjének beállítása.\n"
-"TRAY -b <cím> <szöveg>              A tálca feliratának beállítása."
+msgstr "\nTRAY -f <időkorlát> <fájl1> [<fájl2>] Villogjon a tálcán a két ikon között.\nTRAY -f <fájlnév>                  A tálca beállítása rögzített ikonra.\nTRAY -i <szám>                    Tálca villogtatása belső ikonnal.\nTRAY -t <szöveg>                      A tálca gyorstippjének beállítása.\nTRAY -b <cím> <szöveg>              A tálca feliratának beállítása."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -920,8 +832,8 @@ msgstr "UNLOAD <név>, kikapcsol egy bővítményt vagy parancsfájlt"
 
 #: 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
@@ -930,10 +842,9 @@ msgstr "URL <url>, megnyitja az adott URL-t a böngészőben"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> stb, kiemeli a beceneve(ke)t a csatorna "
-"felhasználólistájában"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> stb, kiemeli a beceneve(ke)t a csatorna felhasználólistájában"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -946,8 +857,7 @@ msgstr "WALLCHAN <üzenet>, kiírja az üzenetet az összes csatornára"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <üzenet>, elküldi az üzenetet az aktuális csatorna összes opjának"
+msgstr "WALLCHOP <üzenet>, elküldi az üzenetet az aktuális csatorna összes opjának"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -963,9 +873,7 @@ msgstr "Használat: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Ehhez a parancshoz nincs súgó.\n"
+msgstr "\nEhhez a parancshoz nincs súgó.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -986,9 +894,7 @@ msgstr ""
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Nem találom a hexchat_plugin_init szimbólumot; biztos, hogy ez egy HexChat "
-"plugin?"
+msgstr "Nem találom a hexchat_plugin_init szimbólumot; biztos, hogy ez egy HexChat plugin?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1036,9 +942,7 @@ msgstr "Biztos, hogy ez SSL-re képes kiszolgáló és port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nem lehet feloldani a(z) %s gépnevet\n"
-"Ellenőrizze az IP-beállításait!\n"
+msgstr "Nem lehet feloldani a(z) %s gépnevet\nEllenőrizze az IP-beállításait!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1054,9 +958,7 @@ msgstr "Ugrás a következő kiszolgálóra %s múlva...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Figyelem: a \"%s\" karakterkészlet ismeretlen. Nem lesz konverzió a(z) %s "
-"hálózaton."
+msgstr "Figyelem: a \"%s\" karakterkészlet ismeretlen. Nem lesz konverzió a(z) %s hálózaton."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1164,8 +1066,7 @@ msgstr "%C22*%O$t%C26$1%O beállítja a csatorna kulcsszavát (%C24$2%O)"
 
 #: src/common/textevents.h:103
 msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
-msgstr ""
-"%C22*%O$t%C26$1%O beállítja a csatorna létszámkorlátját ennyire: %C24$2%O"
+msgstr "%C22*%O$t%C26$1%O beállítja a csatorna létszámkorlátját ennyire: %C24$2%O"
 
 #: src/common/textevents.h:106
 msgid "%C22*%O$t%C26$1%O removes ban on %C18$2%O"
@@ -1209,17 +1110,16 @@ msgstr "%C24*%O$tCTCP Sound %C24$1%C érkezett %C18$2%O felől"
 
 #: src/common/textevents.h:139
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
-msgstr ""
-"%C24*%O$tCTCP Sound %C24$1%C érkezett %C18$2%C felől (%C22$3%O szobában)"
+msgstr "%C24*%O$tCTCP Sound %C24$1%C érkezett %C18$2%C felől (%C22$3%O szobában)"
 
 #: src/common/textevents.h:142
 msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$t%C18$1%O DCC CHAT-je megszakítva."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%OLétrejött a DCC CHAT kapcsolat $t%C18$1%C felé %C30[%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%OLétrejött a DCC CHAT kapcsolat $t%C18$1%C felé %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1239,9 +1139,7 @@ msgstr "%C24*%O$tMár kezdeményeztél CHAT-et %C18$1%O felé"
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
-"%C20*%OA kezdeményezett $tDCC $1 kapcsolódási kísérlet kudarcba fulladt "
-"%C18$2%O felé (%C20$3%O)"
+msgstr "%C20*%OA kezdeményezett $tDCC $1 kapcsolódási kísérlet kudarcba fulladt %C18$2%O felé (%C20$3%O)"
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1254,11 +1152,9 @@ 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"
-msgstr ""
-"%C20*%O$tÉrvénytelen formátumú DCC kérés érkezett %C18$1%O felől.$a010%C23*%O"
-"$tA csomag tartalma: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tÉrvénytelen formátumú DCC kérés érkezett %C18$1%O felől.$a010%C23*%O$tA csomag tartalma: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1275,19 +1171,16 @@ msgstr "%C23*%O$t%C18$1%O felé küldött DCC RECV '%C23$2%O' megszakítva."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' %C18$3%O felől befejeződött %C30[%C24$4%O cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' %C18$3%O felől befejeződött %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tA DCC RECV kapcsolat létrejött %C18$1 felé %C30[%O%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$tA DCC RECV kapcsolat létrejött %C18$1 felé %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
-msgstr ""
-"%C20*%O$t%C18$3%O felől érkező DCC RECV '%C23$1%O' sikertelen (%C20$4%O)"
+msgstr "%C20*%O$t%C18$3%O felől érkező DCC RECV '%C23$1%O' sikertelen (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
@@ -1295,7 +1188,8 @@ msgstr "%C20*%O$tDCC RECV: '%C23$1%C' írása sikertelen (%C20$2%O)"
 
 #: 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 "%C23*%O$tMár létezik '%C24$1%C' nevű fájl, mentés '%C23$2%O' néven."
 
 #: src/common/textevents.h:196
@@ -1309,12 +1203,11 @@ msgstr "%C23*%O$t%C18$1%O felé küldött DCC SEND '%C23$2%C' megszakítva."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' %C18$2%C felé befejeződött %C30[%C24$3%C cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' %C18$2%C felé befejeződött %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC SEND kapcsolat kiépítve %C18$1 felé %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1331,8 +1224,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C' %C18$3%O felé megakadt, leállítás."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C' %C18$3%O felé túllépte az időkorlátot, leállítás."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C' %C18$3%O felé túllépte az időkorlátot, leállítás."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1374,8 +1266,7 @@ msgstr "%OA mellőzési lista üres."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$t%C22$1%C szobához csatlakozás sikertelen (%C20Meghívás szükséges%O)"
+msgstr "%C20*%O$t%C22$1%C szobához csatlakozás sikertelen (%C20Meghívás szükséges%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1388,13 +1279,11 @@ msgstr ""
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
-"%C20*%O$tNem tudok a %C22$1%C szobába belépni (%C20kulcsszó szükséges%O)"
+msgstr "%C20*%O$tNem tudok a %C22$1%C szobába belépni (%C20kulcsszó szükséges%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
-msgstr ""
-"%C22*%O$t%C18$2%C ki lett rúgva %C26$1%C által a %C22$3%C szobából (%C24$4%O)"
+msgstr "%C22*%O$t%C18$2%C ki lett rúgva %C26$1%C által a %C22$3%C szobából (%C24$4%O)"
 
 #: src/common/textevents.h:265
 msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
@@ -1470,8 +1359,7 @@ msgstr "%C24*%O$tPing válasz %C18$1%C felől: %C24$2%O másodperc"
 
 #: src/common/textevents.h:331
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr ""
-"%C20*%O$tNem érkezett ping válasz %C24$1%O másodpercig, szétkapcsolódás."
+msgstr "%C20*%O$tNem érkezett ping válasz %C24$1%O másodpercig, szétkapcsolódás."
 
 #: src/common/textevents.h:346
 msgid "%C24*%O$tA process is already running"
@@ -1528,9 +1416,7 @@ msgstr "%C20*%O$tIsmeretlen gép. Talán elírtad?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tSikertelen a csatlakozás %C22$1%C szobához (%C20Túllépett "
-"létszámkorlát%O)"
+msgstr "%C20*%O$tSikertelen a csatlakozás %C22$1%C szobához (%C20Túllépett létszámkorlát%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1555,9 +1441,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O %C23$2%O óta tétlen, belépett: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Valódi gépnév: %C23$2%O, Valódi IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Valódi gépnév: %C23$2%O, Valódi IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1602,9 +1486,7 @@ msgstr "**** NAPLÓZÁS KEZDETE EKKOR: %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Nem lehet írni a naplófájl(oka)t. Ellenőrizd a\n"
-" jogokat a(z) %s fájlon"
+msgstr "* Nem lehet írni a naplófájl(oka)t. Ellenőrizd a\n jogokat a(z) %s fájlon"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2101,9 +1983,7 @@ msgstr "Kitiltás ideje"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nem lehet olvasni ezt a hangfájlt:\n"
-"%s"
+msgstr "Nem lehet olvasni ezt a hangfájlt:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3462,18 +3342,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Nem lehet hozzáférni a következő fájlhoz: %s\n"
-"%s.\n"
-"A folytatás nem lehetséges."
+msgstr "Nem lehet hozzáférni a következő fájlhoz: %s\n%s.\nA folytatás nem lehetséges."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"A letöltési könyvtárban lévő fájl nagyobb, mint a felkínált. A folytatás nem "
-"lehetséges."
+msgstr "A letöltési könyvtárban lévő fájl nagyobb, mint a felkínált. A folytatás nem lehetséges."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3603,8 +3478,7 @@ msgstr "URL megnyitása vagy parancs végrehajtása egy már futó HexChat-ben"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Indítás minimalizálva. Lehetséges értékek: 0=normál, 0=ikonméret 2=tálca"
+msgstr "Indítás minimalizálva. Lehetséges értékek: 0=normál, 0=ikonméret 2=tálca"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3620,10 +3494,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Nem sikerült a következő betűkészlet megnyitása:\n"
-"\n"
-"%s"
+msgstr "Nem sikerült a következő betűkészlet megnyitása:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3641,93 +3512,72 @@ msgstr "Hálózati küldési sor: %d bájt"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Az \"Oldal váltása\" parancs a noteszlapok közt vált. Állítsd be az Adat1-et "
-"arra az oldalra, amelyre váltani akarsz. Ha az Adat2 bármire be van állítva, "
-"akkor a váltás a jelenlegi pozícióhoz képest megy végbe. Adat1 automatikusra "
-"állításával a legújabb és legfontosabb aktivitáshoz fogsz ugrani (először "
-"lekérdezések, majd csatornák kiemeléssel, csatornák beszélgetéssel, "
-"csatornák egyéb tartalommal)."
+msgstr "Az \"Oldal váltása\" parancs a noteszlapok közt vált. Állítsd be az Adat1-et arra az oldalra, amelyre váltani akarsz. Ha az Adat2 bármire be van állítva, akkor a váltás a jelenlegi pozícióhoz képest megy végbe. Adat1 automatikusra állításával a legújabb és legfontosabb aktivitáshoz fogsz ugrani (először lekérdezések, majd csatornák kiemeléssel, csatornák beszélgetéssel, csatornák egyéb tartalommal)."
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"A \"Beszúrás a pufferbe\" parancs az Adat1 tartalmát szúrja be az aktuális "
-"kurzorpozícióba, ahol a billentyűkombinációt lenyomta"
+msgstr "A \"Beszúrás a pufferbe\" parancs az Adat1 tartalmát szúrja be az aktuális kurzorpozícióba, ahol a billentyűkombinációt lenyomta"
 
 #: 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 ""
-"A \"Puffer beállítása\" parancs a billentyűlenyomáskor bevitt adatokat adja "
-"hozzá az Adat1 tartalmához"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "A \"Puffer beállítása\" parancs a billentyűlenyomáskor bevitt adatokat adja hozzá az Adat1 tartalmához"
 
 #: 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 ""
-"Az \"Utolsó parancs\" az utoljára bevitt parancsot állítja be - ugyanaz, "
-"mint amikor egy parancsértelmezőben megnyomja a felfelé nyilat"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Az \"Utolsó parancs\" az utoljára bevitt parancsot állítja be - ugyanaz, mint amikor egy parancsértelmezőben megnyomja a felfelé nyilat"
 
 #: 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 ""
-"A \"Következő parancs\"  a következő bevitt parancsot jeleníti meg - "
-"ugyanaz, mint amikor egy parancsértelmezőben megnyomja a lefelé nyilat"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "A \"Következő parancs\"  a következő bevitt parancsot jeleníti meg - ugyanaz, mint amikor egy parancsértelmezőben megnyomja a lefelé nyilat"
 
 #: 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 ""
-"Ez a parancs kiegészíti a megkezdett becenevet vagy parancsot. Ha az Adat1 "
-"be van állítva, akkor a TAB kétszeri lenyomása az utolsó becenevet választja "
-"ki, nem a következőt"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ez a parancs kiegészíti a megkezdett becenevet vagy parancsot. Ha az Adat1 be van állítva, akkor a TAB kétszeri lenyomása az utolsó becenevet választja ki, nem a következőt"
 
 #: 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 ""
-"Ez a parancs fel- vagy lefelé görgeti a becenevek listáját. Ha az Adat1 "
-"bármire be van állítva, akkor felfelé görget, egyéb esetben lefelé"
+"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 "Ez a parancs fel- vagy lefelé görgeti a becenevek listáját. Ha az Adat1 bármire be van állítva, akkor felfelé görget, egyéb esetben lefelé"
 
 #: 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 ""
-"Ez a parancs összehasonlítja az utolsó bevitt szót a cserelista tartalmával "
-"és lecseréli, ha egyezést talál"
+msgstr "Ez a parancs összehasonlítja az utolsó bevitt szót a cserelista tartalmával és lecseréli, ha egyezést talál"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3747,9 +3597,7 @@ msgstr "Ez a parancs az aktuális fülek csoportját jobbra mozgatja"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"A beviteli mező tartalmát hozzáadja az előzményekhez, de nem küldi el a "
-"kiszolgálónak"
+msgstr "A beviteli mező tartalmát hozzáadja az előzményekhez, de nem küldi el a kiszolgálónak"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
@@ -3904,9 +3752,7 @@ msgstr "Nincs beállítva téma"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ehhez a kiszolgálóhoz még %d csatorna vagy párbeszéd van társítva. Az "
-"összeset bezárja?"
+msgstr "Ehhez a kiszolgálóhoz még %d csatorna vagy párbeszéd van társítva. Az összeset bezárja?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4233,25 +4079,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Felhasználói parancsok - Speciális kódok:\n"
-"\n"
-"%c  =  jelenlegi csatorna\n"
-"%e  =  jelenlegi hálózat neve\n"
-"%m  =  gép információ\n"
-"%n  =  a beceneved\n"
-"%t  =  idő/dátum\n"
-"%v  =  HexChat verzió\n"
-"%2  =  2. szó\n"
-"%3  =  3. szó\n"
-"&2  =  2. szótól a sor végéig\n"
-"&3  =  3. szótól a sor végéig\n"
-"\n"
-"pl.:\n"
-"/cmd john hello\n"
-"\n"
-"%2 lenne \"john\"\n"
-"&2 lenne \"john hello\"."
+msgstr "Felhasználói parancsok - Speciális kódok:\n\n%c  =  jelenlegi csatorna\n%e  =  jelenlegi hálózat neve\n%m  =  gép információ\n%n  =  a beceneved\n%t  =  idő/dátum\n%v  =  HexChat verzió\n%2  =  2. szó\n%3  =  3. szó\n&2  =  2. szótól a sor végéig\n&3  =  3. szótól a sor végéig\n\npl.:\n/cmd john hello\n\n%2 lenne \"john\"\n&2 lenne \"john hello\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4297,19 +4125,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP válaszok - Különleges kódok:\n"
-"\n"
-"%d  =  adatok (a teljes ctcp)\n"
-"%e  =  jelenlegi hálózat neve\n"
-"%m  =  gép infó\n"
-"%s  =  a ctcp-t küldő becenév\n"
-"%t  =  idő/dátum\n"
-"%2  =  2. szó\n"
-"%3  =  3. szó\n"
-"&2  =  2. szótól a sor végéig\n"
-"&3  =  3. szótól a sor végéig\n"
-"\n"
+msgstr "CTCP válaszok - Különleges kódok:\n\n%d  =  adatok (a teljes ctcp)\n%e  =  jelenlegi hálózat neve\n%m  =  gép infó\n%s  =  a ctcp-t küldő becenév\n%t  =  idő/dátum\n%2  =  2. szó\n%3  =  3. szó\n&2  =  2. szótól a sor végéig\n&3  =  3. szótól a sor végéig\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4321,13 +4137,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL kezelők - Speciális kódok:\n"
-"\n"
-"%s = az URL szöveg\n"
-"\n"
-"A parancs elé !-t téve a HexChat\n"
-"helyett egy shell kapja meg"
+msgstr "URL kezelők - Speciális kódok:\n\n%s = az URL szöveg\n\nA parancs elé !-t téve a HexChat\nhelyett egy shell kapja meg"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -5434,9 +5244,7 @@ msgstr "Ikonok megjelenítése a felhasználói módokhoz"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Grafikus ikonok használata szöveges szimbólumok helyett a "
-"felhasználólistában."
+msgstr "Grafikus ikonok használata szöveges szimbólumok helyett a felhasználólistában."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5595,9 +5403,7 @@ msgstr "Segédalkalmazások megnyitása:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"A DCC, mellőzési, értesítési stb. ablakokat füleken vagy ablakokban nyissa "
-"meg?"
+msgstr "A DCC, mellőzési, értesítési stb. ablakokat füleken vagy ablakokban nyissa meg?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5792,9 +5598,7 @@ msgstr "Mindig kiemelendő becenevek:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Több szót vesszőkkel választhat el egymástól.\n"
-"Helyettesítő karakterek használhatók."
+msgstr "Több szót vesszőkkel választhat el egymástól.\nHelyettesítő karakterek használhatók."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5850,9 +5654,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Küld egy /WHOIS-t, ha a barátlistán szereplő valamelyik felhasználó online "
-"lesz."
+msgstr "Küld egy /WHOIS-t, ha a barátlistán szereplő valamelyik felhasználó online lesz."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5902,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
@@ -5912,8 +5714,8 @@ msgstr "Színkódok automatikus másolása"
 
 #: 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
@@ -5964,7 +5766,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
@@ -6074,11 +5877,9 @@ msgstr "Saját IP lekérdezése az IRC kiszolgálótól"
 
 #: 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 ""
-"Lekéri az IRC kiszolgálótól a valós IP címét. Akkor használja, ha 192.168.*."
-"* alakú címe van!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Lekéri az IRC kiszolgálótól a valós IP címét. Akkor használja, ha 192.168.*.* alakú címe van!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6310,13 +6111,10 @@ msgstr "Kategóriák"
 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 ""
-"Nem helyezheti alulra vagy felülre a fát!\n"
-"Először váltson a <b>Nézet</b> menü <b>Fülek</b> elrendezésére."
+msgstr "Nem helyezheti alulra vagy felülre a fát!\nElőször váltson a <b>Nézet</b> menü <b>Fülek</b> elrendezésére."
 
 #: 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
@@ -6329,11 +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 ""
-"*FIGYELMEZTETÉS*\n"
-"DCC automatikus elfogadása a home könyvtárába\n"
-"veszélyes és kihasználható lehet. Például:\n"
-"Valaki küldhet Önnek egy .bash_profile-t"
+msgstr "*FIGYELMEZTETÉS*\nDCC automatikus elfogadása a home könyvtárába\nveszélyes és kihasználható lehet. Például:\nValaki küldhet Önnek egy .bash_profile-t"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6447,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
@@ -6464,9 +6258,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/id.po b/po/id.po
index b2dd6543..330b4824 100644
--- a/po/id.po
+++ b/po/id.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:
 # Andhika Padmawan <andhika.padmawan@gmail.com>, 2010
 # Rahmat Bambang <doplank@gmx.com>, 2012-2013
@@ -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:12+0000\n"
 "Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Indonesian (http://www.transifex.com/hexchat/hexchat/language/"
-"id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/hexchat/hexchat/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\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 adalah klien IRC yang mudah digunakan tetapi bisa diperluas. Hal ini "
-"memungkinkan anda aman dalam bergabung ke beberapa jaringan dan berbicara ke "
-"pengguna secara pribadi atau dalam saluran dengan menggunakan antarmuka yang "
-"dapat disesuaikan. Anda bahkan dapat mentransfer berkas."
+msgstr "HexChat adalah klien IRC yang mudah digunakan tetapi bisa diperluas. Hal ini memungkinkan anda aman dalam bergabung ke beberapa jaringan dan berbicara ke pengguna secara pribadi atau dalam saluran dengan menggunakan antarmuka yang dapat disesuaikan. Anda bahkan dapat mentransfer berkas."
 
 #: 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 mendukung fitur seperti: DCC, SASL, proksi, periksa ejaan, "
-"peringatan, pencatatan, tema kustom, dan skrip Python/Perl."
+msgstr "HexChat mendukung fitur seperti: DCC, SASL, proksi, periksa ejaan, peringatan, pencatatan, tema kustom, dan skrip Python/Perl."
 
 #: 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 ""
-"Anda tidak memiliki akses tulis ke %s. Tidak ada dari sesi ini yang dapat "
-"disimpan."
+msgstr "Anda tidak memiliki akses tulis ke %s. Tidak ada dari sesi ini yang dapat disimpan."
 
 #: 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 ""
-"* Menjalankan IRC sebagai root adalah salah! Kamu harus\n"
-"  membuat Akun Pengguna untuk loginn.\n"
+msgstr "* Menjalankan IRC sebagai root adalah salah! Kamu harus\n  membuat Akun Pengguna untuk loginn.\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
@@ -436,9 +425,7 @@ msgstr "ADDBUTTON <nama> <aksi>, tambah tombol di bawah dartar pengguna"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <Nama Jaringan> <newserver/6667>, tambahkan jaringan baru ke "
-"daftar jaringan"
+msgstr "ADDSERVER <Nama Jaringan> <newserver/6667>, tambahkan jaringan baru ke daftar jaringan"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -446,9 +433,7 @@ msgstr "ALLCHAN <perintah>, kirim perintah ke semua kanal yang anda masuki"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <perintah>, mengirim perintah ke semua kanal yang terhubung di "
-"server"
+msgstr "ALLCHANL <perintah>, mengirim perintah ke semua kanal yang terhubung di server"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers 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> [<tipe hukuman>], hukum setiap orang yang cocok dengan mask pada "
-"kanal saat ini. Jika mereka ada di kanal, maka mereka tidak langsung "
-"dikeluarkan (memerlukan chanop)"
+msgstr "BAN <mask> [<tipe hukuman>], hukum setiap orang yang cocok dengan mask pada kanal saat ini. Jika mereka ada di kanal, maka mereka tidak langsung dikeluarkan (memerlukan chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -478,17 +460,15 @@ msgstr "CHANOPT [-quiet] <variabel> [<nilai>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<encoding>], atur encoding untuk koneksi yang digunakan saat ini"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<encoding>], atur encoding untuk koneksi yang digunakan saat ini"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<amount>], Membersihkan jendela teks saat ini atau "
-"riwayat perintah"
+msgstr "CLEAR [ALL|HISTORY|[-]<amount>], Membersihkan jendela teks saat ini atau riwayat perintah"
 
 #: src/common/outbound.c:3947
 msgid ""
@@ -498,23 +478,19 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <kode|kartu as>, mencari kode negara, misalnya: au = australia"
+msgstr "COUNTRY [-s] <kode|kartu as>, mencari kode negara, misalnya: 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 <pengguna> <pesan>, kirim pesan CTCP ke pengguna, pesan yang umum "
-"adalah VERSION dan USERINFO"
+msgstr "CTCP <pengguna> <pesan>, kirim pesan CTCP ke pengguna, pesan yang umum adalah VERSION dan USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanal>], keluar dari kanal saat ini atau yang diberikan lalu segera "
-"bergabung kembali"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanal>], keluar dari kanal saat ini atau yang diberikan lalu segera bergabung kembali"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -527,26 +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 <pengguna>                        - menerima berkas yang ditawarkan\n"
-"DCC SEND [-maxcps=#] <pengguna> [berkas]  - kirim berkas ke seseorang\n"
-"DCC PSEND [-maxcps=#] <pengguna> [berkas] - kirim berkas menggunakan mode "
-"pasif\n"
-"DCC LIST                                  - tampilkan daftar DCC\n"
-"DCC CHAT <pengguna>                       - tawarkan DCC CHAT ke seseorang\n"
-"DCC PCHAT <pengguna>                      - tawarkan DCC CHAT menggunakan "
-"mode pasif\n"
-"DCC CLOSE <tipe> <pengguna> <berkas>         contoh:\n"
-"         /dcc close send johnsmith berkas.tar.gz"
+msgstr "\nDCC GET <pengguna>                        - menerima berkas yang ditawarkan\nDCC SEND [-maxcps=#] <pengguna> [berkas]  - kirim berkas ke seseorang\nDCC PSEND [-maxcps=#] <pengguna> [berkas] - kirim berkas menggunakan mode pasif\nDCC LIST                                  - tampilkan daftar DCC\nDCC CHAT <pengguna>                       - tawarkan DCC CHAT ke seseorang\nDCC PCHAT <pengguna>                      - tawarkan DCC CHAT menggunakan mode pasif\nDCC CLOSE <tipe> <pengguna> <berkas>         contoh:\n         /dcc close send johnsmith berkas.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 <pengguna>, cabut hak ½ operator dari pengguna di kanal saat ini "
-"(memerlukan chanop)"
+msgstr "DEHOP <pengguna>, cabut hak ½ operator dari pengguna di kanal saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -556,17 +519,13 @@ msgstr "DELBUTTON <nama>, hapus tombol dari bawah daftar pengguna"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <pengguna>, hapus status operator kanal dari pengguna di kanal saat ini "
-"(memerlukan chanop)"
+msgstr "DEOP <pengguna>, hapus status operator kanal dari pengguna di kanal saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <pengguna>, hapus status suara dari pengguna di kanal saat ini "
-"(memerlukan chanop)"
+msgstr "DEVOICE <pengguna>, hapus status suara dari pengguna di kanal saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -588,9 +547,7 @@ msgstr "ECHO <teks>, Cetak teks lokal"
 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] <perintah>, menjalankan perintah. Jika opsi -o digunakan maka "
-"keluarannya dikirim ke kanal saat ini, atau dicetak ke kotak teks saat ini"
+msgstr "EXEC [-o] <perintah>, menjalankan perintah. Jika opsi -o digunakan maka keluarannya dikirim ke kanal saat ini, atau dicetak ke kotak teks saat ini"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -600,9 +557,7 @@ msgstr "EXECCONT, kirim proses SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], matikan eksekusi yang berjalan di sesi saat ini. Jika -9 "
-"diberikan maka proses akan di-SIGKILL"
+msgstr "EXECKILL [-9], matikan eksekusi yang berjalan di sesi saat ini. Jika -9 diberikan maka proses akan di-SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -622,8 +577,7 @@ msgstr "FLUSHQ, buang antrian pengiriman server saat ini"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<pangkalan>], proxy melewati host, standar pangkalan adalah 23"
+msgstr "GATE <host> [<pangkalan>], proxy melewati host, standar pangkalan adalah 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -631,8 +585,7 @@ msgstr "GHOST <nama> [sandi], Matikan nama pengguna hantu"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <pengguna>, memberikan hak ½ operator ke pengguna (memerlukan chanop)"
+msgstr "HOP <pengguna>, memberikan hak ½ operator ke pengguna (memerlukan chanop)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -645,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> <tipe..> <opsi..>\n"
-"    mask - host mask yang akan diabaikan, misalnya: *!*@*.aol.com\n"
-"    tipe - tipe data yang akan diabaikan, salah satu atau semua dari:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opsi - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <tipe..> <opsi..>\n    mask - host mask yang akan diabaikan, misalnya: *!*@*.aol.com\n    tipe - tipe data yang akan diabaikan, salah satu atau semua dari:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opsi - 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 <pengguna> [<kanal>], undang seseorang ke kanal, standarnya adalah "
-"kanal saat ini (memerlukan chanop)"
+msgstr "INVITE <pengguna> [<kanal>], undang seseorang ke kanal, standarnya adalah kanal saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -667,16 +613,13 @@ msgstr "JOIN <kanal>, gabung ke kanal"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <nick> [reason], tendang nick dari saluran saat ini (memerlukan chanop)"
+msgstr "KICK <nick> [reason], tendang nick dari saluran saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <nick> [reason], larang kemudian tendang nick dari saluran saat ini "
-"(memerlukan chanop)"
+msgstr "KICKBAN <nick> [reason], larang kemudian tendang nick dari saluran saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -688,15 +631,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] [--] <string>, mencari kata di dalam log\n"
-"    Pakai -h untuk menyoroti kata yang ingin dicari(ditemukan)\n"
-"    Pakai -m untuk menemukan kata yang cocok\n"
-"    Pakai -r untuk mencari kata dengan ekspresi reguler\n"
-"    Pakai -- (tanda penghubung ganda) ketika mencari kata pada akhir opsi, "
-"contoh, '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <string>, mencari kata di dalam log\n    Pakai -h untuk menyoroti kata yang ingin dicari(ditemukan)\n    Pakai -m untuk menemukan kata yang cocok\n    Pakai -r untuk mencari kata dengan ekspresi reguler\n    Pakai -- (tanda penghubung ganda) ketika mencari kata pada akhir opsi, contoh, '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -705,22 +641,17 @@ msgstr "LOAD [-e] <berkas>, membuka plugin atau skrip"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Cabut hak ½ operator secara masal di kanal saat ini (memerlukan "
-"chanop)"
+msgstr "MDEHOP, Cabut hak ½ operator secara masal di kanal saat ini (memerlukan chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Cabut hak operator secara masal di kanal saat ini (memerlukan chanop)"
+msgstr "MDEOP, Cabut hak operator secara masal di kanal saat ini (memerlukan 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 <aksi>, mengirim aksi ke kanal saat ini (aksi ditulis dalam sudut pandang "
-"orang ketiga, seperti /me lompat)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <aksi>, mengirim aksi ke kanal saat ini (aksi ditulis dalam sudut pandang orang ketiga, seperti /me lompat)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -733,16 +664,13 @@ msgstr "MKICK, Keluarkan semua orang kecuali kamu (memerlukan chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Operator massal semua pengguna di kanal saat ini (memerlukan chanop)"
+msgstr "MOP, Operator massal semua pengguna di kanal saat ini (memerlukan 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"
-msgstr ""
-"MSG <nick> <message>, mengirimkan pesan pribadi, pesan \".\" untuk mengirim "
-"ke nick terakhir atau awalan dengan \"=\" untuk obrolan dcc"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <nick> <message>, mengirimkan pesan pribadi, pesan \".\" untuk mengirim ke nick terakhir atau awalan dengan \"=\" untuk obrolan dcc"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -768,20 +696,16 @@ msgstr "NOTICE <nick/channel> <message>, mengirimkan pemberitahuan"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n jaringan1[,jaringan2,...]] [<pengguna>], tampilkan daftar "
-"pemberitahuan anda atau tambah seseorang ke dalamnya"
+msgstr "NOTIFY [-n jaringan1[,jaringan2,...]] [<pengguna>], tampilkan daftar pemberitahuan anda atau tambah seseorang ke dalamnya"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <pengguna>, berikan status operator kanal ke pengguna (memerlukan chanop)"
+msgstr "OP <pengguna>, berikan status operator kanal ke pengguna (memerlukan chanop)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<alasan>], meninggalkan kanal, standarnya kanal yang sekarang"
+msgstr "PART [<kanal>] [<alasan>], meninggalkan kanal, standarnya kanal yang sekarang"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -791,17 +715,13 @@ msgstr "PING <pengguna | kanal>, ping CTCP pengguna atau kanal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <nick> [message], membuka jendela pesan pribadi baru ke "
-"seseorang dan opsional mengirim sebuah pesan"
+msgstr "QUERY [-nofocus] <nick> [message], membuka jendela pesan pribadi baru ke seseorang dan opsional mengirim sebuah pesan"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask> [<quiettype>], diamkan semua orang yang cocok dengan tanda di "
-"saluran saat ini jika didukung oleh server."
+msgstr "QUIET <mask> [<quiettype>], diamkan semua orang yang cocok dengan tanda di saluran saat ini jika didukung oleh server."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -813,31 +733,23 @@ msgstr "QUOTE <teks>, kirim teks dalam bentuk mentah ke server"
 
 #: 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>] [<pangkalan>] [<sandi>], Dapat dipanggil cukup "
-"dengan /RECONNECT untuk menyambung ulang ke server saat ini atau dengan /"
-"RECONNECT ALL untuk menyambung ulang ke semua server yang terbuka"
+msgstr "RECONNECT [-ssl] [<host>] [<pangkalan>] [<sandi>], Dapat dipanggil cukup dengan /RECONNECT untuk menyambung ulang ke server saat ini atau dengan /RECONNECT ALL untuk menyambung ulang ke semua server yang terbuka"
 
 #: 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>] [<pangkalan>] [<sandi>], Dapat dipanggil cukup dengan /"
-"RECONNECT untuk menyambung ulang ke server saat ini atau dengan /RECONNECT "
-"ALL untuk menyambung ulang ke semua server yang terbuka"
+msgstr "RECONNECT [<host>] [<pangkalan>] [<sandi>], Dapat dipanggil cukup dengan /RECONNECT untuk menyambung ulang ke server saat ini atau dengan /RECONNECT ALL untuk menyambung ulang ke semua server yang terbuka"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <teks>, kirim data asli le HexChat, seolah-olah itu diterima dari "
-"server IRC"
+msgstr "RECV <teks>, kirim data asli le HexChat, seolah-olah itu diterima dari server IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -863,18 +775,13 @@ msgstr "SERVCHAN <host> <pangkalan> <kanal>, konek dan gabung ke kanal"
 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] <host> [<port>] [<password>], terhubung ke server, untuk "
-"jaringan normal gunakan port 6667, dan gunakan 6697 untuk jaringan yang "
-"terenskripsi"
+msgstr "SERVER [-ssl] <host> [<port>] [<password>], terhubung ke server, untuk jaringan normal gunakan port 6667, dan gunakan 6697 untuk jaringan yang terenskripsi"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<pangkalan>] [<sandi>], konek ke server, port standar adalah "
-"6667"
+msgstr "SERVER <host> [<pangkalan>] [<sandi>], konek ke server, port standar adalah 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -894,10 +801,9 @@ msgstr "SETTEXT <new text>, ganti teks di dalam inputbox"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topik>], tetapkan topik jika ada yang diberikan, atau tampilkan "
-"topik saat ini"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topik>], tetapkan topik jika ada yang diberikan, atau tampilkan topik saat ini"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -907,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 <waktu> <berkas1> [<berkas2>] Kedipkan baki diantara dua ikon.\n"
-"TRAY -f <nama berkas>                 Atur baki ke ikon tetap.\n"
-"TRAY -i <nomor>                       Kedipkan baki dengan ikon internal.\n"
-"TRAY -t <teks>                        Atur tip alat baki.\n"
-"TRAY -b <judul> <teks>                Atur balon baki."
+msgstr "\nTRAY -f <waktu> <berkas1> [<berkas2>] Kedipkan baki diantara dua ikon.\nTRAY -f <nama berkas>                 Atur baki ke ikon tetap.\nTRAY -i <nomor>                       Kedipkan baki dengan ikon internal.\nTRAY -t <teks>                        Atur tip alat baki.\nTRAY -b <judul> <teks>                Atur balon baki."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -929,11 +829,9 @@ msgstr "UNLOAD <nama>, tutup plugin atau skrip"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mask> [<mask>...], batalkan tanda tertentu jika didukung oleh "
-"server."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mask> [<mask>...], batalkan tanda tertentu jika didukung oleh server."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -941,15 +839,13 @@ msgstr "URL <url>, buka tautan ke browser."
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <pengguna1> <pengguna2> dll, sorot pengguna di daftar "
-"pengguna kanal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <pengguna1> <pengguna2> dll, sorot pengguna di daftar pengguna kanal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <pengguna>, berikan status suara ke seseorang (memerlukan chanop)"
+msgstr "VOICE <pengguna>, berikan status suara ke seseorang (memerlukan chanop)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -958,8 +854,7 @@ msgstr "WALLCHAN <pesan>, tulis pesan ke semua kanal"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <pesan>, kirim pesan ke semua operator kanal di kanal saat ini"
+msgstr "WALLCHOP <pesan>, kirim pesan ke semua operator kanal di kanal saat ini"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -975,9 +870,7 @@ msgstr "Penggunaan: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Tak ada bantuan yang tersedia untuk perintah tersebut.\n"
+msgstr "\nTak ada bantuan yang tersedia untuk perintah tersebut.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1046,9 +939,7 @@ msgstr "Anda yakin ini adalah server dan pangkalan yang mendukung SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Tak dapat memecahkan nama host %s\n"
-"Cek Pengaturan IP anda!\n"
+msgstr "Tak dapat memecahkan nama host %s\nCek Pengaturan IP anda!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1064,9 +955,7 @@ msgstr "Daur ke server selanjutnya di %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Peringatan: set karakter \"%s\" tak diketahui. Tak ada konversi yang akan "
-"diterapkan untuk jaringan %s."
+msgstr "Peringatan: set karakter \"%s\" tak diketahui. Tak ada konversi yang akan diterapkan untuk jaringan %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1225,9 +1114,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT %C18$1%O dibatalkan."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tKoneksi DCC CHAT terpasang kembali pada %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 "%C24*%O$tKoneksi DCC CHAT terpasang kembali pada %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1260,11 +1149,9 @@ 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"
-msgstr ""
-"%C20*%O$tMenerima permintaan DCC cacat dari %C18$1%O.$a010%C23*%O$tPaket "
-"konten: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tMenerima permintaan DCC cacat dari %C18$1%O.$a010%C23*%O$tPaket konten: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1281,13 +1168,12 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' ke %C18$1%O dibatalkan."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' dari %C18$3%O selesai %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' dari %C18$3%O selesai %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV koneksi terpasang lagi pada %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 "%C24*%O$tDCC RECV koneksi terpasang lagi pada %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1295,14 +1181,13 @@ msgstr "%C20*%O$tDCC RECV '%C23$1%O' dari %C18$3%O gagal (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: Tidak dapat dibuka '%C23$1%C' untuk ditulis (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV: Tidak dapat dibuka '%C23$1%C' untuk ditulis (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tThe file '%C24$1%C' sudah ada, disimpan dengan nama '%C23$2%O'."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tThe file '%C24$1%C' sudah ada, disimpan dengan nama '%C23$2%O'."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1315,13 +1200,12 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' ke %C18$1%O dibatalkan."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C selesai %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C selesai %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND koneksi terpasang lagi pada %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 "%C24*%O$tDCC SEND koneksi terpasang lagi pada %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1379,9 +1263,7 @@ msgstr "%ODaftar pengabaian kosong."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tTidak dapat bergabung%C22$1%C (%C20Kanal tersebut hanya untuk "
-"undangan%O)"
+msgstr "%C20*%O$tTidak dapat bergabung%C22$1%C (%C20Kanal tersebut hanya untuk undangan%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1419,9 +1301,7 @@ msgstr "%C23*%O$t%C28$1%C adalah salah. Mencoba dengan %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tJulukan ini salah atau sudah digunakan. Gunakan /NICK untuk mencoba "
-"yang lain."
+msgstr "%C20*%O$tJulukan ini salah atau sudah digunakan. Gunakan /NICK untuk mencoba yang lain."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1541,8 +1421,7 @@ msgstr "%C22*%O$tUser di %C22$1%C: %C24$2%O"
 
 #: src/common/textevents.h:409
 msgid "%C23*%O$t%C28[%C18$1%C28]%C is away %C30(%C23$2%O%C30)%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%C sedang tidak ada ditempat %C30(%C23$2%O%C30)%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%C sedang tidak ada ditempat %C30(%C23$2%O%C30)%O"
 
 #: src/common/textevents.h:415
 msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
@@ -1554,14 +1433,12 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O diam %C23$2%O"
 
 #: src/common/textevents.h:424
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O diam selama %C23$2%O, terdaftar pada: %C23$3%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O diam selama %C23$2%O, terdaftar pada: %C23$3%O"
 
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Host asli: %C23$2%O, IP asli: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Host asli: %C23$2%O, IP asli: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1606,9 +1483,7 @@ msgstr "**** MULAI PENCATATAN PADA %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Tidak dapat membuka berkas log. Mohon cek\n"
-"izin berkas pada %s"
+msgstr "* Tidak dapat membuka berkas log. Mohon cek\nizin berkas pada %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2105,9 +1980,7 @@ msgstr "Waktu Hukuman"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Tak dapat membaca berkas suara:\n"
-"%s"
+msgstr "Tak dapat membaca berkas suara:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3466,18 +3339,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Tak dapat mengakses berkas: %s\n"
-"%s.\n"
-"Tidak mungkin melanjutkan."
+msgstr "Tak dapat mengakses berkas: %s\n%s.\nTidak mungkin melanjutkan."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Berkas di direktori unduh lebih besar dari berkas yang ditawarkan. Tidak "
-"mungkin melanjutkan."
+msgstr "Berkas di direktori unduh lebih besar dari berkas yang ditawarkan. Tidak mungkin melanjutkan."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3623,10 +3491,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"
@@ -3644,18 +3509,18 @@ msgstr "Antrean kirim jaringan: %d byte"
 
 #: 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 "
@@ -3666,65 +3531,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 ""
-"Perintah Sisipkan di Penyangga akan menyisipkan isi Data 1 ke dalam entri "
-"tempat kombinasi kunci ditekan pada posisi kursor saat ini"
+msgstr "Perintah Sisipkan di Penyangga akan menyisipkan isi Data 1 ke dalam entri tempat kombinasi kunci ditekan pada posisi kursor saat ini"
 
 #: 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 ""
-"Perintah Atur Penyangga mengatur entri tempat kombinasi tombol dimasukkan ke "
-"isi dari Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Perintah Atur Penyangga mengatur entri tempat kombinasi tombol dimasukkan ke isi dari 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 ""
-"Perintah Ganti Perintah mengatur entri agar berisi perintah terakhir yang "
-"dimasukkan - sama seperti menekan tanda panah atas di shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Perintah Ganti Perintah mengatur entri agar berisi perintah terakhir yang dimasukkan - sama seperti menekan tanda panah atas di 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 ""
-"Perintah Perintah Selanjutnya mengatur entri agar berisi perintah "
-"selanjutnya yang dimasukkan - sama seperti menekan tanda panah bawah di shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Perintah Perintah Selanjutnya mengatur entri agar berisi perintah selanjutnya yang dimasukkan - sama seperti menekan tanda panah bawah di 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 ""
-"Perintah ini mengganti teks di entri untuk menyelesaikan nama pengguna atau "
-"perintah yang belum lengkap. Jika Data 1 diatur maka tab ganda di tali akan "
-"memilih nama pengguna terakhir, bukan yang setelahnya"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Perintah ini mengganti teks di entri untuk menyelesaikan nama pengguna atau perintah yang belum lengkap. Jika Data 1 diatur maka tab ganda di tali akan memilih nama pengguna terakhir, bukan yang setelahnya"
 
 #: 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 ""
-"Perintah ini menggulung ke atas dan bawah melewati daftar pengguna. Jika "
-"Data 1 diatur ke apapun maka perintah akan menggulung ke atas, atau ke bawah"
+"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 "Perintah ini menggulung ke atas dan bawah melewati daftar pengguna. Jika Data 1 diatur ke apapun maka perintah akan menggulung ke atas, atau ke bawah"
 
 #: 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 ""
-"Perintah ini memeriksa kata terakhir yang dimasukkan di entri melawan daftar "
-"ganti lalu menggantinya bila menemukan kecocokan"
+msgstr "Perintah ini memeriksa kata terakhir yang dimasukkan di entri melawan daftar ganti lalu menggantinya bila menemukan kecocokan"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3867,8 +3717,7 @@ msgstr "_Gabung ke kanal ini:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Jika anda tahu nama kanal yang ingin anda masuki, masukkan namanya di sini."
+msgstr "Jika anda tahu nama kanal yang ingin anda masuki, masukkan namanya di sini."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3900,9 +3749,7 @@ msgstr "Tak ada topik"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Server ini masih memiliki %d kanal atau dialog yang terhubung dengannya. "
-"Tutup mereka semua?"
+msgstr "Server ini masih memiliki %d kanal atau dialog yang terhubung dengannya. Tutup mereka semua?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4229,25 +4076,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Perintah User - Kode Spesial:\n"
-"\n"
-"%c  =  kanal saat ini\n"
-"%e  =  nama jaringan saat ini\n"
-"%m  =  informasi mesin\n"
-"%n  =  nick kamu\n"
-"%t  =  waktu/tanggal\n"
-"%v  =  versi HexChat\n"
-"%2  =  2 kata\n"
-"%3  = 3 kata\n"
-"&2  =  2 kata dari akhir baris\n"
-"&3  =  3 kata dari akhir baris\n"
-"\n"
-"contoh:\n"
-"/cmd john hello\n"
-"\n"
-"%2 hasilnya \"john\"\n"
-"&2 hasilnya \"john hello\"."
+msgstr "Perintah User - Kode Spesial:\n\n%c  =  kanal saat ini\n%e  =  nama jaringan saat ini\n%m  =  informasi mesin\n%n  =  nick kamu\n%t  =  waktu/tanggal\n%v  =  versi HexChat\n%2  =  2 kata\n%3  = 3 kata\n&2  =  2 kata dari akhir baris\n&3  =  3 kata dari akhir baris\n\ncontoh:\n/cmd john hello\n\n%2 hasilnya \"john\"\n&2 hasilnya \"john hello\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4293,19 +4122,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Balasan CTCP - Kode khusus:\n"
-"\n"
-"%d  =  data (seluruh ctcp)\n"
-"%e  =  nama jaringan saat ini\n"
-"%m  =  informasi mesin\n"
-"%s  =  pengguna yang mengirim ctcp\n"
-"%t  =  waktu/tanggal\n"
-"%2  =  kata 2\n"
-"%3  =  kata 3\n"
-"&2  =  kata 2 sampai akhir baris\n"
-"&3  =  word 3 sampai akhir baris\n"
-"\n"
+msgstr "Balasan CTCP - Kode khusus:\n\n%d  =  data (seluruh ctcp)\n%e  =  nama jaringan saat ini\n%m  =  informasi mesin\n%s  =  pengguna yang mengirim ctcp\n%t  =  waktu/tanggal\n%2  =  kata 2\n%3  =  kata 3\n&2  =  kata 2 sampai akhir baris\n&3  =  word 3 sampai akhir baris\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4317,14 +4134,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Pengendali Tautan - Kode Spesial:\n"
-"\n"
-"%s  =  Tautan\n"
-"\n"
-"Menaruh ! di depan perintah\n"
-"menunjukkan hal tersebut harus dikirim ke \n"
-"shell bukan HexChat"
+msgstr "Pengendali Tautan - Kode Spesial:\n\n%s  =  Tautan\n\nMenaruh ! di depan perintah\nmenunjukkan hal tersebut harus dikirim ke \nshell bukan HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -5763,8 +5573,7 @@ msgstr "Pesan Tersorot"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Pesan tersorot adalah pesan dimana nama pengguna anda disebutkan, tapi juga:"
+msgstr "Pesan tersorot adalah pesan dimana nama pengguna anda disebutkan, tapi juga:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5786,9 +5595,7 @@ msgstr "Nama pengguna yang selalu disorot:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Pisahkan banyak kata dengan koma.\n"
-"Wildcards juga diterima."
+msgstr "Pisahkan banyak kata dengan koma.\nWildcards juga diterima."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5894,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
@@ -5904,8 +5711,8 @@ msgstr "Otomatis masukkan informasi warna"
 
 #: 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
@@ -5956,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
@@ -6066,11 +5874,9 @@ msgstr "Dapatkan alamat saya dari server 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 ""
-"Tanyakan server IRC alamat asli anda. Gunakan ini jika anda memiliki alamat "
-"192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Tanyakan server IRC alamat asli anda. Gunakan ini jika anda memiliki alamat 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6302,13 +6108,10 @@ msgstr "Kategori"
 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 ""
-"Anda tak dapat menempatkan pohon di atas atau bawah!\n"
-"Silakan ganti tata letak <b>Tab</b> di menu <b>Tampilan</b> dahulu."
+msgstr "Anda tak dapat menempatkan pohon di atas atau bawah!\nSilakan ganti tata letak <b>Tab</b> di menu <b>Tampilan</b> dahulu."
 
 #: 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
@@ -6321,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 ""
-"*PERINGATAN*\n"
-"Otomatis menerima DCC ke direktori home\n"
-"anda dapat berbahaya dan mudah dieksploitasi. Misalnya: \n"
-"Seseorang dapat mengirimi anda .bash_profile"
+msgstr "*PERINGATAN*\nOtomatis menerima DCC ke direktori home\nanda dapat berbahaya dan mudah dieksploitasi. Misalnya: \nSeseorang dapat mengirimi anda .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6439,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
@@ -6456,9 +6255,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/it.po b/po/it.po
index eed1c0f3..966c6dcf 100644
--- a/po/it.po
+++ b/po/it.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:
 # Claudio Arseni <claudio.arseni@gmail.com>, 2013-2014,2016-2018
 # Eros Palberti - Fabio Viola : How-Tux Team <admin@how-tux.com>, 2006
-# Marina Latini <deneb.alphacygni@gmail.com>, 2016
+# Marina Latini <marina.latini@libreoffice.org>, 2016
 # Random_R, 2013
-# Random_R, 2013,2016-2017
+# Random_R, 2013,2016-2018
 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: 2018-01-07 08:15+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-12-15 12:53+0000\n"
 "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/hexchat/hexchat/language/"
-"it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/hexchat/hexchat/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -39,20 +38,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 è un client IRC semplice ed estensibile. Consente di accedere in "
-"modo sicuro a più reti e comunicare con altri utenti privatamente o nei "
-"canali usando una interfaccia personalizzabile. È inoltre possibile "
-"trasferire file."
+msgstr "HexChat è un client IRC semplice ed estensibile. Consente di accedere in modo sicuro a più reti e comunicare con altri utenti privatamente o nei canali usando una interfaccia personalizzabile. È inoltre possibile trasferire file."
 
 #: 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 supporta caratteristiche come: DCC, SASL, proxy, controllo "
-"ortografico, avvisi, registrazione delle conversazioni, temi personalizzati "
-"e script Python e Perl."
+msgstr "HexChat supporta caratteristiche come: DCC, SASL, proxy, controllo ortografico, avvisi, registrazione delle conversazioni, temi personalizzati e script Python e Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -303,18 +295,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Non si possiedono i permessi di scrittura per %s. Nulla di questa sessione "
-"potrà essere salvato."
+msgstr "Non si possiedono i permessi di scrittura per %s. Nulla di questa sessione potrà essere salvato."
 
 #: 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 ""
-"* Eseguire IRC come l'utente root non è consigliato.\n"
-"  È preferibile creare un account utente\n"
-"  e utilizzare tale utente per effettuare l'accesso.\n"
+msgstr "* Eseguire IRC come l'utente root non è consigliato.\n  È preferibile creare un account utente\n  e utilizzare tale utente per effettuare l'accesso.\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
@@ -336,9 +323,7 @@ msgstr "Hai ricevuto un flood CTCP da parte di %s. %s viene ignorato\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Hai ricevuto un flood MSG da parte di %s. gui_autoopen_dialog impostato a "
-"OFF.\n"
+msgstr "Hai ricevuto un flood MSG da parte di %s. gui_autoopen_dialog impostato a OFF.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -441,9 +426,7 @@ msgstr "ADDBUTTON <nome> <azione>, aggiunge un pulsante nell'elenco utenti"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NuovaRete> <nuovo_server/6667>, aggiunge una nuova rete con un "
-"nuovo server all'elenco delle reti"
+msgstr "ADDSERVER <NuovaRete> <nuovo_server/6667>, aggiunge una nuova rete con un nuovo server all'elenco delle reti"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -455,14 +438,11 @@ msgstr "ALLCHANL <cmd>, invia un comando a tutti i canali del server attuale"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <cmd>, invia un comando a tutti i server ai quali si è collegati"
+msgstr "ALLSERV <cmd>, invia un comando a tutti i server ai quali si è collegati"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<motivo>], imposta lo stato di assenza (usare /BACK per ripristinare "
-"la presenza)"
+msgstr "AWAY [<motivo>], imposta lo stato di assenza (usare /BACK per ripristinare la presenza)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -473,10 +453,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> [<tipo_di_ban>], allontana dal canale attuale tutti coloro che "
-"corrispondono alla maschera di rete specificata. Se sono già connessi al "
-"canale, questo non li espelle (kick). Bisogna essere operatore."
+msgstr "BAN <mask> [<tipo_di_ban>], allontana dal canale attuale tutti coloro che corrispondono alla maschera di rete specificata. Se sono già connessi al canale, questo non li espelle (kick). Bisogna essere operatore."
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -484,46 +461,37 @@ msgstr "CHANOPT [-quiet] <variabile> [<valore>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<codifica>], rileva o imposta la codifica usata per la connessione "
-"attuale"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<codifica>], rileva o imposta la codifica usata per la connessione attuale"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<quantità>], pulisce la finestra di testo corrente o "
-"la cronologia dei comandi"
+msgstr "CLEAR [ALL|HISTORY|[-]<quantità>], pulisce la finestra di testo corrente o la cronologia dei comandi"
 
 #: 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 ""
-"CLOSE [-m], chiude la scheda corrente, chiudendo la finestra se questa è "
-"l'unica scheda aperta , o con l'opzione «-m», per chiudere tutte le query."
+msgstr "CLOSE [-m], chiude la scheda corrente, chiudendo la finestra se questa è l'unica scheda aperta , o con l'opzione «-m», per chiudere tutte le query."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <codice|wildcard>, cerca un codice paese, per es.: it = Italia"
+msgstr "COUNTRY [-s] <codice|wildcard>, cerca un codice paese, per es.: it = Italia"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <soprannome> <messaggio>, invia il messaggio CTCP al soprannome "
-"indicato, messaggi comuni sono VERSION e USERINFO"
+msgstr "CTCP <soprannome> <messaggio>, invia il messaggio CTCP al soprannome indicato, messaggi comuni sono VERSION e USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<canale>], abbandona il canale attuale o quello dato e vi rientra "
-"immediatamente"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canale>], abbandona il canale attuale o quello dato e vi rientra immediatamente"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -536,27 +504,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 <soprannome>                      - accetta un file offerto\n"
-"DCC SEND [-maxcps=#] <soprannome> [file]  - invia un file a qualcuno\n"
-"DCC PSEND [-maxcps=#] <soprannome> [file] - invia un file utilizzando la "
-"modalità passiva\n"
-"DCC LIST                                  - visualizza l'elenco dei "
-"collegamenti DCC\n"
-"DCC CHAT <soprannome>                     - propone una CHAT DCC a qualcuno\n"
-"DCC PCHAT <soprannome>                    - propone una CHAT DCC utilizzando "
-"la modalità passiva\n"
-"DCC CLOSE <tipo> <soprannome> <file>        per esempio:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <soprannome>                      - accetta un file offerto\nDCC SEND [-maxcps=#] <soprannome> [file]  - invia un file a qualcuno\nDCC PSEND [-maxcps=#] <soprannome> [file] - invia un file utilizzando la modalità passiva\nDCC LIST                                  - visualizza l'elenco dei collegamenti DCC\nDCC CHAT <soprannome>                     - propone una CHAT DCC a qualcuno\nDCC PCHAT <soprannome>                    - propone una CHAT DCC utilizzando la modalità passiva\nDCC CLOSE <tipo> <soprannome> <file>        per esempio:\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 <soprannome>, rimuove lo stato di semi-operatore sul canale attuale al "
-"soprannome indicato (bisogna essere operatore)"
+msgstr "DEHOP <soprannome>, rimuove lo stato di semi-operatore sul canale attuale al soprannome indicato (bisogna essere operatore)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -566,17 +520,13 @@ msgstr "DELBUTTON <nome>, elimina un pulsante pulsante dall'elenco utenti"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <soprannome>, rimuove lo stato di operatore sul canale attuale al "
-"soprannome indicato (bisogna essere operatore)"
+msgstr "DEOP <soprannome>, rimuove lo stato di operatore sul canale attuale al soprannome indicato (bisogna essere operatore)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <soprannome>, toglie la parola al soprannome indicato sul canale "
-"attuale (bisogna essere operatore)"
+msgstr "DEVOICE <soprannome>, toglie la parola al soprannome indicato sul canale attuale (bisogna essere operatore)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -598,10 +548,7 @@ msgstr "ECHO <testo>, stampa un testo 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>, esegue il comando. Se si utilizza l'opzione -o, "
-"l'output è inviato al canale attuale, altrimenti è stampato nell'area di "
-"testo attuale"
+msgstr "EXEC [-o] <comando>, esegue il comando. Se si utilizza l'opzione -o, l'output è inviato al canale attuale, altrimenti è stampato nell'area di testo attuale"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -611,9 +558,7 @@ msgstr "EXECCONT, invia un SIGCONT al processo"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], termina un'istanza exec nella sessione attuale. Se è "
-"specificato -9, il processo è ucciso con SIGKILL"
+msgstr "EXECKILL [-9], termina un'istanza exec nella sessione attuale. Se è specificato -9, il processo è ucciso con SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -633,9 +578,7 @@ msgstr "FLUSHQ, svuota la coda di invio del server attuale"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<porta>], utilizza un host come proxy, la porta predefinita è "
-"la 23"
+msgstr "GATE <host> [<porta>], utilizza un host come proxy, la porta predefinita è la 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -643,9 +586,7 @@ msgstr "GHOST <soprannome> [password], uccide un soprannome fantasma"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nick>, dà lo stato di semi-operatore al soprannome (bisogna essere "
-"operatore)"
+msgstr "HOP <nick>, dà lo stato di semi-operatore al soprannome (bisogna essere operatore)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -658,20 +599,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 <maschera> <tipi..> <opzioni..>\n"
-"    maschera - host maschera da ignorare, per es.: *!*@*.aol.com\n"
-"    tipi - tipi di dati da ignorare, uno o più tra:\n"
-"              PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opzioni - NOSAVE, QUIET"
+msgstr "IGNORE <maschera> <tipi..> <opzioni..>\n    maschera - host maschera da ignorare, per es.: *!*@*.aol.com\n    tipi - tipi di dati da ignorare, uno o più tra:\n              PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opzioni - 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 <soprannome> [<canale>], invita qualcuno in un canale, la regola "
-"predefinita è per il canale attuale (bisogna essere operatore)"
+msgstr "INVITE <soprannome> [<canale>], invita qualcuno in un canale, la regola predefinita è per il canale attuale (bisogna essere operatore)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -680,17 +614,13 @@ msgstr "JOIN <canale>, entra nel canale"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <soprannome> [motivo], espelle l'utente dal canale attuale (è "
-"necessario essere operatore)"
+msgstr "KICK <soprannome> [motivo], espelle l'utente dal canale attuale (è necessario essere operatore)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <soprannome> [motivo], allontana ed espelle l'utente dal canale "
-"attuale (è necessario essere operatore)"
+msgstr "KICKBAN <soprannome> [motivo], allontana ed espelle l'utente dal canale attuale (è necessario essere operatore)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -702,14 +632,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] [--] <stringa>, cerca una stringa nel buffer\n"
-"Usare -h per evidenziare le stringhe trovate\n"
-"Usare -m quando la stringa è un'espressione regolare\n"
-"Usare -- (doppio trattino) per terminare le opzioni quando si cerca, per "
-"esempio, la stringa «-r»"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <stringa>, cerca una stringa nel buffer\nUsare -h per evidenziare le stringhe trovate\nUsare -m quando la stringa è un'espressione regolare\nUsare -- (doppio trattino) per terminare le opzioni quando si cerca, per esempio, la stringa «-r»"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -718,51 +642,36 @@ msgstr "LOAD [-e] <file>, carica un plugin o uno script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, toglie lo stato a tutti i semi-operatori del canale attuale (bisogna "
-"essere operatore)"
+msgstr "MDEHOP, toglie lo stato a tutti i semi-operatori del canale attuale (bisogna essere operatore)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, toglie lo stato a tutti gli operatori del canale attuale (bisogna "
-"essere operatore)"
+msgstr "MDEOP, toglie lo stato a tutti gli operatori del canale attuale (bisogna essere operatore)"
 
 #: 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 <azione>, invia l'azione al canale attuale (le azioni sono scritte in "
-"terza persona, es. /me saluta tutti)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <azione>, invia l'azione al canale attuale (le azioni sono scritte in terza persona, es. /me saluta tutti)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
-"MHOP, imposta lo stato hop per tutti gli utenti presenti nel canale attuale "
-"(è necessario essere operatore del canale)"
+msgstr "MHOP, imposta lo stato hop per tutti gli utenti presenti nel canale attuale (è necessario essere operatore del canale)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, espelle dal canale attuale tutti gli utenti tranne te (bisogna essere "
-"operatore)"
+msgstr "MKICK, espelle dal canale attuale tutti gli utenti tranne te (bisogna essere operatore)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, rende operatori tutti gli utenti nel canale attuale (bisogna essere "
-"operatore)"
+msgstr "MOP, rende operatori tutti gli utenti nel canale attuale (bisogna essere operatore)"
 
 #: 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"
-msgstr ""
-"MSG <soprannome> <messaggio>, invia un messaggio privato, messaggio \".\" "
-"per inviarlo all'ultimo soprannome contattato o con il prefisso \"=\" per "
-"avviare una chat DCC"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <soprannome> <messaggio>, invia un messaggio privato, messaggio \".\" per inviarlo all'ultimo soprannome contattato o con il prefisso \"=\" per avviare una chat DCC"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -788,44 +697,32 @@ msgstr "NOTICE <soprannome/canale> <messaggio>, invia una notifica"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n rete1[,rete2,...]] [<soprannome>], mostra l'elenco di notifica o "
-"aggiunge qualcuno a esso"
+msgstr "NOTIFY [-n rete1[,rete2,...]] [<soprannome>], mostra l'elenco di notifica o aggiunge qualcuno a esso"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <soprannome>, dà lo stato di operatore al soprannome indicato (bisogna "
-"essere operatore)"
+msgstr "OP <soprannome>, dà lo stato di operatore al soprannome indicato (bisogna essere operatore)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<canale>] [<motivo>], abbandona il canale. Se non specificato, quello "
-"attuale"
+msgstr "PART [<canale>] [<motivo>], abbandona il canale. Se non specificato, quello attuale"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr ""
-"PING <soprannome | canale>, invia un ping CTCP al soprannome o al canale"
+msgstr "PING <soprannome | canale>, invia un ping CTCP al soprannome o al canale"
 
 #: src/common/outbound.c:4071
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <soprannome> [messaggio], apre una nuova finestra per "
-"messaggi privati con qualcuno e opzionalmente invia un messaggio"
+msgstr "QUERY [-nofocus] <soprannome> [messaggio], apre una nuova finestra per messaggi privati con qualcuno e opzionalmente invia un messaggio"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask> [<quiettype>], imposta il quiet per il canale su tutti tutti "
-"coloro che corrispondono alla maschera se la funzione è supportata dal "
-"server."
+msgstr "QUIET <mask> [<quiettype>], imposta il quiet per il canale su tutti tutti coloro che corrispondono alla maschera se la funzione è supportata dal server."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -837,31 +734,23 @@ msgstr "QUOTE <testo>, invia il testo in forma grezza al server"
 
 #: 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>] [<porta>] [<password>], può essere richiamato "
-"semplicemente come /RECONNECT per riconnettersi al server attuale o con /"
-"RECONNECT ALL per riconnettersi a tutti i server aperti"
+msgstr "RECONNECT [-ssl] [<host>] [<porta>] [<password>], può essere richiamato semplicemente come /RECONNECT per riconnettersi al server attuale o con /RECONNECT ALL per riconnettersi a tutti i server aperti"
 
 #: 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>] [<porta>] [<password>], può essere richiamato "
-"semplicemente come /RECONNECT per riconnettersi al server attuale o con /"
-"RECONNECT ALL per riconnettersi a tutti i server aperti"
+msgstr "RECONNECT [<host>] [<porta>] [<password>], può essere richiamato semplicemente come /RECONNECT per riconnettersi al server attuale o con /RECONNECT ALL per riconnettersi a tutti i server aperti"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <testo>, invia dati in forma grezza a HexChat, come se venissero "
-"ricevuti dal server IRC"
+msgstr "RECV <testo>, invia dati in forma grezza a HexChat, come se venissero ricevuti dal server IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -869,9 +758,7 @@ msgstr "RELOAD <nome>, ricarica un plugin o uno script"
 
 #: src/common/outbound.c:4088
 msgid "SAY <text>, sends the text to the object in the current window"
-msgstr ""
-"SAY <testo>, invia il testo all'oggetto a cui corrisponde la finestra "
-"corrente"
+msgstr "SAY <testo>, invia il testo all'oggetto a cui corrisponde la finestra corrente"
 
 #: src/common/outbound.c:4089
 msgid "SEND <nick> [<file>]"
@@ -879,8 +766,7 @@ msgstr "SEND <soprannome> [<file>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <host> <porta> <canale>, si connette ed entra nel canale"
+msgstr "SERVCHAN [-ssl] <host> <porta> <canale>, si connette ed entra nel canale"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -890,18 +776,13 @@ msgstr "SERVCHAN <host> <porta> <canale>, si connette ed entra nel canale"
 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] <host> [<porta>] [<password>], si connette al server, la porta "
-"predefinita è la 6667 per le connessioni normali e la 6697 per le "
-"connessioni ssl"
+msgstr "SERVER [-ssl] <host> [<porta>] [<password>], si connette al server, la porta predefinita è la 6667 per le connessioni normali e la 6697 per le connessioni ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<porta>] [<password>], si connette al server, la porta "
-"predefinita è la 6667"
+msgstr "SERVER <host> [<porta>] [<password>], si connette al server, la porta predefinita è la 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -909,27 +790,21 @@ msgstr "SET [-e] [-off|-on] [-quiet] <variabile> [<valore>]"
 
 #: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
-"SETCURSOR [-|+]<posizione>, riposiziona il cursore nella casella di "
-"immissione"
+msgstr "SETCURSOR [-|+]<posizione>, riposiziona il cursore nella casella di immissione"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nuovo nome>, cambia il nome della scheda. Se troppo lungo verrà "
-"troncato automaticamente"
+msgstr "SETTAB <nuovo nome>, cambia il nome della scheda. Se troppo lungo verrà troncato automaticamente"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
-msgstr ""
-"SETTEXT <nuovo testo>, sostituisce il testo nella casella di immissione"
+msgstr "SETTEXT <nuovo testo>, sostituisce il testo nella casella di immissione"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<argomento>], imposta l'argomento, se specificato, altrimenti mostra "
-"quello attuale"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<argomento>], imposta l'argomento, se specificato, altrimenti mostra quello attuale"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -939,22 +814,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>] Lampeggia l'area di notifica tra due "
-"icone.\n"
-"TRAY -f <nomefile>                  Imposta l'area di notifica a un'icona "
-"fissa.\n"
-"TRAY -i <numero>                    Lampeggia l'area di notifica con "
-"un'icona interna.\n"
-"TRAY -t <testo>                     Imposta il suggerimento dell'area di "
-"notifica.\n"
-"TRAY -b <titolo> <testo>            Imposta l'avviso per l'area di notifica."
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] Lampeggia l'area di notifica tra due icone.\nTRAY -f <nomefile>                  Imposta l'area di notifica a un'icona fissa.\nTRAY -i <numero>                    Lampeggia l'area di notifica con un'icona interna.\nTRAY -t <testo>                     Imposta il suggerimento dell'area di notifica.\nTRAY -b <titolo> <testo>            Imposta l'avviso per l'area di notifica."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <maschera> [<maschera>...], rimuove il ban per la maschera specificata"
+msgstr "UNBAN <maschera> [<maschera>...], rimuove il ban per la maschera specificata"
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -966,11 +830,9 @@ msgstr "UNLOAD <nome>, termina un plugin o uno script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mask> [<mask>...], toglie il quiet alla maschera specificata se la "
-"funzione è supportata dal server."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mask> [<mask>...], toglie il quiet alla maschera specificata se la funzione è supportata dal server."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -978,10 +840,9 @@ msgstr "URL <url>, apre uno URL nel browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <soprannome1> <soprannome2> ecc., evidenzia i/il "
-"soprannomi/e nell'elenco utenti del canale"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <soprannome1> <soprannome2> ecc., evidenzia i/il soprannomi/e nell'elenco utenti del canale"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -994,9 +855,7 @@ msgstr "WALLCHAN <messaggio>, scrive il messaggio su tutti i canali"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <messaggio>, invia il messaggio a tutti gli operatori del canale "
-"attuale"
+msgstr "WALLCHOP <messaggio>, invia il messaggio a tutti gli operatori del canale attuale"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1012,9 +871,7 @@ msgstr "Uso: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Nessun aiuto disponibile per questo comando.\n"
+msgstr "\nNessun aiuto disponibile per questo comando.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1083,9 +940,7 @@ msgstr "Il server e la porta supportano veramente SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Impossibile risolvere il nome host %s.\n"
-"Controllare le impostazioni dell'IP.\n"
+msgstr "Impossibile risolvere il nome host %s.\nControllare le impostazioni dell'IP.\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1101,9 +956,7 @@ msgstr "Nuovo tentativo con il server successivo di %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Attenzione: il set di caratteri «%s» non è conosciuto. Non verrà effettuata "
-"alcuna conversione per la rete %s."
+msgstr "Attenzione: il set di caratteri «%s» non è conosciuto. Non verrà effettuata alcuna conversione per la rete %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1147,8 +1000,7 @@ msgstr "%C22*%O$tCanale %C22$1%O creato su %C24$2%O"
 
 #: src/common/textevents.h:46
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
-msgstr ""
-"%C22*%O$t%C26$1%O ha tolto lo stato di semi-operatore del canale a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O ha tolto lo stato di semi-operatore del canale a %C18$2%O"
 
 #: src/common/textevents.h:49
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
@@ -1164,8 +1016,7 @@ msgstr "%C22*%O$t%C26$1%C ha impostato l'exempt su %C18$2%O"
 
 #: src/common/textevents.h:58
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
-msgstr ""
-"%C22*%O$t%C26$1%O ha dato lo stato di semi-operatore del canale a %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O ha dato lo stato di semi-operatore del canale a %C18$2%O"
 
 #: src/common/textevents.h:61
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
@@ -1264,9 +1115,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tCHAT DCC con %C18$1%O interrotta."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tConnessione CHAT DCC con %C18$1%C %C30[%C24$2%C30]%O stabilita"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%O$tConnessione CHAT DCC con %C18$1%C %C30[%C24$2%C30]%O stabilita"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1286,8 +1137,7 @@ msgstr "%C24*%O$tInvito alla CHAT per %C18$1%O già effettuato"
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
-"%C20*%O$tTentativo di connessione DCC $1 a %C18$2%O non riuscito (%C20$3%O)"
+msgstr "%C20*%O$tTentativo di connessione DCC $1 a %C18$2%O non riuscito (%C20$3%O)"
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1300,11 +1150,9 @@ msgstr "%C16,17 Tipo  A/Da    Stato  Dim    Pos     File"
 
 #: 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"
-msgstr ""
-"%C20*%O$tRicevuta una richiesta DCC mal formata da %C18$1%O.$a010%C23*%O"
-"$tContenuto del pacchetto: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tRicevuta una richiesta DCC mal formata da %C18$1%O.$a010%C23*%O$tContenuto del pacchetto: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1321,13 +1169,12 @@ msgstr "%C23*%O$tDCC RECV «%C23$2%O» a %C18$1%O interrotto."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV «%C23$1%O» da %C18$3%O completato %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV «%C23$1%O» da %C18$3%O completato %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV connessione stabilita con %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 "%C24*%O$tDCC RECV connessione stabilita con %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1335,12 +1182,12 @@ msgstr "%C20*%O$tDCC RECV «%C23$1%O» da %C18$3%O non riuscito (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: impossibile aprire «%C23$1%C» in scrittura (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV: impossibile aprire «%C23$1%C» in scrittura (%C20$2%O)"
 
 #: 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 "%C23*%O$tIl file «%C24$1%C» esiste già, verrà salvato come «%C23$2%O»."
 
 #: src/common/textevents.h:196
@@ -1354,13 +1201,12 @@ msgstr "%C23*%O$tDCC SEND «%C23$2%C» a %C18$1%O interrotto."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND «%C23$1%C» a %C18$2%C completato %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND «%C23$1%C» a %C18$2%C completato %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND connessione stabilita con %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 "%C24*%O$tDCC SEND connessione stabilita con %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1406,8 +1252,7 @@ msgstr "%C16,17"
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
-"%C16,17 Maschera host                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
+msgstr "%C16,17 Maschera host                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1419,9 +1264,7 @@ msgstr "%OL'elenco utenti ignorati è vuoto."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tImpossibile entrare in %C22$1%C (%C20L'accesso al canale è "
-"solamente su invito%O)"
+msgstr "%C20*%O$tImpossibile entrare in %C22$1%C (%C20L'accesso al canale è solamente su invito%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1434,8 +1277,7 @@ msgstr "%C23*$t$1 ($3%C23) è entrato"
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
-"%C20*%O$tImpossibile entrare in %C22$1%C (%C20Richiesta parola chiave%O)"
+msgstr "%C20*%O$tImpossibile entrare in %C22$1%C (%C20Richiesta parola chiave%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
@@ -1460,8 +1302,7 @@ msgstr "%C23*%O$t%C28$1%C è errato. Nuovo tentativo con %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tSoprannome errato o già in uso. Usare /NICK per provarne un altro."
+msgstr "%C20*%O$tSoprannome errato o già in uso. Usare /NICK per provarne un altro."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1516,9 +1357,7 @@ msgstr "%C24*%O$tRisposta al ping da %C18$1%C: %C24$2%O secondi"
 
 #: src/common/textevents.h:331
 msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
-msgstr ""
-"%C20*%O$tNessuna risposta al ping per %C24$1%O secondi, disconnessione in "
-"corso."
+msgstr "%C20*%O$tNessuna risposta al ping per %C24$1%O secondi, disconnessione in corso."
 
 #: src/common/textevents.h:346
 msgid "%C24*%O$tA process is already running"
@@ -1555,8 +1394,7 @@ msgstr "%C29*%O$tRicerca di %C29$1%O"
 
 #: src/common/textevents.h:385
 msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
-msgstr ""
-"%C23*%O$tIl tentativo di connessione precedente è stato interrotto (%C24$1%O)"
+msgstr "%C23*%O$tIl tentativo di connessione precedente è stato interrotto (%C24$1%O)"
 
 #: src/common/textevents.h:388
 msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
@@ -1576,9 +1414,7 @@ msgstr "%C20*%O$tHost sconosciuto. Forse è scritto male?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tImpossibile entrare in %C22$1%C (%C20Raggiunto il limite di utenti"
-"%O)"
+msgstr "%C20*%O$tImpossibile entrare in %C22$1%C (%C20Raggiunto il limite di utenti%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1603,9 +1439,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inattivo %C23$2%O, connesso da: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O host efettivo: %C23$2%O, IP effettivo: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O host efettivo: %C23$2%O, IP effettivo: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1650,9 +1484,7 @@ msgstr "**** INIZIO REGISTRAZIONE: %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Impossibile aprire i file di registro in scrittura.\n"
-"  Verificare i permessi su %s"
+msgstr "* Impossibile aprire i file di registro in scrittura.\n  Verificare i permessi su %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -1859,8 +1691,7 @@ msgstr "Il soprannome della persona che è stata resa semi-operatore"
 
 #: src/common/text.c:1132
 msgid "The nick of the person who did the halfop'ing"
-msgstr ""
-"Il soprannome della persona che ha impostato lo stato di semi-operatore"
+msgstr "Il soprannome della persona che ha impostato lo stato di semi-operatore"
 
 #: src/common/text.c:1136
 msgid "The nick of the person who did the voice'ing"
@@ -1900,8 +1731,7 @@ msgstr "Il soprannome della persona che ha tolto lo stato di operatore"
 
 #: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
-msgstr ""
-"Il soprannome della persona che è stata rimossa dallo stato di operatore"
+msgstr "Il soprannome della persona che è stata rimossa dallo stato di operatore"
 
 #: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
@@ -1909,8 +1739,7 @@ msgstr "Il soprannome della persona che ha tolto lo stato di semi-operatore"
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
-msgstr ""
-"Il soprannome della persona che è stata rimossa dallo stato si semi-operatore"
+msgstr "Il soprannome della persona che è stata rimossa dallo stato si semi-operatore"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
@@ -2152,9 +1981,7 @@ msgstr "Ora del ban"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Impossibile leggere il file audio:\n"
-"%s"
+msgstr "Impossibile leggere il file audio:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3392,9 +3219,7 @@ msgstr "Data"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"È possibile aprire la finestra con l'elenco dei ban solo mentre si è nella "
-"scheda di un canale"
+msgstr "È possibile aprire la finestra con l'elenco dei ban solo mentre si è nella scheda di un canale"
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3515,18 +3340,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Impossibile accedere al file: %s\n"
-"%s.\n"
-"Impossibile ripristinarlo."
+msgstr "Impossibile accedere al file: %s\n%s.\nImpossibile ripristinarlo."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Il file nella directory di scaricamento è più grande di quello offerto. "
-"Impossibile ripristinarlo."
+msgstr "Il file nella directory di scaricamento è più grande di quello offerto. Impossibile ripristinarlo."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3656,9 +3476,7 @@ msgstr "Apri URL o esegui comando in una istanza di HexChat esistente"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Avvia minimizzato. Livello 0=normale 1=ridotto a icona 2=nell'area di "
-"notifica"
+msgstr "Avvia minimizzato. Livello 0=normale 1=ridotto a icona 2=nell'area di notifica"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3674,10 +3492,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Impossibile aprire il carattere:\n"
-"\n"
-"%s"
+msgstr "Impossibile aprire il carattere:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3695,105 +3510,72 @@ msgstr "Coda di invio rete: %d byte"
 
 #: 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 \\\\"
-msgstr ""
-"La funzione Run Command esegue il contenuto di «Dati 1» come se fosse stato "
-"digitato nella casella di testo dove è stata premuta la combinazione di "
-"tasti. Può contenere testo (che verrà inviato ad un canale/utente), comandi "
-"o comandi utente. Quando in «Dati 1» sono presenti più comandi, i caratteri "
-"\\n vengono utilizzati per separali, in modo da eseguire più di un comando. "
-"Per inserire una \\ nell'attuale esecuzione testuale digitare \\\\"
+"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 "La funzione Run Command esegue il contenuto di «Dati 1» come se fosse stato digitato nella casella di testo dove è stata premuta la combinazione di tasti. Può contenere testo (che verrà inviato ad un canale/utente), comandi o comandi utente. Quando in «Dati 1» sono presenti più comandi, i caratteri \\n vengono utilizzati per separali, in modo da eseguire più di un comando. Per inserire una \\ nell'attuale esecuzione testuale digitare \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"La funzione Change Page consente di spostarsi tra le pagine aperte. Inserire "
-"in «Dati 1» la pagina a cui si vuole accedere. Se «Dati 2» è impostato il "
-"cambio sarà relativo alla posizione attuale. Impostare «Dati 1» ad «auto» "
-"per spostarsi nella pagina con l'attività più recente e importante (prima le "
-"query, poi i canali con messaggi evidenziati, i canali con dialoghi, quindi "
-"i canali con altri dati)"
+msgstr "La funzione Change Page consente di spostarsi tra le pagine aperte. Inserire in «Dati 1» la pagina a cui si vuole accedere. Se «Dati 2» è impostato il cambio sarà relativo alla posizione attuale. Impostare «Dati 1» ad «auto» per spostarsi nella pagina con l'attività più recente e importante (prima le query, poi i canali con messaggi evidenziati, i canali con dialoghi, quindi i canali con altri dati)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"La funzione Insert in Buffer inserirà il contenuto di «Dati 1» nella casella "
-"di testo dove è stata eseguita la combinazione di tasti nella posizione "
-"attuale del cursore"
+msgstr "La funzione Insert in Buffer inserirà il contenuto di «Dati 1» nella casella di testo dove è stata eseguita la combinazione di tasti nella posizione attuale del cursore"
 
 #: 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."
-msgstr ""
-"Il comando Scroll Page scorre l'oggetto testo su o giù di una pagina o di "
-"una riga. Impostare Data 1 a Top, Bottom, Up, Down, +1 o -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 "Il comando Scroll Page scorre l'oggetto testo su o giù di una pagina o di una riga. Impostare Data 1 a Top, Bottom, Up, Down, +1 o -1."
 
 #: 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 ""
-"La funzione Set Buffer inserisce nella casella di testo dove viene premuta "
-"la combinazione di tasti il valore contenuto in «Dati 1»"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "La funzione Set Buffer inserisce nella casella di testo dove viene premuta la combinazione di tasti il valore contenuto in «Dati 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 ""
-"La funzione Last Command inserisce nella casella di testo l'ultimo comando "
-"disponibile digitato - così come accade premendo il tasto «freccia su» in un "
-"terminale"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "La funzione Last Command inserisce nella casella di testo l'ultimo comando disponibile digitato - così come accade premendo il tasto «freccia su» in un terminale"
 
 #: 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 ""
-"La funzione Next Command inserisce nella casella di testo il successivo "
-"comando disponibile - così come accade premendo il tasto «freccia giù» in un "
-"terminale"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "La funzione Next Command inserisce nella casella di testo il successivo comando disponibile - così come accade premendo il tasto «freccia giù» in un terminale"
 
 #: 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 ""
-"Questo comando modifica il testo digitato per completare automaticamente un "
-"soprannome o un comando. Se «Dati 1» è configurato, la doppia pressione del "
-"tasto «Tab» in una stringa selezionerà l'ultimo soprannome e non il "
-"successivo"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Questo comando modifica il testo digitato per completare automaticamente un soprannome o un comando. Se «Dati 1» è configurato, la doppia pressione del tasto «Tab» in una stringa selezionerà l'ultimo soprannome e non il successivo"
 
 #: 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 ""
-"Questo comando scorre l'elenco dei soprannomi. Se «Dati 1» è impostato lo "
-"scorrimento avverrà verso l'altro, altrimenti verso il basso"
+"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 "Questo comando scorre l'elenco dei soprannomi. Se «Dati 1» è impostato lo scorrimento avverrà verso l'altro, altrimenti verso il basso"
 
 #: 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 ""
-"Questo comando controlla l'ultima parola inserita nella casella di testo con "
-"l'elenco delle risposte, se viene trovata una corrispondenza viene sostituita"
+msgstr "Questo comando controlla l'ultima parola inserita nella casella di testo con l'elenco delle risposte, se viene trovata una corrispondenza viene sostituita"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3813,14 +3595,11 @@ msgstr "Questo comando sposta il gruppo di schede attuale verso destra"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Inserisci la riga di inserimento nella cronologia ma senza inviarla al server"
+msgstr "Inserisci la riga di inserimento nella cronologia ma senza inviarla al server"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Si è verificato un errore caricando la configurazione delle combinazioni di "
-"tasti"
+msgstr "Si è verificato un errore caricando la configurazione delle combinazioni di tasti"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3923,9 +3702,7 @@ msgstr "Connessione a %s completata."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"Nella finestra con l'elenco dei server, nessun canale (stanza) è stato "
-"scelto per l'ingresso automatico in questa rete."
+msgstr "Nella finestra con l'elenco dei server, nessun canale (stanza) è stato scelto per l'ingresso automatico in questa rete."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3941,8 +3718,7 @@ msgstr "_Entrare in questo canale:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Se si conosce il nome del canale nel quale si vuole entrare, digitarlo qui."
+msgstr "Se si conosce il nome del canale nel quale si vuole entrare, digitarlo qui."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3974,8 +3750,7 @@ msgstr "Nessun argomento impostato"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Questo server ha ancora %d canali o dialoghi associati. Chiudere tutto?"
+msgstr "Questo server ha ancora %d canali o dialoghi associati. Chiudere tutto?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4206,10 +3981,7 @@ msgstr "%d soprannomi selezionati."
 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 ""
-"La barra dei menù è ora nascosta. È possibile mostrarla nuovamente premendo "
-"Ctrl+F9 o facendo clic con il pulsante destro in uno spazio vuoto dell'area "
-"di testo principale."
+msgstr "La barra dei menù è ora nascosta. È possibile mostrarla nuovamente premendo Ctrl+F9 o facendo clic con il pulsante destro in uno spazio vuoto dell'area di testo principale."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4267,9 +4039,7 @@ msgstr "Linea di demarcazione reimpostata manualmente."
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"Linea di demarcazione reimpostata a causa del superamento del limite per le "
-"conversazioni precedenti."
+msgstr "Linea di demarcazione reimpostata a causa del superamento del limite per le conversazioni precedenti."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
@@ -4307,25 +4077,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Comandi utente - Codici speciali:\n"
-"\n"
-"%c  =  canale attuale\n"
-"%e  =  nome della rete attuale\n"
-"%m  =  informazioni sulla macchina\n"
-"%n  =  proprio soprannome\n"
-"%t  =  ora/data\n"
-"%v  =  versione HexChat\n"
-"%2  =  parola 2\n"
-"%3  =  parola 3\n"
-"&2  =  parola 2 alla fine della riga\n"
-"&3  =  parola 3 alla fine della riga\n"
-"\n"
-"esempio:\n"
-"/cmd john ciao\n"
-"\n"
-"%2 dovrebbe essere \"john\"\n"
-"&2 dovrebbe essere \"john ciao\""
+msgstr "Comandi utente - Codici speciali:\n\n%c  =  canale attuale\n%e  =  nome della rete attuale\n%m  =  informazioni sulla macchina\n%n  =  proprio soprannome\n%t  =  ora/data\n%v  =  versione HexChat\n%2  =  parola 2\n%3  =  parola 3\n&2  =  parola 2 alla fine della riga\n&3  =  parola 3 alla fine della riga\n\nesempio:\n/cmd john ciao\n\n%2 dovrebbe essere \"john\"\n&2 dovrebbe essere \"john ciao\""
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4340,18 +4092,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Pulsanti elenco utente - codici speciali:\n"
-"\n"
-"%a = tutti i soprannomi selezionati\n"
-"%c = canale attuale\n"
-"%e = nome rete attuale\n"
-"%h = nomi host dei soprannomi selezionati\n"
-"%m = informazioni sulla macchina\n"
-"%n = proprio soprannome\n"
-"%s = soprannome selezionato\n"
-"%t = orario/data\n"
-"%u = account utenti selezionati"
+msgstr "Pulsanti elenco utente - codici speciali:\n\n%a = tutti i soprannomi selezionati\n%c = canale attuale\n%e = nome rete attuale\n%h = nomi host dei soprannomi selezionati\n%m = informazioni sulla macchina\n%n = proprio soprannome\n%s = soprannome selezionato\n%t = orario/data\n%u = account utenti selezionati"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4366,19 +4107,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Pulsanti dialogo - codici speciali:\n"
-"\n"
-"\n"
-"%a = tutti i soprannomi selezionati\n"
-"%c = canale attuale\n"
-"%e = nome rete attuale\n"
-"%h = nomi host dei soprannomi selezionati\n"
-"%m = informazioni sulla macchina\n"
-"%n = proprio soprannome\n"
-"%s = soprannome selezionato\n"
-"%t = orario/data\n"
-"%u = account utenti selezionati"
+msgstr "Pulsanti dialogo - codici speciali:\n\n\n%a = tutti i soprannomi selezionati\n%c = canale attuale\n%e = nome rete attuale\n%h = nomi host dei soprannomi selezionati\n%m = informazioni sulla macchina\n%n = proprio soprannome\n%s = soprannome selezionato\n%t = orario/data\n%u = account utenti selezionati"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4394,19 +4123,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Risposte CTCP - Codici speciali:\n"
-"\n"
-"%d  =  dati (tutto il ctcp)\n"
-"%e  =  nome della rete attuale\n"
-"%m  =  informazioni sulla macchina\n"
-"%s  =  soprannome di chi ha inviato il ctcp\n"
-"%t  =  ora/data\n"
-"%2  =  parola 2\n"
-"%3  =  parola 3\n"
-"&2  =  parola 2 alla fine della riga\n"
-"&3  =  parola 3 alla fine della riga\n"
-"\n"
+msgstr "Risposte CTCP - Codici speciali:\n\n%d  =  dati (tutto il ctcp)\n%e  =  nome della rete attuale\n%m  =  informazioni sulla macchina\n%s  =  soprannome di chi ha inviato il ctcp\n%t  =  ora/data\n%2  =  parola 2\n%3  =  parola 3\n&2  =  parola 2 alla fine della riga\n&3  =  parola 3 alla fine della riga\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4418,14 +4135,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Gestori URL - Codici speciali:\n"
-"\n"
-"%s  =  stringa dell'URL\n"
-"\n"
-"Inserire un «!» davanti al comando\n"
-"indica che deve essere inviato\n"
-"ad un terminale invece che ad HexChat"
+msgstr "Gestori URL - Codici speciali:\n\n%s  =  stringa dell'URL\n\nInserire un «!» davanti al comando\nindica che deve essere inviato\nad un terminale invece che ad HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4954,9 +4664,7 @@ msgstr "È necessario avere due soprannomi univoci."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Il metodo usato per autenticarsi sul server. Per metodi di accesso "
-"personalizzati usare i comandi di connessione."
+msgstr "Il metodo usato per autenticarsi sul server. Per metodi di accesso personalizzati usare i comandi di connessione."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4981,11 +4689,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Soprannome\n"
-"%p=Password\n"
-"%r=Nome vero\n"
-"%u=Nome utente"
+msgstr "%n=Soprannome\n%p=Password\n%r=Nome vero\n%u=Nome utente"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5049,8 +4753,7 @@ msgstr "Password:"
 
 #: src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
-"Password usata per effettuare l'accesso. In caso di subbio, lasciare vuoto."
+msgstr "Password usata per effettuare l'accesso. In caso di subbio, lasciare vuoto."
 
 #: src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
@@ -5093,9 +4796,7 @@ msgstr "_Ordina"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Ordina l'elenco delle reti alfabeticamente. Usare i tasti Maiusc+Freccia sù "
-"e Maiusc+Freccia giù per spostare una riga."
+msgstr "Ordina l'elenco delle reti alfabeticamente. Usare i tasti Maiusc+Freccia sù e Maiusc+Freccia giù per spostare una riga."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5445,9 +5146,7 @@ msgstr "Dizionario da usare:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Usa codici lingua (come in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
-"Separare le voci con un virgola."
+msgstr "Usa codici lingua (come in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSeparare le voci con un virgola."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5571,9 +5270,7 @@ msgstr "Stato di assenza"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Tieni traccia degli stati di assenza degli utenti e contrassegnali con un "
-"colore differente"
+msgstr "Tieni traccia degli stati di assenza degli utenti e contrassegnali con un colore differente"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5763,9 +5460,8 @@ msgid "Chat window"
 msgstr "Finestra di chat"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Velocità massima per il trasferimento file (Byte per secondo)"
+msgstr "Velocità massima di trasferimento (byte al secondo)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5819,17 +5515,13 @@ msgstr "Emettere un suono per:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Riproduce il suono di sistema per le notifiche di messaggistica istantanea "
-"per gli eventi selezionati"
+msgstr "Riproduce il suono di sistema per le notifiche di messaggistica istantanea per gli eventi selezionati"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Riproduce il suono per le notifiche di messaggistica istantanea dal tema "
-"freedesktop.org per gli eventi selezionati"
+msgstr "Riproduce il suono per le notifiche di messaggistica istantanea dal tema freedesktop.org per gli eventi selezionati"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5867,8 +5559,7 @@ msgstr "Assegnare e rimuovere automaticamente lo stato di assenza"
 
 #: src/fe-gtk/setup.c:423 src/fe-gtk/setup.c:467
 msgid "Automatically change status when hiding to tray."
-msgstr ""
-"Cambia automaticamente lo stato quando si minimizza la finestra nel vassoio."
+msgstr "Cambia automaticamente lo stato quando si minimizza la finestra nel vassoio."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
@@ -5883,9 +5574,7 @@ msgstr "Messaggi evidenziati"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"I messaggi evidenziati sono quelli in cui compare il proprio soprannome, ma "
-"anche:"
+msgstr "I messaggi evidenziati sono quelli in cui compare il proprio soprannome, ma anche:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5907,9 +5596,7 @@ msgstr "Soprannomi da evidenziare sempre:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separare le parole con virgole.\n"
-"Sono ammessi i meta-caratteri."
+msgstr "Separare le parole con virgole.\nSono ammessi i meta-caratteri."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5965,9 +5652,7 @@ msgstr "WHOIS su notifica"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Invia il comando /WHOIS quando un utente presente nell'elenco di notifica si "
-"collega."
+msgstr "Invia il comando /WHOIS quando un utente presente nell'elenco di notifica si collega."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5975,8 +5660,7 @@ msgstr "Nascondere i messaggi di entrata e uscita"
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide channel join/part messages by default."
-msgstr ""
-"Nasconde i messaggi di entrata e uscita nei canali in maniera predefinita."
+msgstr "Nasconde i messaggi di entrata e uscita nei canali in maniera predefinita."
 
 #: src/fe-gtk/setup.c:540
 msgid "Hide nick change messages"
@@ -6010,10 +5694,7 @@ msgstr "Copiare automaticamente il testo selezionato"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Copia il testo selezionato negli appunti quando il pulsante sinistro del "
-"mouse viene rilasciato. In alternativa, usare Ctrl+Maiusc+C per copiare il "
-"testo selezionato negli appunti"
+msgstr "Copia il testo selezionato negli appunti quando il pulsante sinistro del mouse viene rilasciato. In alternativa, usare Ctrl+Maiusc+C per copiare il testo selezionato negli appunti"
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -6021,12 +5702,9 @@ msgstr "Includere automaticamente marcatura temporale"
 
 #: 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."
-msgstr ""
-"Include automaticamente la marcaura temporale nelle righe di testo copiate. "
-"In alternativa, include la marcatura temporale se li tasto Maiusc è premuto "
-"durante la selezione."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Include automaticamente la marcaura temporale nelle righe di testo copiate. In alternativa, include la marcatura temporale se li tasto Maiusc è premuto durante la selezione."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -6034,12 +5712,9 @@ msgstr "Includere automaticamente le informazioni sul colore"
 
 #: 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."
-msgstr ""
-"Include automaticamente le informazioni sul colore nelle righe di testo "
-"copiate. In alternativa, include le informazioni sul colore se il tasto Ctrl "
-"è premuto durante la selezione."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Include automaticamente le informazioni sul colore nelle righe di testo copiate. In alternativa, include le informazioni sul colore se il tasto Ctrl è premuto durante la selezione."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6069,9 +5744,7 @@ msgstr "Usare l'ora del server se supportata"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Mostra l'orario ottenuto dal server se è supportata l'estensione \"time-"
-"server\"."
+msgstr "Mostra l'orario ottenuto dal server se è supportata l'estensione \"time-server\"."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6091,10 +5764,9 @@ msgstr "Tipo di ban:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Tenta di usare questa maschera per i ban e i quiet. (È richiesto "
+"Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
+msgstr "Tenta di usare questa maschera per i ban e i quiet. (È richiesto irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6155,11 +5827,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6203,11 +5875,9 @@ msgstr "Ottenere l'indirizzo dal server 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 ""
-"Chiede al server IRC il vero indirizzo. Abilitare questa funzione se si "
-"utilizza un indirizzo 192.168.*.*"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Chiede al server IRC il vero indirizzo. Abilitare questa funzione se si utilizza un indirizzo 192.168.*.*"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6254,9 +5924,8 @@ msgid "Proxy Authentication"
 msgstr "Autenticazione proxy"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Usa autenticazione (solo HTTP o Socks5)"
+msgstr "Usa autenticazione (solo HTTP o SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6278,9 +5947,7 @@ msgstr "Il server risponderà con il nome utente delle reti"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Sono necessari i permessi per ascoltare su questa porta. Se non è la 113 (0 "
-"equivale a questa) allora è necessario configurare il port forwarding."
+msgstr "Sono necessari i permessi per ascoltare su questa porta. Se non è la 113 (0 equivale a questa) allora è necessario configurare il port forwarding."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6442,22 +6109,15 @@ msgstr "Categorie"
 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 ""
-"Impossibile posizionare l'albero in alto o in basso.\n"
-"Selezionare prima la vista a <b>Schede</b> nel menù <b>Visualizza</b>."
+msgstr "Impossibile posizionare l'albero in alto o in basso.\nSelezionare prima la vista a <b>Schede</b> nel menù <b>Visualizza</b>."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"L'opzione del vero nome non può essere vuota. Verrà ripristinato il valore "
-"\"realname\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "L'opzione del vero nome non può essere vuota. Verrà ripristinato il valore \"realname\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Alcune impostazioni sono state modificate e richiedono il riavvio per essere "
-"applicate."
+msgstr "Alcune impostazioni sono state modificate e richiedono il riavvio per essere applicate."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6465,11 +6125,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 ""
-"*ATTENZIONE*\n"
-"Accettare automaticamente DCC nella propria home\n"
-"potrebbe essere pericoloso. Esempio:\n"
-"Qualcuno potrebbe inserire un file .bash_profile"
+msgstr "*ATTENZIONE*\nAccettare automaticamente DCC nella propria home\npotrebbe essere pericoloso. Esempio:\nQualcuno potrebbe inserire un file .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6583,12 +6239,9 @@ msgstr "Sysinfo: %s è impostato a: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: le impostazioni valide sono: announce e hide_* per ogni parte delle "
-"informazioni. Per esempio hide_os. Senza un valore verrà mostrato il "
-"contenuto attuale (o predefinito).\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: le impostazioni valide sono: announce e hide_* per ogni parte delle informazioni. Per esempio hide_os. Senza un valore verrà mostrato il contenuto attuale (o predefinito).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6603,9 +6256,3 @@ msgstr "Plugin %s attivato\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Plugin %s disattivato\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Sock4"
-
-#~ msgid "Socks5"
-#~ msgstr "Sock5"
diff --git a/po/ja_JP.po b/po/ja_JP.po
index 61bd0fd9..7160556a 100644
--- a/po/ja_JP.po
+++ b/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"
diff --git a/po/kn.po b/po/kn.po
index 6f8e3f82..02d0945a 100644
--- a/po/kn.po
+++ b/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"
diff --git a/po/ko.po b/po/ko.po
index b5207666..6a74b847 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,24 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
 # Intrainos, 2016
-# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014,2016-2017
+# Intrainos, 2016
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014,2016-2017,2019
 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-26 06:00+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2019-04-02 01:54+0000\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.com/hexchat/hexchat/language/"
-"ko/)\n"
-"Language: ko\n"
+"Language-Team: Korean (http://www.transifex.com/hexchat/hexchat/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -37,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 ""
-"헥스채트는 사용하기 쉽고 확장성이 뛰어난 IRC 클라이언트 입니다. 여러 네트워크"
-"에 안전하게 참여할 수 있으며, 여러분이 직접 유연하게 꾸밀 수 있는 인터페이스"
-"를 사용하여 다른 사람과 개인적으로 대화하거나 대화방에서 대화할 수 있습니다. "
-"게다가 파일도 보낼 수 있습니다."
+msgstr "헥스채트는 사용하기 쉽고 확장성이 뛰어난 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 ""
-"핵스채트는 DCC, SASL, 프록시 서버, 철자 검사, 경고, 기록, 사용자 정의 테마, "
-"파이썬/펄 스크립트 같은 기능을 지원합니다."
+msgstr "핵스채트는 DCC, SASL, 프록시 서버, 철자 검사, 경고, 기록, 사용자 정의 테마, 파이썬/펄 스크립트 같은 기능을 지원합니다."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -306,9 +300,7 @@ msgstr "%s에 쓰기 권한이 없습니다. 이 세션에서 저장할 수 없�
 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
@@ -330,9 +322,7 @@ msgstr "%s님에게서 너무 많은 CTCP 요청을 받고 있으므로 %s님을
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"%s에서 과도한 양의 메시지가 오고 있습니다. gui_autoopen_dialog를 OFF로 설정하"
-"십시오.\n"
+msgstr "%s에서 과도한 양의 메시지가 오고 있습니다. gui_autoopen_dialog를 OFF로 설정하십시오.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -364,13 +354,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
@@ -437,9 +425,7 @@ msgstr "ADDBUTTON <버튼이름> <동작>, 사용자 목록에 버튼을 추가�
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <새네트워크> <새서버주소/6667>, 네트워크 목록에 새 서버주소와 새 네"
-"트워크를 추가합니다"
+msgstr "ADDSERVER <새네트워크> <새서버주소/6667>, 네트워크 목록에 새 서버주소와 새 네트워크를 추가합니다"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -455,9 +441,7 @@ msgstr "ALLSERV <명령>. 연결 중인 모든 서버에서 명령을 수행합�
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<reason>], 명령은 자리비움을 설정합니다(설정을 해제하려면 /BACK 명령 사"
-"용)"
+msgstr "AWAY [<reason>], 명령은 자리비움을 설정합니다(설정을 해제하려면 /BACK 명령 사용)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -468,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 <마스크> [<입장금지형식>], 현재 대화방에서 해당되는 마스크에 속한 모든 사"
-"람을 대화방에 입장하지 못하게 합니다. 이미 대화방에 있는 참여자는 강제 퇴장되"
-"지 않습니다(관리 권한 필요)"
+msgstr "BAN <마스크> [<입장금지형식>], 현재 대화방에서 해당되는 마스크에 속한 모든 사람을 대화방에 입장하지 못하게 합니다. 이미 대화방에 있는 참여자는 강제 퇴장되지 않습니다(관리 권한 필요)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -479,44 +460,37 @@ 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 ""
-"CLEAR [ALL|HISTORY|[-]<개수>], 현재 텍스트 창 또는 명령 기록을 지웁니다"
+msgstr "CLEAR [ALL|HISTORY|[-]<개수>], 현재 텍스트 창 또는 명령 기록을 지웁니다"
 
 #: 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 ""
-"CLOSE [-m], 열린 탭이 하나만 있을 경우 창을 닫거나, \"-m\" 플래그로 모든 요청"
-"문을 닫는 식으로 현재 탭을 닫습니다."
+msgstr "CLOSE [-m], 열린 탭이 하나만 있을 경우 창을 닫거나, \"-m\" 플래그로 모든 요청문을 닫는 식으로 현재 탭을 닫습니다."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <코드|와일드카드>, 국가 코드를 찾습니다. 예: au = 오스트레일리아"
+msgstr "COUNTRY [-s] <코드|와일드카드>, 국가 코드를 찾습니다. 예: 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"
-msgstr ""
-"CYCLE [<대화방>], 현재 대화방 또는 주어진 대화방을 나갔다가 바로 다시 들어옵"
-"니다"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<대화방>], 현재 대화방 또는 주어진 대화방을 나갔다가 바로 다시 들어옵니다"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -529,26 +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 <대화명>                      - 해당 사용자에게 파일 받기를 시도합니"
-"다\n"
-"DCC SEND [-maxcps=#] <대화명> [파일]  - 해당 사용자에게 파일을 전송합니다\n"
-"DCC PSEND [-maxcps=#] <대화명> [파일] - 해당 사용자에게 파일을 Passive 모드"
-"로 전송합니다\n"
-"DCC LIST                              - DCC 목록을 표시합니다\n"
-"DCC CHAT <대화명>                     - 해당 사용자와 1:1 대화를 시도합니다\n"
-"DCC PCHAT <대화명>                    - 해당 사용자와 1:1 대화를 Passive 모드"
-"로 시도합니다\n"
-"DCC CLOSE <명령> <대화명> <파일>        예제:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <대화명>                      - 해당 사용자에게 파일 받기를 시도합니다\nDCC SEND [-maxcps=#] <대화명> [파일]  - 해당 사용자에게 파일을 전송합니다\nDCC PSEND [-maxcps=#] <대화명> [파일] - 해당 사용자에게 파일을 Passive 모드로 전송합니다\nDCC LIST                              - DCC 목록을 표시합니다\nDCC CHAT <대화명>                     - 해당 사용자와 1:1 대화를 시도합니다\nDCC PCHAT <대화명>                    - 해당 사용자와 1:1 대화를 Passive 모드로 시도합니다\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"
@@ -564,9 +525,7 @@ msgstr "DEOP <대화명>, 현재 대화방에서 관리 권한을 박탈합니�
 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"
@@ -588,9 +547,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"
@@ -600,9 +557,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"
@@ -622,9 +577,7 @@ msgstr "FLUSHQ, 현재 서버에 보낼 목록을 제거합니다"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <호스트> [<포트>], 해당 호스트를 프록시로 사용합니다. 포트의 기본값은 23"
-"입니다."
+msgstr "GATE <호스트> [<포트>], 해당 호스트를 프록시로 사용합니다. 포트의 기본값은 23입니다."
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -632,8 +585,7 @@ msgstr "GHOST <대화명> [암호], 유령처럼 남은 대화명의 사용자�
 
 #: 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"
@@ -646,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 <마스크> <형식..> <추가 인자..>\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"
@@ -668,17 +613,13 @@ msgstr "JOIN <대화방> [<암호>], 대화방에 입장합니다"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <대화명> [이유], 현재 대화방에서 대화명을 가진 사용자를 강제 퇴장시킵니"
-"다(관리 권한 필요)"
+msgstr "KICK <대화명> [이유], 현재 대화방에서 대화명을 가진 사용자를 강제 퇴장시킵니다(관리 권한 필요)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <대화명> [이유], 현재 대화방에서 대화명을 가진 사용자를 입장 금지한 "
-"후 강제 퇴장시킵니다(관리 권한 필요)"
+msgstr "KICKBAN <대화명> [이유], 현재 대화방에서 대화명을 가진 사용자를 입장 금지한 후 강제 퇴장시킵니다(관리 권한 필요)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -690,14 +631,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"
@@ -706,8 +641,7 @@ 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)"
@@ -715,15 +649,13 @@ 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 <동작>, 현재 대화방에서 동작을 취합니다(동작은 3자에게 사용합니다. 예: /"
-"me 후다다닭==33)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <동작>, 현재 대화방에서 동작을 취합니다(동작은 3자에게 사용합니다. 예: /me 후다다닭==33)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MOP, 현재 대화방의 모든 사용자에게 일부 관리 권한을 부여합니다(관리 권한 필요)"
 
 #: src/common/outbound.c:4047
 msgid ""
@@ -732,17 +664,13 @@ 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"
-msgstr ""
-"MSG <대화명> <메시지>, 귓속말 메시지를 보냅니다. 메시지를 보내려면 대화명 마"
-"지막에 메시지 \".\"을 붙이든지, DCC 대화를 하려면 \"=\"를 메시지 앞에 붙이십"
-"시오"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <대화명> <메시지>, 귓속말 메시지를 보냅니다. 메시지를 보내려면 대화명 마지막에 메시지 \".\"을 붙이든지, DCC 대화를 하려면 \"=\"를 메시지 앞에 붙이십시오"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -768,21 +696,16 @@ msgstr "NOTICE <대화명/대화방> <메시지>, 알림을 보냅니다"
 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 <대화명>, 해당 사용자에게 대화방 관리 권한을 부여합니다(관리 권한 필요)"
+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"
@@ -792,17 +715,13 @@ msgstr "PING <대화명 | 대화방>, 사용자나 대화방에 CTCP 핑을 보�
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <대화명> [메시지], 새 귓속말 창을 열고 추가적으로 메시지를 "
-"보냅니다"
+msgstr "QUERY [-nofocus] <대화명> [메시지], 새 귓속말 창을 열고 추가적으로 메시지를 보냅니다"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <마스크> [<발언권박탈형식>], 서버에서 지원하는 경우 현재 대화방에서 조"
-"건에 일치하는 모두의 발언권을 박탈합니다."
+msgstr "QUIET <마스크> [<발언권박탈형식>], 서버에서 지원하는 경우 현재 대화방에서 조건에 일치하는 모두의 발언권을 박탈합니다."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -814,29 +733,23 @@ 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 ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <텍스트>, IRC 서버의 데이터와 같은 원시 데이터를 헥스채트에 보냅니다"
+msgstr "RECV <텍스트>, IRC 서버의 데이터와 같은 원시 데이터를 헥스채트에 보냅니다"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -852,31 +765,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>]"
@@ -896,10 +801,9 @@ msgstr "SETTEXT <새텍스트>,  입력 창의 텍스트 내용을 바꿉니다"
 
 #: 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 ""
@@ -909,19 +813,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 <제한시간> <파일1> [<파일2>] 트레이에서 두 개의 아이콘을 깜빡이게 합"
-"니다.\n"
-"TRAY -f <파일 이름>                 트레이에 해당 아이콘으로 설정합니다.\n"
-"TRAY -i <번호>                      내장 아이콘을 깜빡입니다.\n"
-"TRAY -t <텍스트>                    트레이에 도움말을 표시합니다.\n"
-"TRAY -b <제목> <텍스트>             트레이에 제목을 표시합니다."
+msgstr "\nTRAY -f <제한시간> <파일1> [<파일2>] 트레이에서 두 개의 아이콘을 깜빡이게 합니다.\nTRAY -f <파일 이름>                 트레이에 해당 아이콘으로 설정합니다.\nTRAY -i <번호>                      내장 아이콘을 깜빡입니다.\nTRAY -t <텍스트>                    트레이에 도움말을 표시합니다.\nTRAY -b <제목> <텍스트>             트레이에 제목을 표시합니다."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <마스크> [<마스크>...], 지정한 마스크를 입장 금지 목록에서 해제합니다."
+msgstr "UNBAN <마스크> [<마스크>...], 지정한 마스크를 입장 금지 목록에서 해제합니다."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -933,11 +829,9 @@ msgstr "UNLOAD <이름>, 추가 기능 또는 스크립트의 사용을 중지�
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <마스크> [<마스크>...], 서버에서 지원하는 경우 지정한 마스크와 일치하"
-"는 사용자의 발언권 박탈을 해제합니다."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <마스크> [<마스크>...], 서버에서 지원하는 경우 지정한 마스크와 일치하는 사용자의 발언권 박탈을 해제합니다."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -945,10 +839,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)"
@@ -977,9 +870,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"
@@ -1048,9 +939,7 @@ msgstr "정말 SSL을 사용할 수 있는 서버와 포트입니까?\n"
 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"
@@ -1066,9 +955,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."
@@ -1112,8 +999,7 @@ msgstr "%C22*%O$t%C22$1%O 대화방은 %C24$2%O에 개설했습니다"
 
 #: src/common/textevents.h:46
 msgid "%C22*%O$t%C26$1%O removes channel half-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:49
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
@@ -1129,8 +1015,7 @@ msgstr "%C22*%O$t%C26$1%C님이 %C18$2%O의 제외 조건을 설정했습니다"
 
 #: src/common/textevents.h:58
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %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:61
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
@@ -1222,17 +1107,16 @@ msgstr "%C24*%O$t%C18$2%C님에게 %C24$1%O CTCP 소리를 받았습니다"
 
 #: src/common/textevents.h:139
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
-msgstr ""
-"%C24*%O$t%C18$2%C님에게 %C24$1%C CTCP 소리를 (%C22$3%O(으)로) 받았습니다"
+msgstr "%C24*%O$t%C18$2%C님에게 %C24$1%C CTCP 소리를 (%C22$3%O(으)로) 받았습니다"
 
 #: src/common/textevents.h:142
 msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$t%C18$1%O님과의 DCC CHAT을 중단했습니다."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$t%C18$1%C에 대한 DCC CHAT 연결이 성립되었습니다. %C30[%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%O$t%C18$1%C에 대한 DCC CHAT 연결이 성립되었습니다. %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1261,15 +1145,13 @@ msgstr "%C23*%O$t%C18$2%O님에게 '%C23$1%C'을(를) 받았습니다"
 #: src/common/textevents.h:166
 #, c-format
 msgid "%C16,17 Type  To/From    Status  Size    Pos     File"
-msgstr ""
+msgstr "%C16,17 형식  송/수신    상태    크기    위치    파일         "
 
 #: 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"
-msgstr ""
-"%C20*%O$t%C18$1%O님에게 잘못된 DCC 요청을 받았습니다.$a010%C23*%O$t패킷 내"
-"용: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$t%C18$1%O님에게 잘못된 DCC 요청을 받았습니다.$a010%C23*%O$t패킷 내용: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1286,14 +1168,12 @@ msgstr "%C23*%O$t%C18$1%O으로의 DCC RECV '%C23$2%O'을(를) 중단했습니�
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$t%C18$3%O님의 DCC RECV '%C23$1%O'을(를) 완료했습니다. %C30[%C24$4%O "
-"cps%C30]%O"
+msgstr "%C24*%O$t%C18$3%O님의 DCC RECV '%C23$1%O'을(를) 완료했습니다. %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$t%C18$1%O님께 DCC RECV 연결을 만들었습니다 %C30[%O%C24$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$t%C18$1%O님께 DCC RECV 연결을 만들었습니다 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1305,14 +1185,13 @@ msgstr "%C20*%O$tDCC RECV: 기록용 '%C23$1%C' 파일을 열 수 없습니다(%
 
 #: 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 "%C23*%O$t'%C24$1%C' 파일이 있어, 대신 '%C23$2%O' 이름으로 저장합니다."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
-msgstr ""
-"%C24*%O$t%C18$1%C님이 %C24$3%C(으)로부터 '%C23$2%C'을(를) 재개하도록 요청했습"
-"니다."
+msgstr "%C24*%O$t%C18$1%C님이 %C24$3%C(으)로부터 '%C23$2%C'을(를) 재개하도록 요청했습니다."
 
 #: src/common/textevents.h:199
 msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
@@ -1321,18 +1200,16 @@ msgstr "%C23*%O$t%C18$1%C님에 대한 '%C23$2%O' DCC SEND를 취소했습니다
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$t%C18$2%C님께 DCC SEND '%C23$1%C'을(를) 완료했습니다. %C30[%C24$3%C "
-"cps%C30]%O"
+msgstr "%C24*%O$t%C18$2%C님께 DCC SEND '%C23$1%C'을(를) 완료했습니다. %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$t%C18$1 %C30[%O%C24$2%C30]로 DCC SEND 연결이 만들어졌습니다 %O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
-msgstr ""
-"%C20*%O$t%C18$2%C님에 대한 DCC SEND '%C23$1%C'에 실패했습니다 (%C20$3%O)"
+msgstr "%C20*%O$t%C18$2%C님에 대한 DCC SEND '%C23$1%C'에 실패했습니다 (%C20$3%O)"
 
 #: src/common/textevents.h:211
 msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
@@ -1340,14 +1217,11 @@ msgstr "%C24*%O$t%C18$1%C님이 '%C23$2%C'을(를) 보냈습니다(%C24$3%O byte
 
 #: src/common/textevents.h:214
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
-msgstr ""
-"%C20*%O$t%C18$3%O님에 대한 DCC $1 '%C23$2%C'을(를) 멈췄습니다. 중지합니다."
+msgstr "%C20*%O$t%C18$3%O님에 대한 DCC $1 '%C23$2%C'을(를) 멈췄습니다. 중지합니다."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$t%C18$3%O님에 대한 DCC $1 '%C23$2%C' 처리 시간이 초과되었습니다. 중지"
-"합니다."
+msgstr "%C20*%O$t%C18$3%O님에 대한 DCC $1 '%C23$2%C' 처리 시간이 초과되었습니다. 중지합니다."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1377,7 +1251,7 @@ msgstr "%C16,17"
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
+msgstr "%C16,17 호스트마스크              PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1406,13 +1280,11 @@ msgstr "%C20*%O$t%C22$1%C에 입장할 수 없습니다(%C20암호 필요%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
-msgstr ""
-"%C22*%O$t%C26$1%C님께서 %C22$3%C에서 %C18$2%C님을 추방했습니다(%C24$4%O)"
+msgstr "%C22*%O$t%C26$1%C님께서 %C22$3%C에서 %C18$2%C님을 추방했습니다(%C24$4%O)"
 
 #: src/common/textevents.h:265
 msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
-msgstr ""
-"%C18$1%C%C19*%O$t%C19%C26$1%C님이 당신의 연결을 강제로 끊었습니다(%C20$2%O)"
+msgstr "%C18$1%C%C19*%O$t%C19%C26$1%C님이 당신의 연결을 강제로 끊었습니다(%C20$2%O)"
 
 #: src/common/textevents.h:274
 msgid "%C29*%O$t%C29MOTD Skipped%O"
@@ -1429,9 +1301,7 @@ msgstr "%C23*%O$t%C28$1%C에 문제가 있습니다. %C18$2%O(으)로 재시도�
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$t대화명에 문제가 있거나 이미 사용중입니다. /NICK을 사용하여 다른 대화"
-"명을 사용해보십시오."
+msgstr "%C20*%O$t대화명에 문제가 있거나 이미 사용중입니다. /NICK을 사용하여 다른 대화명을 사용해보십시오."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1543,8 +1413,7 @@ msgstr "%C20*%O$t알 수 없는 호스트입니다. 잘못 입력하셨습니까
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$t%C22$1%C에 입장할 수 없습니다(%C20참여자 수 제한에 도달했습니다%O)"
+msgstr "%C20*%O$t%C22$1%C에 입장할 수 없습니다(%C20참여자 수 제한에 도달했습니다%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1552,8 +1421,7 @@ msgstr "%C22*%O$t%C22$1%C의 참여자: %C24$2%O"
 
 #: src/common/textevents.h:409
 msgid "%C23*%O$t%C28[%C18$1%C28]%C is away %C30(%C23$2%O%C30)%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%C님은 자리 비움 상태입니다 %C30(%C23$2%O%C30)%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%C님은 자리 비움 상태입니다 %C30(%C23$2%O%C30)%O"
 
 #: src/common/textevents.h:415
 msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
@@ -1570,9 +1438,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O 대기 %C23$2%O, 접속: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O 실제 호스트: %C23$2%O, 실제 IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 실제 호스트: %C23$2%O, 실제 IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1617,9 +1483,7 @@ msgstr "**** 기록 시작: %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* 기록용으로 로그 파일을 열 수 없습니다.\n"
-"%s의 권한을 확인하십시오"
+msgstr "* 기록용으로 로그 파일을 열 수 없습니다.\n%s의 권한을 확인하십시오"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2116,9 +1980,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"
@@ -3378,8 +3240,7 @@ msgstr "새로 고침"
 #: src/fe-gtk/chanlist.c:98
 #, c-format
 msgid "Displaying %d/%d users on %d/%d channels."
-msgstr ""
-"전체 대화방 %4$d개 중 %3$d개, 전체 참여자 %2$d명 중 %1$d명을 나타냅니다."
+msgstr "전체 대화방 %4$d개 중 %3$d개, 전체 참여자 %2$d명 중 %1$d명을 나타냅니다."
 
 #: src/fe-gtk/chanlist.c:515 src/fe-gtk/menu.c:1347 src/fe-gtk/urlgrab.c:148
 msgid "Select an output filename"
@@ -3478,17 +3339,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."
@@ -3634,10 +3491,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"
@@ -3655,98 +3509,72 @@ 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 \\\\"
-msgstr ""
-"명령 실행 동작은 단축키를 눌렀을때 항목 상자에 입력한 데이터 1의 데이터로 실"
-"행합니다. 따라서 텍스트(대화방 참여자로 보냄), 명령 또는 사용자 명령을 넣을 "
-"수 있습니다. 실행할 때 데이터 1 \\n 에 입력한 모든 문자는 명령을 구분하는데 "
-"사용하여, 하나 이상의 명령을 실행할 수 있습니다. 실제 텍스트에 \\ 를 넣으려"
-"면, 실행후 \\\\를 입력하십시오"
+"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 "명령 실행 동작은 단축키를 눌렀을때 항목 상자에 입력한 데이터 1의 데이터로 실행합니다. 따라서 텍스트(대화방 참여자로 보냄), 명령 또는 사용자 명령을 넣을 수 있습니다. 실행할 때 데이터 1 \\n 에 입력한 모든 문자는 명령을 구분하는데 사용하여, 하나 이상의 명령을 실행할 수 있습니다. 실제 텍스트에 \\ 를 넣으려면, 실행후 \\\\를 입력하십시오"
 
 #: 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 "
 "other data)"
-msgstr ""
-"페이지 전환 명령은 노트북의 페이지 사이를 전환하는 명령입니다. 데이터 1에는 "
-"전환할 페이지를 설정합니다. 데이터 2에 어떤 값을 설정하면 설정한 현재 위치와 "
-"관련된 곳으로 전환합니다. 데이터 1에 최근 페이지 및 중요한 동작으로 자동 전환"
-"하도록 설정하십시오(먼저 요청한 다음, 채널을 강조하고, 채널을 대화창으로 띄우"
-"거나, 채널에 다른 데이터를 채우십시오)"
+msgstr "페이지 전환 명령은 노트북의 페이지 사이를 전환하는 명령입니다. 데이터 1에는 전환할 페이지를 설정합니다. 데이터 2에 어떤 값을 설정하면 설정한 현재 위치와 관련된 곳으로 전환합니다. 데이터 1에 최근 페이지 및 중요한 동작으로 자동 전환하도록 설정하십시오(먼저 요청한 다음, 채널을 강조하고, 채널을 대화창으로 띄우거나, 채널에 다른 데이터를 채우십시오)"
 
 #: src/fe-gtk/fkeys.c:145
 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."
-msgstr ""
-"페이지 스크롤 명령은 한 페이지 또는 한 줄 단위로 텍스트 위젯 스크롤을 위아래"
-"로 움직입니다. 데이터 1에 Top, Bottom, Up, Down, +1, -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 "페이지 스크롤 명령은 한 페이지 또는 한 줄 단위로 텍스트 위젯 스크롤을 위아래로 움직입니다. 데이터 1에 Top, Bottom, Up, Down, +1, -1 중 하나를 입력하십시오."
 
 #: 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 "버퍼 설정 명령은 입력창의 내용을 데이터 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"
@@ -3873,9 +3701,7 @@ msgstr "%s에 연결 완료했습니다."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"서버 목록 창에서, 이 네트워크에서 자동으로 참여할 채널(대화방)에 들어가지 않"
-"았습니다."
+msgstr "서버 목록 창에서, 이 네트워크에서 자동으로 참여할 채널(대화방)에 들어가지 않았습니다."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3899,7 +3725,7 @@ msgstr "채널 목록을 엽니다(_O)."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "대화방 목록 받기에 1~2분 정도 걸립니다."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3923,9 +3749,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?"
@@ -4156,9 +3980,7 @@ msgstr "대화명 %d개를 선택했습니다."
 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 ""
-"메뉴 표시줄을 숨깁니다. 다시 보시려면 Ctrl-F9를 누르거나 메인 텍스트 구역에"
-"서 마우스 오른쪽 버튼을 누르십시오."
+msgstr "메뉴 표시줄을 숨깁니다. 다시 보시려면 Ctrl-F9를 누르거나 메인 텍스트 구역에서 마우스 오른쪽 버튼을 누르십시오."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4254,25 +4076,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  =  헥스채트 버전\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  =  헥스채트 버전\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 ""
@@ -4287,18 +4091,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"참여자 목록 버튼 - 특수 코드:\n"
-"\n"
-"%a  =  선택한 모든 대화명\n"
-"%c  =  현재 대화방\n"
-"%e  =  현재 네트워크 이름\n"
-"%h  =  선택한 대화명의 호스트 이름\n"
-"%m  =  머신 정보\n"
-"%n  =  자신의 대화명\n"
-"%s  =  선택한 대화명\n"
-"%t  =  날짜/시간\n"
-"%u  =  선택한 참여자 계정"
+msgstr "참여자 목록 버튼 - 특수 코드:\n\n%a  =  선택한 모든 대화명\n%c  =  현재 대화방\n%e  =  현재 네트워크 이름\n%h  =  선택한 대화명의 호스트 이름\n%m  =  머신 정보\n%n  =  자신의 대화명\n%s  =  선택한 대화명\n%t  =  날짜/시간\n%u  =  선택한 참여자 계정"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4313,18 +4106,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"대화 상자 버튼 - 특수 코드:\n"
-"\n"
-"%a  =  선택한 모든 대화명\n"
-"%c  =  현재 채널\n"
-"%e  =  현재 네트워크 이름\n"
-"%h  =  선택한 대화명의 호스트 이름\n"
-"%m  =  머신 정보\n"
-"%n  =  자신의 대화명\n"
-"%s  =  선택한 대화명\n"
-"%t  =  날짜/시간\n"
-"%u  =  선택한 참여자 계정"
+msgstr "대화 상자 버튼 - 특수 코드:\n\n%a  =  선택한 모든 대화명\n%c  =  현재 채널\n%e  =  현재 네트워크 이름\n%h  =  선택한 대화명의 호스트 이름\n%m  =  머신 정보\n%n  =  자신의 대화명\n%s  =  선택한 대화명\n%t  =  날짜/시간\n%u  =  선택한 참여자 계정"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4340,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 응답 - 특수 코드:\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
@@ -4364,14 +4134,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL 처리기 - 특수 코드:\n"
-"\n"
-"%s  =  URL 문자열\n"
-"\n"
-"명령 앞에 ! 문자를 놓으십시오\n"
-"헥스채트 대신 쉘로 보내야 함을\n"
-"나타냅니다"
+msgstr "URL 처리기 - 특수 코드:\n\n%s  =  URL 문자열\n\n명령 앞에 ! 문자를 놓으십시오\n헥스채트 대신 쉘로 보내야 함을\n나타냅니다"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4815,22 +4578,22 @@ msgstr "채널 메시지 %u건 - %s."
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr ""
+msgstr "개인 메시지 도착: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "개인 메시지 %u개 도착, 마지막 송신: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
-msgstr ""
+msgstr "파일 제공: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "파일 %u개 제공, 마지막 송신: %s (%s) - %s"
 
 #: src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4847,7 +4610,7 @@ msgstr "불러올 추가 기능 또는 스크립트를 선택하십시오"
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr ""
+msgstr "추가 기능과 스크립트 - %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4869,7 +4632,7 @@ msgstr "다른 이름으로 저장..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "원시 로그(%s) -%s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4900,14 +4663,12 @@ msgstr "두 개의 유일한 대화명을 설정해야 합니다."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"서버에 자신을 인증하는 방법입니다. 사용자 정의 로그인 방식을 사용하려면 연결 "
-"명령을 사용하십시오."
+msgstr "서버에 자신을 인증하는 방법입니다. 사용자 정의 로그인 방식을 사용하려면 연결 명령을 사용하십시오."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
 msgid "Edit %s - %s"
-msgstr ""
+msgstr "%s 편집 - %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4927,11 +4688,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)"
@@ -5004,7 +4761,7 @@ msgstr "문자세트:"
 #: src/fe-gtk/servlistgui.c:1977
 #, c-format
 msgid "Network List - %s"
-msgstr ""
+msgstr "네트워크 목록 - %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
@@ -5038,7 +4795,7 @@ msgstr "정렬(_S)"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "네트워크 목록을 철자순으로 정렬합니다. 줄을 이동하려면 Shift+Up 키와 Shift+Down 키를 사용하십시오."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5314,19 +5071,19 @@ msgstr "투명도 설정"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "창 투명도:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "타임스탬프"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "타임스탬프 활성화"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "타임스탬프 형식:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5362,7 +5119,7 @@ msgstr "입력 창"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "텍스트 상자에 글꼴, 색상 사용"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5388,9 +5145,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."
@@ -5426,11 +5181,11 @@ msgstr "그래픽"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "이름순(관리자 먼저)"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "이름역순(관리자 나중)"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5442,19 +5197,19 @@ msgstr "정렬 안함"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "왼쪽(위)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "왼쪽(아래)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "오른쪽(위)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "오른쪽(아래)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5514,7 +5269,7 @@ msgstr "자리 비움 추적"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "자리 비움 상태인 사용자를 추적하여 다른 색상으로 표시합니다"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5645,8 +5400,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"
@@ -5706,7 +5460,7 @@ msgstr "대화 창"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "최대 파일 전송 속도(초당 바이트)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5766,9 +5520,7 @@ msgstr "선택한 이벤트에 대해 \"인스턴트 메시지 알림\" 시스�
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"선택한 이벤트에 대해 freedesktop.org 소리 테마의 \"message-new-instant\"를 재"
-"생합니다."
+msgstr "선택한 이벤트에 대해 freedesktop.org 소리 테마의 \"message-new-instant\"를 재생합니다."
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5941,17 +5693,17 @@ msgstr "선택한 텍스트를 자동으로 복사"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "왼쪽 마우스 버튼을 떼면 클립보드로 텍스트를 복사합니다. 이 방법을 사용하지 않으면, Ctrl+Shift+C키를 눌러 클립보드로 텍스트를 복사합니다."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "복사한 텍스트 줄에 타임스탬프를 자동으로 넣습니다. 이 방식을 사용하지 않으면, Shift 키를 누르면서 선택할 때 타임스탬프를 넣습니다."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5959,9 +5711,9 @@ 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "복사한 텍스트 줄의 색상 정보를 자동으로 넣습니다. 이 방식을 사용하지 않으면, Ctrl키를 누르면서 선택할 때 색상 정보를 넣습니다."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6011,9 +5763,9 @@ msgstr "입장 금지 형식:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"입장 금지 및 발언권 박탈 조치시 입장 금지 마스크 사용. (irc_who_join 필요)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "입장 금지 및 발언권 박탈 조치시 입장 금지 마스크 사용. (irc_who_join 필요)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6074,11 +5826,11 @@ msgstr "윈게이트"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6090,15 +5842,15 @@ msgstr "자동"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "모든 연결"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "IRC 서버만"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "DCC만"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6122,11 +5874,9 @@ 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!"
-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:"
@@ -6138,11 +5888,11 @@ msgstr "파일을 전송할 때 이 주소를 사용합니다."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "DCC 수신 시작 포트:"
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "DCC 수신 마지막 포트:"
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -6174,7 +5924,7 @@ msgstr "프록시 인증"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "인증 사용(HTTP 또는 SOCKS5만)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6196,9 +5946,7 @@ msgstr "서버는 네트워크 사용자 이름에 응답합니다"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"이 포트로 대기하려면 권한이 있어야합니다. 113 번이 아니면(0 값은 기본값) 포"
-"트 포워딩을 설정해야합니다."
+msgstr "이 포트로 대기하려면 권한이 있어야합니다. 113 번이 아니면(0 값은 기본값) 포트 포워딩을 설정해야합니다."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6360,13 +6108,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 "실명 옵션은 비워둔 채로 둘 수 없습니다. \"realname\"으로 대신합니다."
 
 #: src/fe-gtk/setup.c:2261
@@ -6379,16 +6124,12 @@ 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"
-"홈 디렉터리로 자동 받기를 할 경우 상당히 위험합니다.\n"
-"예:\n"
-"어떤 사용자가 .bash_profile을 전송했을 때"
+msgstr "*경고*\n홈 디렉터리로 자동 받기를 할 경우 상당히 위험합니다.\n예:\n어떤 사용자가 .bash_profile을 전송했을 때"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
 msgid "Preferences - %s"
-msgstr ""
+msgstr "기본 설정 - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
@@ -6454,7 +6195,7 @@ msgstr "확인"
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
 msgid "URL Grabber - %s"
-msgstr ""
+msgstr "URL 감지 - %s"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Clear list"
@@ -6497,11 +6238,9 @@ msgstr "Sysinfo: %s을(를) %d(으)로 설정했습니다\n"
 #: 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"
-msgstr ""
-"Sysinfo: 올바른 설정은 hide_os와 같이 각 정보에 대해 hide_*를 설정하는 방식입"
-"니다. 값을 두지 않으면 현재 설정값 (또는 기본값)을 보여줍니다.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: 올바른 설정은 hide_os와 같이 각 정보에 대해 hide_*를 설정하는 방식입니다. 값을 두지 않으면 현재 설정값 (또는 기본값)을 보여줍니다.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6516,9 +6255,3 @@ msgstr "%s 플러그인 불러옴\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s 플러그인 불러오기 해제함\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/lt.po b/po/lt.po
index 89d3cb87..2b0c5ec2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,30 +1,28 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Eldar Šabanovič <eldux777@gmail.com>, 2014
 # Gediminas Paulauskas <menesis@delfi.lt>, 2000
 # Marius Gedminas <mgedmin@b4net.lt>, 2007
 # Mindaugas Butkevicius <promind@live.com>, 2016
-# Moo, 2015-2017
+# Moo, 2015-2018
 # Vaidrius Petrauskas <vaidrius@delfi.lt>, 2005
 # Žygimantas Beručka <zygis@gnome.org>, 2006
 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-18 10:10+0000\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-06-02 21:01+0000\n"
 "Last-Translator: Moo\n"
-"Language-Team: Lithuanian (http://www.transifex.com/hexchat/hexchat/language/"
-"lt/)\n"
-"Language: lt\n"
+"Language-Team: Lithuanian (http://www.transifex.com/hexchat/hexchat/language/lt/)\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%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -42,20 +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 yra paprastas naudoti IRC klientas, leidžiantis jums saugiai "
-"prisijungti prie kelių tinklų, privačiai kalbėtis su atskirais naudotojais "
-"arba kanaluose, naudojant tinkinamą sąsają. Jūs netgi galite persiųsti "
-"failus."
+msgstr "HexChat yra paprastas naudoti IRC klientas, leidžiantis jums saugiai prisijungti prie kelių tinklų, privačiai kalbėtis su atskirais naudotojais arba kanaluose, naudojant tinkinamą sąsają. Jūs netgi galite persiųsti failus."
 
 #: 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 palaiko tokias galimybes kaip: DCC, SASL, įgaliotuosius serverius, "
-"rašybos tikrinimą, signalizavimą, registravimą, tinkintas temas bei Phyton/"
-"Perl scenarijus."
+msgstr "HexChat palaiko tokias galimybes kaip: DCC, SASL, įgaliotuosius serverius, rašybos tikrinimą, signalizavimą, registravimą, tinkintas temas bei Phyton/Perl scenarijus."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -306,16 +297,13 @@ msgstr "„Ping“"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Jus neturite rašymo teisės į %s. Nieko iš šios sesijos negalima išsaugoti. "
+msgstr "Jus neturite rašymo teisės į %s. Nieko iš šios sesijos negalima išsaugoti. "
 
 #: 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 ""
-"Neprotinga vykdyti IRC „root“ teisėmis! Susikurkite naudotojo paskyrą ir "
-"jungiantis naudokitės ja.\n"
+msgstr "Neprotinga vykdyti IRC „root“ teisėmis! Susikurkite naudotojo paskyrą ir jungiantis naudokitės ja.\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
@@ -412,8 +400,7 @@ msgstr "Įskiepio apibrėžtos komandos:"
 
 #: src/common/outbound.c:2303
 msgid "Type /HELP <command> for more information, or /HELP -l"
-msgstr ""
-"Surinkite /HELP <komanda> norėdami gauti daugiau informacijos arba /HELP -l"
+msgstr "Surinkite /HELP <komanda> norėdami gauti daugiau informacijos arba /HELP -l"
 
 #: src/common/outbound.c:2390
 #, c-format
@@ -441,25 +428,19 @@ msgstr "ADDBUTTON <vardas> <veiksmas> - prideda mygtuką po vartotojų sąrašu"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NaujasTinklas><naujasserveris/6667>, prideda naują tinklą su "
-"nauju serveriu į tinklų sąrašą"
+msgstr "ADDSERVER <NaujasTinklas><naujasserveris/6667>, prideda naują tinklą su nauju serveriu į tinklų sąrašą"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <komanda> - siunčia komandą į visus kanalus, kuriuose jus prisijungę"
+msgstr "ALLCHAN <komanda> - siunčia komandą į visus kanalus, kuriuose jus prisijungę"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHAN <komanda> - siunčia komandą į visus kanalus aktyviame serveryje"
+msgstr "ALLCHAN <komanda> - siunčia komandą į visus kanalus aktyviame serveryje"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <komanda> - nusiunčia komandą visiems serveriams, prie kurių tu esi "
-"prisijungęs"
+msgstr "ALLSERV <komanda> - nusiunčia komandą visiems serveriams, prie kurių tu esi prisijungęs"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -474,10 +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 <kaukė> [<bloko tipas>] - užblokuoja visus esančius aktyviame kanale, "
-"kurie atitnka užduotą kaukę. Jei jie jau yra kanale, ši komanda neišmeta jų "
-"(reikia kanalo operatoriaus teisių)"
+msgstr "BAN <kaukė> [<bloko tipas>] - užblokuoja visus esančius aktyviame kanale, kurie atitnka užduotą kaukę. Jei jie jau yra kanale, ši komanda neišmeta jų (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -485,26 +463,21 @@ msgstr "CHANOPT [-quiet] <kintamasis>[<reikšmė>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET[<kodavimas>], gauti arba nustatyti kodavimą naudojamą aktyviam "
-"susijungimui"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET[<kodavimas>], gauti arba nustatyti kodavimą naudojamą aktyviam susijungimui"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<kiekis>], išvalo aktyvų tekstinį langą arba komandų "
-"istoriją"
+msgstr "CLEAR [ALL|HISTORY|[-]<kiekis>], išvalo aktyvų tekstinį langą arba komandų istoriją"
 
 #: 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 ""
-"CLOSE [-m], Uždaro aktyvią kortelę, uždaro langą jei tai vienintelė kortelė, "
-"arba naudojant \"-m\" žymą, uždaro visus žinučių langus."
+msgstr "CLOSE [-m], Uždaro aktyvią kortelę, uždaro langą jei tai vienintelė kortelė, arba naudojant \"-m\" žymą, uždaro visus žinučių langus."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -514,16 +487,13 @@ msgstr "COUNTRY [-s] <kodas|pakaita>, randa šalies kodą, pvz.: au = australija
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <slapyvardis> <žinutė> - siųsti CTCP žinutę vartotojui, dažniausios "
-"žinutės yra VERSION ir USERINFO"
+msgstr "CTCP <slapyvardis> <žinutė> - siųsti CTCP žinutę vartotojui, dažniausios žinutės yra VERSION ir USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanalas>], padaliną aktyvų arba nurodytą kanalą ir tuojpat "
-"persijungia"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanalas>], padaliną aktyvų arba nurodytą kanalą ir tuojpat persijungia"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -536,32 +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 <slapyvardis> - priimti siūlomą failą\n"
-"\n"
-"DCC SEND [-maxcps=#] <slapyvardis> [failas] - nusiųsti kažkam failą\n"
-"\n"
-"DCC PSEND [-maxcps=#] <slapyvardis> [failas] - siųsti failą, naudojant "
-"pasyvią veikseną\n"
-"\n"
-"DCC LIST - parodyti „DCC“ sąrašą\n"
-"\n"
-"DCC CHAT <slapyvardis> - pasiūlyti  kažkam „DCC CHAT“\n"
-"\n"
-"DCC PCHAT <slapyvardis> - pasiūlyti „DCC CHAT“, naudojant pasyvią veikseną\n"
-"\n"
-"DCC CLOSE <tipas> <slapyvardis> <failas> pavyzdys:\n"
-"\n"
-"/dcc close send jonassmitas failas.tar.gz"
+msgstr "\nDCC GET <slapyvardis> - priimti siūlomą failą\n\nDCC SEND [-maxcps=#] <slapyvardis> [failas] - nusiųsti kažkam failą\n\nDCC PSEND [-maxcps=#] <slapyvardis> [failas] - siųsti failą, naudojant pasyvią veikseną\n\nDCC LIST - parodyti „DCC“ sąrašą\n\nDCC CHAT <slapyvardis> - pasiūlyti  kažkam „DCC CHAT“\n\nDCC PCHAT <slapyvardis> - pasiūlyti „DCC CHAT“, naudojant pasyvią veikseną\n\nDCC CLOSE <tipas> <slapyvardis> <failas> pavyzdys:\n\n/dcc close send jonassmitas failas.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 <slapyvardis> - panaikina kanalo pusiau-operatoriaus teises vartotojui "
-"aktyviame kanale (reikia kanalo operatoriaus teisių)"
+msgstr "DEHOP <slapyvardis> - panaikina kanalo pusiau-operatoriaus teises vartotojui aktyviame kanale (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -571,17 +522,13 @@ msgstr "DELBUTTON <vardas> - ištrina mygtuką iš po vartotojo sąrašu"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <slapyvardis> - panaikina kanalo operatoriaus teises vartotojui "
-"aktyviame kanale (reikia kanalo operatoriaus teisių)"
+msgstr "DEOP <slapyvardis> - panaikina kanalo operatoriaus teises vartotojui aktyviame kanale (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <slapyvardis> - panaikina balso teisę vartotojui aktyviame kanale "
-"(reikia kanalo operatoriaus teisių)"
+msgstr "DEVOICE <slapyvardis> - panaikina balso teisę vartotojui aktyviame kanale (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -603,10 +550,7 @@ msgstr "ECHO <tekstas> - lokaliai atspausdina tekstą"
 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> - įvykdo komandą. Jei nurodoma -o žymė, komandos "
-"grąžinamas tekstas bus nusiųstas į aktyvų kanalą, kitu atveju jis "
-"atvaziduojamas aktyviame teksto lauke"
+msgstr "EXEC [-o] <komanda> - įvykdo komandą. Jei nurodoma -o žymė, komandos grąžinamas tekstas bus nusiųstas į aktyvų kanalą, kitu atveju jis atvaziduojamas aktyviame teksto lauke"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -616,9 +560,7 @@ msgstr "EXECCONT - nusiunčia procesui SIGCONT signalą"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9] - nutraukia aktyvioje sesijoje vykdomą komandą. Jei nurodomas "
-"parametras -9, procesui bus nusiųstas SIGKILL signalas"
+msgstr "EXECKILL [-9] - nutraukia aktyvioje sesijoje vykdomą komandą. Jei nurodomas parametras -9, procesui bus nusiųstas SIGKILL signalas"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -638,9 +580,7 @@ msgstr "FLUSHHQ - panaikina aktyvaus serverio siuntimo eilę"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <hostas> [<prievadas>] - jungiasi per proxy serverį. Nutylimas portas - "
-"23"
+msgstr "GATE <hostas> [<prievadas>] - jungiasi per proxy serverį. Nutylimas portas - 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -648,9 +588,7 @@ msgstr "GHOST <slapyvardis> [slaptažodis], pašalina sudvejintą psiaudonimą"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <slapyvardis> - suteikia vartotojui kanalo pusiau-operatoriaus teises "
-"(reikia kanalo operatoriaus teisių)"
+msgstr "HOP <slapyvardis> - suteikia vartotojui kanalo pusiau-operatoriaus teises (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -663,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 <kaukė><tipai...><pasirinkimai...>\n"
-"kaukė - ignoruojamų hostų kaukė, pvz.: *!*@*.aol.com\n"
-"tipai - ignoruojamų duomenų tipai, vienas arba visi iš:\n"
-"PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"pasirinkimai - NOSAVE, QUIET"
+msgstr "IGNORE <kaukė><tipai...><pasirinkimai...>\nkaukė - ignoruojamų hostų kaukė, pvz.: *!*@*.aol.com\ntipai - ignoruojamų duomenų tipai, vienas arba visi iš:\nPRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\npasirinkimai - 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 <slapyvardis> [<kanalas>] - pakviečia varotoją į kanalą, pagal "
-"nutilėjimą į aktyvųjį kanalą (reikia kanalo operatoriaus teisių)"
+msgstr "INVITE <slapyvardis> [<kanalas>] - pakviečia varotoją į kanalą, pagal nutilėjimą į aktyvųjį kanalą (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -685,17 +616,13 @@ msgstr "JOIN <kanalas> - prisijungia prie kanalo"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <slapyvardis> [priežastis], išmeta vartotoją iš aktyvaus kanalo (reikia "
-"kanalo operatoriaus teisių)"
+msgstr "KICK <slapyvardis> [priežastis], išmeta vartotoją iš aktyvaus kanalo (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <slapyvardis> [priežastis], užblokuoja ir išmeta vartotoją iš "
-"aktyvaus kanalo (reikia kanalo operatoriaus teisių)"
+msgstr "KICKBAN <slapyvardis> [priežastis], užblokuoja ir išmeta vartotoją iš aktyvaus kanalo (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -707,19 +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] [--] <string>, searches for a string in the buffer\n"
-"\n"
-"-h naudojamas paryškinti rastas eilute(s)\n"
-"\n"
-"-m naudojamas registro tapatinimui\n"
-"\n"
-"-r kai eilutė yra paieškos formato išraiška\n"
-"\n"
-"-- (dvygubas brukšnys) naudojamas pasirinkimų pabaigai indikuoti, "
-"kpavyzdžiui, kai ieškoma eilutės '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <string>, searches for a string in the buffer\n\n-h naudojamas paryškinti rastas eilute(s)\n\n-m naudojamas registro tapatinimui\n\n-r kai eilutė yra paieškos formato išraiška\n\n-- (dvygubas brukšnys) naudojamas pasirinkimų pabaigai indikuoti, kpavyzdžiui, kai ieškoma eilutės '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -728,23 +644,17 @@ msgstr "LOAD [-e] <byla>, pakrauna įskiepį arba skriptą"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP - atima kanalo pusiau-operatoriaus teises iš visų aktyviame kanale "
-"jas turinčių (reikia kanalo operatoriaus teisių)"
+msgstr "MDEHOP - atima kanalo pusiau-operatoriaus teises iš visų aktyviame kanale jas turinčių (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP - atima kanalo operatoriaus teises iš visų aktyviame kanale jas "
-"turinčių (reikia kanalo operatoriaus teisių)"
+msgstr "MDEOP - atima kanalo operatoriaus teises iš visų aktyviame kanale jas turinčių (reikia kanalo operatoriaus teisių)"
 
 #: 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 <veiksmas> - siunčia veiksmą į aktyvų kanalą (veiksmai rašomi 3-ju "
-"asmeniu, pvz.: /me pašoka)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <veiksmas> - siunčia veiksmą į aktyvų kanalą (veiksmai rašomi 3-ju asmeniu, pvz.: /me pašoka)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -753,24 +663,17 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK - išmeta iš aktyvaus kanalo visus išskyrus jus (reikia kanalo "
-"operatoriaus teisių)"
+msgstr "MKICK - išmeta iš aktyvaus kanalo visus išskyrus jus (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MDEOP - atima kanalo operatoriaus teises iš visų aktyviame kanale jas "
-"turinčių (reikia kanalo operatoriaus teisių)"
+msgstr "MDEOP - atima kanalo operatoriaus teises iš visų aktyviame kanale jas turinčių (reikia kanalo operatoriaus teisių)"
 
 #: 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"
-msgstr ""
-"MSG <slapyvardis> <žinutė>, siunčia privačią žinutę, išsiųskite \".\" "
-"norėdami persiųsti paskutiniam vartotojui arba pridėkite \"=\" pražioje DCC "
-"pokalbiui "
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <slapyvardis> <žinutė>, siunčia privačią žinutę, išsiųskite \".\" norėdami persiųsti paskutiniam vartotojui arba pridėkite \"=\" pražioje DCC pokalbiui "
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -796,42 +699,32 @@ msgstr "NOTICE <slapyvardis/kanalas> <žinutė>, siunčia įspėjimą"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n tinklas1[,tinklas2,...]] [<slapyvardis>], parodo jūsų "
-"informuojamųjų sąrašą arba pridedą kažką į jį"
+msgstr "NOTIFY [-n tinklas1[,tinklas2,...]] [<slapyvardis>], parodo jūsų informuojamųjų sąrašą arba pridedą kažką į jį"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <slapyvardis> - suteikia vartotojui kanalo operatoriaus teises (reikia "
-"kanalo operatoriaus teisių)"
+msgstr "OP <slapyvardis> - suteikia vartotojui kanalo operatoriaus teises (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanalas>] [<priežastis>] - palieka kanalą, pagal nutylėjimą - aktyvųjį"
+msgstr "PART [<kanalas>] [<priežastis>] - palieka kanalą, pagal nutylėjimą - aktyvųjį"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr ""
-"PING <slapyvardis | kanalas> - siunčia CTCP „ping“ vartotojui arba kanalui "
+msgstr "PING <slapyvardis | kanalas> - siunčia CTCP „ping“ vartotojui arba kanalui "
 
 #: src/common/outbound.c:4071
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <slapyvardis> [žinutė], atveria naują privačios žinutės "
-"langą kažkam ir pasirintktinai išsiunčia žinutę"
+msgstr "QUERY [-nofocus] <slapyvardis> [žinutė], atveria naują privačios žinutės langą kažkam ir pasirintktinai išsiunčia žinutę"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <kaukė> [<tilumotipas>], nutildo kiekvieną atitinkantį kaukę aktyviame "
-"kanale jei serveris palaiko."
+msgstr "QUIET <kaukė> [<tilumotipas>], nutildo kiekvieną atitinkantį kaukę aktyviame kanale jei serveris palaiko."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -843,31 +736,23 @@ msgstr "QUOTE <tekstas> - nusiunčia neformatuotą tekstą serveriui"
 
 #: 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] [<hostas>] [<prievadas>] [<slaptažodis>], gali būti "
-"naudojamas kaip /RECONNECT persijungimui prie aktyvaus serverio arba kaip /"
-"RECONNECT ALL persijungimui prie visų atvirų serverių"
+msgstr "RECONNECT [-ssl] [<hostas>] [<prievadas>] [<slaptažodis>], gali būti naudojamas kaip /RECONNECT persijungimui prie aktyvaus serverio arba kaip /RECONNECT ALL persijungimui prie visų atvirų serverių"
 
 #: 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 [<hostas>] [<prievadas>] [<slaptažodis>], gali būti naudojamas "
-"kaip /RECONNECT persijungimui prie aktyvaus serverio arba kaip /RECONNECT "
-"ALL persijungimui prie visų atvirų serverių"
+msgstr "RECONNECT [<hostas>] [<prievadas>] [<slaptažodis>], gali būti naudojamas kaip /RECONNECT persijungimui prie aktyvaus serverio arba kaip /RECONNECT ALL persijungimui prie visų atvirų serverių"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <tekstas>, siunčia neformatuotus duomenis į HexChat, tarsi jie būtų "
-"gauti iš IRC serverio"
+msgstr "RECV <tekstas>, siunčia neformatuotus duomenis į HexChat, tarsi jie būtų gauti iš IRC serverio"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -883,32 +768,23 @@ msgstr "SEND <slapyvardis> [<byla>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <hostas> <prievadas> <kanalas> - susijungia ir prisijungia "
-"prie kanalo"
+msgstr "SERVCHAN [-ssl] <hostas> <prievadas> <kanalas> - susijungia ir prisijungia prie kanalo"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <hostas> <prievadas> <kanalas> - susijungia ir prisijungia prie "
-"kanalo"
+msgstr "SERVCHAN <hostas> <prievadas> <kanalas> - susijungia ir prisijungia prie kanalo"
 
 #: 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] <hostas> [<prievadas>] [<slaptažodis>],susijungia su serveriu, "
-"pagal nutylėjimą įprastiems sujungimams naudojamas portas 6667, o ssl "
-"sujungimams 6697"
+msgstr "SERVER [-ssl] <hostas> [<prievadas>] [<slaptažodis>],susijungia su serveriu, pagal nutylėjimą įprastiems sujungimams naudojamas portas 6667, o ssl sujungimams 6697"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <serveris> [<prievadas>] [<slaptažodis>] - susijungia su serveriu, "
-"pagal nutylėjimą naudojamas portas 6667"
+msgstr "SERVER <serveris> [<prievadas>] [<slaptažodis>] - susijungia su serveriu, pagal nutylėjimą naudojamas portas 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -920,9 +796,7 @@ msgstr "SETCURSOR [-|+]<pozicija>, pakeičia kursoriaus pozicija įveties lauke"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <naujas pavadinimas>, keičia kortelės pavadinima, galioja kortelės "
-"pavadinimo ilgio ryba tab_trunc"
+msgstr "SETTAB <naujas pavadinimas>, keičia kortelės pavadinima, galioja kortelės pavadinimo ilgio ryba tab_trunc"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -930,9 +804,9 @@ msgstr "SETTEXT <naujas tekstas>, pakeičia tekstą įvesties lauke"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<tema>], nustato kanalo temą, jei ji duota, arba parodo aktyvią temą"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tema>], nustato kanalo temą, jei ji duota, arba parodo aktyvią temą"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -942,24 +816,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 <periodas> <byla1> [<byla2>] keičia užduočių juostos piktogramą tarp "
-"dviejų paveikslėlių nustatytu periodu.\n"
-"\n"
-"TRAY -f <filename> nustato fiksuotą užduočių juostos piktogramą.\n"
-"\n"
-"TRAY -i <number> keičia užduočių juostos piktogramą vidiniu paveikslėliu.\n"
-"\n"
-"TRAY -t <text> nustato užduočių juostos patarimą.\n"
-"\n"
-"TRAY -b <title> <text> nustato užduočių juostos pranešimo baliono tekstą."
+msgstr "\nTRAY -f <periodas> <byla1> [<byla2>] keičia užduočių juostos piktogramą tarp dviejų paveikslėlių nustatytu periodu.\n\nTRAY -f <filename> nustato fiksuotą užduočių juostos piktogramą.\n\nTRAY -i <number> keičia užduočių juostos piktogramą vidiniu paveikslėliu.\n\nTRAY -t <text> nustato užduočių juostos patarimą.\n\nTRAY -b <title> <text> nustato užduočių juostos pranešimo baliono tekstą."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <kaukė> [<kaukė>...], nuima bloką vartotojams atitinkantiems nurodytą "
-"kaukę arba kaukęs."
+msgstr "UNBAN <kaukė> [<kaukė>...], nuima bloką vartotojams atitinkantiems nurodytą kaukę arba kaukęs."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -971,11 +832,9 @@ msgstr "UNLOAD <pavadinimas> - iškrauna įskiepį ar skriptą"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <kaukė> [<kaukė>...], nuima nutyldyma vartotojams atitinkantiems "
-"nurodytas kaukes, jei serveris palaiko."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <kaukė> [<kaukė>...], nuima nutyldyma vartotojams atitinkantiems nurodytas kaukes, jei serveris palaiko."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -983,16 +842,13 @@ msgstr "URL <adresas> - atveria adresą naršyklėje"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <slapyvardis1> <slapyvardis2> ir t.t. - paryškina "
-"vartotojo(-ų) slapyvardžius kanalo vartotojų sąraše"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <slapyvardis1> <slapyvardis2> ir t.t. - paryškina vartotojo(-ų) slapyvardžius kanalo vartotojų sąraše"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <slapyvardis> - suteikia vartotojui balso teisę (reikia kanalo "
-"operatoriaus teisių)"
+msgstr "VOICE <slapyvardis> - suteikia vartotojui balso teisę (reikia kanalo operatoriaus teisių)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -1001,8 +857,7 @@ msgstr "WALLCHAN <žinutė> - nusiunčia žinutę į visus kanalus"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <žinutė> - siunčia žinutę visiems aktyvaus kanalo operatoriams"
+msgstr "WALLCHOP <žinutė> - siunčia žinutę visiems aktyvaus kanalo operatoriams"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1018,9 +873,7 @@ msgstr "Naudojimas: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Šiai komandai nėra pagalbos įrašo.\n"
+msgstr "\nŠiai komandai nėra pagalbos įrašo.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1082,17 +935,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 ""
-"Ar jus įsitikinę, kad tai SSL šifravimą palaikantis serveris ir prievadas?\n"
+msgstr "Ar jus įsitikinę, kad tai SSL šifravimą palaikantis serveris ir prievadas?\n"
 
 #: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nepavyksta nustatyti hosto vardą: %s\n"
-"Patikrinkite jūsų IP nustatymus!\n"
+msgstr "Nepavyksta nustatyti hosto vardą: %s\nPatikrinkite jūsų IP nustatymus!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1108,8 +958,7 @@ msgstr "Bandomas kitas serveris esantis „%s“...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Dėmesio: „%s“ koduotė nežinoma. Konvertavimas tinkle „%s“ nebus vykdomas."
+msgstr "Dėmesio: „%s“ koduotė nežinoma. Konvertavimas tinkle „%s“ nebus vykdomas."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1268,7 +1117,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC POKALBIS su %C18$1%O nutrauktas."
 
 #: 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 "%C24*%O$tSėkminga DCC POKALBIO jungtis su %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
@@ -1302,11 +1152,9 @@ 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"
-msgstr ""
-"%C20*%O$tGauta netaisyklinga DCC užklausa nuo %C18$1%O.$a010%C23*%O$tPaketo "
-"turinys: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tGauta netaisyklinga DCC užklausa nuo %C18$1%O.$a010%C23*%O$tPaketo turinys: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1323,11 +1171,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' į %C18$1%O nutraukta."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' nuo %C18$3%O užbaigta %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' nuo %C18$3%O užbaigta %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tSėkminga DCC RECV jungtis su %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1340,7 +1188,8 @@ msgstr "%C20*%O$tDCC RECV: Atidaryti '%C23$1%C' rašymui nepavyko (%C20$2%O)"
 
 #: 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 "%C23*%O$tFailas '%C24$1%C' jau yra, išsaugoma kaip '%C23$2%O'."
 
 #: src/common/textevents.h:196
@@ -1354,11 +1203,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' į %C18$1%O nutraukta."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' į %C18$2%C užbaigta %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' į %C18$2%C užbaigta %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tSėkminga DCC SEND jungtis su %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1375,8 +1224,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C' į %C18$3%O užvilkinta, nutraukiama."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C' į %C18$3%O užklausos laikas baigėsi, nutraukiama."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C' į %C18$3%O užklausos laikas baigėsi, nutraukiama."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1456,9 +1304,7 @@ msgstr "%C23*%O$t%C28$1%C yra netinkamas ar klaidingas. Bandome %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tSlapyvardis yra klaidingas arba jau naudojamas. Bandykite kitą "
-"slapyvardį naudodami /NICK."
+msgstr "%C20*%O$tSlapyvardis yra klaidingas arba jau naudojamas. Bandykite kitą slapyvardį naudodami /NICK."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1595,9 +1441,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O neutralus %C23$2%O, prisijungta: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O tikras Tinklas: %C23$2%O, Tikras IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O tikras Tinklas: %C23$2%O, Tikras IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1642,9 +1486,7 @@ msgstr "**** REGISTRAVIMAS PRADEDAMAS %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Negalime atidaryti įrašų failų. patikrinkite\n"
-"prieigą %s"
+msgstr "* Negalime atidaryti įrašų failų. patikrinkite\nprieigą %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2141,9 +1983,7 @@ msgstr "Draudimo laikas"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nepavyko perskaityti garso failo:\n"
-"%s"
+msgstr "Nepavyko perskaityti garso failo:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3502,18 +3342,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Failo prieiga negalima: %s\n"
-"%s.\n"
-"Tęsti neįmanoma."
+msgstr "Failo prieiga negalima: %s\n%s.\nTęsti neįmanoma."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Failas parsisiuntimo kataloge yra didesnis nei siūlomas failas. Tęsti "
-"neįmanoma."
+msgstr "Failas parsisiuntimo kataloge yra didesnis nei siūlomas failas. Tęsti neįmanoma."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3643,8 +3478,7 @@ msgstr "Atidaryti adresą arba įvykdyti komandą egzistuojančiame HexChat"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Pradėti minimizuojant langą. Lygis 0=normalus 1=piktograma 2=užduočių juosta"
+msgstr "Pradėti minimizuojant langą. Lygis 0=normalus 1=piktograma 2=užduočių juosta"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3660,10 +3494,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Nepavyko atidaryti šriftą:\n"
-"\n"
-"%s"
+msgstr "Nepavyko atidaryti šriftą:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3681,18 +3512,18 @@ msgstr "Tinklo išsiuntimo eilė: %d baitų"
 
 #: 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 "
@@ -3707,39 +3538,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
@@ -3862,7 +3693,7 @@ msgstr "kanalo pavadinimas per trumpas, bandykite dar kartą."
 #: src/fe-gtk/joind.c:133
 #, c-format
 msgid "Connection Complete - %s"
-msgstr ""
+msgstr "Ryšys užbaigtas - %s"
 
 #: src/fe-gtk/joind.c:162
 #, c-format
@@ -3889,17 +3720,15 @@ msgstr "Prisi_jungti prie šio kanalo:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Jeigu žinote kanalo, prie kurio norėtumėte jungtis, pavadinimą, įrašykite jį "
-"čia."
+msgstr "Jeigu žinote kanalo, prie kurio norėtumėte jungtis, pavadinimą, įrašykite jį čia."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "A_tverti kanalų sąrašą."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "Kanalų sąrašo gavimas gali užimti vieną ar dvi minutes."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3912,11 +3741,11 @@ msgstr ""
 #: src/fe-gtk/maingui.c:682
 #, c-format
 msgid "Topic for %s is: %s"
-msgstr ""
+msgstr "%s tema yra: %s"
 
 #: src/fe-gtk/maingui.c:687
 msgid "No topic is set"
-msgstr ""
+msgstr "Tema nenustatyta"
 
 #: src/fe-gtk/maingui.c:1076
 #, c-format
@@ -4028,7 +3857,7 @@ msgstr ""
 
 #: src/fe-gtk/maingui.c:2043
 msgid "Filter Colors"
-msgstr ""
+msgstr "Filtruoti spalvas"
 
 #: src/fe-gtk/maingui.c:2044
 msgid "No outside messages"
@@ -4060,7 +3889,7 @@ msgstr ""
 
 #: src/fe-gtk/maingui.c:2579
 msgid "Enter new nickname:"
-msgstr ""
+msgstr "Įveskite naują slapyvardį:"
 
 #: src/fe-gtk/maingui.c:2802
 msgid "No results found."
@@ -4068,23 +3897,23 @@ msgstr "Rezultatų nerasta."
 
 #: src/fe-gtk/maingui.c:2898
 msgid "Search hit end or not found."
-msgstr ""
+msgstr "Paieška priėjo pabaigą arba nieko nerasta."
 
 #: src/fe-gtk/maingui.c:2914
 msgid "_Highlight all"
-msgstr ""
+msgstr "_Paryškinti visus"
 
 #: src/fe-gtk/maingui.c:2920
 msgid "Highlight all occurrences, and underline the current occurrence."
-msgstr ""
+msgstr "Paryškinti visus atitikmenis ir pabraukti dabartinį."
 
 #: src/fe-gtk/maingui.c:2922
 msgid "Mat_ch case"
-msgstr ""
+msgstr "Ski_rti raidžių dydį"
 
 #: src/fe-gtk/maingui.c:2927
 msgid "Perform a case-sensitive search."
-msgstr ""
+msgstr "Atlikti paiešką skiriant raidžių dydį."
 
 #: src/fe-gtk/maingui.c:2929
 msgid "_Regex"
@@ -4154,10 +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 ""
-"Dabar, meniu juosta yra paslėpta. Jūs galite parodyti ją vėl, nuspausdami "
-"Control+F9 (Vald+F9) arba spusteldami dešiniu pelės mygtuku tuščioje "
-"pagrindinio teksto srities dalyje."
+msgstr "Dabar, meniu juosta yra paslėpta. Jūs galite parodyti ją vėl, nuspausdami Control+F9 (Vald+F9) arba spusteldami dešiniu pelės mygtuku tuščioje pagrindinio teksto srities dalyje."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4840,9 +4666,7 @@ msgstr ""
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Būdas kaip prisistatote serveriui. Tinkintiems prisijungimo metodams "
-"naudokite susijungimo komandas."
+msgstr "Būdas kaip prisistatote serveriui. Tinkintiems prisijungimo metodams naudokite susijungimo komandas."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4867,11 +4691,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Slapyvardis\n"
-"%p=Slaptažodis\n"
-"%r=Tikras vardas\n"
-"%u=Naudotojo vardas"
+msgstr "%n=Slapyvardis\n%p=Slaptažodis\n%r=Tikras vardas\n%u=Naudotojo vardas"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5884,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
@@ -5894,8 +5714,8 @@ msgstr "Automatiškai įtraukti spalvų informaciją"
 
 #: 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
@@ -5946,7 +5766,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
@@ -6056,8 +5877,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
@@ -6293,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
@@ -6421,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
@@ -6438,9 +6258,3 @@ msgstr "%s įskiepis įkeltas\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s įskiepis iškeltas\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/lv.po b/po/lv.po
index ed87246c..b289354d 100644
--- a/po/lv.po
+++ b/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"
diff --git a/po/mk.po b/po/mk.po
index 40aa5c34..db0cffc3 100644
--- a/po/mk.po
+++ b/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"
diff --git a/po/ml.po b/po/ml.po
index ff58894c..4912f5ab 100644
--- a/po/ml.po
+++ b/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
diff --git a/po/ms.po b/po/ms.po
index d5368e0d..a314fe2a 100644
--- a/po/ms.po
+++ b/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"
diff --git a/po/nb.po b/po/nb.po
index ec455056..963eb652 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,11 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Allan Nordhøy <epost@anotheragency.no>, 2016-2017
 # Johnny A. Solbu <johnny@solbu.net>, 2015,2017
 # Johnny A. Solbu <transifex@solbu.net>, 2015
+# Johnny A. Solbu <transifex@solbu.net>, 2015
 # Xtreme Power <neethan98@hotmail.ca>, 2013
 # pere <pere-transifex@hungry.com>, 2016
 # pere <pere-transifex@hungry.com>, 2016
@@ -16,15 +17,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 18:37+0000\n"
-"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/hexchat/hexchat/"
-"language/nb/)\n"
-"Language: nb\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-04-03 20:12+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/hexchat/hexchat/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -43,19 +43,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 er en enkel og fleksibel IRC-klient. Den gir deg muligheten til å "
-"sikkert koble deg til nettverk, ha samtaler i kanaler eller privat med "
-"brukere, og dette med et tilpassbart grensesnitt. Du kan også utføre "
-"filoverføringer."
+msgstr "HexChat er en enkel og fleksibel IRC-klient. Den gir deg muligheten til å sikkert koble deg til nettverk, ha samtaler i kanaler eller privat med brukere, og dette med et tilpassbart grensesnitt. Du kan også utføre filoverføringer."
 
 #: 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 støtter funksjoner som: DCC, SASL, mellomtjenere, stavekontroll, "
-"varslinger, logging, tilpassbare temaer, samt Python-/Perl-skript."
+msgstr "HexChat støtter funksjoner som: DCC, SASL, mellomtjenere, stavekontroll, varslinger, logging, tilpassbare temaer, samt Python-/Perl-skript."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -306,16 +300,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Du har ikke skrivetilgang til %s. Ingenting fra denne sesjonen kan lagres."
+msgstr "Du har ikke skrivetilgang til %s. Ingenting fra denne sesjonen kan lagres."
 
 #: 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 ""
-"* Det er ikke lurt å kjøre IRC som root! Du bør\n"
-"  opprette en vanlig brukerkonto og bruke denne.\n"
+msgstr "* Det er ikke lurt å kjøre IRC som root! Du bør\n  opprette en vanlig brukerkonto og bruke denne.\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
@@ -337,8 +328,7 @@ msgstr "Du mottar en flom av CTCP-forespørsler fra %s, ignorerer %s\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Du blir oversvømt av MSG-meldinger fra %s, Slår av gui_autoopen_dialog.\n"
+msgstr "Du blir oversvømt av MSG-meldinger fra %s, Slår av gui_autoopen_dialog.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -441,9 +431,7 @@ msgstr "ADDBUTTON <navn> <hendelse>, legger til en knapp under brukerlisten"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NyttNettverk> <NyVert/6667>, legger til et nytt nettverk med en "
-"ny vert i nettverkslisten"
+msgstr "ADDSERVER <NyttNettverk> <NyVert/6667>, legger til et nytt nettverk med en ny vert i nettverkslisten"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -451,9 +439,7 @@ msgstr "ALLCHAN <kommando>, sender en kommando til alle kanaler du er med i"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <kommando>, sender en kommando til alle kanalene på den nåværende "
-"tjeneren"
+msgstr "ALLCHANL <kommando>, sender en kommando til alle kanalene på den nåværende tjeneren"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -472,10 +458,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 <maske> [<type>], utestenger alle som passer masken i den nåværende "
-"kanalen. Om de allerede er i kanalen vil de ikke bli kastet ut samtidig. "
-"(Krever chanop.)"
+msgstr "BAN <maske> [<type>], utestenger alle som passer masken i den nåværende kanalen. Om de allerede er i kanalen vil de ikke bli kastet ut samtidig. (Krever chanop.)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -483,26 +466,21 @@ msgstr "CHANOPT [-quiet] <variabel> [<verdi>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<tegnsett>], hent ut eller sett tegnsettet som brukes for den "
-"nåværende tilkoblingen"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<tegnsett>], hent ut eller sett tegnsettet som brukes for den nåværende tilkoblingen"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<mengde>], Fjerner gjeldende tekstvindu eller "
-"kommandohistorie"
+msgstr "CLEAR [ALL|HISTORY|[-]<mengde>], Fjerner gjeldende tekstvindu eller kommandohistorie"
 
 #: 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 ""
-"CLOSE [-m], Lukker gjeldende fane, lukker vinduet hvis det er den eneste "
-"åpne fanen, eller med  \"-m\"-flagget, lukker alle forespørsler."
+msgstr "CLOSE [-m], Lukker gjeldende fane, lukker vinduet hvis det er den eneste åpne fanen, eller med  \"-m\"-flagget, lukker alle forespørsler."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -512,16 +490,13 @@ msgstr "COUNTRY [-s] <kode|maske>, finner en landskode, f.eks.: au = australia"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <kallenavn> <melding>, sender CTCP-meldingen til kallenavnet. Ofte "
-"brukte meldinger er VERSION og USERINFO"
+msgstr "CTCP <kallenavn> <melding>, sender CTCP-meldingen til kallenavnet. Ofte brukte meldinger er VERSION og USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanal>], forlater aktiv eller spesifisert kanal og blir øyeblikkelig "
-"med igjen"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanal>], forlater aktiv eller spesifisert kanal og blir øyeblikkelig med igjen"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -534,24 +509,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 <kallenavn> - godta tilbudt fil\n"
-"DCC SEND [-maxcps=#] <kallenavn> [<file>] - send en fil til noen\n"
-"DCC PSEND [-maxcps=#] <kallenavn> [<file>] - send en fil i passiv modus\n"
-"DCC LIST -  vis DCC-liste\n"
-"DCC CHAT <kallenavn> - tilby DCC-sludring med noen\n"
-"DCC PCHAT <kallenavn> - tilby DCC-sludring i passiv modus\n"
-"DCC CLOSE <type> <kallenavn> <file>         eksempel:\n"
-"         /dcc close send olanormann fil.tar.gz"
+msgstr "\nDCC GET <kallenavn> - godta tilbudt fil\nDCC SEND [-maxcps=#] <kallenavn> [<file>] - send en fil til noen\nDCC PSEND [-maxcps=#] <kallenavn> [<file>] - send en fil i passiv modus\nDCC LIST -  vis DCC-liste\nDCC CHAT <kallenavn> - tilby DCC-sludring med noen\nDCC PCHAT <kallenavn> - tilby DCC-sludring i passiv modus\nDCC CLOSE <type> <kallenavn> <file>         eksempel:\n         /dcc close send olanormann fil.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 <kallenavn>, fjerner chanhalf-op status fra kallenavnet i den aktive "
-"kanalen (krever chanop)"
+msgstr "DEHOP <kallenavn>, fjerner chanhalf-op status fra kallenavnet i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -561,17 +525,13 @@ msgstr "DELBUTTON <navn>, fjerner en knapp under brukerlisten"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <kallenavn>, fjerner chanop status fra kallenavnet i den aktive "
-"kanalen. (Krever chanop)"
+msgstr "DEOP <kallenavn>, fjerner chanop status fra kallenavnet i den aktive kanalen. (Krever chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <kallenavn>, fjerner stemme-status fra kallenavnet i den aktive "
-"kanalen. (krever chanop)"
+msgstr "DEVOICE <kallenavn>, fjerner stemme-status fra kallenavnet i den aktive kanalen. (krever chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -593,9 +553,7 @@ msgstr "ECHO <tekst>, viser tekst lokalt"
 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] <kommando>, kjører kommandoen. Hvis -o flagget brukes, så vil "
-"utdata bli sendt til den aktive kanalen, hvis ikke vises det lokalt"
+msgstr "EXEC [-o] <kommando>, kjører kommandoen. Hvis -o flagget brukes, så vil utdata bli sendt til den aktive kanalen, hvis ikke vises det lokalt"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -605,9 +563,7 @@ msgstr "EXECCONT, sender SIGCONT til prosessen"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9] , dreper en kommando som kjører i den aktive sesjonen. Hvis -9 "
-"brukes, så vil prosessen bli SIGKILL-drept."
+msgstr "EXECKILL [-9] , dreper en kommando som kjører i den aktive sesjonen. Hvis -9 brukes, så vil prosessen bli SIGKILL-drept."
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -627,8 +583,7 @@ msgstr "FLUSHQ, tømmer den aktive vertens sende-kø"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <vert> [<port>], bruker en vert som mellommann, standard port er 23"
+msgstr "GATE <vert> [<port>], bruker en vert som mellommann, standard port er 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -636,9 +591,7 @@ msgstr "GHOST <kallenavn> [<passord>], dreper et GHOST-et kallenavn"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <kallenavn>, gir chanhalf-op status til kallenavnet i den aktive kanalen "
-"(krever chanop)"
+msgstr "HOP <kallenavn>, gir chanhalf-op status til kallenavnet i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -651,20 +604,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 <maske> <typer..> <alternativer..>\n"
-"    maske - vertsmaske som skal ignoreres, f.eks.: *!*@*.aol.com\n"
-"    typer - datatyper som skal ignoreres, en eller alle av:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    alternativer - NOSAVE, QUIET"
+msgstr "IGNORE <maske> <typer..> <alternativer..>\n    maske - vertsmaske som skal ignoreres, f.eks.: *!*@*.aol.com\n    typer - datatyper som skal ignoreres, en eller alle av:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    alternativer - NOSAVE, QUIET"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITER <kallenavn> [<kanal>], inviterer noen til en kanal, hvor aktiv kanal "
-"er standarden (krever chanop)"
+msgstr "INVITER <kallenavn> [<kanal>], inviterer noen til en kanal, hvor aktiv kanal er standarden (krever chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -673,17 +619,13 @@ msgstr "JOIN <kanal>, blir med i kanalen"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <kallenavn> [reason], sparker kallenavn fra den aktuelle kanalen "
-"(Krever chanop)"
+msgstr "KICK <kallenavn> [reason], sparker kallenavn fra den aktuelle kanalen (Krever chanop)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <kallenavn> [reason], utestenger og deretter sparker kallenavn fra "
-"den aktuelle kanalen (Krever chanop)"
+msgstr "KICKBAN <kallenavn> [reason], utestenger og deretter sparker kallenavn fra den aktuelle kanalen (Krever chanop)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -695,15 +637,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] [--] <tekst>, søker etter en tekst i mellomlageret\n"
-"    Bruk -h for å framheve funnet tekst\n"
-"    Bruk -m for sensitivitet til store og små bokstaver\n"
-"    Bruk -r når tekst er et regulært uttrykk\n"
-"    Bruk -- (dobbel bindestrek) for å avslutte alternativer når du f.eks. "
-"søker etter teksten '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <tekst>, søker etter en tekst i mellomlageret\n    Bruk -h for å framheve funnet tekst\n    Bruk -m for sensitivitet til store og små bokstaver\n    Bruk -r når tekst er et regulært uttrykk\n    Bruk -- (dobbel bindestrek) for å avslutte alternativer når du f.eks. søker etter teksten '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -712,9 +647,7 @@ msgstr "LOAD [-e] <fil>, laster et tillegg eller skript"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, fjerner samtlige chanhalf-op statuser i den aktive kanalen (krever "
-"chanop)"
+msgstr "MDEHOP, fjerner samtlige chanhalf-op statuser i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -722,24 +655,18 @@ msgstr "MDEOP, fjerner samtlige chanops i den aktive kanalen (krever 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 <handling>, sender handlingen til den aktive kanalen (handlinger skrives "
-"i tredjeperson, som f.eks. /me hoppet)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <handling>, sender handlingen til den aktive kanalen (handlinger skrives i tredjeperson, som f.eks. /me hoppet)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
-"MHOP <kallenavn>, gir chanhalf-op status til alle brukere i den aktive "
-"kanalen (krever chanop)"
+msgstr "MHOP <kallenavn>, gir chanhalf-op status til alle brukere i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, kaster ut samtlige personer i den aktive kanalen, bortsett fra deg "
-"(krever chanop)"
+msgstr "MKICK, kaster ut samtlige personer i den aktive kanalen, bortsett fra deg (krever chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -747,11 +674,9 @@ msgstr "MOP, gir samtlige personer chanop i den aktive kanalen (krever 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"
-msgstr ""
-"MSG <kallenavn> <message>, sender en privat melding, melding «.» for å sende "
-"til siste kallenavn eller prefiks med «=» for DCC-sludring"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <kallenavn> <message>, sender en privat melding, melding «.» for å sende til siste kallenavn eller prefiks med «=» for DCC-sludring"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -777,15 +702,11 @@ msgstr "NOTICE <kallenavn/kanal> <melding>, sender ett varsel"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n nettverk1[,nettverk2,...]] [<kallenavn>], viser varslingslisten "
-"din eller legger noen til den"
+msgstr "NOTIFY [-n nettverk1[,nettverk2,...]] [<kallenavn>], viser varslingslisten din eller legger noen til den"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <kallenavn>, gir chanop status til kallenavnet  i den aktive kanalen "
-"(krever chanop)"
+msgstr "OP <kallenavn>, gir chanop status til kallenavnet  i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -800,17 +721,13 @@ msgstr "PING <kallenavn | kanal>, CTCP-pinger et kallenavn eller en kanal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <kallenavn> [message], åpner opp et nytt privmsg vindu til "
-"noen og eventuelt send en melding"
+msgstr "QUERY [-nofocus] <kallenavn> [message], åpner opp et nytt privmsg vindu til noen og eventuelt send en melding"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <treffmaske> [<stillhetstype>], demper alle som samsvarer med "
-"treffmasken i den nåværende kanal, hvis det støttes av tjeneren."
+msgstr "QUIET <treffmaske> [<stillhetstype>], demper alle som samsvarer med treffmasken i den nåværende kanal, hvis det støttes av tjeneren."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -822,29 +739,23 @@ msgstr "QUOTE <tekst>, sender teksten i rå form til verten"
 
 #: 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] [<vert>] [<port>] [<passord>], kan bli brukt som /RECONNECT "
-"for å koble til nåværende vert på ny eller med /RECONNECT ALL for å koble "
-"til alle"
+msgstr "RECONNECT [-ssl] [<vert>] [<port>] [<passord>], kan bli brukt som /RECONNECT for å koble til nåværende vert på ny eller med /RECONNECT ALL for å koble til alle"
 
 #: 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 [<vert>] [<port>] [<passord>], kan bli brukt som /RECONNECT for å "
-"koble til nåværende vert på ny eller med /RECONNECT ALL for å koble til alle"
+msgstr "RECONNECT [<vert>] [<port>] [<passord>], kan bli brukt som /RECONNECT for å koble til nåværende vert på ny eller med /RECONNECT ALL for å koble til alle"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <tekst>, send rå data til HexChat, som om det var mottatt fra IRC-verten"
+msgstr "RECV <tekst>, send rå data til HexChat, som om det var mottatt fra IRC-verten"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -860,8 +771,7 @@ msgstr "SEND <kallenavn> [<fil>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <vert> <port> <kanal>, kobler til og blir med i en kanal"
+msgstr "SERVCHAN [-ssl] <vert> <port> <kanal>, kobler til og blir med i en kanal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -871,17 +781,13 @@ msgstr "SERVCHAN <vert> <port> <kanal>, kobler til og blir med i en kanal"
 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] <vert> [<port>] [<passord>], kobler til en vert med standard "
-"port som 6667 for vanlige tilkoblinger, og 6697 for SSL-tilkoblinger"
+msgstr "SERVER [-ssl] <vert> [<port>] [<passord>], kobler til en vert med standard port som 6667 for vanlige tilkoblinger, og 6697 for SSL-tilkoblinger"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <vert> [<port>] [<passord>], kobler til en vert med standard port som "
-"6667"
+msgstr "SERVER <vert> [<port>] [<passord>], kobler til en vert med standard port som 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -889,14 +795,11 @@ msgstr "SET [-e] [-off|-on] [-quiet] <variabel> [<verdi>]"
 
 #: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
-"SETCURSOR [-|+]<posisjon>, endre posisjonen til markøren i inndataboksen"
+msgstr "SETCURSOR [-|+]<posisjon>, endre posisjonen til markøren i inndataboksen"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nytt navn>, endre navnet til en fane, tab_trunc-grensen gjelder "
-"fortsatt"
+msgstr "SETTAB <nytt navn>, endre navnet til en fane, tab_trunc-grensen gjelder fortsatt"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -904,10 +807,9 @@ msgstr "SETTEXT <ny tekst>, erstatter teksten i inndataboksen"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], endrer kanalens emne om gitt, hvis ikke vises det nåværende "
-"emnet"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], endrer kanalens emne om gitt, hvis ikke vises det nåværende emnet"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -917,20 +819,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 <tidsavbrud> <fil1> [<fil2>] Blink systemkurvikonet mellom to "
-"ikoner.\n"
-"TRAY -f <filnavn>                  Sett systemkurvikonet til et ikon.\n"
-"TRAY -i <nummer>                    Blink systemkurvikonet med et internt "
-"ikon.\n"
-"TRAY -t <tekst>                      Sett systemkurvens infoboble.\n"
-"TRAY -b <tittel> <tekst>              Sett systemkurves varslingsboble."
+msgstr "\nTRAY -f <tidsavbrud> <fil1> [<fil2>] Blink systemkurvikonet mellom to ikoner.\nTRAY -f <filnavn>                  Sett systemkurvikonet til et ikon.\nTRAY -i <nummer>                    Blink systemkurvikonet med et internt ikon.\nTRAY -t <tekst>                      Sett systemkurvens infoboble.\nTRAY -b <tittel> <tekst>              Sett systemkurves varslingsboble."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <maske> [<maske>...], fjerner utestengingen av de spesifiserte maskene."
+msgstr "UNBAN <maske> [<maske>...], fjerner utestengingen av de spesifiserte maskene."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -942,11 +835,9 @@ msgstr "UNLOAD <navn>, laster ut et tillegg eller skript"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <treffmaske> [<treffmaske>...], fjerner dempingen av de spesifiserte "
-"maskene, hvis støttet av tjeneren."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <treffmaske> [<treffmaske>...], fjerner dempingen av de spesifiserte maskene, hvis støttet av tjeneren."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -954,16 +845,13 @@ msgstr "URL <url>, åpner en URL i din nettleser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <kallenavn1> <kallenavn2> osv, framhever kallenavn(er) i "
-"kanalens brukerliste"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <kallenavn1> <kallenavn2> osv, framhever kallenavn(er) i kanalens brukerliste"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOIE <kallenavn>, gir stemme-status til kallenavnet i den aktive kanalen "
-"(krever chanop)"
+msgstr "VOIE <kallenavn>, gir stemme-status til kallenavnet i den aktive kanalen (krever chanop)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -972,8 +860,7 @@ msgstr "WALLCHAN <melding>, sender en melding til alle åpne kanaler"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <melding>, sender meldingen til alle chanops i den aktive kanalen"
+msgstr "WALLCHOP <melding>, sender meldingen til alle chanops i den aktive kanalen"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -989,9 +876,7 @@ msgstr "Bruk: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Ingen hjelp tilgjengelig for kommandoen.\n"
+msgstr "\nIngen hjelp tilgjengelig for kommandoen.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1012,9 +897,7 @@ msgstr "Ukjent kommando %s.  Forsøk /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Ingen startpunkt for hexchat_plugin_init; er dette egentlig et HexChat-"
-"tillegg?"
+msgstr "Ingen startpunkt for hexchat_plugin_init; er dette egentlig et HexChat-tillegg?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1062,9 +945,7 @@ msgstr "Sikker på at denne verten støtter SSL og porten valgt?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Kunne ikke løse vertsnavnet %s\n"
-"Sjekk din Internett-konfigurasjon!\n"
+msgstr "Kunne ikke løse vertsnavnet %s\nSjekk din Internett-konfigurasjon!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1080,9 +961,7 @@ msgstr "Går videre til neste vert i %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Advarsel: tegnsettet «%s» er ukjent. Ingen konvertering vil bli brukt for "
-"nettverket %s."
+msgstr "Advarsel: tegnsettet «%s» er ukjent. Ingen konvertering vil bli brukt for nettverket %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1241,9 +1120,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT til %C18$1%O ble avbrutt."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tTilkobling for DCC CHAT ble etablert mot %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 "%C24*%O$tTilkobling for DCC CHAT ble etablert mot %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1276,11 +1155,9 @@ msgstr "%C16,17 Type  Til/fra    Status  Størrelse    Pos     Fil"
 
 #: 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"
-msgstr ""
-"%C20*%O$tMottok en ugyldig DCC-forespørsel fra %C18$1%O.$a010%C23*%O"
-"$tPakkeinnholdet: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tMottok en ugyldig DCC-forespørsel fra %C18$1%O.$a010%C23*%O$tPakkeinnholdet: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1297,11 +1174,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' til %C18$1%O ble avbrutt."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' fra %C18$3%O fullført %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' fra %C18$3%O fullført %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC RECV-tilkobling etablert til %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1314,9 +1191,9 @@ msgstr "%C20*%O$tDCC RECV: Kan ikke åpne '%C23$1%C' for skriving (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tThe file '%C24$1%C' finnes allerede, lagrer som '%C23$2%O' i stedet."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tThe file '%C24$1%C' finnes allerede, lagrer som '%C23$2%O' i stedet."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1329,11 +1206,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' til %C18$1%O avbrutt."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' til %C18$2%C fullført %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' til %C18$2%C fullført %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC SEND-tilkobling etablert til %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1380,8 +1257,7 @@ msgstr "%C16,17"
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
-"%C16,17 Vertsmaske                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr "%C16,17 Vertsmaske                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1393,8 +1269,7 @@ msgstr "%OIgnoreringslisten er tom."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tKan ikke bli med i %C22$1%C (%C20Kanalen er i invitasjonsmodus%O)"
+msgstr "%C20*%O$tKan ikke bli med i %C22$1%C (%C20Kanalen er i invitasjonsmodus%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1432,9 +1307,7 @@ msgstr "%C23*%O$t%C28$1%C er feilaktige. Forsøker igjen med %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tKallenavnet er ikke støttet, eller allerede i bruk. Bruk /NICK for "
-"å velge ett annet kallenavn."
+msgstr "%C20*%O$tKallenavnet er ikke støttet, eller allerede i bruk. Bruk /NICK for å velge ett annet kallenavn."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1571,8 +1444,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inaktiv %C23$2%O, logget på: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Ekte vert: %C23$2%O, Ekte IP: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Ekte vert: %C23$2%O, Ekte IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1617,9 +1489,7 @@ msgstr "**** BEGYNNER LOGGING PÅ %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Kan ikke åpne loggfilen(e) for skriving. Sjekk\n"
-"tilgangene til %s"
+msgstr "* Kan ikke åpne loggfilen(e) for skriving. Sjekk\ntilgangene til %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2116,9 +1986,7 @@ msgstr "Utestengelsesvarighet"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Kan ikke lese lydfil:\n"
-"%s"
+msgstr "Kan ikke lese lydfil:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3477,18 +3345,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Kan ikke åpne filen: %s\n"
-"%s.\n"
-" Gjenopptaking ikke mulig."
+msgstr "Kan ikke åpne filen: %s\n%s.\n Gjenopptaking ikke mulig."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Filen i nedlastningsmappen er større enn filen tilbudt. Gjenopptaking er "
-"ikke mulig."
+msgstr "Filen i nedlastningsmappen er større enn filen tilbudt. Gjenopptaking er ikke mulig."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3618,9 +3481,7 @@ msgstr "Åpne en URL eller kjør en kommando i en eksisterende HexChat"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Start minimert. Nivå 0 er normalt, nivå 1 er ikonifisert og nivå 2 er i "
-"systemkurven"
+msgstr "Start minimert. Nivå 0 er normalt, nivå 1 er ikonifisert og nivå 2 er i systemkurven"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3636,10 +3497,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Mislyktes med å åpne skrift:\n"
-"\n"
-"%s"
+msgstr "Mislyktes med å åpne skrift:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3657,100 +3515,72 @@ msgstr "Nettverkskø for sending: %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 \\\\"
-msgstr ""
-"Run Command-handlinga kjører dataene i data 1 som om det hadde blitt skrevet "
-"inn i boksen der du trykket tastesekvensen. Dermed kan den inneholde tekst "
-"(som vil bli sendt til kanalen/personen), kommandoer eller brukerkommandoer. "
-"Ved kjøring vil alle \\n tegnene i Data 1 brukes til å dele opp separate "
-"kommandoer slik at det er mulig å kjøre mer enn en kommando. Hvis du ønsker "
-"en\\ i selve teksten kjøre deretter inn\\\\"
+"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 "Run Command-handlinga kjører dataene i data 1 som om det hadde blitt skrevet inn i boksen der du trykket tastesekvensen. Dermed kan den inneholde tekst (som vil bli sendt til kanalen/personen), kommandoer eller brukerkommandoer. Ved kjøring vil alle \\n tegnene i Data 1 brukes til å dele opp separate kommandoer slik at det er mulig å kjøre mer enn en kommando. Hvis du ønsker en\\ i selve teksten kjøre deretter inn\\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Change Page-kommandoen veksler mellom sidene i notatboken. Sett Data 1 til "
-"den siden du ønsker å bytte til. Hvis data 2 er satt til noe vil byttingen "
-"være i forhold til den aktuelle posisjonen. Sett Data 1 til auto for å bytte "
-"til siden med den nyeste og viktig aktiviteten (private vinduer først, "
-"deretter kanaler med Utheving, kanaler med dialog og kanaler med andre data)"
+msgstr "Change Page-kommandoen veksler mellom sidene i notatboken. Sett Data 1 til den siden du ønsker å bytte til. Hvis data 2 er satt til noe vil byttingen være i forhold til den aktuelle posisjonen. Sett Data 1 til auto for å bytte til siden med den nyeste og viktig aktiviteten (private vinduer først, deretter kanaler med Utheving, kanaler med dialog og kanaler med andre data)"
 
 #: src/fe-gtk/fkeys.c:145
 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-kommandoen vil sette innholdet i data 1 i posten der "
-"tastesekvensen ble trykket ved markørposisjonen"
+msgstr "Insert in Buffer-kommandoen vil sette innholdet i data 1 i posten der tastesekvensen ble trykket ved markørposisjonen"
 
 #: 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."
-msgstr ""
-"Scroll Page-kommandoen ruller tekstfeltet (text-widget opp eller ned en side "
-"eller en linje. Sett Data 1 til enten Top, Bottom, Up, Down, +1 eller -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 "Scroll Page-kommandoen ruller tekstfeltet (text-widget opp eller ned en side eller en linje. Sett Data 1 til enten Top, Bottom, Up, Down, +1 eller -1."
 
 #: 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-kommandoen setter oppføringen der tastesekvensen ble oppgitt til "
-"innholdet i data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Set Buffer-kommandoen setter oppføringen der tastesekvensen ble oppgitt til innholdet i 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 ""
-"Last Command-kommandoen setter oppføringen til å inneholde den forige "
-"angitte kommandoen - det samme som å trykke opp i et skall"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Last Command-kommandoen setter oppføringen til å inneholde den forige angitte kommandoen - det samme som å trykke opp i et skall"
 
 #: 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-kommandoen setter oppføringen til å inneholde den neste angitte "
-"kommandoen - det samme som å trykke ned i et skall"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Next Command-kommandoen setter oppføringen til å inneholde den neste angitte kommandoen - det samme som å trykke ned i et skall"
 
 #: 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 ""
-"Denne kommandoen endrer teksten i oppføringen for å fullføre et ufullstendig "
-"kallenavn eller kommando. Hvis Data 1 er satt vil dobbelt-tabbing i en "
-"streng velge det siste kallenavnet, ikke det neste"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Denne kommandoen endrer teksten i oppføringen for å fullføre et ufullstendig kallenavn eller kommando. Hvis Data 1 er satt vil dobbelt-tabbing i en streng velge det siste kallenavnet, ikke det neste"
 
 #: 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 ""
-"Denne kommandoen ruller opp og ned gjennom listen over kallenavn. Hvis Data "
-"1 er satt til noe vil det bla opp, ellers blar det ned"
+"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 "Denne kommandoen ruller opp og ned gjennom listen over kallenavn. Hvis Data 1 er satt til noe vil det bla opp, ellers blar det ned"
 
 #: 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 ""
-"Denne kommandoen sjekker det siste ordet oppgitt i oppføringen mot "
-"erstatningslisten og erstatter den hvis den finner et treff"
+msgstr "Denne kommandoen sjekker det siste ordet oppgitt i oppføringen mot erstatningslisten og erstatter den hvis den finner et treff"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3877,9 +3707,7 @@ msgstr "Tilkobling til %s fullført."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"I nettverksvinduet har ingen kanal (sludrerom) blitt satt for å automatisk "
-"bli med i for dette nettverket."
+msgstr "I nettverksvinduet har ingen kanal (sludrerom) blitt satt for å automatisk bli med i for dette nettverket."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3895,9 +3723,7 @@ msgstr "_Bli med i denne kanalen:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr ""
-"Hvis du vet hvilken kanal du ønsker å bli med i, så kan du skrive inn navnet "
-"her."
+msgstr "Hvis du vet hvilken kanal du ønsker å bli med i, så kan du skrive inn navnet her."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
@@ -3929,9 +3755,7 @@ msgstr "Emne er ikke satt"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Denne verten har fortsatt %d kanaler eller dialoger assosiert med den. Vil "
-"du lukke alle?"
+msgstr "Denne verten har fortsatt %d kanaler eller dialoger assosiert med den. Vil du lukke alle?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4162,9 +3986,7 @@ msgstr "%d kallenavn valgt."
 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 ""
-"Menylinjen er nå skjult. For å vise den igjen kan du trykke Control+F9, "
-"eller ved å høyre-klikke i en blank del av hovedområdet for tekst."
+msgstr "Menylinjen er nå skjult. For å vise den igjen kan du trykke Control+F9, eller ved å høyre-klikke i en blank del av hovedområdet for tekst."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4260,25 +4082,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Brukerkommandoer - spesialkoder:\n"
-"\n"
-"%c  =  gjeldende kanal\n"
-"%e  =  gjeldende nettverksnavn\n"
-"%m  =  maskininformasjon\n"
-"%n  =  kallenavnet ditt\n"
-"%t  =  tid/dato\n"
-"%v  =  HexChat-versjon\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 til enden av linjen\n"
-"&3  =  ord 3 til enden av linjen\n"
-"\n"
-"f.eks.:\n"
-"/cmd john hallo\n"
-"\n"
-"%2 vil bli «john»\n"
-"&2 vil bli «john hallo»."
+msgstr "Brukerkommandoer - spesialkoder:\n\n%c  =  gjeldende kanal\n%e  =  gjeldende nettverksnavn\n%m  =  maskininformasjon\n%n  =  kallenavnet ditt\n%t  =  tid/dato\n%v  =  HexChat-versjon\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til enden av linjen\n&3  =  ord 3 til enden av linjen\n\nf.eks.:\n/cmd john hallo\n\n%2 vil bli «john»\n&2 vil bli «john hallo»."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4293,18 +4097,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Brukerknapper - spesialkoder:\n"
-"\n"
-"%a  =  Alle valgte kallenavn\n"
-"%c  =  gjeldende kanal\n"
-"%e  =  gjeldende nettverksnavn\n"
-"%h  =  valgte kallenavns vertsnavn\n"
-"%m  =  maskininformasjon\n"
-"%n  =  kallenavnet ditt\n"
-"%s  =  valgte kallenavn\n"
-"%t  =  tid/dato\n"
-"%u  =  valgte kallenavns konto"
+msgstr "Brukerknapper - spesialkoder:\n\n%a  =  Alle valgte kallenavn\n%c  =  gjeldende kanal\n%e  =  gjeldende nettverksnavn\n%h  =  valgte kallenavns vertsnavn\n%m  =  maskininformasjon\n%n  =  kallenavnet ditt\n%s  =  valgte kallenavn\n%t  =  tid/dato\n%u  =  valgte kallenavns konto"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4319,18 +4112,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Dialogknapper - spesialkoder:\n"
-"\n"
-"%a  =  Alle valgte kallenavn\n"
-"%c  =  gjeldende kanal\n"
-"%e  =  gjeldende nettverksnavn\n"
-"%h  =  valgte kallenavns vertsnavn\n"
-"%m  =  maskininformasjon\n"
-"%n  =  kallenavnet ditt\n"
-"%s  =  valgte kallenavn\n"
-"%t  =  tid/dato\n"
-"%u  =  valgte kallenavns konto"
+msgstr "Dialogknapper - spesialkoder:\n\n%a  =  Alle valgte kallenavn\n%c  =  gjeldende kanal\n%e  =  gjeldende nettverksnavn\n%h  =  valgte kallenavns vertsnavn\n%m  =  maskininformasjon\n%n  =  kallenavnet ditt\n%s  =  valgte kallenavn\n%t  =  tid/dato\n%u  =  valgte kallenavns konto"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4346,19 +4128,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP-svar - spesialkoder:\n"
-"\n"
-"%d  =  data (hele ctcp)\n"
-"%e  =  gjeldende nettverksnavn\n"
-"%m  =  maskininformasjon\n"
-"%s  =  kallenavnet som sendte ctcp-en\n"
-"%t  =  tid/dato\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 til enden av linjen\n"
-"&3  =  ord 3 til enden av linjen\n"
-"\n"
+msgstr "CTCP-svar - spesialkoder:\n\n%d  =  data (hele ctcp)\n%e  =  gjeldende nettverksnavn\n%m  =  maskininformasjon\n%s  =  kallenavnet som sendte ctcp-en\n%t  =  tid/dato\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til enden av linjen\n&3  =  ord 3 til enden av linjen\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4370,14 +4140,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL-behandlere - spesialkoder:\n"
-"\n"
-"%s  =  URL-strengen\n"
-"\n"
-"Plassering av ! foran kommandoen\n"
-"indikerer at den skal sendes til et\n"
-"shell i steden for HexChat"
+msgstr "URL-behandlere - spesialkoder:\n\n%s  =  URL-strengen\n\nPlassering av ! foran kommandoen\nindikerer at den skal sendes til et\nshell i steden for HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4906,9 +4669,7 @@ msgstr "Du må ha to unike kallenavn."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Fremgangsmåte for identifikasjon mot tjener. For egendefinerte "
-"innloggingsmetoder kan du bruke tilkoblingskommandoer."
+msgstr "Fremgangsmåte for identifikasjon mot tjener. For egendefinerte innloggingsmetoder kan du bruke tilkoblingskommandoer."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4933,11 +4694,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n = kallenavn\n"
-"%p = passord\n"
-"%r = ekte navn\n"
-"%u = brukernavn"
+msgstr "%n = kallenavn\n%p = passord\n%r = ekte navn\n%u = brukernavn"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5044,9 +4801,7 @@ msgstr "_Sorter"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Sorterer nettverkslisten i alfabetisk rekkefølge. Bruk Shift+↑ og Shift+↓ -"
-"tastene for å flytte en rad."
+msgstr "Sorterer nettverkslisten i alfabetisk rekkefølge. Bruk Shift+↑ og Shift+↓ -tastene for å flytte en rad."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5396,9 +5151,7 @@ msgstr "Ordbøker i bruk:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Bruk språkkoder (som i «%LOCALAPPDATA%\\enchant\\myspell\\dicts»).\n"
-"Skill flere oppføringer med komma."
+msgstr "Bruk språkkoder (som i «%LOCALAPPDATA%\\enchant\\myspell\\dicts»).\nSkill flere oppføringer med komma."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5712,9 +5465,8 @@ msgid "Chat window"
 msgstr "Samtalevindu"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Maksimum overføringshastighet (i Byte per sekund)"
+msgstr "Maksimum filoverføringshastighet (bytes per sekund)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5774,9 +5526,7 @@ msgstr "Spill systemlyden «lynmeldingsvarsling» på de utvalgte hendelser"
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Spill «message-new-instant» fra freedesktop.org lydtema på de utvalgte "
-"hendelser"
+msgstr "Spill «message-new-instant» fra freedesktop.org lydtema på de utvalgte hendelser"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5851,9 +5601,7 @@ msgstr "Kallenavn som alltid skal fremheves:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separer flere ord med komma.\n"
-"Jokertegn kan brukes."
+msgstr "Separer flere ord med komma.\nJokertegn kan brukes."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5909,9 +5657,7 @@ msgstr "WHOIS ved mottakelse av varslingsmelding"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Sender en /WHOIS når en bruker som ligger i varslingslisten din kobler seg "
-"på."
+msgstr "Sender en /WHOIS når en bruker som ligger i varslingslisten din kobler seg på."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5953,9 +5699,7 @@ msgstr "Kopier valgt tekst automatisk"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Kopier valgt tekst til utklippstavlen når venstre museknappen slippes. "
-"Ellers vil Ctrl+Shift+C kopiere den markerte teksten til utklippstavlen."
+msgstr "Kopier valgt tekst til utklippstavlen når venstre museknappen slippes. Ellers vil Ctrl+Shift+C kopiere den markerte teksten til utklippstavlen."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -5963,11 +5707,9 @@ msgstr "Inkluder tidsstempel automatisk"
 
 #: 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."
-msgstr ""
-"Inkluder tidsstempler automatisk i tekst som blir kopiert. Ellers, inkluder "
-"tidsstempler hvis Shift-tasten er nede."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Inkluder tidsstempler automatisk i tekst som blir kopiert. Ellers, inkluder tidsstempler hvis Shift-tasten er nede."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5975,11 +5717,9 @@ msgstr "Inkluder farge informasjon automatisk"
 
 #: 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."
-msgstr ""
-"Inkluder farge informasjon automatisk i tekst som blir kopiert. Ellers, "
-"inkluder farge informasjon hvis Ctrl-tasten er nede."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Inkluder farge informasjon automatisk i tekst som blir kopiert. Ellers, inkluder farge informasjon hvis Ctrl-tasten er nede."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6009,9 +5749,7 @@ msgstr "Bruk servertid hvis det støttes"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Vis tidsstempler hentet fra serveren hvis den støtter «time-server»-"
-"utvidelsen."
+msgstr "Vis tidsstempler hentet fra serveren hvis den støtter «time-server»-utvidelsen."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6031,10 +5769,9 @@ msgstr "Utestengelsestype:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Forsøk å bruke denne banmasken ved utestengelse eller demping. (krever "
+"Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
+msgstr "Forsøk å bruke denne banmasken ved utestengelse eller demping. (krever irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6095,11 +5832,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6143,11 +5880,9 @@ msgstr "Hent adressen min fra IRC-verten"
 
 #: 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 ""
-"Spør IRC-tjeneren for din ekte adresse. Bruk dette hvis du har en 192.168.*."
-"* adresse!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Spør IRC-tjeneren for din ekte adresse. Bruk dette hvis du har en 192.168.*.* adresse!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6194,7 +5929,6 @@ msgid "Proxy Authentication"
 msgstr "Proxy-autentisering"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
 msgstr "Bruk autentisering (Kun HTTP eller SOCKS5)"
 
@@ -6218,9 +5952,7 @@ msgstr "Tjener vil svare med nettverkets brukernavn"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Du må ha rettigheter til å lytte på denne porten.  Hvis det ikke er 113 (0 "
-"er forhåndsvalgt til dette) så må du sette opp port-videresending."
+msgstr "Du må ha rettigheter til å lytte på denne porten.  Hvis det ikke er 113 (0 er forhåndsvalgt til dette) så må du sette opp port-videresending."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6382,21 +6114,15 @@ msgstr "Kategorier"
 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 ""
-"Du kan ikke plassere tre-navigasjonen på toppen eller bunnen!\n"
-"Bytt til <b>Faner</B>-oppsettet fra <b>Vis</b>-menyen først."
+msgstr "Du kan ikke plassere tre-navigasjonen på toppen eller bunnen!\nBytt til <b>Faner</B>-oppsettet fra <b>Vis</b>-menyen først."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Alternativet for ekte navn kan ikke være tomt. Faller derfor tilbake til "
-"«realname»."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Alternativet for ekte navn kan ikke være tomt. Faller derfor tilbake til «realname»."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Noen innstillinger som krever en omstart for å få full effekt, ble endret."
+msgstr "Noen innstillinger som krever en omstart for å få full effekt, ble endret."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6404,11 +6130,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 ""
-"*ADVARSEL*\n"
-"Auto akseptere DCC til hjemmekatalogen\n"
-"kan være farlig og kan utnyttes. Eks:\n"
-"Noen kunne sende deg en .bash_profile"
+msgstr "*ADVARSEL*\nAuto akseptere DCC til hjemmekatalogen\nkan være farlig og kan utnyttes. Eks:\nNoen kunne sende deg en .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6517,20 +6239,14 @@ msgstr "Sysinfo: Ingen informasjon ved ved navnet\n"
 #: plugins/sysinfo/sysinfo.c:154 plugins/sysinfo/sysinfo.c:158
 #, c-format
 msgid "Sysinfo: %s is set to: %d\n"
-msgstr ""
-"Sysinfo: %s satt til: %d\n"
-"\n"
-"\n"
+msgstr "Sysinfo: %s satt til: %d\n\n\n"
 
 #: 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"
-msgstr ""
-"Sysinfo: Gyldige verdier er: announce og hide_* for hver bit informasjon, f."
-"eks. hide_os.  Uten en verdi vil den vise gjeldende (eller forhåndsvalgt) "
-"oppsett.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Gyldige verdier er: announce og hide_* for hver bit informasjon, f.eks. hide_os.  Uten en verdi vil den vise gjeldende (eller forhåndsvalgt) oppsett.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6545,9 +6261,3 @@ msgstr "Tillegg %s lastet\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Tillegg %s tatt vekk\n"
-
-#~ msgid "Socks4"
-#~ msgstr "SOCKS4"
-
-#~ msgid "Socks5"
-#~ msgstr "SOCKS5"
diff --git a/po/nl.po b/po/nl.po
index 64a7ea9b..31b73fb6 100644
--- a/po/nl.po
+++ b/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"
diff --git a/po/no.po b/po/no.po
index e3f20e56..79b0d815 100644
--- a/po/no.po
+++ b/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"
diff --git a/po/pa.po b/po/pa.po
index 0c34cff6..1feedd6c 100644
--- a/po/pa.po
+++ b/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"
diff --git a/po/pl.po b/po/pl.po
index fd038518..5fde04e1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,37 +1,37 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Marcin Szymański <cysioland@gmail.com>, 2014
 # Marcin Szymański <cysioland@gmail.com>, 2014
 # Eustachy_Kapusta <eustachy.kapusta@gmail.com>, 2012
 # Eustachy_Kapusta <eustachy.kapusta@gmail.com>, 2013-2014
+# Hubert Ślósarski <inactive+hsslosars@transifex.com>, 2018
 # Jakub Wasielewski <jakub@wasielewski.info>, 2005
 # Krzysztof Blachnicki <necrokris@gmail.com>, 2013
 # Krzysztof Blachnicki <necrokris@gmail.com>, 2013
 # lipvig <p@ryciuk.com>, 2014
-# Marcin Mikołajczak <m4sk1n@vivaldi.net>, 2016
+# Marcin Mikołajczak <me@mkljczk.pl>, 2016
+# Marcin Mikołajczak <me@mkljczk.pl>, 2016
 # Marcin Szymański <cysioland@gmail.com>, 2014
-# michcioperz <michcioperz@gmail.com>, 2017
+# Michał Sidor <michcioperz@gmail.com>, 2017
+# Michał Sidor <michcioperz@gmail.com>, 2017
 # lipvig <p@ryciuk.com>, 2014
 # Eustachy_Kapusta <eustachy.kapusta@gmail.com>, 2012
 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-11-28 20:40+0000\n"
-"Last-Translator: michcioperz <michcioperz@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/hexchat/hexchat/language/"
-"pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-05-13 14:45+0000\n"
+"Last-Translator: Hubert Ślósarski <inactive+hsslosars@transifex.com>\n"
+"Language-Team: Polish (http://www.transifex.com/hexchat/hexchat/language/pl/)\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==1 ? 0 : (n%10>=2 && n%10<=4) && (n"
-"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
-"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -49,18 +49,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 jest prostym, lecz dowolnie poszerzalnym klientem IRC. Pozwala na "
-"bezpieczne dołączenie do wielu sieci i rozmawianie z użytkownikami prywatnie "
-"bądź na kanałach. Można nawet przesyłać pliki."
+msgstr "HexChat jest prostym, lecz dowolnie poszerzalnym klientem IRC. Pozwala na bezpieczne dołączenie do wielu sieci i rozmawianie z użytkownikami prywatnie bądź na kanałach. Można nawet przesyłać pliki."
 
 #: 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 wspiera takie funkcje, jak: DCC, SASL, serwery proxy, sprawdzanie "
-"pisowni, alerty, logi, własne motywy i skrypty w Pythonie/Perlu."
+msgstr "HexChat wspiera takie funkcje, jak: DCC, SASL, serwery proxy, sprawdzanie pisowni, alerty, logi, własne motywy i skrypty w Pythonie/Perlu."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -77,7 +72,7 @@ msgstr "IM;Chat;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -317,9 +312,7 @@ msgstr "Nie możesz zapisywać %s. Nic z tej sesji nie może być zapisanego."
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Używanie IRC-a jako root to głupota! Utwórz \n"
-"konto użytkownika, aby logować się z niego.\n"
+msgstr "* Używanie IRC-a jako root to głupota! Utwórz \nkonto użytkownika, aby logować się z niego.\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
@@ -341,9 +334,7 @@ msgstr "%s zasypuje Cię pakietami CTCP! Ignoruję %s\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Zostałeś/aś zasypany/a wiadomościami przez %s, ustawiam gui_autoopen_dialog "
-"OFF.\n"
+msgstr "Zostałeś/aś zasypany/a wiadomościami przez %s, ustawiam gui_autoopen_dialog OFF.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -379,8 +370,7 @@ msgstr "Nie jesteś na żadnym kanale. Użyj polecenia /join #<nazwa_kanalu>\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr ""
-"Brak połączenia z serwerem. Użyj polecenia /server <nazwa_hosta> [<port>]\n"
+msgstr "Brak połączenia z serwerem. Użyj polecenia /server <nazwa_hosta> [<port>]\n"
 
 #: src/common/outbound.c:277
 #, c-format
@@ -447,27 +437,19 @@ msgstr "ADDBUTTON <nazwa> <akcja>, dodaje przycisk pod listą użytkowników"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NowaSiec> <nowyserver/6667>, dodaje nową siec z nowym serwerem do "
-"listy sieci"
+msgstr "ADDSERVER <NowaSiec> <nowyserver/6667>, dodaje nową siec z nowym serwerem do listy sieci"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <polecenie>, wysyła polecenie do wszystkich kanałów, w których się "
-"znajdujesz"
+msgstr "ALLCHAN <polecenie>, wysyła polecenie do wszystkich kanałów, w których się znajdujesz"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <polecenie>, wysyła polecenie do wszystkich kanałów na aktualnym "
-"serwerze"
+msgstr "ALLCHANL <polecenie>, wysyła polecenie do wszystkich kanałów na aktualnym serwerze"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <polecenia>, wysyła polecenie do wszystkich serwerów, z którymi "
-"jesteś połączony/a"
+msgstr "ALLSERV <polecenia>, wysyła polecenie do wszystkich serwerów, z którymi jesteś połączony/a"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -482,10 +464,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> [<rodzaj>], banuje wszystkich pasujących do maski na danym "
-"kanale. Jeśli są oni obecni w tym kanale te polecenie nie spowoduje ich "
-"wyproszenia (musisz być operatorem kanału)"
+msgstr "BAN <maska> [<rodzaj>], banuje wszystkich pasujących do maski na danym kanale. Jeśli są oni obecni w tym kanale te polecenie nie spowoduje ich wyproszenia (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -493,17 +472,15 @@ msgstr "CHANOPT [-quiet] <zmienna> [<wartość>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kodowanie>], wyświetl albo ustaw kodowanie dla bieżącegopołączenia"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kodowanie>], wyświetl albo ustaw kodowanie dla bieżącegopołączenia"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY]|[-]<ilosc>, czyści aktualną zawartość okna lub historię "
-"poleceń"
+msgstr "CLEAR [ALL|HISTORY]|[-]<ilosc>, czyści aktualną zawartość okna lub historię poleceń"
 
 #: src/common/outbound.c:3947
 msgid ""
@@ -519,14 +496,12 @@ msgstr "COUNTRY [-s] <kod|maska>, odszukuje kod kraju, np.: pl = Polska"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <wiadomość>, wysyła wiadomość CTCP do użytkownika o podanym "
-"nicku. Typowe wiadomości to VERSION (wersja) oraz USERINFO (informacje o "
-"użytkowniku)"
+msgstr "CTCP <nick> <wiadomość>, wysyła wiadomość CTCP do użytkownika o podanym nicku. Typowe wiadomości to VERSION (wersja) oraz USERINFO (informacje o użytkowniku)"
 
 #: 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 [<kanał>], wyjście i natychmiastowy powrót do kanału"
 
 #: src/common/outbound.c:3956
@@ -540,30 +515,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>                       - przyjmuje zaoferowany plik\n"
-"DCC SEND [-makszns=#] <nick> [plik]  - wysyła plik do kogoś o podanym nicku\n"
-"DCC PSEND [-makszns=#] <nick> [plik] - wysyła plik w trybie pasywnym\n"
-"DCC LIST                                  - wyświetla listę połączeń "
-"bezpośrednich\n"
-"DCC CHAT <nick>                      - oferuje użytkownikowi o podanym nicku "
-"czat bezpośredni\n"
-"DCC PCHAT <nick>                     - oferuje użytkownikowi o podanym "
-"nicku\n"
-" czat bezpośredni w trybie pasywnym\n"
-"DCC CLOSE <rodzaj> <nick> <plik>     - zamyka określone połączenie "
-"bezpośrednie\n"
-" przykład:\n"
-"/dcc close send jasio plik.zip"
+msgstr "\nDCC GET <nick>                       - przyjmuje zaoferowany plik\nDCC SEND [-makszns=#] <nick> [plik]  - wysyła plik do kogoś o podanym nicku\nDCC PSEND [-makszns=#] <nick> [plik] - wysyła plik w trybie pasywnym\nDCC LIST                                  - wyświetla listę połączeń bezpośrednich\nDCC CHAT <nick>                      - oferuje użytkownikowi o podanym nicku czat bezpośredni\nDCC PCHAT <nick>                     - oferuje użytkownikowi o podanym nicku\n czat bezpośredni w trybie pasywnym\nDCC CLOSE <rodzaj> <nick> <plik>     - zamyka określone połączenie bezpośrednie\n przykład:\n/dcc close send jasio plik.zip"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <nick>, zabiera uprawnienia półoperatora użytkownikowi o podanym nicku "
-"w aktualnym kanale (musisz być operatorem kanału)"
+msgstr "DEHOP <nick>, zabiera uprawnienia półoperatora użytkownikowi o podanym nicku w aktualnym kanale (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -573,17 +531,13 @@ msgstr "DELBUTTON <nazwa>, usuwa przycisk spod listy użytkowników"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, zabiera uprawnienia operatora użytkownikowi o podanym nicku na "
-"aktualnym kanale (musisz być operatorem kanału)"
+msgstr "DEOP <nick>, zabiera uprawnienia operatora użytkownikowi o podanym nicku na aktualnym kanale (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, zabiera prawo głosu użytkownikowi o podanym nicku na "
-"aktualnym kanale (musisz być operatorem kanału)"
+msgstr "DEVOICE <nick>, zabiera prawo głosu użytkownikowi o podanym nicku na aktualnym kanale (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -605,10 +559,7 @@ msgstr "ECHO <tekst>, wypisuje lokalnie zadany tekst"
 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] <polecenie>, uruchamia polecenie. Jeśli podana jest opcja -o "
-"wówczas wynik jest wysyłany do aktualnego kanału, w innym wypadku jest "
-"wyświetlany lokalnie"
+msgstr "EXEC [-o] <polecenie>, uruchamia polecenie. Jeśli podana jest opcja -o wówczas wynik jest wysyłany do aktualnego kanału, w innym wypadku jest wyświetlany lokalnie"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -618,9 +569,7 @@ msgstr "EXECCONT, wysyła procesowi sygnał SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], zabija uruchomiony proces w aktualnej sesji. Jeśli podana "
-"jest opcja -9, proces otrzymuje sygnał SIGKILL"
+msgstr "EXECKILL [-9], zabija uruchomiony proces w aktualnej sesji. Jeśli podana jest opcja -9, proces otrzymuje sygnał SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -640,8 +589,7 @@ msgstr "FLUSHHQ, opróżnia aktualną kolejkę wysyłkową serwera"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<port>], włączenie pośredniczenia przez host, domyślny portto 23"
+msgstr "GATE <host> [<port>], włączenie pośredniczenia przez host, domyślny portto 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -649,8 +597,7 @@ msgstr "GHOST <nick> [hasło], Pozbywa się martwego nicka"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nick>, nadaje status półoperatora kanału (musisz być operatorem kanału)"
+msgstr "HOP <nick>, nadaje status półoperatora kanału (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -663,20 +610,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 <maska> <rodzaje..> <opcje..>\n"
-"    maska - maska ignorowanego hosta, przykład: *!*@*.tpnet.pl\n"
-"  rodzaje - zakres ignorowania, jeden rodzaj lub ALL:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opcje - NOSAVE, QUIET"
+msgstr "IGNORE <maska> <rodzaje..> <opcje..>\n    maska - maska ignorowanego hosta, przykład: *!*@*.tpnet.pl\n  rodzaje - zakres ignorowania, jeden rodzaj lub ALL:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opcje - 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> [<kanal>], wysyła zaproszenie do kanału, domyślnie jest to "
-"aktualny kanał (musisz być operatorem kanału)"
+msgstr "INVITE <nick> [<kanal>], wysyła zaproszenie do kanału, domyślnie jest to aktualny kanał (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -685,17 +625,13 @@ msgstr "JOIN <kanał>, dołączenie do kanału"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <nick> [powód], wyprasza użytkownika z aktualnego kanału (musisz być "
-"operatorem kanału)"
+msgstr "KICK <nick> [powód], wyprasza użytkownika z aktualnego kanału (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <nick> [powód], banuje a następnie wyprasza użytkownika z aktualnego "
-"kanału (musisz być operatorem kanału)"
+msgstr "KICKBAN <nick> [powód], banuje a następnie wyprasza użytkownika z aktualnego kanału (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -707,14 +643,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] [--] <ciąg>, szuka danego ciągu w buforze\n"
-"    Użyj -h aby podświetlić znaleziony/ne ciąg/i\n"
-"    Użyj -m aby wielkość znaków miała znaczenie\n"
-"   Użyj -r gdy ciąg jest Wyrażeniem Regularnym\tUżyj -- (podwójna kreska) "
-"aby zakończyć opcje gdy szukasz, na przykład, ciąg '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <ciąg>, szuka danego ciągu w buforze\n    Użyj -h aby podświetlić znaleziony/ne ciąg/i\n    Użyj -m aby wielkość znaków miała znaczenie\n   Użyj -r gdy ciąg jest Wyrażeniem Regularnym\tUżyj -- (podwójna kreska) aby zakończyć opcje gdy szukasz, na przykład, ciąg '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -723,23 +653,17 @@ msgstr "LOAD [-e] <plik>, załadowanie wtyczki lub skryptu"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, masowe odebranie statusu półoperatora wszystkim na aktualnym kanale "
-"(musisz być operatorem kanału)"
+msgstr "MDEHOP, masowe odebranie statusu półoperatora wszystkim na aktualnym kanale (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, masowe odebranie statusu operatora wszystkim na aktualnym kanale "
-"(musisz być operatorem kanału)"
+msgstr "MDEOP, masowe odebranie statusu operatora wszystkim na aktualnym kanale (musisz być operatorem kanału)"
 
 #: 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 <akcja>, wysyła akcję do aktualnego kanału (akcje pisane są 3. osobie, "
-"tak jak /me skacze)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <akcja>, wysyła akcję do aktualnego kanału (akcje pisane są 3. osobie, tak jak /me skacze)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -748,23 +672,17 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, wyrzuca wszystkich oprócz ciebie w bieżącym kanale (musisz być "
-"operatorem kanału)"
+msgstr "MKICK, wyrzuca wszystkich oprócz ciebie w bieżącym kanale (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, daje wszystkim użytkownikom status operatora na bieżącym kanale (musisz "
-"być operatorem kanału)"
+msgstr "MOP, daje wszystkim użytkownikom status operatora na bieżącym kanale (musisz być operatorem kanału)"
 
 #: 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"
-msgstr ""
-"MSG <nick> <wiadomośc>, wysyła prywatną wiadomość, użyj \".\" aby wysąć "
-"wiadomośc do ostatnio uzytego nicka albo użyj \"=\" aby rozpocząć dcc chat"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <nick> <wiadomośc>, wysyła prywatną wiadomość, użyj \".\" aby wysąć wiadomośc do ostatnio uzytego nicka albo użyj \"=\" aby rozpocząć dcc chat"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -790,14 +708,11 @@ msgstr "NOTICE <nick/kanał> <wiadomość>, wysyła ogłoszenie"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nick>], wyświetla listę powiadomień "
-"lub dodaje kogoś do niej"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nick>], wyświetla listę powiadomień lub dodaje kogoś do niej"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nick>, daje nicku status operatora kanału (musisz być operatorem kanału)"
+msgstr "OP <nick>, daje nicku status operatora kanału (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -818,9 +733,7 @@ msgstr "QUERY [-nofocus] <nick> [wiadomość], otwiera nowe okno rozmowy"
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUITE <maska> [<rodzaj>], wycisza wszystkich pasujących do maski w danym "
-"pokoju - jeśli jest to wspierane przez serwer."
+msgstr "QUITE <maska> [<rodzaj>], wycisza wszystkich pasujących do maski w danym pokoju - jeśli jest to wspierane przez serwer."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -832,31 +745,23 @@ msgstr "QUOTE <tekst>, wysyła surowy tekst do serwera"
 
 #: 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>] [<hasło>], można użyć jako /RECONNECT aby "
-"ponownie połączyć się do bieżącego serwera lub /RECONNECT ALL aby ponownie "
-"połączyć się do wszystkich otwartych serwerów"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<hasło>], można użyć jako /RECONNECT aby ponownie połączyć się do bieżącego serwera lub /RECONNECT ALL aby ponownie połączyć się do wszystkich otwartych serwerów"
 
 #: 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>] [<hasło>], można użyć jako /RECONNECT aby "
-"ponownie połączyć się do bieżącego serwera lub /RECONNECT ALL aby ponownie "
-"połączyć się do wszystkich otwartych serwerów"
+msgstr "RECONNECT [<host>] [<port>] [<hasło>], można użyć jako /RECONNECT aby ponownie połączyć się do bieżącego serwera lub /RECONNECT ALL aby ponownie połączyć się do wszystkich otwartych serwerów"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <tekst>, wyślij surowe dane do HexChata, tak jakby zostały odebrane od "
-"serwera IRC"
+msgstr "RECV <tekst>, wyślij surowe dane do HexChata, tak jakby zostały odebrane od serwera IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -882,16 +787,13 @@ msgstr "SERVCHAN <host> <port> <kanal>, łączy i dołącza do kanału"
 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] <host> [<port>] [<hasło>], łączy Cię z serwerem, domyślny port "
-"to 6667 dla zwykłych połączeń, 6697 dla połączeń ssl"
+msgstr "SERVER [-ssl] <host> [<port>] [<hasło>], łączy Cię z serwerem, domyślny port to 6667 dla zwykłych połączeń, 6697 dla połączeń ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<hasło>], łączy się z serwerem, domyślny port to 6667"
+msgstr "SERVER <host> [<port>] [<hasło>], łączy się z serwerem, domyślny port to 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -903,9 +805,7 @@ msgstr "SETCURSOR [-|+]<pozycja>, przestawia kursor w polu wprowadzania"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <nowa nazwa>, zmienia nazwę zakładki, nadal obowiązuje limit z "
-"tab_trunc"
+msgstr "SETTAB <nowa nazwa>, zmienia nazwę zakładki, nadal obowiązuje limit z tab_trunc"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -913,10 +813,9 @@ msgstr "SETTEXT <nowy tekst>, zmienia tekst w polu wprowadzania"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<temat>], określa temat jeśli jest podany, inaczej pokazuje bieżący "
-"temat"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<temat>], określa temat jeśli jest podany, inaczej pokazuje bieżący temat"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -926,14 +825,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 <limit czasu> <plik1> [<plik2>] Miga w zasobniku pomiędzy dwoma "
-"ikonami.\n"
-"TRAY -f <nazwa pliku>                  Ustawia zasobnik do ustalonej ikony.\n"
-"TRAY -i <numer>                    Miga w zasobniku wewnętrzną ikoną.\n"
-"TRAY -t <tekst>                      Ustawia tooltip zasobnika.\n"
-"TRAY -b <tytuł> <tekst>              Ustawia balon zasobnika."
+msgstr "\nTRAY -f <limit czasu> <plik1> [<plik2>] Miga w zasobniku pomiędzy dwoma ikonami.\nTRAY -f <nazwa pliku>                  Ustawia zasobnik do ustalonej ikony.\nTRAY -i <numer>                    Miga w zasobniku wewnętrzną ikoną.\nTRAY -t <tekst>                      Ustawia tooltip zasobnika.\nTRAY -b <tytuł> <tekst>              Ustawia balon zasobnika."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -949,11 +841,9 @@ msgstr "UNLOAD <nazwa>, usuwa wtyczkę lub skrypt"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <maska> [<maska>...], usuwa wyciszenie - jeśli jest to wspierane "
-"przez serwer."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <maska> [<maska>...], usuwa wyciszenie - jeśli jest to wspierane przez serwer."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -961,15 +851,13 @@ msgstr "URL <url>, otwiera URL w twojej przeglądarce"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> itp, podświetla nick(i) w liście "
-"użytkowników kanału"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> itp, podświetla nick(i) w liście użytkowników kanału"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <nick>, przyznaje komuś prawo głosu (musisz być operatorem kanału)"
+msgstr "VOICE <nick>, przyznaje komuś prawo głosu (musisz być operatorem kanału)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -978,9 +866,7 @@ msgstr "WALLCHAN <wiadomość>, pisze wiadomość do wszystkich kanałów"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <wiadomość>, wysyła wiadomość do wszystkich operatorów w bieżącym "
-"kanale"
+msgstr "WALLCHOP <wiadomość>, wysyła wiadomość do wszystkich operatorów w bieżącym kanale"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -996,9 +882,7 @@ msgstr "Wykorzystanie: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Nie ma pomocy do tego polecenia.\n"
+msgstr "\nNie ma pomocy do tego polecenia.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1067,9 +951,7 @@ msgstr "Czy jesteś pewien/pewna, że ten serwer i/lub port obsługuje SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nie można rozwiązać nazwy hosta %s\n"
-"Sprawdź twoje ustawienia IP!\n"
+msgstr "Nie można rozwiązać nazwy hosta %s\nSprawdź twoje ustawienia IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1085,9 +967,7 @@ msgstr "Skocz do następnego serwera w %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Uwaga: nieznane kodowanie \"%s\". Nie będzie stosowanej konwersji dla sieci "
-"%s."
+msgstr "Uwaga: nieznane kodowanie \"%s\". Nie będzie stosowanej konwersji dla sieci %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1246,15 +1126,13 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tPrzerwano czat bezpośredni z %C18$1%O."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tPołączenie czatu bezpośredniego z %C18$1%C %C30[%C24$2%C30]%O "
-"ustanowione"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr "%C24*%O$tPołączenie czatu bezpośredniego z %C18$1%C %C30[%C24$2%C30]%O ustanowione"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
-msgstr ""
-"%C20*%O$tUtracono (%C20$4%O) połączenie czatu bezpośredniego z %C18$1%O"
+msgstr "%C20*%O$tUtracono (%C20$4%O) połączenie czatu bezpośredniego z %C18$1%O"
 
 #: src/common/textevents.h:151
 msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
@@ -1283,11 +1161,9 @@ 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"
-msgstr ""
-"%C20*%O$tOtrzymano uszkodzone żądanie czatu bezpośredniego od %C18$1%O."
-"$a010%C23*%O$tZawartość pakietu: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tOtrzymano uszkodzone żądanie czatu bezpośredniego od %C18$1%O.$a010%C23*%O$tZawartość pakietu: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1304,11 +1180,11 @@ msgstr "%C23*%O$tPrzerwano DCC RECV '%C23$2%O' do %C18$1%O"
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tUkończono DCC RECV '%C23$1%O' od %C18$3%O %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tUkończono DCC RECV '%C23$1%O' od %C18$3%O %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tUstanowiono DCC RECV do %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1321,9 +1197,9 @@ msgstr "%C20*%O$tDCC RECV: Nie można otworzyć '%C23$1%C' do zapisu (%C20$2%O)
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tPlik '%C24$1%C' już istnieje, zostanie zapisywany jako '%C23$2%O'"
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tPlik '%C24$1%C' już istnieje, zostanie zapisywany jako '%C23$2%O'"
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1336,13 +1212,12 @@ msgstr "%C23*%O$tPrzerwano DCC SEND '%C23$2%C' do %C18$1%O"
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tUkończono DCC SEND '%C23$1%C' do %C18$2%C %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tUkończono DCC SEND '%C23$1%C' do %C18$2%C %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tUstanowiono połączenie DCC SEND do %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 "%C24*%O$tUstanowiono połączenie DCC SEND do %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1358,9 +1233,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C' do %C18$3%O wstrzymane, przerywanie."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C' do %C18$3%O przekroczyło limit czasu żadania, "
-"przerywanie."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C' do %C18$3%O przekroczyło limit czasu żadania, przerywanie."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1402,14 +1275,11 @@ msgstr "%OLista ignorowanych jest pusta."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tNie można dołączyć do %C22$1%C (%C20Kanał jest tylko dla "
-"zaproszonych%O)"
+msgstr "%C20*%O$tNie można dołączyć do %C22$1%C (%C20Kanał jest tylko dla zaproszonych%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
-msgstr ""
-"%C24*%O$tZostałeś/aś zaproszony/na do %C22$1%O przez %C18$2%O (%C29$3%O)"
+msgstr "%C24*%O$tZostałeś/aś zaproszony/na do %C22$1%O przez %C18$2%O (%C29$3%O)"
 
 #: src/common/textevents.h:256
 #, c-format
@@ -1555,8 +1425,7 @@ msgstr "%C20*%O$tNieznany host. Może źle go napisałeś/aś?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tNie można dołączyć do %C22$1%C (%C20Osiągnięto limit użytkowników%O)"
+msgstr "%C20*%O$tNie można dołączyć do %C22$1%C (%C20Osiągnięto limit użytkowników%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1581,9 +1450,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, połaczono: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Prawdziwy Host: %C23$2%O, Prawdziwe IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Prawdziwy Host: %C23$2%O, Prawdziwe IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1628,9 +1495,7 @@ msgstr "**** ZACZNIJ LOGOWANIE O %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Nie można otworzyć pliku z logiem do zapisu. Sprawdź\n"
-"uprawnienia dla %s"
+msgstr "* Nie można otworzyć pliku z logiem do zapisu. Sprawdź\nuprawnienia dla %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2127,9 +1992,7 @@ msgstr "Czas bana"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nie można odczytać pliku dźwiękowego:\n"
-"%s"
+msgstr "Nie można odczytać pliku dźwiękowego:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3367,9 +3230,7 @@ msgstr "Data"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Możesz otworzyć okno listy banów tylko wtedy gdy znajdujesz się na karcie "
-"kanału."
+msgstr "Możesz otworzyć okno listy banów tylko wtedy gdy znajdujesz się na karcie kanału."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3490,18 +3351,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Nie można uzyskać dostępu do pliku: %s\n"
-"%s.\n"
-"Wznawianie nie jest możliwe."
+msgstr "Nie można uzyskać dostępu do pliku: %s\n%s.\nWznawianie nie jest możliwe."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Plik w katalogu pobierania jest większy niż zaoferowany. Wznawianie nie jest "
-"możliwe."
+msgstr "Plik w katalogu pobierania jest większy niż zaoferowany. Wznawianie nie jest możliwe."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3631,9 +3487,7 @@ msgstr "Otwórz link albo uruchom komendę w otwartym HexChatcie"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"Rozpocznij zminimalizowanie. Poziom 0=normalny  1=minimalizowany 2=w "
-"zasobniku"
+msgstr "Rozpocznij zminimalizowanie. Poziom 0=normalny  1=minimalizowany 2=w zasobniku"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3649,10 +3503,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Nie można otworzyć czcionki:\n"
-"\n"
-"%s"
+msgstr "Nie można otworzyć czcionki:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3670,101 +3521,72 @@ msgstr "Kolejka sieci wysłania: %d bajtów"
 
 #: 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 \\\\"
-msgstr ""
-"Polecenie Run Command uruchamia dane w Dane 1 tak jakby były wpisane w linii "
-"poleceń, w kolejności wciśniętych klawiszy. Tak więc mogą zawierać one tekst "
-"(który zostanie wysłany do kanału/osoby), polecenia lub polecenia użytkownika"
-"\\n\n"
-" oddziela polecenia, tak że można uruchomić kilka poleceń. Jeśli potrzebujesz"
-" \\ w tekście, wpisz \\\\"
+"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 "Polecenie Run Command uruchamia dane w Dane 1 tak jakby były wpisane w linii poleceń, w kolejności wciśniętych klawiszy. Tak więc mogą zawierać one tekst (który zostanie wysłany do kanału/osoby), polecenia lub polecenia użytkownika\\n\n oddziela polecenia, tak że można uruchomić kilka poleceń. Jeśli potrzebujesz \\ w tekście, wpisz \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Polecenie Change Page przełącza pomiędzy stronami w notatniku. Ustaw w Dane "
-"1 stronę do której chcesz przełączyć. Jeśli podane jest coś w Dane 2 "
-"przełącza to w stosunku do aktualnej pozycji. Ustaw Data 1 na auto aby "
-"przełączyć się do strony z aktywnością i ważnymi wydarzeniami (pierwsze są "
-"okienka rozmowy, później kanały z podświetleniami, kanały z rozmowami, "
-"kanały z innymi danymi)"
+msgstr "Polecenie Change Page przełącza pomiędzy stronami w notatniku. Ustaw w Dane 1 stronę do której chcesz przełączyć. Jeśli podane jest coś w Dane 2 przełącza to w stosunku do aktualnej pozycji. Ustaw Data 1 na auto aby przełączyć się do strony z aktywnością i ważnymi wydarzeniami (pierwsze są okienka rozmowy, później kanały z podświetleniami, kanały z rozmowami, kanały z innymi danymi)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Polecenie Insert in Buffer wstawia zawartość \"Dane 1\" do miejsca wciśnięta "
-"kolejności klawiszy przy pozycji kursora"
+msgstr "Polecenie Insert in Buffer wstawia zawartość \"Dane 1\" do miejsca wciśnięta kolejności klawiszy przy pozycji kursora"
 
 #: 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."
-msgstr ""
-"Polecenie Scroll Page przewija tekst widżetu o jedną stronę w górę lub w "
-"dół. Możliwe wartości dla \"Dane 1\": Top, Bottom, Up, Down, +1 lub -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 "Polecenie Scroll Page przewija tekst widżetu o jedną stronę w górę lub w dół. Możliwe wartości dla \"Dane 1\": Top, Bottom, Up, Down, +1 lub -1."
 
 #: 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 ""
-"Polecenie Set Buffer ustawia wpis gdzie została podana kolejność klawiszy do "
-"zawartości \"Dane 1\""
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Polecenie Set Buffer ustawia wpis gdzie została podana kolejność klawiszy do zawartości \"Dane 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 ""
-"Polecenie Last Command ustawia wpis zawierający ostatnie polecenie - tak "
-"samo jak naciśnięcie w górę w shellu"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Polecenie Last Command ustawia wpis zawierający ostatnie polecenie - tak samo jak naciśnięcie w górę w shellu"
 
 #: 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 ""
-"Polecenie Next Command ustawia wpis zawierający następne polecenie - tak "
-"samo jak naciśnięcie w dół w shellu"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Polecenie Next Command ustawia wpis zawierający następne polecenie - tak samo jak naciśnięcie w dół w shellu"
 
 #: 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 ""
-"To polecenie zmienia tekst w wpisie aby uzupełnić niekompletny nicku lub "
-"polecenie. Jeśli podane są \"Dane 1\" dwukrotny tab wybiera ostatni nick, a "
-"nie następny"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "To polecenie zmienia tekst w wpisie aby uzupełnić niekompletny nicku lub polecenie. Jeśli podane są \"Dane 1\" dwukrotny tab wybiera ostatni nick, a nie następny"
 
 #: 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 ""
-"To polecenie przewija w górę i w dół, poprzez listę nicków. Jeśli podane są "
-"\"Dane 1\" wszystko przewija w górę, inaczej w dół"
+"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 "To polecenie przewija w górę i w dół, poprzez listę nicków. Jeśli podane są \"Dane 1\" wszystko przewija w górę, inaczej w dół"
 
 #: 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 ""
-"To polecenie sprawdza ostatnie wpisane słowo w liście zastąpień a następnie "
-"wymienia je, jeżeli znajdzie zgodę"
+msgstr "To polecenie sprawdza ostatnie wpisane słowo w liście zastąpień a następnie wymienia je, jeżeli znajdzie zgodę"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3939,8 +3761,7 @@ msgstr "Brak tematu rozmowy"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ten serwer ma wciąż %d otwartych kanałów lub rozmów. Zamknąć je wszystkie?"
+msgstr "Ten serwer ma wciąż %d otwartych kanałów lub rozmów. Zamknąć je wszystkie?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4171,10 +3992,7 @@ msgstr "%d wybranych nicków."
 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 ""
-"Pasek menu jest teraz ukryty. Możesz przywrócić go ponownie, naciskając "
-"klawisz Control+F9 lub klikając prawym przyciskiem myszy w pustej części "
-"obszaru tekstu głównego."
+msgstr "Pasek menu jest teraz ukryty. Możesz przywrócić go ponownie, naciskając klawisz Control+F9 lub klikając prawym przyciskiem myszy w pustej części obszaru tekstu głównego."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4270,25 +4088,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Komendy użytkownika - Kody specjalne:\n"
-"\n"
-"%c  =  bieżący kanał\n"
-"%e  =  nazwa bieżącej sieci\n"
-"%m  =  informacje o maszynie\n"
-"%n  =  Twój nick\n"
-"%t  =  godzina/data\n"
-"%v  =  wersja HexChata\n"
-"%2  =  2 słowo\n"
-"%3  =  3 słowo\n"
-"&2  =  2 słowo do końca linii\n"
-"&3  =  3 słowo do końca linii\n"
-"\n"
-"np.:\n"
-"/cmd jan czesc\n"
-"\n"
-"&2 było by \"jan\"\n"
-"&3 było by \"jan czesc\"."
+msgstr "Komendy użytkownika - Kody specjalne:\n\n%c  =  bieżący kanał\n%e  =  nazwa bieżącej sieci\n%m  =  informacje o maszynie\n%n  =  Twój nick\n%t  =  godzina/data\n%v  =  wersja HexChata\n%2  =  2 słowo\n%3  =  3 słowo\n&2  =  2 słowo do końca linii\n&3  =  3 słowo do końca linii\n\nnp.:\n/cmd jan czesc\n\n&2 było by \"jan\"\n&3 było by \"jan czesc\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4303,18 +4103,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Przyciski użytkownika - Specjalne kody:\n"
-"\n"
-"%a  =  wszystkie wybrane nicki\n"
-"%c  =  bieżący kanał\n"
-"%e  =  bieżąca nazwa sieci\n"
-"%h  =  wybrana nazwa hosta nicku\n"
-"%m  =  informacje komputera\n"
-"%n  =  twój nick\n"
-"%s  =  wybrany nick\n"
-"%t  =  czas/data\n"
-"%u = wybrane konto użytkownika"
+msgstr "Przyciski użytkownika - Specjalne kody:\n\n%a  =  wszystkie wybrane nicki\n%c  =  bieżący kanał\n%e  =  bieżąca nazwa sieci\n%h  =  wybrana nazwa hosta nicku\n%m  =  informacje komputera\n%n  =  twój nick\n%s  =  wybrany nick\n%t  =  czas/data\n%u = wybrane konto użytkownika"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4329,18 +4118,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Przyciski rozmowy - Specjalne kody:\n"
-"\n"
-"%a  =  wszystkie wybrane nicki\n"
-"%c  =  bieżący kanał\n"
-"%e  =  bieżąca nazwa sieci\n"
-"%h  =  wybrana nazwa hosta nicku\n"
-"%m  =  informacje komputera\n"
-"%n  =  twój nick\n"
-"%s  =  wybrany nick\n"
-"%t  =  czas/data\n"
-"%u = wybrane konto użytkownika"
+msgstr "Przyciski rozmowy - Specjalne kody:\n\n%a  =  wszystkie wybrane nicki\n%c  =  bieżący kanał\n%e  =  bieżąca nazwa sieci\n%h  =  wybrana nazwa hosta nicku\n%m  =  informacje komputera\n%n  =  twój nick\n%s  =  wybrany nick\n%t  =  czas/data\n%u = wybrane konto użytkownika"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4356,19 +4134,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Odpowiedzi CTCP - Specjalne kody:\n"
-"\n"
-"%d  =  dane (w całym CTCP)\n"
-"%e  =  bieżąca nazwa sieci\n"
-"%m  =  informacje komputera\n"
-"%s  =  nick, który wysłał CTCP\n"
-"%t  =  time/date\n"
-"%2  =  słowo 2\n"
-"%3  =  słowo 3\n"
-"&2  =  słowo 2 do końca linii\n"
-"&3  =  słowo 3 do końca linii\n"
-"\n"
+msgstr "Odpowiedzi CTCP - Specjalne kody:\n\n%d  =  dane (w całym CTCP)\n%e  =  bieżąca nazwa sieci\n%m  =  informacje komputera\n%s  =  nick, który wysłał CTCP\n%t  =  time/date\n%2  =  słowo 2\n%3  =  słowo 3\n&2  =  słowo 2 do końca linii\n&3  =  słowo 3 do końca linii\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4380,14 +4146,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Zarządanie Linkami - Kody specjalne:\n"
-"\n"
-"%s  =  ciąg z linkiem\n"
-"\n"
-"Dodanie ! na początku komendy\n"
-"oznacza, że zostanie ona wysłana\n"
-"do terminala zamiast do HexChata"
+msgstr "Zarządanie Linkami - Kody specjalne:\n\n%s  =  ciąg z linkiem\n\nDodanie ! na początku komendy\noznacza, że zostanie ona wysłana\ndo terminala zamiast do HexChata"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4916,9 +4675,7 @@ msgstr "Musisz mieć dwa różne nicki."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Metody identyfikacji z serwerem. Dla własnej metody użyj komend po "
-"podłączeniu."
+msgstr "Metody identyfikacji z serwerem. Dla własnej metody użyj komend po podłączeniu."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4943,11 +4700,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Nick⏎\n"
-"%p=Hasło⏎\n"
-"%r=Prawdziwe imię⏎\n"
-"%u=Nazwa użytkownika"
+msgstr "%n=Nick⏎\n%p=Hasło⏎\n%r=Prawdziwe imię⏎\n%u=Nazwa użytkownika"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5404,9 +5157,7 @@ msgstr "Słowniki do użycia:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Używaj kodów języka (jak tutaj \"share\\myspell\\dicts\").\n"
-"Oddzielaj różne wpisy przecinkami."
+msgstr "Używaj kodów języka (jak tutaj \"share\\myspell\\dicts\").\nOddzielaj różne wpisy przecinkami."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5502,8 +5253,7 @@ msgstr "Wyświetlaj ikonki dla trybów użytkownika"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Używaj graficznych ikonek zamiast symboli tekstowych w liście użytkowników."
+msgstr "Używaj graficznych ikonek zamiast symboli tekstowych w liście użytkowników."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5662,8 +5412,7 @@ msgstr "Otwórz narzędzia w:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"Otwórz czat bezpośredni, ignoruj, powiadom itp, w kartach czy w oknach?"
+msgstr "Otwórz czat bezpośredni, ignoruj, powiadom itp, w kartach czy w oknach?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5783,9 +5532,7 @@ msgstr "Odtwarzaj \"Instant Message Notification\" przy wybranych wydarzeniach"
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Odtwarzaj \"message-new-instant\" z freedesktop.org przy wybranych "
-"wydarzeniach"
+msgstr "Odtwarzaj \"message-new-instant\" z freedesktop.org przy wybranych wydarzeniach"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5838,8 +5585,7 @@ msgstr "Podświetlone wiadomości"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Podświetlone wiadomości to te, w których ktoś używa twojego nicku, ale także:"
+msgstr "Podświetlone wiadomości to te, w których ktoś używa twojego nicku, ale także:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5861,9 +5607,7 @@ msgstr "Zawsze podświetlaj te nicki:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Oddziel kilka słów przecinkami.\n"
-"Akceptowane są symbole wieloznaczne."
+msgstr "Oddziel kilka słów przecinkami.\nAkceptowane są symbole wieloznaczne."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5919,8 +5663,7 @@ msgstr "Polecenie /WHOIS w reakcji na ogłoszenie"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Wyślij /WHOIS gdy użytkownik z twojej listy powiadomień pojawi się online"
+msgstr "Wyślij /WHOIS gdy użytkownik z twojej listy powiadomień pojawi się online"
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5970,8 +5713,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
@@ -5980,8 +5723,8 @@ msgstr "Automatycznie dodawaj informacje o kolorach"
 
 #: 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
@@ -5994,8 +5737,7 @@ msgstr "Alternatywne czcionki:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr ""
-"Oddziel wiele wpisów używając przecinków bez spacji na początku lub końcu"
+msgstr "Oddziel wiele wpisów używając przecinków bez spacji na początku lub końcu"
 
 #: src/fe-gtk/setup.c:574
 msgid "Display lists in compact mode"
@@ -6013,9 +5755,7 @@ msgstr "Używaj czasu z serwera jeśli jest to wspierane"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Wyświetlaj znaczkiki czasu otrzymane od serweraja jesli serwer wspiera "
-"rozszerzenie time-server"
+msgstr "Wyświetlaj znaczkiki czasu otrzymane od serweraja jesli serwer wspiera rozszerzenie time-server"
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6035,9 +5775,9 @@ msgstr "Rodzaj bana:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Spróbuj użyć tej maski podzas banowania lub wyciszania. (wymaga irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Spróbuj użyć tej maski podzas banowania lub wyciszania. (wymaga irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6146,12 +5886,9 @@ msgstr "Pobierz mój adres IP z serwera IRCa"
 
 #: 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 ""
-"Prosi serwer IRC o Twój prawdziwy (publiczny/zewnętrzny) adres IP. Użyj tej "
-"opcji jeśli Twoja sieć znajduje się za firewallem a Twój lokalny adres to "
-"192.168.*.* lub 10.*.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Prosi serwer IRC o Twój prawdziwy (publiczny/zewnętrzny) adres IP. Użyj tej opcji jeśli Twoja sieć znajduje się za firewallem a Twój lokalny adres to 192.168.*.* lub 10.*.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6383,15 +6120,11 @@ msgstr "Kategorie"
 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 ""
-"Nie można umieścić drzewa na górze lub na dole!\n"
-"Proszę zmień najpierw styl <b>kart</b> w punkcie menu <b>widok</b>."
+msgstr "Nie można umieścić drzewa na górze lub na dole!\nProszę zmień najpierw styl <b>kart</b> w punkcie menu <b>widok</b>."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Pole z Prawdziwym imieniem nie może być puste. Ustawiam je na \"realname\""
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Pole z Prawdziwym imieniem nie może być puste. Ustawiam je na \"realname\""
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
@@ -6403,11 +6136,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 ""
-"*OSTRZEŻENIE*\n"
-"Automatyczne przyjmowanie Czatu Bezpośredniego do twojego\n"
-"katalogu domowego może być niebezpieczne i jest wykorzystywane.\n"
-"Np.: Ktoś mógłby ci wysłać profil .bash"
+msgstr "*OSTRZEŻENIE*\nAutomatyczne przyjmowanie Czatu Bezpośredniego do twojego\nkatalogu domowego może być niebezpieczne i jest wykorzystywane.\nNp.: Ktoś mógłby ci wysłać profil .bash"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6521,8 +6250,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
@@ -6538,9 +6267,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "SOCKS4"
-
-#~ msgid "Socks5"
-#~ msgstr "SOCKS5"
diff --git a/po/pt.po b/po/pt.po
index 130ece5d..acec8799 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,25 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # artur simões <artursimoes.pt@gmail.com>, 2013
 # artur simões <artursimoes.pt@gmail.com>, 2012-2013
 # Sandro Amaral <sandro123iv@gmail.com>, 2013-2014
 # Vitor Antunes <vhda@mega.ist.utl.pt>, 2004
+# Vitor Luis <droider.pc@gmail.com>, 2018
+# Vitor Luis <droider.pc@gmail.com>, 2018
 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"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Portuguese (http://www.transifex.com/hexchat/hexchat/language/"
-"pt/)\n"
-"Language: pt\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-05-09 13:02+0000\n"
+"Last-Translator: Vitor Luis <droider.pc@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/hexchat/hexchat/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -31,31 +32,24 @@ msgstr "HexChat"
 #: data/misc/io.github.Hexchat.appdata.xml.in:9
 #: data/misc/io.github.Hexchat.desktop.in.in:4
 msgid "IRC Client"
-msgstr "Cliente IRC"
+msgstr "Cliente de IRC"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:11
 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 ""
-"O HexChat é um Cliente de IRC fácil de usar, mas também fácil de expandir. "
-"Ele permite que te juntes seguramente a várias redes e que fales com outros "
-"utilizadores em privado ou em canais através de uma interface "
-"personalizável. Se quiseres, podes até transferir ficheiros!"
+msgstr "O HexChat é um Cliente de IRC fácil de usar, mas também fácil de expandir. Ele permite que te juntes de forma segura a várias redes e que fales com outros utilizadores em privado ou em canais através de uma interface personalizável. Se quiseres, podes até transferir ficheiros!"
 
 #: 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 ""
-"O HexChat suporta funcionalidades como: DCC, SASL, proxies, verificação de "
-"erros ortográficos, alertas, registos, temas personalizados, e scripts em "
-"Python/Perl."
+msgstr "O HexChat suporta funcionalidades como: DCC, SASL, proxies, verificação de erros ortográficos, alertas, registos, temas personalizados, e scripts em Python/Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
-msgstr ""
+msgstr "Janela de Chat Principal"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:5
 msgid "Chat with other people online"
@@ -68,7 +62,7 @@ msgstr "IM;Chat;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -90,15 +84,15 @@ msgstr "Saindo"
 
 #: src/common/chanopt.c:79
 msgid "OFF"
-msgstr ""
+msgstr "DESLIGADO"
 
 #: src/common/chanopt.c:81
 msgid "ON"
-msgstr ""
+msgstr "LIGADO"
 
 #: src/common/chanopt.c:83
 msgid "{unset}"
-msgstr ""
+msgstr "{nao colocado}"
 
 #: src/common/chanopt.c:128 src/common/text.c:1325 src/fe-gtk/notifygui.c:125
 #: src/fe-gtk/setup.c:1886
@@ -123,7 +117,7 @@ msgstr "À espera"
 #. black
 #: src/common/dcc.c:73
 msgid "Active"
-msgstr "Ativo"
+msgstr "Activo"
 
 #. cyan
 #: src/common/dcc.c:74
@@ -163,7 +157,7 @@ msgstr "Erro"
 #: src/common/dcc.c:2487
 #, c-format
 msgid "%s is offering \"%s\". Do you want to accept?"
-msgstr "%s está a oferecer \"\"%s\". Aceitas?"
+msgstr "%s está a oferecer \"%s\". Aceitar?"
 
 #: src/common/dcc.c:2704
 msgid "No active DCCs\n"
@@ -203,11 +197,11 @@ msgstr "Retirar Ops"
 
 #: src/common/hexchat.c:894
 msgid "Give Voice"
-msgstr "Dar Voz"
+msgstr "Dar Voice"
 
 #: src/common/hexchat.c:895
 msgid "Take Voice"
-msgstr "Retirar Voz"
+msgstr "Retirar Voice"
 
 #: src/common/hexchat.c:897
 msgid "Kick/Ban"
@@ -230,7 +224,7 @@ msgstr "Expulsar&Banir"
 
 #: src/common/hexchat.c:917
 msgid "Leave Channel"
-msgstr "Sair do canal"
+msgstr "Sair do Canal"
 
 #: src/common/hexchat.c:918
 msgid "Join Channel..."
@@ -238,7 +232,7 @@ msgstr "Entrar num Canal..."
 
 #: src/common/hexchat.c:919 src/fe-gtk/menu.c:1411
 msgid "Enter Channel to Join:"
-msgstr "Introduz o Canal a entrar:"
+msgstr "Introduz o Canal a Entrar:"
 
 #: src/common/hexchat.c:920
 msgid "Server Links"
@@ -271,7 +265,7 @@ msgstr "Introduz a razão da expulsão de %s:"
 
 #: src/common/hexchat.c:938
 msgid "Send File"
-msgstr ""
+msgstr "Enviar Ficheiro"
 
 #: src/common/hexchat.c:939
 msgid "Dialog"
@@ -302,17 +296,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Não tens permissões de escrita para %s. Nada desta sessão poderá ser "
-"guardado."
+msgstr "Não tens permissões de escrita para %s. Nada desta sessão poderá ser guardado."
 
 #: 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 ""
-"* Correr o IRC como root é estúpido! Deve\n"
-"  criar outro utilizador e usá-lo.\n"
+msgstr "* Correr o IRC como root é estúpido! Deve\n  criar outro utilizador e usá-lo.\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
@@ -329,32 +319,30 @@ msgstr "NÃO  "
 #: src/common/ignore.c:370
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr "Está a sofrer uma inundação de CTCP de %s, ignorando %s\n"
+msgstr "Está a sofrer uma grande afluência de CTCP de %s, ignorando %s\n"
 
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Estás a receber demasiadas mensagens de %s, a desligar as definições "
-"gui_autoopen_dialog.\n"
+msgstr "Estás a receber demasiadas mensagens de %s, a desligar as definições gui_autoopen_dialog.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
 msgid "Resolved to %s"
-msgstr ""
+msgstr "Resolvido para %s"
 
 #: src/common/inbound.c:1284 src/common/inbound.c:1312
 msgid "Not found"
-msgstr ""
+msgstr "Nao encontrado"
 
 #: src/common/inbound.c:1301
 msgid "Resolved to:"
-msgstr ""
+msgstr "Resolvido para:"
 
 #: src/common/inbound.c:1331
 #, c-format
 msgid "Looking up %s..."
-msgstr ""
+msgstr "Resolvendo %s..."
 
 #: src/common/notify.c:559
 #, c-format
@@ -372,7 +360,7 @@ msgstr "Não estás em nenhum canal. Usa /join #<canal>\n"
 
 #: src/common/outbound.c:75
 msgid "Not connected. Try /server <host> [<port>]\n"
-msgstr "Não estás ligado. Usa /server <endereço> [<porta>]\n"
+msgstr "Nao estas ligado. Tenta /servidor <endereço> [porta]\n"
 
 #: src/common/outbound.c:277
 #, c-format
@@ -391,11 +379,11 @@ msgstr "Já estás como ausente: %s⏎\n"
 
 #: src/common/outbound.c:405
 msgid "Already marked back.\n"
-msgstr "Já estás como de volta.⏎\n"
+msgstr "Já estás como de volta.\n"
 
 #: src/common/outbound.c:1839
 msgid "I need /bin/sh to run!\n"
-msgstr "Preciso de /bin/sh para correr!\n"
+msgstr "Preciso de /bin/sh para operar!\n"
 
 #: src/common/outbound.c:2262
 msgid "Commands Available:"
@@ -439,9 +427,7 @@ msgstr "ADDBUTTON <nome> <ação>, adiciona um botão à lista de utilizadores"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NovaRede> <novoservidor/6667>, junta uma nova rede e novo "
-"servidor à lista de redes"
+msgstr "ADDSERVER <NovaRede> <novoservidor/6667>, adiciona uma nova rede com um novo servidor à lista de redes"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -457,21 +443,18 @@ msgstr "ALLSERV <cmd>, envia um comando para todos os servidores onde está"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
+msgstr "AWAY [razao], marca-o como ausente (utilize /BACK para reverter)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
-msgstr "BACK, de volta (não ausente)"
+msgstr "BACK, marca-o como de volta (não ausente)"
 
 #: src/common/outbound.c:3943
 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 banimento>], bane do canal todos os utilizadores "
-"correspondentes à máscara. Se o utilizador estiver no canal este comando não "
-"o expulsa (necessita do estatuto operador)"
+msgstr "BAN <máscara> [<tipo de ban>], bane do canal todos os utilizadores correspondentes à máscara. Se o utilizador estiver no canal este comando não o expulsa (necessita do estatuto operador)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -479,41 +462,36 @@ msgstr "CHANOPT [-quiet] <variável> [<valor>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<codificação>], obtêm ou ativa a codificação usada na corrente "
-"ligação"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<codificação>], obtêm ou ativa a codificação usada na corrente ligação"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<quantidade>], Limpa a janela de texto atual ou "
-"histórico de comandos"
+msgstr "CLEAR [ALL|HISTORY|[-]<quantidade>], Limpa a janela de texto atual ou histórico de comandos"
 
 #: 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 ""
+msgstr "CLOSE [-m], Fecha a aba actual, fechando a janela se essa é a única aba aberta, ou com a opçao \"-m\", fecha todas as janelas."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <código|universal>, procura o código de pais, ex: au = austrália"
+msgstr "COUNTRY [-s] <código|universal>, procura o código de pais, ex: au = austrália"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nick> <mensagem>, envia uma mensagem CTCP para o nick. Mensagens "
-"comuns são VERSION e USERINFO"
+msgstr "CTCP <nick> <mensagem>, envia uma mensagem CTCP para o nick. Mensagens comuns são VERSION e 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 [<canal>], sair e imediatamente entrar no canal"
 
 #: src/common/outbound.c:3956
@@ -527,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 <nick>                      - aceita um ficheiro oferecido\n"
-"DCC SEND [-maxcps=#] <nick> [file]  - envia um ficheiro a nick\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - envia um ficheiro usando o modo "
-"passivo\n"
-"DCC LIST                            - mostra a lista de DCCs\n"
-"DCC CHAT <nick>                     - oferece uma conversa DCC a nick\n"
-"DCC PCHAT <nick>                    - oferece uma conversa DCC usando o modo "
-"passivo\n"
-"DCC CLOSE <type> <nick> <file>         exemplo:\n"
-"         /dcc close send artur_pt ficheiro.tar.gz"
+msgstr "\nDCC GET <nick>                      - aceita um ficheiro oferecido\nDCC SEND [-maxcps=#] <nick> [file]  - envia um ficheiro a nick\nDCC PSEND [-maxcps=#] <nick> [file] - envia um ficheiro usando o modo passivo\nDCC LIST                            - mostra a lista de DCCs\nDCC CHAT <nick>                     - oferece uma conversa DCC a nick\nDCC PCHAT <nick>                    - oferece uma conversa DCC usando o modo passivo\nDCC CLOSE <type> <nick> <file>         exemplo:\n         /dcc close send artur_pt 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 <nick>, retira o modo semi-operador ao nick no canal atual (necessita "
-"do estatuto operador)"
+msgstr "DEHOP <nick>, retira o modo semi-operador ao nick no canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -556,17 +521,13 @@ msgstr "DELBUTTON <nome>, apaga um botão da lista de utilizador"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>, retira o estatuto de operador ao nick dado no canal atual "
-"(necessita do estatuto operador)"
+msgstr "DEOP <nick>, retira o estatuto de operador ao nick dado no canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nick>, retira o estatuto voz do nick dado no canal atual (necessita "
-"do estatuto operador)"
+msgstr "DEVOICE <nick>, retira o estatuto voz do nick dado no canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -578,7 +539,7 @@ msgstr "DNS <nick|host|ip>, Resolve um IP ou hostname"
 
 #: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
-msgstr ""
+msgstr "DOAT <canal, lista, /rede> <comando>"
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
@@ -588,10 +549,7 @@ msgstr "ECHO <texto>, Escreve na janela local o texto inserido"
 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 de shell. Se a opção -o for usada o "
-"resultado é enviado para o canal atual, caso contrário é escrito na janela "
-"de texto atual"
+msgstr "EXEC [-o] <comando>, executa o comando de shell. Se a opção -o for usada o resultado é enviado para o canal atual, caso contrário é escrito na janela de texto atual"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -601,9 +559,7 @@ msgstr "EXECCONT, envia a um processo em execução o sinal CONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], pára a execução de um processo da sessão atual. Se a opção -9 "
-"for usada é enviado o sinal KILL em vez do sinal TERM"
+msgstr "EXECKILL [-9], pára a execução de um processo da sessão atual. Se a opção -9 for usada é enviado o sinal KILL em vez do sinal TERM"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -623,9 +579,7 @@ msgstr "FLUSHQ, despeja a fila de dados a enviar do servidor atual"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <endereço> [<porta>], utiliza o proxy dado para a comunicação, a porta "
-"é por omissão 23"
+msgstr "GATE <endereço> [<porta>], utiliza o proxy dado para a comunicação, a porta é por omissão 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -633,9 +587,7 @@ msgstr "GHOST <nick> [palavrapasse], exclui um nick fantasma"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nick>, dá o estatuto semi-operador ao nick(necessita do estatuto "
-"operador)"
+msgstr "HOP <nick>, dá o estatuto semi-operador ao nick(necessita do estatuto operador)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -648,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 <máscara> <tipos..> <opções..>\n"
-"    máscara - máscara a ser ignorada, ex: *!*@*.iol.pt\n"
-"    tipos - tipos de dados a ignorar, um ou todos de:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    opções - NOSAVE, QUIET"
+msgstr "IGNORE <máscara> <tipos..> <opções..>\n    máscara - máscara a ser ignorada, ex: *!*@*.iol.pt\n    tipos - tipos de dados a ignorar, um ou todos de:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    opções - 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> [<canal>], convida alguém para o canal, por defeito o canal "
-"atual (necessita do estatuto operador)"
+msgstr "INVITE <nick> [<canal>], convida alguém para o canal, por defeito o canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -670,17 +615,13 @@ msgstr "JOIN <canal>, entra no canal"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <nick> [motivo], expulsa o nick do canal atual (necessita do estatuto "
-"operador)"
+msgstr "KICK <nick> [motivo], expulsa o nick do canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <nick> [motivo], bane e expulsa o nick do canal atual (necessita do "
-"estatuto operador)"
+msgstr "KICKBAN <nick> [motivo], bane e expulsa o nick do canal atual (necessita do estatuto operador)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -692,13 +633,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] [--] <string>, procura pela string na buffer⏎ Use -h "
-"para marcar o resultado da(s) procura⏎ Use -m para igual a⏎ Use -r quando a "
-"string for uma Expressão Regular⏎ Use -- (duplo hífen) para acabar com "
-"opções para procurar, por exemplo, a sequência de '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <string>, procura pela string na buffer⏎ Use -h para marcar o resultado da(s) procura⏎ Use -m para igual a⏎ Use -r quando a string for uma Expressão Regular⏎ Use -- (duplo hífen) para acabar com opções para procurar, por exemplo, a sequência de '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -707,48 +643,36 @@ msgstr "LOAD [-e] <ficheiro>, carrega o plugin ou script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Retira o estatuto semi-operador a todos os utilizadores no canal "
-"actual (necessita do modo operador)"
+msgstr "MDEHOP, Retira o estatuto semi-operador a todos os utilizadores no canal actual (necessita do modo operador)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Retira o estatuto operador a todos os utilizadores no canal actual "
-"(necessita do modo operador)"
+msgstr "MDEOP, Retira o estatuto operador a todos os utilizadores no canal actual (necessita do modo operador)"
 
 #: 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 <ação>, envia a ação para o canal atual (as ações devem ser escritas na "
-"3ª pessoa, como  '/eu salta')"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <ação>, envia a ação para o canal atual (as ações devem ser escritas na 3ª pessoa, como  '/eu salta')"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MHOP, Da halfop a todos os utilizadores do canal actual (necessita ser operador de canal)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Expulsa todo os utilizadores, excepto tu, do canal actual (necessita "
-"do modo operador)"
+msgstr "MKICK, Expulsa todo os utilizadores, excepto tu, do canal actual (necessita do modo operador)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Coloca o estatuto operador a todos os utilizadores do canal (necessita "
-"do modo operador)"
+msgstr "MOP, Coloca o estatuto operador a todos os utilizadores do canal (necessita do modo operador)"
 
 #: 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"
-msgstr ""
-"MSG <nick> <mensagem>, envia uma mensagem privada, mensagem \".\" para "
-"enviar para o último nick ou prefixo com \"=\" para o dcc chat"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <nick> <mensagem>, envia uma mensagem privada, mensagem \".\" para enviar para o último nick ou prefixo com \"=\" para o dcc chat"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -774,14 +698,11 @@ msgstr "NOTICE <nick/canal> <mensagem>, envia uma notificação"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n rede1[,rede2,...]] [<nick>], mostra a lista de notificações ou "
-"adiciona alguém."
+msgstr "NOTIFY [-n rede1[,rede2,...]] [<nick>], mostra a lista de notificações ou adiciona alguém."
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nick>, adiciona o estatuto operador a nick (necessita do modo operador)"
+msgstr "OP <nick>, adiciona o estatuto operador a nick (necessita do modo operador)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -796,17 +717,13 @@ msgstr "PING <nick | canal>, envia um CTCP a nick ou canal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <nick> [message], abre um novo chat privado com alguém e, "
-"opcionalmente, enviar uma mensagem"
+msgstr "QUERY [-nofocus] <nick> [message], abre um novo chat privado com alguém e, opcionalmente, enviar uma mensagem"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <máscara> [<tipo_de_silêncio>], silência todos os que correspondem à "
-"máscara no canal atual se suportado pelo servidor."
+msgstr "QUIET <máscara> [<tipo_de_silêncio>], silência todos os que correspondem à máscara no canal atual se suportado pelo servidor."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -818,31 +735,23 @@ msgstr "QUOTE <texto>, envia o texto diretamente ao 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] [<endereço>] [<porta>] [<palavrapasse>], Usado para "
-"reiniciar a ligação ao servidor dado, servidor atual por omissão, ou na "
-"forma /RECONNECT ALL para reiniciar a ligação a todos os servidores"
+msgstr "RECONNECT [-ssl] [<endereço>] [<porta>] [<palavrapasse>], Usado para reiniciar a ligação ao servidor dado, servidor atual por omissão, ou na forma /RECONNECT ALL para reiniciar a ligação a todos os servidores"
 
 #: 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 [<endereço>] [<porta>] [<palavrapasse>], Usado para reiniciar a "
-"ligação ao servidor dado, servidor atual por omissão, ou na forma /RECONNECT "
-"ALL para reiniciar a ligação a todos os servidores"
+msgstr "RECONNECT [<endereço>] [<porta>] [<palavrapasse>], Usado para reiniciar a ligação ao servidor dado, servidor atual por omissão, ou na forma /RECONNECT ALL para reiniciar a ligação a todos os servidores"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <texto>, envio raw data para HexChat,como se fosse recebido do servidor "
-"de IRC"
+msgstr "RECV <texto>, envio raw data para HexChat,como se fosse recebido do servidor de IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -858,31 +767,23 @@ msgstr "SEND <nick> [<ficheiro>]"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <endereço> <porta> <canal>, liga-se ao servidor entrando de "
-"seguida no canal"
+msgstr "SERVCHAN [-ssl] <endereço> <porta> <canal>, liga-se ao servidor entrando de seguida no canal"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <endereço> <porta> <canal>, liga-se ao servidor entrando de seguida "
-"no canal"
+msgstr "SERVCHAN <endereço> <porta> <canal>, liga-se ao servidor entrando de seguida no canal"
 
 #: 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] <endereço> [<porta>] [<palavrapasse>], ligação a servidor, por "
-"omissão porta 6667 usada em ligações normais, ligações por ssl 6697"
+msgstr "SERVER [-ssl] <endereço> [<porta>] [<palavrapasse>], ligação a servidor, por omissão porta 6667 usada em ligações normais, ligações por ssl 6697"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <endereço> [<porta>] [<palavrapasse>], ligação ao servidor por "
-"omissão porta 6667"
+msgstr "SERVER <endereço> [<porta>] [<palavrapasse>], ligação ao servidor por omissão porta 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -894,9 +795,7 @@ msgstr "SETCURSOR [-|+]<posição>, reposiciona o cursor na caixa de entrada"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <novo nome>, troca o nome do separador, tab_trunc limite ainda se "
-"aplica "
+msgstr "SETTAB <novo nome>, troca o nome do separador, tab_trunc limite ainda se aplica "
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -904,9 +803,9 @@ msgstr "SETTEXT <novo texto>, troca o texto na caixa de entrada"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<tópico>], muda o tópico do canal atual, ou mostra o tópico atual"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tópico>], muda o tópico do canal atual, ou mostra o tópico atual"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -916,18 +815,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 <limitetempo> <ficheiro1> [<ficheiro2>] Pisca tabuleiro entre dois "
-"ícones.⏎ TRAY -f <nomeficheiro> Definir tabuleiro para um ícone fixo.⏎ TRAY -"
-"i <número> Pisca tabuleiro com icóne interno.⏎ TRAY -t <texto> Define "
-"tabuleiro com dica.⏎ TRAY -b <titulo> <texto> Define tabuleiro balão."
+msgstr "\n⏎ TRAY -f <limitetempo> <ficheiro1> [<ficheiro2>] Pisca tabuleiro entre dois ícones.⏎ TRAY -f <nomeficheiro> Definir tabuleiro para um ícone fixo.⏎ TRAY -i <número> Pisca tabuleiro com icóne interno.⏎ TRAY -t <texto> Define tabuleiro com dica.⏎ TRAY -b <titulo> <texto> Define tabuleiro balão."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <máscara> [<máscara>...]>, reautoriza o acesso ao canal aos "
-"utilizadores que correspondem a/as máscara/s necessita estatuto operador "
+msgstr "UNBAN <máscara> [<máscara>...]>, reautoriza o acesso ao canal aos utilizadores que correspondem a/as máscara/s necessita estatuto operador "
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -939,11 +831,9 @@ msgstr "UNLOAD <nome>, desliga o plugin ou script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <máscara> [<mascara>...], de-silência as máscaras especificas se "
-"suportado pelo servidor."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <máscara> [<mascara>...], de-silência as máscaras especificas se suportado pelo servidor."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -951,27 +841,22 @@ msgstr "URL <url>, abre o URL no teu browser"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, sublinha o(s) nick(s) na lista de "
-"utilizadores do canal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nick1> <nick2> etc, sublinha o(s) nick(s) na lista de utilizadores do canal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <nick>, coloca o modo voz a nick (necessita do estatuto operador)"
+msgstr "VOICE <nick>, coloca o modo voz a nick (necessita do estatuto operador)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
-msgstr ""
-"WALLCHAN <mensagem>, escreve uma mensagem em todos os canais em que entraste"
+msgstr "WALLCHAN <mensagem>, escreve uma mensagem em todos os canais em que entraste"
 
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mensagem>, envia uma mensagem a todos os utilizadores com estatuto "
-"operador no canal atual"
+msgstr "WALLCHOP <mensagem>, envia uma mensagem a todos os utilizadores com estatuto operador no canal atual"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -987,9 +872,7 @@ msgstr "Utilização: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Não existe ajuda para esse comando.\n"
+msgstr "\nNão existe ajuda para esse comando.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1006,49 +889,48 @@ msgstr "Excessiva recursividade de comandos de utilizador, cancelando."
 #: src/common/outbound.c:4832
 #, c-format
 msgid "Unknown Command %s. Try /help\n"
-msgstr ""
+msgstr "Comando desconhecido %s. Tenta /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"inexistent hexchat_plugin_init symbol; isto é realmente um plugin HexChat?"
+msgstr "inexistent hexchat_plugin_init symbol; isto é realmente um plugin HexChat?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
 msgid "*\tServicing ident request from %s as %s"
-msgstr ""
+msgstr "*\tRespondendo ao pedido de ident de %s como %s"
 
 #: src/common/plugin-identd.c:238
 #, c-format
 msgid "*\tError starting identd server: %s"
-msgstr ""
+msgstr "*\tErro ao iniciar o servidor de identd: %s"
 
 #: src/common/plugin-identd.c:262
 msgid "IDENTD <port> <username>"
-msgstr ""
+msgstr "IDENTD <porta> <nome de utilizador>"
 
 #: src/common/plugin-timer.c:75
 #, c-format
 msgid "Timer %d deleted.\n"
-msgstr ""
+msgstr "Temporizador %d removido.\n"
 
 #: src/common/plugin-timer.c:81
 msgid "No such ref number found.\n"
-msgstr ""
+msgstr "Nenhum numero de referencia encontrado.\n"
 
 #: src/common/plugin-timer.c:145
 msgid "No timers installed.\n"
-msgstr ""
+msgstr "Sem temporizadores instalados.\n"
 
 #. 00000 00000000 0000000 abc
 #: src/common/plugin-timer.c:150
 msgid " Ref#  Seconds  Repeat  Command \n"
-msgstr ""
+msgstr " Ref#  Segundos  Repeticao  Comando \n"
 
 #: src/common/plugin-timer.c:155
 #, c-format
 msgid "%5d %8.1f %7d  %s\n"
-msgstr ""
+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"
@@ -1059,9 +941,7 @@ msgstr "Tens a certeza que este servidor e/ou porta suportam SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Não foi possível resolver o endereço %s\n"
-"Verifique as configurações de IP!\n"
+msgstr "Não foi possível resolver o endereço %s\nVerifique as configurações de IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1077,9 +957,7 @@ msgstr "A mudar para o servidor seguinte em %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Aviso: o carácter \"%s\" é desconhecido. Não vai ser aplicada conversão à "
-"rede %s."
+msgstr "Aviso: o carácter \"%s\" é desconhecido. Não vai ser aplicada conversão à rede %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1099,7 +977,7 @@ msgstr "%C29*%O$tCapacidades reconhecidas: %C29$2%O"
 
 #: src/common/textevents.h:22
 msgid "%C29*%O$tCapabilities removed: %C29$2%O"
-msgstr ""
+msgstr "%C29*%O$tRecursos removidos: %C29$2%O"
 
 #: src/common/textevents.h:25
 msgid "%C23*%O$tCapabilities supported: %C29$2%O"
@@ -1238,7 +1116,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT para %C18$1%O abortado."
 
 #: 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 "%C24*%O$tDCC CHAT ligação estabalecida com %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
@@ -1268,15 +1147,13 @@ msgstr "%C23*%O$tRecebida '%C23$1%C' de %C18$2%O"
 #: src/common/textevents.h:166
 #, c-format
 msgid "%C16,17 Type  To/From    Status  Size    Pos     File"
-msgstr ""
+msgstr "%C16,17 Tipo  Para/De    Estado  Tamanho    Posiçao     Ficheiro"
 
 #: 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"
-msgstr ""
-"%C20*%O$tRecebido pedido mal-formado DCC de %C18$1%O.$a010%C23*%O$tConteúdo "
-"do pacote: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tRecebido pedido mal-formado DCC de %C18$1%O.$a010%C23*%O$tConteúdo do pacote: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1293,11 +1170,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' para %C18$1%O abortado."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O completo %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O completo %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC RECV ligação estabelecida a %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1310,9 +1187,9 @@ msgstr "%C20*%O$tDCC RECV: Impossível abrir '%C23$1%C' para escrita (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tFicheiro '%C24$1%C' já existe, a guardar como '%C23$2%O' em vez."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tFicheiro '%C24$1%C' já existe, a guardar como '%C23$2%O' em vez."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1325,11 +1202,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' para %C18$1%O abortado."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' a %C18$2%C completo %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' a %C18$2%C completo %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC SEND ligação estabelecida a %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1371,12 +1248,12 @@ msgstr "%OA Lista de Ignorados foi alterada em %C18$1%O."
 #: src/common/textevents.h:238
 #, c-format
 msgid "%C16,17"
-msgstr ""
+msgstr "%C16,17"
 
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
+msgstr "%C16,17 Mascara                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1426,9 +1303,7 @@ msgstr "%C23*%O$t%C28$1%C está errado. Tentando com %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tO Nickname está errado ou já está em uso. Usa /NICK para tentar "
-"outro."
+msgstr "%C20*%O$tO Nickname está errado ou já está em uso. Usa /NICK para tentar outro."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1453,7 +1328,7 @@ msgstr "$tLista de notificações vazia."
 #: src/common/textevents.h:307
 #, c-format
 msgid "%C16,17  Notify List"
-msgstr ""
+msgstr "%C16,17  Lista de notificaçoes"
 
 #: src/common/textevents.h:310
 msgid "%C23*%O$t%C23$1%O users in notify list."
@@ -1540,8 +1415,7 @@ msgstr "%C20*%O$tHost desconhecido. Talvez esteja mal escrito?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tEntrada interdita %C22$1%C (%C20Limite máximo de utilizadores%O)"
+msgstr "%C20*%O$tEntrada interdita %C22$1%C (%C20Limite máximo de utilizadores%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1561,14 +1435,12 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inativo à %C23$2%O"
 
 #: src/common/textevents.h:424
 msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O inativo à %C23$2%O, identificado em  %C23$3%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O inativo à %C23$2%O, identificado em  %C23$3%O"
 
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1613,9 +1485,7 @@ msgstr "**** REGISTO INICIADO EM %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Impossivel abrir ficheiro(s) registo para escrita. Verifique as ⏎ "
-"permissões em %s"
+msgstr "* Impossivel abrir ficheiro(s) registo para escrita. Verifique as ⏎ permissões em %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -1699,7 +1569,7 @@ msgstr "Capacidades reconhecidas"
 
 #: src/common/text.c:1005
 msgid "Removed Capabilities"
-msgstr ""
+msgstr "Recursos removidos"
 
 #: src/common/text.c:1010
 msgid "Server Capabilities"
@@ -1858,7 +1728,7 @@ msgstr "O nick do utilizador que retirou o limite"
 
 #: src/common/text.c:1159
 msgid "The nick of the person who did the deop'ing"
-msgstr ""
+msgstr "O nick da pessoa que tirou o op"
 
 #: src/common/text.c:1160
 msgid "The nick of the person who has been deop'ed"
@@ -1866,7 +1736,7 @@ msgstr "O nick do utilizador a quem foi retirado o estatuto operador"
 
 #: src/common/text.c:1163
 msgid "The nick of the person who did the dehalfop'ing"
-msgstr ""
+msgstr "O nick da pessoa que tirou o halfop"
 
 #: src/common/text.c:1164
 msgid "The nick of the person who has been dehalfop'ed"
@@ -1874,7 +1744,7 @@ msgstr "O nick do utilizador a quem foi retirado o estatuto semi-operador"
 
 #: src/common/text.c:1168
 msgid "The nick of the person who did the devoice'ing"
-msgstr ""
+msgstr "O nick da pessoa que tirou o voice"
 
 #: src/common/text.c:1169
 msgid "The nick of the person who has been devoice'ed"
@@ -1882,11 +1752,11 @@ msgstr "O nick do utilizador a quem foi retirado o estatuto voz"
 
 #: src/common/text.c:1173
 msgid "The nick of the person who did the unban'ing"
-msgstr ""
+msgstr "O nick da pessoa que tirou o ban"
 
 #: src/common/text.c:1178
 msgid "The nick of the person who did the unquiet'ing"
-msgstr ""
+msgstr "O nick da pessoa que removeu o silencio"
 
 #: src/common/text.c:1183
 msgid "The nick of the person who did the exempt"
@@ -2112,9 +1982,7 @@ msgstr "Hora do Banimento"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Não foi possível ler ficheiro de som:\n"
-"%s"
+msgstr "Não foi possível ler ficheiro de som:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3357,7 +3225,7 @@ msgstr "Só podes ver a Lista de banimentos enquanto estás num canal."
 #: src/fe-gtk/banlist.c:808
 #, c-format
 msgid "Ban List (%s) - %s"
-msgstr ""
+msgstr "Lista de Bans (%s) - %s"
 
 #: src/fe-gtk/banlist.c:843 src/fe-gtk/notifygui.c:429
 msgid "Remove"
@@ -3395,7 +3263,7 @@ msgstr "Copiar Texto do _Tópico "
 #: src/fe-gtk/chanlist.c:720
 #, c-format
 msgid "Channel List (%s) - %s"
-msgstr ""
+msgstr "Lista de Canais (%s) - %s"
 
 #: src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3473,18 +3341,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Impossível aceder ao ficheiro: %s\n"
-"%s.\n"
-"Não é possível continuar."
+msgstr "Impossível aceder ao ficheiro: %s\n%s.\nNão é possível continuar."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Ficheiro da pasta de transferências é maior que o ficheiro oferecido. "
-"Impossível continuar."
+msgstr "Ficheiro da pasta de transferências é maior que o ficheiro oferecido. Impossível continuar."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3493,7 +3356,7 @@ msgstr "Impossível continuar o mesmo ficheiro de dois utilizadores."
 #: src/fe-gtk/dccgui.c:803
 #, c-format
 msgid "Uploads and Downloads - %s"
-msgstr ""
+msgstr "Uploads e Downloads - %s"
 
 #: src/fe-gtk/dccgui.c:820 src/fe-gtk/dccgui.c:1063 src/fe-gtk/notifygui.c:124
 msgid "Status"
@@ -3550,7 +3413,7 @@ msgstr "Abrir Pasta..."
 #: src/fe-gtk/dccgui.c:1050
 #, c-format
 msgid "DCC Chat List - %s"
-msgstr ""
+msgstr "Lista de DCC Chat - %s"
 
 #: src/fe-gtk/dccgui.c:1065
 msgid "Recv"
@@ -3614,8 +3477,7 @@ msgstr "Abra URL ou execute o comando em um HexChat existente"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr ""
-"iniciar minimizado. Nível 0=Normal 1=Minimizado 2=Barra de notificações"
+msgstr "iniciar minimizado. Nível 0=Normal 1=Minimizado 2=Barra de notificações"
 
 #: src/fe-gtk/fe-gtk.c:91
 msgid "level"
@@ -3631,10 +3493,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Não foi possível abrir a fonte:\n"
-"\n"
-"%s"
+msgstr "Não foi possível abrir a fonte:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3652,102 +3511,72 @@ msgstr "Fila de envio da 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 \\\\"
-msgstr ""
-"A ação do Comando Executar executa a informação em Data 1 como se tivesse "
-"sido escrita na caixa de entrada em que tenhas pressionado a sequência de "
-"teclas. Pode conter texto (que será enviado para o canal/pessoa), comandos "
-"ou comandos de utilizador. Os caracteres \\n em Data 1 são usados para "
-"delimitar comandos separados, de forma a ser possível executar mais de um "
-"comando. Se quiseres adicionar um caracter \\ literal ao texto, escreve \\\\"
+"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 "A ação do Comando Executar executa a informação em Data 1 como se tivesse sido escrita na caixa de entrada em que tenhas pressionado a sequência de teclas. Pode conter texto (que será enviado para o canal/pessoa), comandos ou comandos de utilizador. Os caracteres \\n em Data 1 são usados para delimitar comandos separados, de forma a ser possível executar mais de um comando. Se quiseres adicionar um caracter \\ literal ao texto, escreve \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"O comando Change Page alterna entre as páginas do notebook. Conjunto de data "
-"1 para a página que desejas alterar. Se Data 2 estiver definido para "
-"qualquer coisa, então a opção será relativa à posição atual. Conjunto de "
-"dados de 1 para mudar automaticamente para a página com a atividade mais "
-"recente e importante (consultas primeiro, depois os canais com realçes, "
-"canais de diálogo ativos, canais com outros dados)"
+msgstr "O comando Change Page alterna entre as páginas do notebook. Conjunto de data 1 para a página que desejas alterar. Se Data 2 estiver definido para qualquer coisa, então a opção será relativa à posição atual. Conjunto de dados de 1 para mudar automaticamente para a página com a atividade mais recente e importante (consultas primeiro, depois os canais com realçes, canais de diálogo ativos, canais com outros dados)"
 
 #: src/fe-gtk/fkeys.c:145
 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 Buffer introduz o conteúdo de Dados 1 na posição atual "
-"do cursor da entrada onde a sequência de teclas foi pressionada"
+msgstr "O comando Inserir no Buffer introduz o conteúdo de Dados 1 na posição atual do cursor da entrada onde a sequência de teclas foi pressionada"
 
 #: 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."
-msgstr ""
-"O comando Scroll Page desloca o widget de texto para cima ou para baixo uma "
-"página ou uma linha. Define Data 1 para Top (Topo), Bottom (Fundo), Up "
-"(Cima), Down (Baixo), +1 ou -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 "O comando Scroll Page desloca o widget de texto para cima ou para baixo uma página ou uma linha. Define Data 1 para Top (Topo), Bottom (Fundo), Up (Cima), Down (Baixo), +1 ou -1."
 
 #: 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 comando define a entrada, com a sequência de teclas introduzida "
-"para o conteúdo Dados 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Set Buffer comando define a entrada, com a sequência de teclas introduzida para o conteúdo Dados 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 ""
-"Last Command comando define a entrada para conter o último comando inserido "
-"- o mesmo que pressionar Cima num shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Last Command comando define a entrada para conter o último comando inserido - o mesmo que pressionar Cima num 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 ""
-"Next Command comando define a entrada para conter o próximo comando  a "
-"inserir - o mesmo que pressionar Baixo num shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Next Command comando define a entrada para conter o próximo comando  a inserir - o mesmo que pressionar Baixo num 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 ""
-"Este comando altera o texto na entrada para completar um nick ou comando "
-"incompleto. Se Dados 1 está definido então ao carregar duas vezes na tecla "
-"TAB numa palavra irá seleccionar o último nick e não o próximo"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Este comando altera o texto na entrada para completar um nick ou comando incompleto. Se Dados 1 está definido então ao carregar duas vezes na tecla TAB numa palavra irá seleccionar o último nick e não o próximo"
 
 #: 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 percorre a lista de nicks. Se Dados 1 está definido então a "
-"lista é percorrido para cima, caso contrário é percorrida para baixo"
+"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 percorre a lista de nicks. Se Dados 1 está definido então a lista é percorrido para cima, caso contrário é percorrida para baixo"
 
 #: 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 verifica a última palavra introduzida na entrada contra a lista "
-"de substituições e substitui-a se encontrar uma"
+msgstr "Este comando verifica a última palavra introduzida na entrada contra a lista de substituições e substitui-a se encontrar uma"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3759,18 +3588,15 @@ msgstr "Este comando move o separador actual uma posição para a direita"
 
 #: src/fe-gtk/fkeys.c:165
 msgid "This command moves the current tab family to the left"
-msgstr ""
-"Este comando move a família de separadores actual uma posição para a esquerda"
+msgstr "Este comando move a família de separadores actual uma posição para a esquerda"
 
 #: src/fe-gtk/fkeys.c:167
 msgid "This command moves the current tab family to the right"
-msgstr ""
-"Este comando move a família de separadores actual uma posição para a direita"
+msgstr "Este comando move a família de separadores actual uma posição para a direita"
 
 #: src/fe-gtk/fkeys.c:169
 msgid "Push input line into history but doesn't send to server"
-msgstr ""
-"Coloca a linha de entrada para o historial mas não a envia para o servidor"
+msgstr "Coloca a linha de entrada para o historial mas não a envia para o servidor"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
@@ -3783,7 +3609,7 @@ msgstr "Seleciona uma linha para obter ajuda sobre a sua Ação."
 #: src/fe-gtk/fkeys.c:812
 #, c-format
 msgid "Keyboard Shortcuts - %s"
-msgstr ""
+msgstr "Atalhos de teclado - %s"
 
 #: src/fe-gtk/gtkutil.c:130
 msgid "Cannot write to that file."
@@ -3829,7 +3655,7 @@ msgstr "Introduzir máscara a ignorar:"
 #: src/fe-gtk/ignoregui.c:350
 #, c-format
 msgid "Ignore list - %s"
-msgstr ""
+msgstr "Lista de ignorados - %s"
 
 #: src/fe-gtk/ignoregui.c:360
 msgid "Ignore Stats:"
@@ -3866,7 +3692,7 @@ msgstr "Nome do canal é demasiado pequeno, tenta outra vez."
 #: src/fe-gtk/joind.c:133
 #, c-format
 msgid "Connection Complete - %s"
-msgstr ""
+msgstr "Ligaçao completada - %s"
 
 #: src/fe-gtk/joind.c:162
 #, c-format
@@ -3877,7 +3703,7 @@ msgstr "Ligação a %s concluída."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
+msgstr "Na janela da lista de servidores, nenhum canal (sala de chat) foi adicionado para entrada automatica nesta rede."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3897,11 +3723,11 @@ msgstr "Se sabes o nome do canal onde queres entrar, escreve-o aqui."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "_Abrir a lista de canais."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "A recuperação da lista de canais pode demorar um ou dois minutos."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3925,8 +3751,7 @@ msgstr "Nenhum tópico introduzido"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Este servidor ainda tem %d canais ou diálogos associados. Fechar todos?"
+msgstr "Este servidor ainda tem %d canais ou diálogos associados. Fechar todos?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4157,10 +3982,7 @@ msgstr "%d nicks selecionados."
 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 ""
-"A Barra de Menu está agora oculta. Podes mostra-la de novo pressionando "
-"Control+F9 ou clicando com o botão direito numa zona em branco da área de "
-"texto principal."
+msgstr "A Barra de Menu está agora oculta. Podes mostra-la de novo pressionando Control+F9 ou clicando com o botão direito numa zona em branco da área de texto principal."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4197,12 +4019,12 @@ msgstr "Ligar _Automaticamente"
 #: src/fe-gtk/menu.c:1138
 #, c-format
 msgid "User menu - %s"
-msgstr ""
+msgstr "Menu de utilizador - %s"
 
 #. sep
 #: src/fe-gtk/menu.c:1147
 msgid "Edit This Menu"
-msgstr ""
+msgstr "Editar este Menu"
 
 #: src/fe-gtk/menu.c:1293
 msgid "Marker line disabled."
@@ -4218,8 +4040,7 @@ msgstr "A linha de marcador foi redefinida manualmente."
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"A linha de marcador foi redefinida porque excedia o limite de retrocesso."
+msgstr "A linha de marcador foi redefinida porque excedia o limite de retrocesso."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
@@ -4231,7 +4052,7 @@ msgstr "Estado da linha de marcador é desconhecido."
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
-msgstr ""
+msgstr "Mostrar a lista de canais"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
@@ -4257,25 +4078,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Comandos Utilizador - Códigos especiais:\n"
-"\n"
-"%c  =  canal em uso\n"
-"%e  =  rede em uso\n"
-"%m  =  info máquina\n"
-"%n  =  meu nick\n"
-"%t  =  hora/data\n"
-"%v  =  Versão HexChat\n"
-"%2  =  palavra 2\n"
-"%3  =  palavra 3\n"
-"&2  =  palavra 2 no final da linha\n"
-"&3  =  palavra 3 no final da linha\n"
-"\n"
-"ex:\n"
-"/cmd artur olá\n"
-"\n"
-"%2 será \"artur\"\n"
-"&2 será \"artur olá\"."
+msgstr "Comandos Utilizador - Códigos especiais:\n\n%c  =  canal em uso\n%e  =  rede em uso\n%m  =  info máquina\n%n  =  meu nick\n%t  =  hora/data\n%v  =  Versão HexChat\n%2  =  palavra 2\n%3  =  palavra 3\n&2  =  palavra 2 no final da linha\n&3  =  palavra 3 no final da linha\n\nex:\n/cmd artur olá\n\n%2 será \"artur\"\n&2 será \"artur olá\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4290,18 +4093,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botões da lista de utilizador - Códigos especiais:\n"
-"\n"
-"%a  = todos os nicks selecionados\n"
-"%c  =  nome do canal atual\n"
-"%e  =  nome da rede atual\n"
-"%h  =  hostname do nick selecionado\n"
-"%m  =  informação da máquina\n"
-"%n  =  teu nick\n"
-"%s  =  nick selecionado\n"
-"%t  =  tempo/data\n"
-"%u  =  conta dos utilizadores selecionados"
+msgstr "Botões da lista de utilizador - Códigos especiais:\n\n%a  = todos os nicks selecionados\n%c  =  nome do canal atual\n%e  =  nome da rede atual\n%h  =  hostname do nick selecionado\n%m  =  informação da máquina\n%n  =  teu nick\n%s  =  nick selecionado\n%t  =  tempo/data\n%u  =  conta dos utilizadores selecionados"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4316,18 +4108,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botões de diálogo - Códigos especiais:\n"
-"\n"
-"%a  = todos os nicks selecionados\n"
-"%c  =  nome do canal atual\n"
-"%e  =  nome da rede atual\n"
-"%h  =  hostname do nick selecionado\n"
-"%m  =  informação da máquina\n"
-"%n  =  teu nick\n"
-"%s  =  nick selecionado\n"
-"%t  =  tempo/data\n"
-"%u  =  conta dos utilizadores selecionados"
+msgstr "Botões de diálogo - Códigos especiais:\n\n%a  = todos os nicks selecionados\n%c  =  nome do canal atual\n%e  =  nome da rede atual\n%h  =  hostname do nick selecionado\n%m  =  informação da máquina\n%n  =  teu nick\n%s  =  nick selecionado\n%t  =  tempo/data\n%u  =  conta dos utilizadores selecionados"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4343,11 +4124,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:⏎ ⏎ %d = data (todo ctcp)⏎ %e = nome rede "
-"em uso⏎ %m = info máquina⏎ %s = nick do envio ctcp⏎ %t = hora/data⏎ %2 = "
-"palavra 2⏎ %3 = palavra 3⏎ &2 = palavra 2 no final da linha⏎ &3 = palavra 3 "
-"no final da linha⏎ ⏎\n"
+msgstr "Respostas CTCP - Códigos especiais:⏎ ⏎ %d = data (todo ctcp)⏎ %e = nome rede em uso⏎ %m = info máquina⏎ %s = nick do envio ctcp⏎ %t = hora/data⏎ %2 = palavra 2⏎ %3 = palavra 3⏎ &2 = palavra 2 no final da linha⏎ &3 = palavra 3 no final da linha⏎ ⏎\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4359,28 +4136,22 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL Manipuladores- Códigos especiais:\n"
-"\n"
-"%s  =  string URL \n"
-"Inserir um! na frente do comando\n"
-"indica que deve ser enviado para uma\n"
-"shell em vez HexChat"
+msgstr "URL Manipuladores- Códigos especiais:\n\n%s  =  string URL \nInserir um! na frente do comando\nindica que deve ser enviado para uma\nshell em vez HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
 msgid "User Defined Commands - %s"
-msgstr ""
+msgstr "Comandos definidos pelo utilizador - %s"
 
 #: src/fe-gtk/menu.c:1538
 #, c-format
 msgid "Userlist Popup menu -  %s"
-msgstr ""
+msgstr "Menu pop-up da lista de utilizadores - %s"
 
 #: src/fe-gtk/menu.c:1546
 #, c-format
 msgid "Replace - %s"
-msgstr ""
+msgstr "Substituir - %s"
 
 #: src/fe-gtk/menu.c:1547
 msgid "Replace with"
@@ -4389,22 +4160,22 @@ msgstr "Substituir por"
 #: src/fe-gtk/menu.c:1554
 #, c-format
 msgid "URL Handlers - %s"
-msgstr ""
+msgstr "Manipuladores de URL - %s"
 
 #: src/fe-gtk/menu.c:1574
 #, c-format
 msgid "Userlist buttons - %s"
-msgstr ""
+msgstr "Botoes da lista de utilizadores - %s"
 
 #: src/fe-gtk/menu.c:1582
 #, c-format
 msgid "Dialog buttons - %s"
-msgstr ""
+msgstr "Botoes de dialogo - %s"
 
 #: src/fe-gtk/menu.c:1591
 #, c-format
 msgid "CTCP Replies - %s"
-msgstr ""
+msgstr "Respostas CTCP - %s"
 
 #: src/fe-gtk/menu.c:1757
 msgid "He_xChat"
@@ -4412,7 +4183,7 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "_Lista de redes"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4420,23 +4191,23 @@ msgstr "_Novo"
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr ""
+msgstr "Aba de servidor"
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr ""
+msgstr "Aba de canal"
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr ""
+msgstr "Janela de servidor"
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr ""
+msgstr "Janela de canal"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr ""
+msgstr "_Carregar Plugin ou Script"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4461,7 +4232,7 @@ msgstr "_Lista Utilizador"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr ""
+msgstr "_Lista de botoes de utilizador"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4509,11 +4280,11 @@ msgstr "_Reconetar"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr ""
+msgstr "_Entrar num canal"
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr ""
+msgstr "_Lista de canais"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
@@ -4534,39 +4305,39 @@ msgstr "_Preferências"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr ""
+msgstr "Auto substituiçao"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "Respostas CTCP"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "Botoes de dialogo"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Atalhos de teclado"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "Eventos de texto"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "Manipuladores de URL"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "Comandos de utilizador"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "Lista de botoes de utilizador"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
-msgstr ""
+msgstr "Lista de popup de utilizador"
 
 #. 52
 #: src/fe-gtk/menu.c:1825
@@ -4575,36 +4346,36 @@ msgstr "_Janela"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "_Lista de bans"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "Chat directo"
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "_Transferencias de ficheiros"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
-msgstr ""
+msgstr "Lista de amigos"
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "Lista de ignorados"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "_Plugins e Scripts"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Registo RAW"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "_Colector de URLs"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
@@ -4624,7 +4395,7 @@ msgstr "_Limpar Texto"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr ""
+msgstr "Salvar Texto"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4632,7 +4403,7 @@ msgstr "Procurar"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr ""
+msgstr "Procurar Texto"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
@@ -4708,7 +4479,7 @@ msgstr "Lista separada por vírgula de redes permitida."
 #: src/fe-gtk/notifygui.c:409
 #, c-format
 msgid "Friends List - %s"
-msgstr ""
+msgstr "Lista de amigos - %s"
 
 #: src/fe-gtk/notifygui.c:433
 msgid "Open Dialog"
@@ -4732,12 +4503,12 @@ msgstr "Oferta de ficheiro de: %s (%s)"
 #: src/fe-gtk/plugin-notification.c:149
 #, c-format
 msgid "Invited to channel by: %s (%s)"
-msgstr ""
+msgstr "Convidado para o canal por: %s (%s)"
 
 #: src/fe-gtk/plugin-notification.c:154
 #, c-format
 msgid "Notice from: %s (%s)"
-msgstr ""
+msgstr "Notice de: %s (%s)"
 
 #: src/fe-gtk/plugin-notification.c:158
 #, c-format
@@ -4747,7 +4518,7 @@ msgstr "Mensagem privada de: %s (%s)"
 #: src/fe-gtk/plugin-tray.c:177
 #, c-format
 msgid "Connected to %u networks and %u channels - %s"
-msgstr ""
+msgstr "Ligado a %u redes e %u canais - %s"
 
 #: src/fe-gtk/plugin-tray.c:549
 msgid "_Restore Window"
@@ -4789,42 +4560,42 @@ msgstr "_de Volta"
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagens com menções de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:637
 #, c-format
 msgid "%u highlighted messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%umensagens com menções, ultima de %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagem de canal de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
-msgstr ""
+msgstr "%u mensagens de canal. - %s"
 
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagem privada de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u mensagens privadas, ultima de %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
-msgstr ""
+msgstr "Oferta de ficheiro de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u ofertas de ficheiros, ultima de: %s (%s) - %s"
 
 #: src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4841,7 +4612,7 @@ msgstr "Seleccionar um Plugin ou Script para carregar"
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr ""
+msgstr "Plugins e Scripts - %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4863,7 +4634,7 @@ msgstr "Guardar como..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "Registo bruto (%s) - %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4884,7 +4655,7 @@ msgstr "O nome de utilizador não pode ficar em branco."
 
 #: src/fe-gtk/servlistgui.c:1578
 msgid "You cannot have an empty nick name."
-msgstr ""
+msgstr "Você não pode ter uma alcunha vazia."
 
 #: src/fe-gtk/servlistgui.c:1585
 msgid "You must have two unique nick names."
@@ -4894,14 +4665,12 @@ msgstr "Tens de ter dois nomes de utilizador únicos."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"A forma como te identificas ao servidor. Para métodos de login "
-"personalizados usa os comandos de conexão."
+msgstr "A forma como te identificas ao servidor. Para métodos de login personalizados usa os comandos de conexão."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
 msgid "Edit %s - %s"
-msgstr ""
+msgstr "Editar %s - %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4921,11 +4690,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Nick\n"
-"%p=Senha\n"
-"%r=Nome real\n"
-"%u=Nome de utilizador"
+msgstr "%n=Nick\n%p=Senha\n%r=Nome real\n%u=Nome de utilizador"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -4998,7 +4763,7 @@ msgstr "Conjunto de caracteres:"
 #: src/fe-gtk/servlistgui.c:1977
 #, c-format
 msgid "Network List - %s"
-msgstr ""
+msgstr "Lista de redes - %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
@@ -5032,7 +4797,7 @@ msgstr "_Ordenar"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "Classifica a lista de redes em ordem alfabética. Use as teclas Shift+Cima e Shift+Baixo para mover uma fila."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5308,19 +5073,19 @@ msgstr "Configurações de Transparência"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "Opacidade da janela:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "Horas"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "Activar horas"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "Formato das horas:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5356,7 +5121,7 @@ msgstr "Caixa Entrada"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "Use a fonte e as cores da caixa de texto"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5382,10 +5147,7 @@ msgstr "Dicionários a utilizar:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Usa códigos de idioma (como em \"%LOCALAPPDATA%\\enchant\\myspell\\dicts"
-"\").\n"
-"Separa múltiplas entradas com vírgulas."
+msgstr "Usa códigos de idioma (como em \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSepara múltiplas entradas com vírgulas."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5421,11 +5183,11 @@ msgstr "Gráfico"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Z, ops primeiro"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Z-A, ops em ultimo"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5437,19 +5199,19 @@ msgstr "Desordenado"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "Esquerda (superior)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "Esquerda (inferior)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "Direito (superior)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "Direita (inferior)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5481,8 +5243,7 @@ msgstr "Ver ícones para os modos de utilizador"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Usar ícones gráficos em vez de símbolos de texto na lista de utilizadores."
+msgstr "Usar ícones gráficos em vez de símbolos de texto na lista de utilizadores."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5510,7 +5271,7 @@ msgstr "Controlar Ausência"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "Acompanha o estado de ausência dos utilizadores e marca-os em uma cor diferente"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5597,7 +5358,7 @@ msgstr "Usa a roda do rato para mudar entre separadores"
 
 #: src/fe-gtk/setup.c:318
 msgid "Middle click to close tab"
-msgstr ""
+msgstr "Clique no meio para fechar a guia"
 
 #: src/fe-gtk/setup.c:319
 msgid "Smaller text"
@@ -5701,7 +5462,7 @@ msgstr "Janela de conversa"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "Velocidades Máximas de Transferência de Arquivos (Byte por Segundo)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5734,7 +5495,7 @@ msgstr "Alertas"
 
 #: src/fe-gtk/setup.c:403 src/fe-gtk/setup.c:485
 msgid "Show notifications on:"
-msgstr ""
+msgstr "Mostrar notificações em:"
 
 #: src/fe-gtk/setup.c:404 src/fe-gtk/setup.c:442
 msgid "Blink tray icon on:"
@@ -5755,17 +5516,13 @@ msgstr "Som de beep em:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Tocar o som do sistema \"Notificação de Mensagem Instantânea\" mediante os "
-"eventos selecionados"
+msgstr "Tocar o som do sistema \"Notificação de Mensagem Instantânea\" mediante os eventos selecionados"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Tocar \"message-new-instant\" do tema de sons de freedesktop.org  mediante "
-"os eventos selecionados"
+msgstr "Tocar \"message-new-instant\" do tema de sons de freedesktop.org  mediante os eventos selecionados"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5807,7 +5564,7 @@ msgstr "Mudar automaticamente de status quando na bandeja."
 
 #: src/fe-gtk/setup.c:424
 msgid "Only show notifications when hidden or iconified"
-msgstr ""
+msgstr "Mostrar apenas notificações quando ocultas ou iconificadas"
 
 #: src/fe-gtk/setup.c:426 src/fe-gtk/setup.c:469 src/fe-gtk/setup.c:492
 #: src/fe-gtk/setup.c:514
@@ -5840,8 +5597,7 @@ msgstr "Nick para marcar sempre:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separe múltiplas palavras com vírgulas. caracteres universais ⏎ são aceites."
+msgstr "Separe múltiplas palavras com vírgulas. caracteres universais ⏎ são aceites."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5897,9 +5653,7 @@ msgstr "WHOIS após notificação"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Envia um /WHOIS quando um utilizador da tua lista de notificação ficar "
-"online."
+msgstr "Envia um /WHOIS quando um utilizador da tua lista de notificação ficar online."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5941,17 +5695,17 @@ msgstr "Copiar texto selecionado automaticamente"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Copie o texto selecionado para a área de transferência quando o botão esquerdo do rato é libertado. Caso contrário, Ctrl+Shift+C copiará o texto selecionado para a área de transferência."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+msgstr "Incluir horas automaticamente"
 
 #: 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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Incluir automaticamente data e hora em linhas de texto copiadas. Caso contrário, inclui data e hora apenas se a tecla Shift estiver pressionada durante a seleção."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5959,9 +5713,9 @@ msgstr "Incluir informações de cor"
 
 #: 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Incluir automaticamente informações de cor em linhas copiadas de texto. Caso contrário, inclui informações sobre cores apenas se a tecla Ctrl estiver pressionada durante a seleção."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -5981,9 +5735,7 @@ msgstr "Ver listas compactadas"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Use menos espaçamento entre as linhas de lista utilizadores / árvores de "
-"canal."
+msgstr "Use menos espaçamento entre as linhas de lista utilizadores / árvores de canal."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -5993,9 +5745,7 @@ msgstr "Usar tempo do servidor se suportado"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Mostrar data e hora obtidos do servidor se ele suportar a extensão time-"
-"server."
+msgstr "Mostrar data e hora obtidos do servidor se ele suportar a extensão time-server."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6015,10 +5765,9 @@ msgstr "Tipo de Banimento:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Tenta usar esta máscara de banimento para banir ou silenciar. (requer "
+"Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
+msgstr "Tenta usar esta máscara de banimento para banir ou silenciar. (requer irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6079,11 +5828,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6095,15 +5844,15 @@ msgstr "Automático"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "Todas as conexões"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "Apenas servidor de IRC"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "Somente DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6127,11 +5876,9 @@ msgstr "Obter endereço através do servidor de 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 ""
-"Pergunta ao servidor de IRC o teu endereço real. Utiliza se tiveres um "
-"endereço 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Pergunta ao servidor de IRC o teu endereço real. Utiliza se tiveres um endereço 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6143,11 +5890,11 @@ msgstr "Utilizar este endereço quando oferta ficheiros."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "Primeira porta de escuta do DCC:"
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "Última porta de escuta do DCC:"
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -6179,7 +5926,7 @@ msgstr "Autenticação Proxy"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "Use autenticação (somente HTTP ou SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6187,21 +5934,21 @@ msgstr "Utilizador:"
 
 #: src/fe-gtk/setup.c:662
 msgid "Identd Server"
-msgstr ""
+msgstr "Servidor de Identidade"
 
 #: src/fe-gtk/setup.c:663
 msgid "Enabled"
-msgstr ""
+msgstr "Activado"
 
 #: src/fe-gtk/setup.c:663
 msgid "Server will respond with the networks username"
-msgstr ""
+msgstr "O servidor responderá com o nome de utilizador da rede"
 
 #: src/fe-gtk/setup.c:664
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
+msgstr "Você deve ter permissões para escutar nesta porta. Se não for 113 (o padrão é 0), você deverá configurar o reencaminhamento de porta."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6353,7 +6100,7 @@ msgstr "Transferência de ficheiros"
 
 #: src/fe-gtk/setup.c:1889
 msgid "Identd"
-msgstr ""
+msgstr "Identidade"
 
 #: src/fe-gtk/setup.c:2019
 msgid "Categories"
@@ -6363,15 +6110,11 @@ msgstr "Categorias"
 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 ""
-"Você não pode colocar a árvore na parte superior ou inferior! ⏎ por favor "
-"mude para as <b>Guias</ b> disposição no <b>Ver</ b> primeiro menu."
+msgstr "Você não pode colocar a árvore na parte superior ou inferior! ⏎ por favor mude para as <b>Guias</ b> disposição no <b>Ver</ b> primeiro menu."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"A opção Nome real não pode ser deixada em branco. Voltando a \"realname\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "A opção Nome real não pode ser deixada em branco. Voltando a \"realname\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
@@ -6383,15 +6126,12 @@ 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"
-"Aceitar automaticamente DCC no diretório do utilizador pode ser perigoso. "
-"Por exemplo, uma pessoal mal intencionada pode enviar-te um .bash_profile"
+msgstr "*AVISO*\nAceitar automaticamente DCC no diretório do utilizador pode ser perigoso. Por exemplo, uma pessoal mal intencionada pode enviar-te um .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
 msgid "Preferences - %s"
-msgstr ""
+msgstr "Preferências - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
@@ -6457,7 +6197,7 @@ msgstr "OK"
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
 msgid "URL Grabber - %s"
-msgstr ""
+msgstr "Coletor de URLs - %s"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Clear list"
@@ -6486,40 +6226,34 @@ msgstr "Abrir um URL irc://servidor:porta/canal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
+msgstr "Sysinfo: Falha ao obter informações. Não suportado ou erro."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
-msgstr ""
+msgstr "Sysinfo: Nenhuma informação com esse nome\n"
 
 #: plugins/sysinfo/sysinfo.c:154 plugins/sysinfo/sysinfo.c:158
 #, c-format
 msgid "Sysinfo: %s is set to: %d\n"
-msgstr ""
+msgstr "Sysinfo: %s definido como: %d\n"
 
 #: 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"
-msgstr ""
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: As configurações válidas são: announce e hide_ * para cada informação. por exemplo: hide_os. Sem um valor, ele mostrará a configuração atual (ou padrão).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
-msgstr ""
+msgstr "Sysinfo: nome da variável inválido\n"
 
 #: plugins/sysinfo/sysinfo.c:239
 #, c-format
 msgid "%s plugin loaded\n"
-msgstr ""
+msgstr "%s plugin carregado\n"
 
 #: plugins/sysinfo/sysinfo.c:247
 #, c-format
 msgid "%s plugin unloaded\n"
-msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
+msgstr "%s plugin descarregado\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 190d1128..71a1bb05 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,29 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Aníbal Deboni Neto <adneto@outlook.com>, 2014-2016
+# Aníbal Deboni Neto <adneto@outlook.com>, 2014-2016,2018
 # Flamarion Jorge <flamarilinux@yahoo.com.br>, 2009
 # Flamarion Jorge <jorge.flamarion@gmail.com>, 2012
+# Flamarion Jorge <jorge.flamarion@gmail.com>, 2012
 # Frédéric L. W. Meunier <fredlwm@olympiquedemarseille.org>, 20, 2009
 # Leonardo Pires Felix <leonardo@piresfelix.com>, 2013
 # Matheus Felipe Braga, 2014,2016
+# Matheus Felipe Braga, 2014,2016
 # Matheus Macabu <mkbu95@gmail.com>, 2012
+# Matheus Macabu <mkbu95@gmail.com>, 2012
+# Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
 # Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
 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"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/hexchat/hexchat/"
-"language/pt_BR/)\n"
-"Language: pt_BR\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-05-13 01:10+0000\n"
+"Last-Translator: Aníbal Deboni Neto <adneto@outlook.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/hexchat/hexchat/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -42,23 +45,17 @@ 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 é um cliente IRC extensível e fácil de usar. Ele permite que, de "
-"forma segura, você acesse múltiplas redes e tenha conversas privadas com "
-"outros usuários ou ainda em canais públicos, tudo isso através de uma "
-"interface personalizável. Você poderá até mesmo transferir arquivos."
+msgstr "HexChat é um cliente IRC extensível e fácil de usar. Ele permite que, de forma segura, você acesse múltiplas redes e tenha conversas privadas com outros usuários ou ainda em canais públicos, tudo isso através de uma interface personalizável. Você poderá até mesmo transferir arquivos."
 
 #: 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 suporta recursos como: DCC, SASL, proxies, corretor ortográfico, "
-"alertas, registros, temas personalizados, e scripts em Python/Perl"
+msgstr "HexChat suporta recursos como: DCC, SASL, proxies, corretor ortográfico, alertas, registros, temas personalizados, e scripts em Python/Perl"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
-msgstr "Janela de Chat Principal"
+msgstr "Janela principal de bate-papo"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:5
 msgid "Chat with other people online"
@@ -71,7 +68,7 @@ msgstr "IM;Chat;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -274,7 +271,7 @@ msgstr "Qual o motivo para chuta--lo(a) %s:"
 
 #: src/common/hexchat.c:938
 msgid "Send File"
-msgstr ""
+msgstr "Enviar arquivo"
 
 #: src/common/hexchat.c:939
 msgid "Dialog"
@@ -305,16 +302,13 @@ msgstr "Pingar"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Você não tem permissão de escrita a %s. Nada desta sessão poderá ser salvo."
+msgstr "Você não tem permissão de escrita a %s. Nada desta sessão poderá ser salvo."
 
 #: 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 ""
-"* Executar um IRC como root é estupidez. Você deve\n"
-"  criar uma conta de usuário e usá-la para fazer o login.\n"
+msgstr "* Executar um IRC como root é estupidez. Você deve\n  criar uma conta de usuário e usá-la para fazer o login.\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
@@ -331,16 +325,12 @@ msgstr "NÃO   "
 #: src/common/ignore.c:370
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr ""
-"Você está recebendo um CTCP flood de %s, ignorando %s\n"
-"\n"
+msgstr "Você está recebendo um CTCP flood de %s, ignorando %s\n\n"
 
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Você está recebendo muitas mensagens consecutivas de %s, o parâmetro "
-"gui_autoopen_dialog será DESATIVADO.\n"
+msgstr "Você está recebendo muitas mensagens consecutivas de %s, o parâmetro gui_autoopen_dialog será DESATIVADO.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -443,25 +433,19 @@ msgstr "ADDBUTTON <nome> <ação>, adiciona um botão abaixo da lista de usuári
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NovaRede> <novoservidor/6667>, adiciona uma nova rede com um novo "
-"servidor a lista de redes"
+msgstr "ADDSERVER <NovaRede> <novoservidor/6667>, adiciona uma nova rede com um novo servidor a lista de redes"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr ""
-"ALLCHAN <comando>, envia um comando para todos os canais em que você estiver"
+msgstr "ALLCHAN <comando>, envia um comando para todos os canais em que você estiver"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <comando>, envia um comando para todos os canais no servidor atual"
+msgstr "ALLCHANL <comando>, envia um comando para todos os canais no servidor atual"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <comando>, envia um comando para todos os servidores em que você "
-"estiver"
+msgstr "ALLSERV <comando>, envia um comando para todos os servidores em que você estiver"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
@@ -476,10 +460,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 ""
-"BAM <mask> [<bantype>], bane todos os usuários com a máscara correspondente "
-"no canal atual. Esse comando não os expulsará caso eles ainda estejam no "
-"canal (necessário ChanOp)"
+msgstr "BAM <mask> [<bantype>], bane todos os usuários com a máscara correspondente no canal atual. Esse comando não os expulsará caso eles ainda estejam no canal (necessário ChanOp)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -487,45 +468,37 @@ msgstr "CHANOPT [-quiet] <variável> [<valor>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<codificação>], obtém ou altera a codificação usada na conexão atual"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<codificação>], obtém ou altera a codificação usada na conexão atual"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<quantidade>], Limpa o texto da janela atual ou "
-"histórico de comandos"
+msgstr "CLEAR [ALL|HISTORY|[-]<quantidade>], Limpa o texto da janela atual ou histórico de comandos"
 
 #: 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 ""
-"CLOSE [-m], Fecha a janela/aba atual, fechando a janela se esta for a única "
-"aba aberta, ou com \"-m\", fecha todas as conversas privadas. "
+msgstr "CLOSE [-m], Fecha a janela/aba atual, fechando a janela se esta for a única aba aberta, ou com \"-m\", fecha todas as conversas privadas. "
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <código|valor coringa>, procura pelo código de um país, ex: br "
-"= brasil"
+msgstr "COUNTRY [-s] <código|valor coringa>, procura pelo código de um país, ex: br = brasil"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <usuário> <mensagem>, envia uma mensagem CTCP  ao usuário, mensagens "
-"comuns são VERSION e USERINFO"
+msgstr "CTCP <usuário> <mensagem>, envia uma mensagem CTCP  ao usuário, mensagens comuns são VERSION e USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<canal>], Sai do canal atual, ou de um escolhido, e entra novamente"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<canal>], Sai do canal atual, ou de um escolhido, e entra novamente"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -538,26 +511,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 <apelido>                      - aceita uma oferta de arquivo\n"
-"DCC SEND [-maxcps=#] <apelido> [arquivo]  - envia um arquivo a um usuário\n"
-"DCC PSEND [-maxcps=#] <apelido> [arquivo] - envia um arquivo em modo passivo "
-"a um usuário\n"
-"DCC LIST                            - exibe a lista de DCCs\n"
-"DCC CHAT <apelido>                     - oferece um DCC CHAT\n"
-"DCC PCHAT <apelido>                    - oferece um DCC CHAT em modo "
-"passivo\n"
-"DCC CLOSE <tipo> <apelido> <arquivo>         exemplo:\n"
-"         /dcc close send josesilva arquivo.tar.gz"
+msgstr "\nDCC GET <apelido>                      - aceita uma oferta de arquivo\nDCC SEND [-maxcps=#] <apelido> [arquivo]  - envia um arquivo a um usuário\nDCC PSEND [-maxcps=#] <apelido> [arquivo] - envia um arquivo em modo passivo a um usuário\nDCC LIST                            - exibe a lista de DCCs\nDCC CHAT <apelido>                     - oferece um DCC CHAT\nDCC PCHAT <apelido>                    - oferece um DCC CHAT em modo passivo\nDCC CLOSE <tipo> <apelido> <arquivo>         exemplo:\n         /dcc close send josesilva arquivo.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 <usuário>, remove o estado de meio-operador do usuário no canal ativo "
-"(necessita ChanOp)"
+msgstr "DEHOP <usuário>, remove o estado de meio-operador do usuário no canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -567,17 +527,13 @@ msgstr "DELBUTTON <nome> apaga um botão da parte inferior da lista de usuários
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <usuário>, remove o estado de operador de um usuário no canal ativo "
-"(necessita ChanOp)"
+msgstr "DEOP <usuário>, remove o estado de operador de um usuário no canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <usuário>, remove o estado de voz de um usuário no canal ativo "
-"(necessita ChanOp)"
+msgstr "DEVOICE <usuário>, remove o estado de voz de um usuário no canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -589,7 +545,7 @@ msgstr "DNS <usuário|host|ip>, Resolve um IP ou hostname"
 
 #: src/common/outbound.c:3977
 msgid "DOAT <channel,list,/network> <command>"
-msgstr ""
+msgstr "DOAT <channel,list,/network> <command>"
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
@@ -599,10 +555,7 @@ msgstr "ECHO <texto>, Exibe um 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 um comando na shell. Se o modo -o for usado, "
-"então o resultado do comando será enviado ao canal ativo, ou então exibido "
-"na caixa de texto ativa"
+msgstr "EXEC [-o] <comando>, executa um comando na shell. Se o modo -o for usado, então o resultado do comando será enviado ao canal ativo, ou então exibido na caixa de texto ativa"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -612,9 +565,7 @@ msgstr "EXECCONT, envia SIGCONT ao processo"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], elimina um comando exec ativo na sessão atual. Se o modo -9 "
-"for utilizado, o processo designado é terminado com SIGKILL"
+msgstr "EXECKILL [-9], elimina um comando exec ativo na sessão atual. Se o modo -9 for utilizado, o processo designado é terminado com SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -634,9 +585,7 @@ msgstr "FLUSHQ, esvazia a lista de envios do servidor ativo"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<porta>], cria uma conexão proxy através de um host, a porta "
-"padrão é 23"
+msgstr "GATE <host> [<porta>], cria uma conexão proxy através de um host, a porta padrão é 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -644,9 +593,7 @@ msgstr "GHOST <usuário) [senha], Encerra a conexão de um usuário fantasma"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <usuário>, concede estado de meio-operador a um usuário (necessita "
-"ChanOp)"
+msgstr "HOP <usuário>, concede estado de meio-operador a um usuário (necessita ChanOp)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -659,20 +606,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> <opções>\n"
-"máscara - máscara do host a ignorar, ex: *!*@*.telesp.net.br\n"
-"tipos - tipo de dado a ignorar, dentre as opções:\n"
-"PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"opções - NOSAVE, QUIET"
+msgstr "IGNORE <máscara> <tipos> <opções>\nmáscara - máscara do host a ignorar, ex: *!*@*.telesp.net.br\ntipos - tipo de dado a ignorar, dentre as opções:\nPRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\nopções - 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 <usuário> [<canal>], convida alguém para entrar no canal, por padrão "
-"o canal ativo (necessita ChanOp)"
+msgstr "INVITE <usuário> [<canal>], convida alguém para entrar no canal, por padrão o canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -681,16 +621,13 @@ msgstr "JOIN <canal>, entra no canal"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <usuário> [motivo], chuta o usuário do canal ativo (necessita ChanOp)"
+msgstr "KICK <usuário> [motivo], chuta o usuário do canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <usuário> [motivo], bane e então chuta o usuário do canal ativo "
-"(necessita ChanOp)"
+msgstr "KICKBAN <usuário> [motivo], bane e então chuta o usuário do canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -702,16 +639,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] [--] <fragmento>, pesquisa por um dado fragmento nos "
-"registros\n"
-"Use -h para dar destaque ao fragmento encontrado\n"
-"Use -m para somente palavras inteiras\n"
-"Use -r quando o fragmento for um Expressão Regular\n"
-"Use -- (duplo hífen) para encerrar as opções quando pesquisando, use, a "
-"opção '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <fragmento>, pesquisa por um dado fragmento nos registros\nUse -h para dar destaque ao fragmento encontrado\nUse -m para somente palavras inteiras\nUse -r quando o fragmento for um Expressão Regular\nUse -- (duplo hífen) para encerrar as opções quando pesquisando, use, a opção '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -720,49 +649,36 @@ msgstr "LOAD [-e] <arquivo>, carrega um plug-in ou script"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Remove, em massa, o estado dos meio-operadores no canal ativo "
-"(necessita ChanOp)"
+msgstr "MDEHOP, Remove, em massa, o estado dos meio-operadores no canal ativo (necessita ChanOp)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Remove, em massa, o estado de todos os operadores do canal ativo "
-"(necessita ChanOp)"
+msgstr "MDEOP, Remove, em massa, o estado de todos os operadores do canal ativo (necessita 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 <ação>, envia a ação para o canal ativo (ações são geralmente escritas em "
-"3ª pessoa, ex: /me pula)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <ação>, envia a ação para o canal ativo (ações são geralmente escritas em 3ª pessoa, ex: /me pula)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
+msgstr "MHOP, Concede estado de meio-operador em massa no canal ativo (é necessário ser operador)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Chuta todos os usuário do canal ativo com exceção de você (necessita "
-"ChanOp)"
+msgstr "MKICK, Chuta todos os usuário do canal ativo com exceção de você (necessita ChanOp)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Concede modo de operador a todos os usuários do canal ativo (necessita "
-"ChanOp)"
+msgstr "MOP, Concede modo de operador a todos os usuários do canal ativo (necessita 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"
-msgstr ""
-"MSG <usuário> <mensagem>, envia uma mensagem privada. Ao utilizar \".\", no "
-"lugar de um apelido de usuário, a mensagem é encaminhado ao último usuário, "
-"ou prefixe com \"=\" para enviar a um dcc chat"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <usuário> <mensagem>, envia uma mensagem privada. Ao utilizar \".\", no lugar de um apelido de usuário, a mensagem é encaminhado ao último usuário, ou prefixe com \"=\" para enviar a um dcc chat"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -788,9 +704,7 @@ msgstr "NOTICE <usuário/canal> <mensagem>, envia uma aviso"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n rede1[,rede2,...]] [<usuário>], exibe sua lista de amigos ou "
-"adiciona alguém a ela"
+msgstr "NOTIFY [-n rede1[,rede2,...]] [<usuário>], exibe sua lista de amigos ou adiciona alguém a ela"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -809,18 +723,13 @@ msgstr "PING <usuário | canal>, envia um CTCP ping a um usuário ou canal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <usuário> [mensagem], abre uma nova janela de conversa "
-"privada e, opcionalmente, também envia uma mensagem"
+msgstr "QUERY [-nofocus] <usuário> [mensagem], abre uma nova janela de conversa privada e, opcionalmente, também envia uma mensagem"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <máscara> [<tipodesilencio>], silencia todos os usuários que possuam "
-"uma dada máscara no canal ativo, contanto que esta ação seja suportada pelo "
-"servidor"
+msgstr "QUIET <máscara> [<tipodesilencio>], silencia todos os usuários que possuam uma dada máscara no canal ativo, contanto que esta ação seja suportada pelo servidor"
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -832,31 +741,23 @@ msgstr "QUOTE <texto>, envia um texto em formato puro para 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] [<host>] [<porta>] [<senha>], Pode ser usado apenas "
-"digitando /RECONNECT para reconectar ao servidor atual ou com /RECONNECT ALL "
-"para reconectar a todos os servidores ativos"
+msgstr "RECONNECT [-ssl] [<host>] [<porta>] [<senha>], Pode ser usado apenas digitando /RECONNECT para reconectar ao servidor atual ou com /RECONNECT ALL para reconectar a todos os servidores ativos"
 
 #: 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>] [<porta>] [<senha>], Pode ser usado apenas digitando /"
-"RECONNECT para reconectar ao servidor atual ou com /RECONNECT ALL para "
-"reconectar a todos os servidores ativos"
+msgstr "RECONNECT [<host>] [<porta>] [<senha>], Pode ser usado apenas digitando /RECONNECT para reconectar ao servidor atual ou com /RECONNECT ALL para reconectar a todos os servidores ativos"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <texto>, envia dados puros ao HexChat, como se estes fossem recebidos "
-"diretamente do servidor IRC"
+msgstr "RECV <texto>, envia dados puros ao HexChat, como se estes fossem recebidos diretamente do servidor IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -882,17 +783,13 @@ msgstr "SERVCHAN <host> <porta> <canal>, conecta e entra em um canal"
 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] <host> [<porta>] [<senha>], conecta a um servidor. Por padrão, "
-"a porta 6667 é para conexões normais e a 6697 para conexões com SSL"
+msgstr "SERVER [-ssl] <host> [<porta>] [<senha>], conecta a um servidor. Por padrão, a porta 6667 é para conexões normais e a 6697 para conexões com SSL"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<porta>] [<senha>], conecta a um servidor, a portão padrão é "
-"6667"
+msgstr "SERVER <host> [<porta>] [<senha>], conecta a um servidor, a portão padrão é 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -904,9 +801,7 @@ msgstr "SETCURSOR [-|+]<posição>, reposiciona o cursos na caixa de entrada "
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <novo nome>, altera o nome da aba, no entando o valor ajustado para "
-"tab_trunc ainda será respeitado"
+msgstr "SETTAB <novo nome>, altera o nome da aba, no entando o valor ajustado para tab_trunc ainda será respeitado"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -914,10 +809,9 @@ msgstr "SETTEXT <novo texto>, muda o texto da caixa de entrada"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<topic>], ajusta um novo tópico, caso nenhum seja informado, exibe o "
-"tópico atual"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<topic>], ajusta um novo tópico, caso nenhum seja informado, exibe o tópico atual"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -927,20 +821,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>] Alterna a bandeja piscando entre dois "
-"ícones.\n"
-"TRAY -f <arquivo>                        Ajusta a bandeja para um ícone.\n"
-"TRAY -i <número>                        Pisca a bandeja com o ícone "
-"interno.\n"
-"TRAY -t <texto>                            Ajusta as dicas da bandeja.\n"
-"TRAY -b <titulo> <texto>               Ajusta o balão da bandeja"
+msgstr "\nTRAY -f <timeout> <file1> [<file2>] Alterna a bandeja piscando entre dois ícones.\nTRAY -f <arquivo>                        Ajusta a bandeja para um ícone.\nTRAY -i <número>                        Pisca a bandeja com o ícone interno.\nTRAY -t <texto>                            Ajusta as dicas da bandeja.\nTRAY -b <titulo> <texto>               Ajusta o balão da bandeja"
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <mascara> [<mascara>...], tira o banimento das mascaras escolhidas."
+msgstr "UNBAN <mascara> [<mascara>...], tira o banimento das mascaras escolhidas."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
@@ -952,11 +837,9 @@ msgstr "UNLOAD <nome>, descarrega um plug-in ou script"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mascara> [<mascara>...], tira o silêncio das máscaras escolhidas "
-"quando suportado pelo servidor."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mascara> [<mascara>...], tira o silêncio das máscaras escolhidas quando suportado pelo servidor."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -964,10 +847,9 @@ msgstr "URL <url>, abre a 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] <apelido1> <apelido2> etc, destaca o usuário(s) na lista "
-"do canal"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <apelido1> <apelido2> etc, destaca o usuário(s) na lista do canal"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -980,8 +862,7 @@ msgstr "WALLCHAN <mensagem>, envia uma mensagem a todos os canais"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mensagem>, envia uma mensagem a todos os operadores do canal ativo"
+msgstr "WALLCHOP <mensagem>, envia uma mensagem a todos os operadores do canal ativo"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -997,9 +878,7 @@ msgstr "Uso: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Nenhuma ajuda disponível para este comando.\n"
+msgstr "\nNenhuma ajuda disponível para este comando.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1020,9 +899,7 @@ msgstr "Comando desconhecido %s. Tente /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"O símbolo para hexchat_plugin_init não foi encontrando. Este arquivo é "
-"realmente um plugin do HexChat?"
+msgstr "O símbolo para hexchat_plugin_init não foi encontrando. Este arquivo é realmente um plugin do HexChat?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1070,9 +947,7 @@ msgstr "Tem certeza que esse é um servidor e porta que suportam SSL?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Impossível resolver hostname %s\n"
-"Verifique suas configurações de IP!\n"
+msgstr "Impossível resolver hostname %s\nVerifique suas configurações de IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1088,9 +963,7 @@ msgstr "Rodando para o próximo servidor em %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Aviso: o conjunto de caracteres \"%s\" é desconhecido. Não será utilizada "
-"nenhuma conversão para rede %s."
+msgstr "Aviso: o conjunto de caracteres \"%s\" é desconhecido. Não será utilizada nenhuma conversão para rede %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1102,8 +975,7 @@ msgstr "%C22*%O$t%C22$1%O: %C18$2%O por %C24$4%O em %C26$3%O"
 
 #: src/common/textevents.h:13
 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)."
-msgstr ""
-"%C22*%O$tNão foi possível entrar no canal %C22$1 %O(%C20Você está banido%O)."
+msgstr "%C22*%O$tNão foi possível entrar no canal %C22$1 %O(%C20Você está banido%O)."
 
 #: src/common/textevents.h:19
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
@@ -1243,15 +1115,15 @@ msgstr "%C24*%O$tVocê recebeu um CTCP Sound %C24$1%C de %C18$2%O"
 
 #: src/common/textevents.h:139
 msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
-msgstr ""
-"%C24*%O$tVocê recebeu um CTCP Sound %C24$1%C de %C18$2%C (para %C22$3%O)"
+msgstr "%C24*%O$tVocê recebeu um CTCP Sound %C24$1%C de %C18$2%C (para %C22$3%O)"
 
 #: src/common/textevents.h:142
 msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT com %C18$1%O cancelado."
 
 #: 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 "%C24*%O$tDCC CHAT conexão estabelecida com %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
@@ -1272,9 +1144,7 @@ msgstr "%C24*%O$tVocê já propôs um CHAT com %C18$1%O"
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
-"%C20*%O$tDCC $1 a tentativa de se conectar a %C18$2%O foi mal sucedida "
-"(%C20$3%O)"
+msgstr "%C20*%O$tDCC $1 a tentativa de se conectar a %C18$2%O foi mal sucedida (%C20$3%O)"
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1283,15 +1153,13 @@ msgstr "%C23*%O$tRecebido '%C23$1%C' de %C18$2%O"
 #: src/common/textevents.h:166
 #, c-format
 msgid "%C16,17 Type  To/From    Status  Size    Pos     File"
-msgstr ""
+msgstr "%C16,17 Tipo  De/Para    Estado  Tamanho    Pos     Arquivo"
 
 #: 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"
-msgstr ""
-"%C20*%O$tVocê recebeu um pedido de DCC mal formado vindo de %C18$1%O."
-"$a010%C23*%O$tConteúdo dos pacotes: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tVocê recebeu um pedido de DCC mal formado vindo de %C18$1%O.$a010%C23*%O$tConteúdo dos pacotes: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1308,11 +1176,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' para %C18$1%O cancelado."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O concluído %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' de %C18$3%O concluído %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC RECV conexão estabelecida com %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1321,15 +1189,13 @@ msgstr "%C20*%O$tDCC RECV '%C23$1%O' de %C18$3%O mal sucedido (%C20$4%O)"
 
 #: src/common/textevents.h:190
 msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
-msgstr ""
-"%C20*%O$tDCC RECV: Não foi possível abrir '%C23$1%C' para gravação (%C20$2%O)"
+msgstr "%C20*%O$tDCC RECV: Não foi possível abrir '%C23$1%C' para gravação (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tO arquivo '%C24$1%C' já existe, no entanto, salvaremos como "
-"'%C23$2%O'."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tO arquivo '%C24$1%C' já existe, no entanto, salvaremos como '%C23$2%O'."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1342,11 +1208,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' para %C18$1%O cancelado."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' para %C18$2%C concluído %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' para %C18$2%C concluído %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC SEND conexão estabelecida com %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1363,8 +1229,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C' para %C18$3%O estagnou-se e será cancelado."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C' para %C18$3%O esgotou o tempo e será cancelado."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C' para %C18$3%O esgotou o tempo e será cancelado."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1389,12 +1254,12 @@ msgstr "%OAlterada forma de ignorar %C18$1%O."
 #: src/common/textevents.h:238
 #, c-format
 msgid "%C16,17"
-msgstr ""
+msgstr "%C16,17"
 
 #: src/common/textevents.h:241
 #, c-format
 msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
-msgstr ""
+msgstr "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
 
 #: src/common/textevents.h:244
 msgid "%O%C18$1%O removed from ignore list."
@@ -1406,15 +1271,11 @@ msgstr "%ONinguém sendo ignorado."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tNão foi possível entrar no canal %C22$1%C (%C20Entrada somente por "
-"convite%O)"
+msgstr "%C20*%O$tNão foi possível entrar no canal %C22$1%C (%C20Entrada somente por convite%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
-msgstr ""
-"%C24*%O$tVocê foi convidado a entrar no canal %C22$1%O por %C18$2%O "
-"(%C29$3%O)"
+msgstr "%C24*%O$tVocê foi convidado a entrar no canal %C22$1%O por %C18$2%O (%C29$3%O)"
 
 #: src/common/textevents.h:256
 #, c-format
@@ -1423,9 +1284,7 @@ msgstr "%C23*$t$1 ($3%C23) entrou"
 
 #: src/common/textevents.h:259
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
-msgstr ""
-"%C20*%O$tNão foi possível entrar no canal %C22$1%C (%C20Necessita palavra-"
-"chave%O)"
+msgstr "%C20*%O$tNão foi possível entrar no canal %C22$1%C (%C20Necessita palavra-chave%O)"
 
 #: src/common/textevents.h:262
 msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
@@ -1450,9 +1309,7 @@ msgstr "%C23*%O$t%C28$1%C está incorreto. Tentando novamente com %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tO apelido está incorreto ou já esta em uso. Use /NICK para tentar "
-"outro."
+msgstr "%C20*%O$tO apelido está incorreto ou já esta em uso. Use /NICK para tentar outro."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1477,7 +1334,7 @@ msgstr "$tLista de amigos vazia."
 #: src/common/textevents.h:307
 #, c-format
 msgid "%C16,17  Notify List"
-msgstr ""
+msgstr "%C16,17  Lista de notificações"
 
 #: src/common/textevents.h:310
 msgid "%C23*%O$t%C23$1%O users in notify list."
@@ -1564,9 +1421,7 @@ msgstr "%C20*%O$tEndereço desconhecido. Será que você não errou na digitaç�
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tNão foi possível entrar em %C22$1%C (%C20O limite de usuários foi "
-"atingido%O)"
+msgstr "%C20*%O$tNão foi possível entrar em %C22$1%C (%C20O limite de usuários foi atingido%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1591,9 +1446,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inativo %C23$2%O, entrada: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Endereço verdadeiro: %C23$2%O, IP verdadeiro: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Endereço verdadeiro: %C23$2%O, IP verdadeiro: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1638,9 +1491,7 @@ msgstr "**** REGISTRO COMEÇANDO EM %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Não foi possível abrir os registros para escrita. Verifique\n"
-"suas permissões em %s"
+msgstr "* Não foi possível abrir os registros para escrita. Verifique\nsuas permissões em %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2137,9 +1988,7 @@ msgstr "Hora do banimento"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Não foi possível reproduzir o som:\n"
-"%s"
+msgstr "Não foi possível reproduzir o som:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3377,14 +3226,12 @@ msgstr "Data"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Só é possível abrir a lista de banimentos enquanto a janela do canal estiver "
-"ativa."
+msgstr "Só é possível abrir a lista de banimentos enquanto a janela do canal estiver ativa."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
 msgid "Ban List (%s) - %s"
-msgstr ""
+msgstr "Lista de banimentos (%s) - %s"
 
 #: src/fe-gtk/banlist.c:843 src/fe-gtk/notifygui.c:429
 msgid "Remove"
@@ -3422,7 +3269,7 @@ msgstr "Copiar _tópico"
 #: src/fe-gtk/chanlist.c:720
 #, c-format
 msgid "Channel List (%s) - %s"
-msgstr ""
+msgstr "Lista de canais (%s) - %s"
 
 #: src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3500,28 +3347,22 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Falha ao acessar arquivo: %s\n"
-"%s.\n"
-"Não é possível continuar."
+msgstr "Falha ao acessar arquivo: %s\n%s.\nNão é possível continuar."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"O arquivo encontrado no diretório de download é maior do que o oferecido. "
-"Não é possível continuar a baixar."
+msgstr "O arquivo encontrado no diretório de download é maior do que o oferecido. Não é possível continuar a baixar."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
-msgstr ""
-"Não é possível continuar a baixar o mesmo arquivo de pessoas diferentes."
+msgstr "Não é possível continuar a baixar o mesmo arquivo de pessoas diferentes."
 
 #: src/fe-gtk/dccgui.c:803
 #, c-format
 msgid "Uploads and Downloads - %s"
-msgstr ""
+msgstr "Envios e recebimentos - %s"
 
 #: src/fe-gtk/dccgui.c:820 src/fe-gtk/dccgui.c:1063 src/fe-gtk/notifygui.c:124
 msgid "Status"
@@ -3578,7 +3419,7 @@ msgstr "Abrir pasta"
 #: src/fe-gtk/dccgui.c:1050
 #, c-format
 msgid "DCC Chat List - %s"
-msgstr ""
+msgstr "Lista de conversas por DCC - %s"
 
 #: src/fe-gtk/dccgui.c:1065
 msgid "Recv"
@@ -3658,10 +3499,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Falha ao abrir fonte:\n"
-"\n"
-"%s"
+msgstr "Falha ao abrir fonte:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3679,102 +3517,72 @@ msgstr "Envios em espera da 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 \\\\"
-msgstr ""
-"A ação Run Command executa os dados em Dados 1 como se tivessem sido "
-"digitados na caixa de entrada onde você digitou a sequência. Ademais, ele "
-"pode conter texto (que será enviado para o canal/pessoa), comandos ou "
-"comandos de usuários. Quando for executado, todos os caracteres \\n contidos "
-"no Dados 1 delimitarão comando, dessa forma é possível executar mais de um "
-"comando. Se você quiser um caractere \"\\\" no texto utilize \"\\\\\""
+"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 "A ação Run Command executa os dados em Dados 1 como se tivessem sido digitados na caixa de entrada onde você digitou a sequência. Ademais, ele pode conter texto (que será enviado para o canal/pessoa), comandos ou comandos de usuários. Quando for executado, todos os caracteres \\n contidos no Dados 1 delimitarão comando, dessa forma é possível executar mais de um comando. Se você quiser um caractere \"\\\" no texto utilize \"\\\\\""
 
 #: 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 "
 "other data)"
-msgstr ""
-"O comando Change Page alterna entre as páginas do notebook. Conjunto de "
-"dados 1 para a página que desejar alterar. Se Dados 2 estiver definido para "
-"qualquer coisa, então a opção será relativa à posição atual. Conjunto de "
-"dados de 1 para mudar automaticamente para a página com a atividade mais "
-"recente e importante (consultas primeiro, depois os canais com destaque, "
-"canais de conversa ativos, canais com outros dados)"
+msgstr "O comando Change Page alterna entre as páginas do notebook. Conjunto de dados 1 para a página que desejar alterar. Se Dados 2 estiver definido para qualquer coisa, então a opção será relativa à posição atual. Conjunto de dados de 1 para mudar automaticamente para a página com a atividade mais recente e importante (consultas primeiro, depois os canais com destaque, canais de conversa ativos, canais com outros dados)"
 
 #: src/fe-gtk/fkeys.c:145
 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 Buffer introduz o conteúdo de Dados 1 na posição atual "
-"do cursor da entrada onde a sequência de teclas foi pressionada"
+msgstr "O comando Inserir no Buffer introduz o conteúdo de Dados 1 na posição atual do cursor da entrada onde a sequência de teclas foi pressionada"
 
 #: 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."
-msgstr ""
-"O comando Scroll Page desloca o widget de texto para cima ou para baixo uma "
-"página ou uma linha. Define Data 1 para Top (Topo), Bottom (Fundo), Up "
-"(Cima), Down (Baixo), +1 ou -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 "O comando Scroll Page desloca o widget de texto para cima ou para baixo uma página ou uma linha. Define Data 1 para Top (Topo), Bottom (Fundo), Up (Cima), Down (Baixo), +1 ou -1."
 
 #: 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 comando define a entrada, com a sequência de teclas introduzida "
-"para o conteúdo Dados 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Set Buffer comando define a entrada, com a sequência de teclas introduzida para o conteúdo Dados 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 ""
-"Last Command comando define a entrada para conter o último comando inserido-"
-"o mesmo que pressionar Cima num shell"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Last Command comando define a entrada para conter o último comando inserido-o mesmo que pressionar Cima num 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 ""
-"Next Command comando define a entrada para conter o próximo comando a "
-"inserir - o mesmo que pressionar Baixo num shell"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Next Command comando define a entrada para conter o próximo comando a inserir - o mesmo que pressionar Baixo num 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 ""
-"Este comando altera o texto na entrada para completar um apelido ou comando "
-"incompleto. Se Dados 1 está definido então ao carregar duas vezes na tecla "
-"TAB numa palavra irá seleccionar o último apelido e não o próximo"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Este comando altera o texto na entrada para completar um apelido ou comando incompleto. Se Dados 1 está definido então ao carregar duas vezes na tecla TAB numa palavra irá seleccionar o último apelido e não o próximo"
 
 #: 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 percorre a lista de nicks. Se Dados 1 está definido então a "
-"lista é percorrido para cima, caso contrário é percorrida para baixo"
+"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 percorre a lista de nicks. Se Dados 1 está definido então a lista é percorrido para cima, caso contrário é percorrida para baixo"
 
 #: 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 verifica a ultima palavra informada contra a lista de "
-"substituição e a substitui se houver coincidência"
+msgstr "Este comando verifica a ultima palavra informada contra a lista de substituição e a substitui se houver coincidência"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3807,7 +3615,7 @@ msgstr "Selecione uma linha para obter ajuda em suas ações"
 #: src/fe-gtk/fkeys.c:812
 #, c-format
 msgid "Keyboard Shortcuts - %s"
-msgstr ""
+msgstr "Atalhos de teclado - %s"
 
 #: src/fe-gtk/gtkutil.c:130
 msgid "Cannot write to that file."
@@ -3853,7 +3661,7 @@ msgstr "Informe a máscara a ignorar:"
 #: src/fe-gtk/ignoregui.c:350
 #, c-format
 msgid "Ignore list - %s"
-msgstr ""
+msgstr "Lista de ignorados - %s"
 
 #: src/fe-gtk/ignoregui.c:360
 msgid "Ignore Stats:"
@@ -3890,7 +3698,7 @@ msgstr "Nome do canal pequeno demais, tente outro maior."
 #: src/fe-gtk/joind.c:133
 #, c-format
 msgid "Connection Complete - %s"
-msgstr ""
+msgstr "Conexão completa - %s"
 
 #: src/fe-gtk/joind.c:162
 #, c-format
@@ -3901,7 +3709,7 @@ msgstr "Conexão com %s concluída."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
+msgstr "Na janela da lista de servidores, nenhum canal (sala de bate-papo) foi adicionado para entrada automática nessa rede."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3921,11 +3729,11 @@ msgstr "Se você sabe o nome de algum canal que deseja entrar, digite aqui."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "A_brir lista de canais."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "Requisitando lista de canais, isso pode levar alguns minutos"
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3949,8 +3757,7 @@ msgstr "Nenhum tópico ajustado"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Esse servidor ainda tem %d canais ou conversas abertas. Fechar assim mesmo?"
+msgstr "Esse servidor ainda tem %d canais ou conversas abertas. Fechar assim mesmo?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4181,10 +3988,7 @@ msgstr "%d usuários selecionados."
 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 ""
-"A barra de menu ficará escondida. Para acessá-la você deve apertar CTRL+F9 "
-"ou então clicar com o botão direito do mouse na caixa de texto principal "
-"desta interface."
+msgstr "A barra de menu ficará escondida. Para acessá-la você deve apertar CTRL+F9 ou então clicar com o botão direito do mouse na caixa de texto principal desta interface."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4221,12 +4025,12 @@ msgstr "_Conexão automática"
 #: src/fe-gtk/menu.c:1138
 #, c-format
 msgid "User menu - %s"
-msgstr ""
+msgstr "Menu do usuário - %s"
 
 #. sep
 #: src/fe-gtk/menu.c:1147
 msgid "Edit This Menu"
-msgstr ""
+msgstr "Editar este menu"
 
 #: src/fe-gtk/menu.c:1293
 msgid "Marker line disabled."
@@ -4242,8 +4046,7 @@ msgstr "Linha de marcação reajustada manualmente."
 
 #: src/fe-gtk/menu.c:1305
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr ""
-"Linha de marcação reajustada pois excedeu o limite do registro de conversas."
+msgstr "Linha de marcação reajustada pois excedeu o limite do registro de conversas."
 
 #: src/fe-gtk/menu.c:1307
 msgid "Marker line reset by CLEAR command."
@@ -4255,7 +4058,7 @@ msgstr "O estado da linha de marcação é desconhecido"
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
-msgstr ""
+msgstr "Requisitar lista de canais"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
@@ -4281,25 +4084,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Comandos do usuário - códigos especiais:\n"
-"\n"
-"%c  =  canal ativo\n"
-"%e  =  nome da rede ativa\n"
-"%m  =  informações sobre o computador\n"
-"%n  =  seu apelido\n"
-"%t  =  hora/data\n"
-"%v  =  versão do HexChat\n"
-"%2  =  2ª palavra\n"
-"%3  =  3ª palavra\n"
-"&2  =  da 2ª palavra até o fim da linha\n"
-"&3  =  da 3ª palavra até o fim da linha\n"
-"\n"
-"ex:\n"
-"/cmd jose olá\n"
-"\n"
-"%2 seria \"jose\"\n"
-"&2 seria \"josé olá\"."
+msgstr "Comandos do usuário - códigos especiais:\n\n%c  =  canal ativo\n%e  =  nome da rede ativa\n%m  =  informações sobre o computador\n%n  =  seu apelido\n%t  =  hora/data\n%v  =  versão do HexChat\n%2  =  2ª palavra\n%3  =  3ª palavra\n&2  =  da 2ª palavra até o fim da linha\n&3  =  da 3ª palavra até o fim da linha\n\nex:\n/cmd jose olá\n\n%2 seria \"jose\"\n&2 seria \"josé olá\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4314,18 +4099,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botões da lista de usuários - códigos especiais:\n"
-"\n"
-"%a  =  todos os usuários selecionados\n"
-"%c  =  canal ativo\n"
-"%e  =  nome da rede ativa\n"
-"%h  =  hostname dos usuários selecionados\n"
-"%m  =  informações sobre o computador\n"
-"%n  =  seu apelido\n"
-"%s  =  usuários selecionados\n"
-"%t  =  hora/data\n"
-"%u  =  conta dos usuários selecionados"
+msgstr "Botões da lista de usuários - códigos especiais:\n\n%a  =  todos os usuários selecionados\n%c  =  canal ativo\n%e  =  nome da rede ativa\n%h  =  hostname dos usuários selecionados\n%m  =  informações sobre o computador\n%n  =  seu apelido\n%s  =  usuários selecionados\n%t  =  hora/data\n%u  =  conta dos usuários selecionados"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4340,18 +4114,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Botões da janela de conversa - códigos especiais:\n"
-"\n"
-"%a  =  todos os usuários selecionados\n"
-"%c  =  canal ativo\n"
-"%e  =  nome da rede ativa\n"
-"%h  =  hostname dos usuários selecionados\n"
-"%m  =  informações sobre o computador\n"
-"%n  =  seu apelido\n"
-"%s  =  usuários selecionados\n"
-"%t  =  hora/data\n"
-"%u  =  conta dos usuários selecionados"
+msgstr "Botões da janela de conversa - códigos especiais:\n\n%a  =  todos os usuários selecionados\n%c  =  canal ativo\n%e  =  nome da rede ativa\n%h  =  hostname dos usuários selecionados\n%m  =  informações sobre o computador\n%n  =  seu apelido\n%s  =  usuários selecionados\n%t  =  hora/data\n%u  =  conta dos usuários selecionados"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4367,21 +4130,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Respostas de CTCP - códigos especiais:\n"
-"\n"
-"%d  =  data (todo o ctcp)\n"
-"%e  =  nome da rede ativa\n"
-"%m  =  informações sobre o computador\n"
-"%s  =  apelido do usuário que enviou o ctcp\n"
-"%t  =  hora/data\n"
-"%2  =  2ª palavra\n"
-"%3  =  3ª palavra\n"
-"&2  =  da 2ª palavra até o fim da linha\n"
-"&3  =  da 3ª palavra até o fim da linha\n"
-"\n"
-"\n"
-"\n"
+msgstr "Respostas de CTCP - códigos especiais:\n\n%d  =  data (todo o ctcp)\n%e  =  nome da rede ativa\n%m  =  informações sobre o computador\n%s  =  apelido do usuário que enviou o ctcp\n%t  =  hora/data\n%2  =  2ª palavra\n%3  =  3ª palavra\n&2  =  da 2ª palavra até o fim da linha\n&3  =  da 3ª palavra até o fim da linha\n\n\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4393,29 +4142,22 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Manipuladores de URL - códigos especiais:\n"
-"\n"
-"%s  =  linha da URL\n"
-"\n"
-"Adicionando ! na frente do comando\n"
-"que ele deve ser executado em\n"
-"shell ao invés do HexChat"
+msgstr "Manipuladores de URL - códigos especiais:\n\n%s  =  linha da URL\n\nAdicionando ! na frente do comando\nque ele deve ser executado em\nshell ao invés do HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
 msgid "User Defined Commands - %s"
-msgstr ""
+msgstr "Comandos definidos pelo usuário - %s"
 
 #: src/fe-gtk/menu.c:1538
 #, c-format
 msgid "Userlist Popup menu -  %s"
-msgstr ""
+msgstr "Menu da lista de usuários -  %s"
 
 #: src/fe-gtk/menu.c:1546
 #, c-format
 msgid "Replace - %s"
-msgstr ""
+msgstr "Substituir - %s"
 
 #: src/fe-gtk/menu.c:1547
 msgid "Replace with"
@@ -4424,22 +4166,22 @@ msgstr "Substituir com"
 #: src/fe-gtk/menu.c:1554
 #, c-format
 msgid "URL Handlers - %s"
-msgstr ""
+msgstr "Gestores de URL - %s"
 
 #: src/fe-gtk/menu.c:1574
 #, c-format
 msgid "Userlist buttons - %s"
-msgstr ""
+msgstr "Botões da lista de usuários - %s"
 
 #: src/fe-gtk/menu.c:1582
 #, c-format
 msgid "Dialog buttons - %s"
-msgstr ""
+msgstr "Botões de diálogo - %s"
 
 #: src/fe-gtk/menu.c:1591
 #, c-format
 msgid "CTCP Replies - %s"
-msgstr ""
+msgstr "Respostas de CTCP - %s"
 
 #: src/fe-gtk/menu.c:1757
 msgid "He_xChat"
@@ -4447,7 +4189,7 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "Li_sta de redes"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4455,23 +4197,23 @@ msgstr "_Nova"
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr ""
+msgstr "Aba de servidores"
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr ""
+msgstr "Aba de canais"
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr ""
+msgstr "Janela de servidores"
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr ""
+msgstr "Janela de canais"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr ""
+msgstr "_Carregar complemento"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4496,7 +4238,7 @@ msgstr "Lista de _usuários"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr ""
+msgstr "Botões da lista de u_suários"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4544,11 +4286,11 @@ msgstr "_Reconectar"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr ""
+msgstr "_Entrar em um canal"
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr ""
+msgstr "_Lista de canais"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
@@ -4569,39 +4311,39 @@ msgstr "_Preferências"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr ""
+msgstr "Auto substituir"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "Respostas de CTCP"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "Botões de diálogo"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Atalhos de teclado"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "Eventos de texto"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "Gestores de URL"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "Comandos de usuário"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "Botões da lista de usuário"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
-msgstr ""
+msgstr "Menu da lista de usuários"
 
 #. 52
 #: src/fe-gtk/menu.c:1825
@@ -4610,36 +4352,36 @@ msgstr "_Ferramentas"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "Lista de _banimentos"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "Conversa direta"
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "_Transferência de arquivos"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
-msgstr ""
+msgstr "Lista de amigos"
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "Lista de ignorados"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "_Complementos"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Registro puro"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "Registrador de _URL"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
@@ -4659,7 +4401,7 @@ msgstr "_Limpar texto"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr ""
+msgstr "Salvar texto"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4667,7 +4409,7 @@ msgstr "Localizar"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr ""
+msgstr "Pesquisar"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
@@ -4743,7 +4485,7 @@ msgstr "Você pode utilizar uma lista de redes separadas por vírgulas."
 #: src/fe-gtk/notifygui.c:409
 #, c-format
 msgid "Friends List - %s"
-msgstr ""
+msgstr "Lista de amigos - %s"
 
 #: src/fe-gtk/notifygui.c:433
 msgid "Open Dialog"
@@ -4782,7 +4524,7 @@ msgstr "Mensagem privada de: %s (%s)"
 #: src/fe-gtk/plugin-tray.c:177
 #, c-format
 msgid "Connected to %u networks and %u channels - %s"
-msgstr ""
+msgstr "Conectado a %u redes e %u canais - %s"
 
 #: src/fe-gtk/plugin-tray.c:549
 msgid "_Restore Window"
@@ -4824,42 +4566,42 @@ msgstr "_Voltar"
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagem destacada de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:637
 #, c-format
 msgid "%u highlighted messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u mensagens destacadas, ultima de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagem em canal de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
 msgid "%u channel messages. - %s"
-msgstr ""
+msgstr "%u mensagens em canais. - %s"
 
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr ""
+msgstr "Mensagem privada de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
 msgid "%u private messages, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u mensagens privadas, ultima de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:727
 #, c-format
 msgid "File offer from: %s (%s) - %s"
-msgstr ""
+msgstr "Oferta de arquivo de: %s (%s) - %s"
 
 #: src/fe-gtk/plugin-tray.c:730
 #, c-format
 msgid "%u file offers, latest from: %s (%s) - %s"
-msgstr ""
+msgstr "%u oferta de arquivos, ultima de: %s (%s) - %s"
 
 #: src/fe-gtk/plugingui.c:65
 msgid "Version"
@@ -4876,7 +4618,7 @@ msgstr "Escolha um complemento para carregar"
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr ""
+msgstr "Complementos - %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4898,7 +4640,7 @@ msgstr "Salvar como..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "Registro puro (%s) - %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4929,14 +4671,12 @@ msgstr "Você precisa de dois apelidos diferentes"
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Forma como você se identifica com o servidor. Para métodos personalizados de "
-"conexão, utilize os comandos de conexão"
+msgstr "Forma como você se identifica com o servidor. Para métodos personalizados de conexão, utilize os comandos de conexão"
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
 msgid "Edit %s - %s"
-msgstr ""
+msgstr "Editar %s - %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4956,11 +4696,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Apelido\n"
-"%p=Senha\n"
-"%r=Nome verdadeiro\n"
-"%u=Nome de usuário"
+msgstr "%n=Apelido\n%p=Senha\n%r=Nome verdadeiro\n%u=Nome de usuário"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -4976,8 +4712,7 @@ msgstr "Conectar somente ao servidor escolhido"
 
 #: src/fe-gtk/servlistgui.c:1867
 msgid "Don't cycle through all the servers when the connection fails."
-msgstr ""
-"Não alternar entre todos os servidores quando a conexão for mal sucedida"
+msgstr "Não alternar entre todos os servidores quando a conexão for mal sucedida"
 
 #: src/fe-gtk/servlistgui.c:1868
 msgid "Connect to this network automatically"
@@ -5034,7 +4769,7 @@ msgstr "Codificação:"
 #: src/fe-gtk/servlistgui.c:1977
 #, c-format
 msgid "Network List - %s"
-msgstr ""
+msgstr "Lista de redes - %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
@@ -5068,7 +4803,7 @@ msgstr "_Ordenar"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "Organiza a lista de redes em ordem alfabética. Use as teclas Shift+Up e Shift+Down para mover a linha."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5344,19 +5079,19 @@ msgstr "Ajuste de transparência"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "Opacidade de janela:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "Marca da hora"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "Habilitar marcação de hora"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "Formato da marcação de hora:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5392,7 +5127,7 @@ msgstr "Caixa de entrada"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "Usar fonte e cores da caixa de texto"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5418,10 +5153,7 @@ msgstr "Dicionários a utilizar:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Utilize os códigos de idioma (como em \"%LOCALAPPDATA%\\enchant\\myspell"
-"\\dicts\").\n"
-"Separe múltiplas entradas com vírgula."
+msgstr "Utilize os códigos de idioma (como em \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSepare múltiplas entradas com vírgula."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5457,11 +5189,11 @@ msgstr "Gráfico"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Z, operadores primeiro"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Z-A, operadores no final"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5473,19 +5205,19 @@ msgstr "Não ordenado"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "Esquerda (superior)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "Esquerda (inferior)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "Direita (superior)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "Direita (inferior)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5545,7 +5277,7 @@ msgstr "Monitorar ausências"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "Monitorar ausência dos usuários e marca-los com um cor diferente"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5736,7 +5468,7 @@ msgstr "Conversa"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "Velocidade máxima de transferência de arquivos (byte por segundo)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5790,17 +5522,13 @@ msgstr "Produzir bip em:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Reproduzir o som do sistema \"Instant Message Notification\" para os eventos "
-"selecionados"
+msgstr "Reproduzir o som do sistema \"Instant Message Notification\" para os eventos selecionados"
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Reproduzir o tema de som \"message-new-instant\" do freedesktop.org para os "
-"eventos selecionados"
+msgstr "Reproduzir o tema de som \"message-new-instant\" do freedesktop.org para os eventos selecionados"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5875,9 +5603,7 @@ msgstr "Usuários a sempre destacar"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Palavras distintas devem ser separadas por vírgula.\n"
-"Coringas também são aceitos."
+msgstr "Palavras distintas devem ser separadas por vírgula.\nCoringas também são aceitos."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5917,8 +5643,7 @@ msgstr "Voltar automaticamente do período de ausência"
 
 #: src/fe-gtk/setup.c:534
 msgid "Unmark yourself as away before sending messages."
-msgstr ""
-"Voltar do período de ausência automaticamente antes de enviar mensagens."
+msgstr "Voltar do período de ausência automaticamente antes de enviar mensagens."
 
 #: src/fe-gtk/setup.c:536 src/fe-gtk/setup.c:569
 msgid "Miscellaneous"
@@ -5976,17 +5701,17 @@ msgstr "Copiar o texto selecionado automaticamente"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Copiar texto selecionado quando ao soltar o botão esquerdo do mouse. De toda forma, Ctrl+Shift+c copiará o texto selecionado."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+msgstr "Incluir marcação de hora automaticamente"
 
 #: 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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Incluir marcação de hora automaticamente ao copiar linhas de texto. Caso contrário, a marcação de texto será incluída no texto copiado se a tecla Shift for pressionada enquanto o texto é selecionado."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5994,9 +5719,9 @@ msgstr "Incluir cores"
 
 #: 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Incluir automaticamente os códigos de cor as linhas de texto copiadas. Caso contrário, os códigos de cor será incluídos no texto copiado se a tecla Crl for pressionado enquanto o texto é selecionado."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6008,9 +5733,7 @@ msgstr "Fontes alternativas:"
 
 #: src/fe-gtk/setup.c:572
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr ""
-"Entradas distintas devem ser separadas por vírgulas e sem espaço, antes ou "
-"depois."
+msgstr "Entradas distintas devem ser separadas por vírgulas e sem espaço, antes ou depois."
 
 #: src/fe-gtk/setup.c:574
 msgid "Display lists in compact mode"
@@ -6028,8 +5751,7 @@ msgstr "Utilizar hora do servidor caso seja suportado"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Exibe a hora obtida do servidor caso ele suporte a extensão time-server."
+msgstr "Exibe a hora obtida do servidor caso ele suporte a extensão time-server."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6049,10 +5771,9 @@ msgstr "Tipo de banimento:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Tente utilizar essa máscara quando estiver banindo ou silenciando. "
-"(necessita de irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Tente utilizar essa máscara quando estiver banindo ou silenciando. (necessita de irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6113,11 +5834,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6129,15 +5850,15 @@ msgstr "Auto"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "Todas as conexões"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "Somente servidores de IRC"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "Somente DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6161,11 +5882,9 @@ msgstr "Obter meu endereço através 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 ""
-"Pede seu endereço verdadeiro ao servidor IRC. Utilize caso seu endereço se "
-"pareça com 192.168.*.*"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Pede seu endereço verdadeiro ao servidor IRC. Utilize caso seu endereço se pareça com 192.168.*.*"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6173,16 +5892,15 @@ msgstr "Endereço IP do DCC:"
 
 #: src/fe-gtk/setup.c:641
 msgid "Claim you are at this address when offering files."
-msgstr ""
-"Declara que você está neste endereço quando estiver oferecendo arquivos."
+msgstr "Declara que você está neste endereço quando estiver oferecendo arquivos."
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "Primeira porta DCC:"
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "Ultima porta DCC:"
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -6214,7 +5932,7 @@ msgstr "Autenticação de proxy"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "Usar autenticação (HTTP ou somente SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6236,10 +5954,7 @@ msgstr "O servidor responderá com os nomes de usuário da rede"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Você precisa estar autorizado a ouvir nesta porta. Se não for a 113 (0 é o "
-"padrão) então você deve configurar o encaminhamento de porta (port-"
-"forwarding)"
+msgstr "Você precisa estar autorizado a ouvir nesta porta. Se não for a 113 (0 é o padrão) então você deve configurar o encaminhamento de porta (port-forwarding)"
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6401,23 +6116,15 @@ msgstr "Categorias"
 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 ""
-"A exibição do alternador em árvore não pode ser colocado na parte de cima ou "
-"de baixo!\n"
-"Por favor altere a exibição para <b>Abas</b> no menu <b>Ver</b>."
+msgstr "A exibição do alternador em árvore não pode ser colocado na parte de cima ou de baixo!\nPor favor altere a exibição para <b>Abas</b> no menu <b>Ver</b>."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"O nome verdadeiro não pode ser deixado em branco. Retornando para "
-"\"nomeverdadeiro\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "O nome verdadeiro não pode ser deixado em branco. Retornando para \"nomeverdadeiro\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Foram feitas algumas alterações que requerem que o programa seja reiniciado "
-"para que tenham efeito."
+msgstr "Foram feitas algumas alterações que requerem que o programa seja reiniciado para que tenham efeito."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6425,16 +6132,12 @@ 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"
-"Aceitar DCC automaticamente para seu diretório pessoal\n"
-"pode ser extremamente perigoso e altamente explorável.\n"
-"Ex: alguém pode lhe enviar um novo arquivo .bash_profile"
+msgstr "*AVISO*\nAceitar DCC automaticamente para seu diretório pessoal\npode ser extremamente perigoso e altamente explorável.\nEx: alguém pode lhe enviar um novo arquivo .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
 msgid "Preferences - %s"
-msgstr ""
+msgstr "Preferências - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
@@ -6500,7 +6203,7 @@ msgstr "OK"
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
 msgid "URL Grabber - %s"
-msgstr ""
+msgstr "Registrador de URL - %s"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Clear list"
@@ -6529,8 +6232,7 @@ msgstr "Abre uma URL irc://servidor:porta/canal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: Falha ao obter informações. Talvez não suportado ou incorreta."
+msgstr "Sysinfo: Falha ao obter informações. Talvez não suportado ou incorreta."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6544,12 +6246,9 @@ msgstr "Sysinfo: %s está configurado para: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Configurações válidas são: announce e hide_* para cada pedaço de "
-"informação. e.x. hide_os. Sem nenhuma parâmetro ele mostrará a configuração "
-"atual (ou padrão).\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Configurações válidas são: announce e hide_* para cada pedaço de informação. e.x. hide_os. Sem nenhuma parâmetro ele mostrará a configuração atual (ou padrão).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6564,9 +6263,3 @@ msgstr "%s plugin carregado\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s plugin descarregado\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/ru.po b/po/ru.po
index 3825afae..668e25d8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Aleksandr P <davian818@gmail.com>, 2010
+# Aleksandr P, 2010
 # Aleksey <aleksdem@aleksdem.com>, 2016
 # Aleksey <aleksdem@aleksdem.com>, 2014-2015
-# Aleksandr P <davian818@gmail.com>, 2010
+# Aleksandr P, 2010
 # Andrey Vihrov <andrey.vihrov@gmail.com>, 2013
 # Igor <f2404@yandex.ru>, 2017
 # Ilyas B Arinov <arinov.ilyas@gmail.com>, 2016
@@ -16,23 +16,21 @@
 # Valek Filippov <frob@df.ru>, 2001
 # Volosenkov Dmitry <_bil_@mail.ru>, 1999
 # Aleksey <aleksdem@aleksdem.com>, 2016
+# Артем Малофеев <79067635919@yandex.ru>, 2019
 # Магретов Никита <huku111a@gmail.com>, 2016
 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"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Russian (http://www.transifex.com/hexchat/hexchat/language/"
-"ru/)\n"
-"Language: ru\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2019-03-18 18:38+0000\n"
+"Last-Translator: Артем Малофеев <79067635919@yandex.ru>\n"
+"Language-Team: Russian (http://www.transifex.com/hexchat/hexchat/language/ru/)\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: ru\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
@@ -50,20 +48,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"
@@ -320,9 +311,7 @@ msgstr "У вас нет права записи в %s. Ничего нельз�
 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
@@ -344,9 +333,7 @@ msgstr "Вас забрасывают CTCP запросами от %s, %s игн
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"Вас забрасывают MSG запросами от %s, изменение переменной "
-"gui_autoopen_dialog на ВЫКЛ.\n"
+msgstr "Вас забрасывают MSG запросами от %s, изменение переменной gui_autoopen_dialog на ВЫКЛ.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -443,16 +430,13 @@ msgstr "Плагин невозможно выгрузить.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <название> <действие>, добавляет кнопку под списком пользователей"
+msgstr "ADDBUTTON <название> <действие>, добавляет кнопку под списком пользователей"
 
 #: src/common/outbound.c:3933
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <НоваяСеть> <новыйсервер/6667>, добавляет новую сеть с новым "
-"сервером в список сетей"
+msgstr "ADDSERVER <НоваяСеть> <новыйсервер/6667>, добавляет новую сеть с новым сервером в список сетей"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -468,9 +452,7 @@ msgstr "ALLSERV <команда>, посылает команду на всех
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<причина>], устанавливает флаг отсутствия (используйте /BACK для "
-"отключения)"
+msgstr "AWAY [<причина>], устанавливает флаг отсутствия (используйте /BACK для отключения)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -481,10 +463,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>]"
@@ -492,26 +471,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 ""
-"CLEAR [ALL|HISTORY|[-]<количество>], Очищает текущее текстовое окно или "
-"командную строку"
+msgstr "CLEAR [ALL|HISTORY|[-]<количество>], Очищает текущее текстовое окно или командную строку"
 
 #: 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 ""
-"CLOSE [-m], Закрывает текущую вкладку, закрывая окно, если это единственная "
-"открытая вкладка, или с флагом \"-m\", закрывает все беседы."
+msgstr "CLOSE [-m], Закрывает текущую вкладку, закрывая окно, если это единственная открытая вкладка, или с флагом \"-m\", закрывает все беседы."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -521,13 +495,12 @@ msgstr "COUNTRY [-s] <код|маска>, находит код страны, н
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <ник> <сообщение>, посылает пользователю с указанным ником CCTP-"
-"сообщение, обычные сообщения -- VERSION и USERINFO"
+msgstr "CTCP <ник> <сообщение>, посылает пользователю с указанным ником CCTP-сообщение, обычные сообщения -- 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
@@ -541,24 +514,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\n"
-"DCC PCHAT <nick>                   - запросить разговор в пассивном режиме\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\nDCC PCHAT <nick>                   - запросить разговор в пассивном режиме\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 <имя>, удаляет chanhalf-op статус у имени на текущем канале\n"
-"(нужны права администратора канала)"
+msgstr "DEHOP <имя>, удаляет chanhalf-op статус у имени на текущем канале\n(нужны права администратора канала)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -568,18 +530,13 @@ msgstr "DELBUTTON <имя>, удаляет кнопку из-под списка
 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>, удаляет право голоса у пользователя с переданным именем на "
-"текущем\n"
-"канале. Для использования нужны права администратора канала"
+msgstr "DEVOICE <nick>, удаляет право голоса у пользователя с переданным именем на текущем\nканале. Для использования нужны права администратора канала"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -601,10 +558,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 вывод \n"
-"команды перенаправляется в текущий канал. Иначе вывод печатается в текущем "
-"окне"
+msgstr "EXEC [-o] <Команда>, выполняет команду. При передаче опции -o вывод \nкоманды перенаправляется в текущий канал. Иначе вывод печатается в текущем окне"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -614,9 +568,7 @@ msgstr "EXECCONT, sends the process 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"
@@ -644,9 +596,7 @@ msgstr "GHOST <ник> [пароль], Убивает ник, ставший п�
 
 #: 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"
@@ -659,20 +609,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"
@@ -681,17 +624,13 @@ msgstr "JOIN <канал>, зайти на канал"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <Ник>, [причина]удаляет человека с текущего канала (нужны права "
-"оператора)"
+msgstr "KICK <Ник>, [причина]удаляет человека с текущего канала (нужны права оператора)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <ник> [причина], банит и затем выпинывает ник с текущего канала "
-"(требуется право оператора)"
+msgstr "KICKBAN <ник> [причина], банит и затем выпинывает ник с текущего канала (требуется право оператора)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -703,15 +642,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"
@@ -720,23 +652,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 <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)"
@@ -749,17 +675,13 @@ 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"
-msgstr ""
-"MSG <ник> <сообщение>, посылает приватное сообщение, подставьте \".\" чтобы "
-"отправить на последний ник или префикс с \"=\" для dcc-чата"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <ник> <сообщение>, посылает приватное сообщение, подставьте \".\" чтобы отправить на последний ник или префикс с \"=\" для dcc-чата"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -785,15 +707,11 @@ msgstr "NOTICE <ник/канал> <сообщение>, посылает уве
 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 ""
@@ -808,17 +726,13 @@ msgstr "PING <Ник | канал>, CTCP-пинг пользователя ил�
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <ник> [сообщение], открывает новое окно приватных сообщений "
-"с кем-нибудь и, опционально, отправляет сообщение"
+msgstr "QUERY [-nofocus] <ник> [сообщение], открывает новое окно приватных сообщений с кем-нибудь и, опционально, отправляет сообщение"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <маска> [<типтишины>], заставляет замолчать каждого, кто проходит по "
-"маске на текущем канале, если это поддерживается сервером."
+msgstr "QUIET <маска> [<типтишины>], заставляет замолчать каждого, кто проходит по маске на текущем канале, если это поддерживается сервером."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -830,31 +744,23 @@ 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 ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <текст>, отправляет сырые (raw) данные в HexChat, как будто бы они были "
-"получены с IRC севера"
+msgstr "RECV <текст>, отправляет сырые (raw) данные в HexChat, как будто бы они были получены с IRC севера"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -870,31 +776,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 [-ssl] <Сервер> <порт> <канал>, подключиться к серверу, а затем к "
-"каналу"
+msgstr "SERVCHAN [-ssl] <Сервер> <порт> <канал>, подключиться к серверу, а затем к каналу"
 
 #: 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>]"
@@ -906,9 +804,7 @@ msgstr "SETCURSOR [-|+]<позиция>, перемещает курсор в п
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <новое название>, меняет название вкладки (ограничение tab_trunc "
-"остаётся в силе)"
+msgstr "SETTAB <новое название>, меняет название вкладки (ограничение tab_trunc остаётся в силе)"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -916,10 +812,9 @@ msgstr "SETTEXT <новый текст>, заменяет текст в поле
 
 #: 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 ""
@@ -929,13 +824,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>] Blink tray between two icons.\n"
-"TRAY -f <имя_файла>                  Set tray to a fixed icon.\n"
-"TRAY -i <число>                      Blink tray with an internal icon.\n"
-"TRAY -t <текст>                      Set the tray tooltip.\n"
-"TRAY -b <заголовок> <текст>          Set the tray balloon."
+msgstr "\nTRAY -f <интервал> <файл1> [<файл2>] Blink tray between two icons.\nTRAY -f <имя_файла>                  Set tray to a fixed icon.\nTRAY -i <число>                      Blink tray with an internal icon.\nTRAY -t <текст>                      Set the tray tooltip.\nTRAY -b <заголовок> <текст>          Set the tray balloon."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -951,11 +840,9 @@ msgstr "UNLOAD <имя>, выгрузить плагин или скрипт"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <маска> [<маска>...], снимает молчание по указанной маске, если "
-"поддерживается сервером."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <маска> [<маска>...], снимает молчание по указанной маске, если поддерживается сервером."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -963,9 +850,9 @@ msgstr "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)"
@@ -978,8 +865,7 @@ msgstr "WALLCHAN <Сообщение>, посылает сообщение на
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <Сообщение>, посылает сообщение всемl операторам текущего канала"
+msgstr "WALLCHOP <Сообщение>, посылает сообщение всемl операторам текущего канала"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -995,9 +881,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"
@@ -1066,9 +950,7 @@ msgstr "Вы уверены, что сервер и порт поддержив�
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Не могу разрешить имя %s\n"
-"Проверьте ваши сетевые настройки!\n"
+msgstr "Не могу разрешить имя %s\nПроверьте ваши сетевые настройки!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1084,8 +966,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."
@@ -1244,7 +1125,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
@@ -1278,8 +1160,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
@@ -1300,7 +1182,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
@@ -1313,7 +1196,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
@@ -1330,7 +1214,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
@@ -1389,9 +1274,7 @@ msgstr "%OСписок игнорирования пуст."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tНевозможно подключиться к %C22$1%C (%C20Канал только по приглашениям"
-"%O)"
+msgstr "%C20*%O$tНевозможно подключиться к %C22$1%C (%C20Канал только по приглашениям%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1476,7 +1359,7 @@ msgstr "%C24*$t$1 ($2%C24) вышел"
 #: src/common/textevents.h:325
 #, c-format
 msgid "%C24*$t$1 ($2%C24) has left ($4)"
-msgstr "%C24*$t$1 ($2%C24) вышло ($4)"
+msgstr "%C24*$t$1 ($2%C24) вышел ($4)"
 
 #: src/common/textevents.h:328
 msgid "%C24*%O$tPing reply from %C18$1%C: %C24$2%O second(s)"
@@ -1493,7 +1376,7 @@ msgstr "%C24*%O$tA процесс уже запущен"
 #: src/common/textevents.h:349
 #, c-format
 msgid "%C24*$t$1 has quit ($2)"
-msgstr "%C24*$t$1 вышло ($2)"
+msgstr "%C24*$t$1 вышел ($2)"
 
 #: src/common/textevents.h:352
 msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
@@ -1611,9 +1494,7 @@ msgstr "**** НАЧАЛО ВХОЖДЕНИЯ НА %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Не удалось открыть файл(ы) журнала для записи. Проверьте права доступа на "
-"%s"
+msgstr "* Не удалось открыть файл(ы) журнала для записи. Проверьте права доступа на %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2110,9 +1991,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"
@@ -3471,10 +3350,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 ""
@@ -3626,10 +3502,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"
@@ -3647,18 +3520,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 "
@@ -3669,64 +3542,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 установлены, "
-"двойной Tab выбирает последний ник, не следующий."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Команда заменяет текст, дополняя ники и команды. Если Данные 1 установлены, двойной Tab выбирает последний ник, не следующий."
 
 #: 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"
@@ -4132,9 +3991,7 @@ msgstr "Выделено имен: %d."
 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"
@@ -4276,19 +4133,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
@@ -4854,11 +4699,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)"
@@ -5570,8 +5411,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"
@@ -5766,9 +5606,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:"
@@ -5874,8 +5712,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
@@ -5884,8 +5722,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
@@ -5936,7 +5774,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
@@ -6046,11 +5885,9 @@ msgstr "Получить свой IP от 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 ""
-"Запросить у сервера свой реальный адрес. Используйте, если ваш адрес вида "
-"192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Запросить у сервера свой реальный адрес. Используйте, если ваш адрес вида 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6282,22 +6119,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\"."
-msgstr ""
-"Опция реального имени не может оставаться пустой. Откатываю значение до "
-"\"realname\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Опция реального имени не может оставаться пустой. Откатываю значение до \"realname\"."
 
 #: 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 ""
@@ -6305,11 +6135,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
@@ -6409,8 +6235,7 @@ msgstr "Открывает URL вида irc://сервер:порт/канал"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: Ошибка при получении информации. Либо не поддерживается или ошибка."
+msgstr "Sysinfo: Ошибка при получении информации. Либо не поддерживается или ошибка."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6424,12 +6249,9 @@ msgstr "Sysinfo: %s установлен в %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Корректные настройки: announce и hide_* для каждой информационной "
-"части. Например: hide_os. Без указания значения будет показана текущая (по "
-"умолчанию) настройка.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Корректные настройки: announce и hide_* для каждой информационной части. Например: hide_os. Без указания значения будет показана текущая (по умолчанию) настройка.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6444,9 +6266,3 @@ msgstr "%s плагин загружен\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s плагин выгружен\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/rw.po b/po/rw.po
index f2ae7110..95c6e473 100644
--- a/po/rw.po
+++ b/po/rw.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:
 # Antoine Bigirimana <antoine@e-tools.com>, 2005
 # Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005
@@ -16,15 +16,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: Kinyarwanda (http://www.transifex.com/hexchat/hexchat/"
-"language/rw/)\n"
-"Language: rw\n"
+"Language-Team: Kinyarwanda (http://www.transifex.com/hexchat/hexchat/language/rw/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: rw\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -466,7 +465,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
@@ -493,7 +493,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
@@ -635,8 +636,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,8 +654,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
@@ -673,8 +673,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
@@ -738,8 +738,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 ""
 
@@ -806,7 +806,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
@@ -833,8 +834,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
@@ -843,7 +844,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
@@ -1117,7 +1119,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
@@ -1151,8 +1154,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
@@ -1173,7 +1176,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
@@ -1186,7 +1190,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
@@ -1203,7 +1208,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
@@ -3508,18 +3514,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 "
@@ -3534,39 +3540,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
@@ -5700,8 +5706,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
@@ -5710,8 +5716,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
@@ -5762,7 +5768,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
@@ -5872,8 +5879,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
@@ -6109,8 +6116,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
@@ -6237,8 +6243,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
diff --git a/po/sk.po b/po/sk.po
index c905b458..5515c3f3 100644
--- a/po/sk.po
+++ b/po/sk.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:
 # Martin Pekar <cortex@nextra.sk>, 2000
 # Stanislav Visnovsky <visnovsky@kde.org>, 2003
@@ -10,16 +10,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: Slovak (http://www.transifex.com/hexchat/hexchat/language/"
-"sk/)\n"
-"Language: sk\n"
+"Language-Team: Slovak (http://www.transifex.com/hexchat/hexchat/language/sk/)\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -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 ""
-"* Spúšťať IRC ako root nie je dobrý nápad! Mali by ste\n"
-"  si vytvoriť používateľský účet a prihlasovať sa pod ním.\n"
+msgstr "* Spúšťať IRC ako root nie je dobrý nápad! Mali by ste\n  si vytvoriť používateľský účet a prihlasovať sa pod ním.\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 +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 <maska> [<typ>], zakáže každého, kto odpovedá maske, z aktuálneho "
-"kanála. Ak už sú prihlásení v kanáli, nevykopne ich to (musíte byť chanop)"
+msgstr "BAN <maska> [<typ>], zakáže každého, kto odpovedá maske, z aktuálneho kanála. Ak už sú prihlásení v kanáli, nevykopne ich to (musíte byť chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -464,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
@@ -487,13 +483,12 @@ msgstr "COUNTRY [-s] <kód|maska>, nájde kód krajiny, napr. sk = Slovensko"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <prezývka> <správa>, pošle správu CTCP používateľovi, obvyklé správy sú "
-"VERSION a USERINFO"
+msgstr "CTCP <prezývka> <správa>, pošle správu CTCP používateľovi, obvyklé správy sú VERSION a 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 +508,7 @@ msgstr ""
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <prezývka>, odstráni stav chanhalf-op pre prezývku v aktuálnom kanáli "
-"(vyžaduje chanop)"
+msgstr "DEHOP <prezývka>, odstráni stav chanhalf-op pre prezývku v aktuálnom kanáli (vyžaduje chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -525,17 +518,13 @@ msgstr "DELBUTTON <meno>, odstráni tlačidlo pod zoznamom používateľov"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <prezývka>, odstráni stav chanop pre prezývku v aktuálnom kanáli "
-"(vyžaduje chanop)"
+msgstr "DEOP <prezývka>, odstráni stav chanop pre prezývku v aktuálnom kanáli (vyžaduje chanop)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <prezývka>, odstráni stav voice pre prezývku v aktuálnom kanáli "
-"(vyžaduje chanop)"
+msgstr "DEVOICE <prezývka>, odstráni stav voice pre prezývku v aktuálnom kanáli (vyžaduje chanop)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -557,9 +546,7 @@ msgstr "ECHO <text>, Zobrazí text lokálne"
 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] <príkaz>, spustí príkaz. Ak je použitý prepínač -o, výstup sa "
-"posiela do aktuálneho kanálu, inak sa zobrazí do aktuálneho textového poľa"
+msgstr "EXEC [-o] <príkaz>, spustí príkaz. Ak je použitý prepínač -o, výstup sa posiela do aktuálneho kanálu, inak sa zobrazí do aktuálneho textového poľa"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -569,9 +556,7 @@ msgstr "EXECCONT, pošle procesu SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], zabije programy bežiace v aktuálnom sedení. Ak je zadané -9, "
-"pošle sa signál SIGKILL"
+msgstr "EXECKILL [-9], zabije programy bežiace v aktuálnom sedení. Ak je zadané -9, pošle sa signál SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -591,8 +576,7 @@ msgstr "FLUSHQ, vyčistí aktuálnu frontu serveru pre posielanie"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <hostiteľ> [<port>], nastaví proxy na hostiteľa, port je štandardne 23"
+msgstr "GATE <hostiteľ> [<port>], nastaví proxy na hostiteľa, port je štandardne 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -600,8 +584,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <prezývka>, nastaví stav chanhalf-op pre používateľa (vyžaduje chanop)"
+msgstr "HOP <prezývka>, nastaví stav chanhalf-op pre používateľa (vyžaduje chanop)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -614,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 <maska> <typy..> <možnosti..>\n"
-"    maska - maska ignorovaných hostiteľov, napr.: *!*@*.aol.com\n"
-"    typy - typy ignorovaný dát, jedna alebo všetky z:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    možnosti - NOSAVE, QUIET"
+msgstr "IGNORE <maska> <typy..> <možnosti..>\n    maska - maska ignorovaných hostiteľov, napr.: *!*@*.aol.com\n    typy - typy ignorovaný dát, jedna alebo všetky z:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    možnosti - 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 <prezývka> [<kanál>], pozve niekoho na kanál, štandardne na aktuálny "
-"kanál (vyžaduje chanop)"
+msgstr "INVITE <prezývka> [<kanál>], pozve niekoho na kanál, štandardne na aktuálny kanál (vyžaduje chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -654,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
@@ -665,23 +640,17 @@ msgstr ""
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, hromadne zruší stav všetkým chanhalf-op v aktuálnom kanáli (vyžaduje "
-"chanop)"
+msgstr "MDEHOP, hromadne zruší stav všetkým chanhalf-op v aktuálnom kanáli (vyžaduje chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, hromadne zruší stav všetkým chanop v aktuálnom kanáli (vyžaduje "
-"chanop)"
+msgstr "MDEOP, hromadne zruší stav všetkým chanop v aktuálnom kanáli (vyžaduje 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 <akcia>, pošle akciu do aktuálneho kanálu (akcie sa píšu v tretej osobe, "
-"napríklad /me skáče)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <akcia>, pošle akciu do aktuálneho kanálu (akcie sa píšu v tretej osobe, napríklad /me skáče)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -690,20 +659,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, hromadne vykopne každého okrem vás z aktuálneho kanálu (vyžaduje "
-"chanop)"
+msgstr "MKICK, hromadne vykopne každého okrem vás z aktuálneho kanálu (vyžaduje chanop)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, hromadne nastaví stav všetkým používateľom v aktuálnom kanáli (vyžaduje "
-"chanop)"
+msgstr "MOP, hromadne nastaví stav všetkým používateľom v aktuálnom kanáli (vyžaduje 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
@@ -767,23 +732,17 @@ msgstr "QUOTE <text>, pošle text tak ako je na server"
 
 #: 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] [<hostiteľ>] [<port>] [<heslo>], môže sa použiť aj bez "
-"parametrov ako /RECONNECT pre znovupripojenie k aktuálnemu serveru alebo "
-"ako /RECONNECT ALL pre znovupripojenie ku všetkým aktívným serverom"
+msgstr "RECONNECT [-ssl] [<hostiteľ>] [<port>] [<heslo>], môže sa použiť aj bez parametrov ako /RECONNECT pre znovupripojenie k aktuálnemu serveru alebo ako /RECONNECT ALL pre znovupripojenie ku všetkým aktívným serverom"
 
 #: 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 [<hostiteľ>] [<port>] [<heslo>], môže sa použiť aj bez parametrov "
-"ako /RECONNECT pre znovupripojenie k aktuálnemu serveru alebo ako /RECONNECT "
-"ALL pre znovupripojenie ku všetkým aktívnym serverom"
+msgstr "RECONNECT [<hostiteľ>] [<port>] [<heslo>], môže sa použiť aj bez parametrov ako /RECONNECT pre znovupripojenie k aktuálnemu serveru alebo ako /RECONNECT ALL pre znovupripojenie ku všetkým aktívnym serverom"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -805,8 +764,7 @@ msgstr ""
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <hostiteľ> <port> <kanál>, pripojí sa a vstúpi na kanál"
+msgstr "SERVCHAN [-ssl] <hostiteľ> <port> <kanál>, pripojí sa a vstúpi na kanál"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
@@ -822,9 +780,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"/SERVER <hostiteľ> [<port>] [<heslo>], pripojí sa na server, štandardný port "
-"je 6667"
+msgstr "/SERVER <hostiteľ> [<port>] [<heslo>], pripojí sa na server, štandardný port je 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -844,7 +800,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 [<téma>], nastaví tému, ak je zadaná, inak zobrazí aktuálnu tému"
 
 #: src/common/outbound.c:4112
@@ -871,8 +828,8 @@ msgstr "UNLOAD <súbor>, odoberie plugin alebo skript"
 
 #: 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
@@ -881,7 +838,8 @@ msgstr "URL <adresa>, otvorí URL adresu vo vašom prehliadači"
 
 #: 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
@@ -895,8 +853,7 @@ msgstr "WALLCHAN <správa>, napíše správu do všetkých kanálov"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <správa>, pošle správu všetkým so stavom chanop v aktuálnom kanáli"
+msgstr "WALLCHOP <správa>, pošle správu všetkým so stavom chanop v aktuálnom kanáli"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -912,9 +869,7 @@ msgstr "Použitie: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Pre tento príkaz nie je žiadna pomoc.\n"
+msgstr "\nPre tento príkaz nie je žiadna pomoc.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -983,9 +938,7 @@ msgstr "Ste si istý, že tento server podporuje SSL na tomto porte?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nemôžem zistiť meno hostiteľa %s\n"
-"Skontrolujte si IP nastavenia!\n"
+msgstr "Nemôžem zistiť meno hostiteľa %s\nSkontrolujte si IP nastavenia!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1001,9 +954,7 @@ msgstr "Skúšam ďalší server v %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Pozor: kódová stránka \"%s\" je neznáma. Na sieť %s nebude aplikovaná žiadna "
-"konverzia."
+msgstr "Pozor: kódová stránka \"%s\" je neznáma. Na sieť %s nebude aplikovaná žiadna konverzia."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1162,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
@@ -1196,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
@@ -1218,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
@@ -1231,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
@@ -1248,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
@@ -2024,9 +1979,7 @@ msgstr "Čas zákazu"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Nemôžem prečítať zvukový súbor:\n"
-"%s"
+msgstr "Nemôžem prečítať zvukový súbor:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3385,17 +3338,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Nemôžem pristupovať k súboru: %s\n"
-"%s.\n"
-"Pokračovanie nie je možné."
+msgstr "Nemôžem pristupovať k súboru: %s\n%s.\nPokračovanie nie je možné."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Nedokončený súbor je väčší ako ponúkaný súbor. Pokračovanie nie je možné."
+msgstr "Nedokončený súbor je väčší ako ponúkaný súbor. Pokračovanie nie je možné."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3541,10 +3490,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Nepodarilo sa načítať písmo:\n"
-"\n"
-"%s"
+msgstr "Nepodarilo sa načítať písmo:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3562,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 "
@@ -3584,65 +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 ""
-"Príkaz Vložiť do textu vloží obsah Data 1 do položky na aktuálnu pozíciu "
-"kurzoru, akoby boli stlačené tieto klávesy"
+msgstr "Príkaz Vložiť do textu vloží obsah Data 1 do položky na aktuálnu pozíciu kurzoru, akoby boli stlačené tieto klávesy"
 
 #: 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 ""
-"Príkaz Nastaviť text vyplní položku akoby boli stlačené dané klávesy podľa "
-"obsahu Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Príkaz Nastaviť text vyplní položku akoby boli stlačené dané klávesy podľa obsahu 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 ""
-"Príkaz Posledný príkaz nastaví položku, aby obsahovala posledný zadaný "
-"príkaz - rovnaké ako stlačenie šipky hore v shelle"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Príkaz Posledný príkaz nastaví položku, aby obsahovala posledný zadaný príkaz - rovnaké ako stlačenie šipky hore v shelle"
 
 #: 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 ""
-"Príkaz Nasledujúci príkaz nastaví položku, aby obsahovala ďalší zadaný "
-"príkaz - rovnaké ako stlačenie šipky dolu v shelle"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Príkaz Nasledujúci príkaz nastaví položku, aby obsahovala ďalší zadaný príkaz - rovnaké ako stlačenie šipky dolu v shelle"
 
 #: 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 ""
-"Tento príkaz zmení text v položke tak, aby dokončil neúplné prezývky alebo "
-"príkazy. Ak je Data 1 vyplnené, použijú sa dvojité tabulátory ako posledná "
-"prezývka a nie nasledujúca"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Tento príkaz zmení text v položke tak, aby dokončil neúplné prezývky alebo príkazy. Ak je Data 1 vyplnené, použijú sa dvojité tabulátory ako posledná prezývka a nie nasledujúca"
 
 #: 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 ""
-"Tento príkaz posunie hore alebo dolu v zozname prezývok. Ak je niečo "
-"vyplnené v Data 1, posun bude nahor, inak bude posun nadol"
+"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 "Tento príkaz posunie hore alebo dolu v zozname prezývok. Ak je niečo vyplnené v Data 1, posun bude nahor, inak bude posun nadol"
 
 #: 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 ""
-"Tento príkaz otestuje posledné zadané slovo v položke oproti zoznamu náhrad "
-"a použije náhrady, ak nájde odpovedajúce časti"
+msgstr "Tento príkaz otestuje posledné zadané slovo v položke oproti zoznamu náhrad a použije náhrady, ak nájde odpovedajúce časti"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -5769,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
@@ -5779,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
@@ -5831,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
@@ -5941,11 +5873,9 @@ msgstr "Získať moju adresu z IRC serveru"
 
 #: 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 ""
-"Spýta sa serveru na vašu reálnu adresu. Použite toto ak máte adresu v tvare "
-"192.168.*.* !"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Spýta sa serveru na vašu reálnu adresu. Použite toto ak máte adresu v tvare 192.168.*.* !"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6180,14 +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 ""
-"Boli vykonané zmeny, ktoré vyžadujú spustiť aplikáciu znovu, aby sa použili."
+msgstr "Boli vykonané zmeny, ktoré vyžadujú spustiť aplikáciu znovu, aby sa použili."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6195,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 ""
-"*VAROVANIE*\n"
-"Automatické prijatie DCC do vášho domovského\n"
-"priečinku môže byť nebezpečné. Napríklad:\n"
-"niekto by vám mohol poslať súbor .bash_profile."
+msgstr "*VAROVANIE*\nAutomatické prijatie DCC do vášho domovského\npriečinku môže byť nebezpečné. Napríklad:\nniekto by vám mohol poslať súbor .bash_profile."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6313,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
@@ -6330,9 +6254,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/sl.po b/po/sl.po
index 4a1f8944..9ad67704 100644
--- a/po/sl.po
+++ b/po/sl.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:
 # BOCo <bosko.orban@gmail.com>, 2017
-# Jure Cuhalev <gandalf@owca.info>, 2005
+# BOCo <bosko.orban@gmail.com>, 2017
+# Jure Cuhalev <gandalf@owca.info>, 2003,2005
 # Jure Cuhalev <gandalf@owca.info>, 2003
 # Nejc Novak <nejc.novak@guest.arnes.si>, 2001
 # Roman Maurer [mailto:roman.maurer@amis.net, 2004
@@ -12,17 +13,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-12-13 06:14+0000\n"
-"Last-Translator: BOCo <bosko.orban@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.com/hexchat/hexchat/language/"
-"sl/)\n"
-"Language: sl\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: Slovenian (http://www.transifex.com/hexchat/hexchat/language/sl/)\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%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -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 ""
-"* Uporaba IRC-a kot root uporabnik je neumna!\n"
-"  Ustvarite uporabniški račun in ga uporabite za prijavo.\n"
+msgstr "* Uporaba IRC-a kot root uporabnik je neumna!\n  Ustvarite uporabniški račun in ga uporabite za prijavo.\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 <maska> [<vrsta>], prepove dostop do trenutnega kanala vsem, ki "
-"ustrezajo maski. Če so že na kanalu, jih ta ukaz ne brcne iz kanala "
-"(potrebuje status op)"
+msgstr "BAN <maska> [<vrsta>], prepove dostop do trenutnega kanala vsem, ki ustrezajo maski. Če so že na kanalu, jih ta ukaz ne brcne iz kanala (potrebuje status op)"
 
 #: 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
@@ -491,13 +486,12 @@ msgstr "COUNTRY <koda|vzorec> poišče ime države, npr: si = Slovenija"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <vzdevek> <sporočilo> pošlje sporočilo CTCP vzdevku; pogosti sporočili "
-"sta VERSION in USERINFO"
+msgstr "CTCP <vzdevek> <sporočilo> pošlje sporočilo CTCP vzdevku; pogosti sporočili sta VERSION in 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
@@ -511,25 +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 <vzdevek>              - prejme ponujeno datoteko\n"
-"DCC SEND [-maxcps=#] <vzdevek> [datoteka]  - pošlje nekomu datoteko\n"
-"DCC PSEND [-maxcps=#] <vzdevek> [datoteka]  - pošlje nekomu datoteko z "
-"uporabo pasivnega načina\n"
-"DCC LIST                       - pokaže DCC seznam\n"
-"DCC CHAT <vzdevek>             - nekomu ponudi DCC CHAT\n"
-"DCC CHAT <vzdevek>             - nekomu ponudi DCC CHAT v pasivnem načinu\n"
-"DCC CLOSE <vrsta> <vzdevek> <datoteka>         primer:\n"
-"          /dcc close send janeznovak datoteka.tar.gz"
+msgstr "\nDCC GET <vzdevek>              - prejme ponujeno datoteko\nDCC SEND [-maxcps=#] <vzdevek> [datoteka]  - pošlje nekomu datoteko\nDCC PSEND [-maxcps=#] <vzdevek> [datoteka]  - pošlje nekomu datoteko z uporabo pasivnega načina\nDCC LIST                       - pokaže DCC seznam\nDCC CHAT <vzdevek>             - nekomu ponudi DCC CHAT\nDCC CHAT <vzdevek>             - nekomu ponudi DCC CHAT v pasivnem načinu\nDCC CLOSE <vrsta> <vzdevek> <datoteka>         primer:\n          /dcc close send janeznovak datoteka.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 <vzdevek> odstrani status polovični-op vzdevku (za kar so potrebne "
-"pravice op)"
+msgstr "DEHOP <vzdevek> odstrani status polovični-op vzdevku (za kar so potrebne pravice op)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -539,16 +521,13 @@ msgstr "DELBUTTON <ime> zbriše gumb s seznama uporabnikov"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <vzdevek> odstrani status op vzdevku (za kar so potrebne pravice op)"
+msgstr "DEOP <vzdevek> odstrani status op vzdevku (za kar so potrebne pravice op)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <vzdevek> odstrani glasovni privilegij vzdevku (za kar so potrebne "
-"pravice op)"
+msgstr "DEVOICE <vzdevek> odstrani glasovni privilegij vzdevku (za kar so potrebne pravice op)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -570,9 +549,7 @@ msgstr "ECHO <besedilo> izpiše besedilo v okno"
 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] <ukaz> izvede ukaz. Če uporabite stikalo -o, je rezultat izpisan "
-"na trenutnem kanalu, sicer pa v trenutnem besedilnem polju"
+msgstr "EXEC [-o] <ukaz> izvede ukaz. Če uporabite stikalo -o, je rezultat izpisan na trenutnem kanalu, sicer pa v trenutnem besedilnem polju"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -582,9 +559,7 @@ msgstr "EXECCONT pošlje procesu signal za nadaljevanje SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9] ubije delujoči proces v trenutni seji. Če uporabite stikalo "
-"-9, je procesu poslan signal SIGKILL"
+msgstr "EXECKILL [-9] ubije delujoči proces v trenutni seji. Če uporabite stikalo -9, je procesu poslan signal SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -604,9 +579,7 @@ msgstr "FULSHQ odpošlje čakajočo vrsto sporočil na strežnik"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <gostitelj> [<vrata>] usmeri tok prek gostitelja (proxy), privzeto prek "
-"vrat 23"
+msgstr "GATE <gostitelj> [<vrata>] usmeri tok prek gostitelja (proxy), privzeto prek vrat 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -614,9 +587,7 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <vzdevek> vzdevku dodeli status polovični-op (za kar potrebuje pravice "
-"op)"
+msgstr "HOP <vzdevek> vzdevku dodeli status polovični-op (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -629,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 <maska> <vrste..> <možnosti..>\n"
-"    maska - maska gostitelja, npr.: *!*@*.siol.net\n"
-"    vrste - vrste podatkov za preziranje, ena ali vse od:\n"
-"           PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    možnosti - NOSAVE, QUIET"
+msgstr "IGNORE <maska> <vrste..> <možnosti..>\n    maska - maska gostitelja, npr.: *!*@*.siol.net\n    vrste - vrste podatkov za preziranje, ena ali vse od:\n           PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    možnosti - 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 <vzdevek> [<kanal>] povabi vzdevek na kanal, privzeto na trenutnega "
-"(za kar potrebuje pravice op)"
+msgstr "INVITE <vzdevek> [<kanal>] povabi vzdevek na kanal, privzeto na trenutnega (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -669,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
@@ -680,23 +643,17 @@ msgstr "LOAD [-e] <datoteka>, naloži dodatek ali skripto"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP vsem odvzame polovične statuse op na trenutnem kanalu (za kar "
-"potrebuje pravice op)"
+msgstr "MDEHOP vsem odvzame polovične statuse op na trenutnem kanalu (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP vsem na trenutnem kanalu odvzame status op  (za kar potrebuje pravice "
-"op)"
+msgstr "MDEOP vsem na trenutnem kanalu odvzame status op  (za kar potrebuje pravice op)"
 
 #: 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 <dejanje> pošlje dejanje v trenutni kanal (dejanja so izpisana v tretji "
-"osebi, npr. /me skače)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <dejanje> pošlje dejanje v trenutni kanal (dejanja so izpisana v tretji osebi, npr. /me skače)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -705,20 +662,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK na trenutnem kanalu brcne vse razen samega sebe (za kar potrebuje "
-"pravice op)"
+msgstr "MKICK na trenutnem kanalu brcne vse razen samega sebe (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MDEOP vsem na trenutnem kanalu odvzame status op (za kar potrebuje pravice "
-"op)"
+msgstr "MDEOP vsem na trenutnem kanalu odvzame status op (za kar potrebuje pravice op)"
 
 #: 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
@@ -749,9 +702,7 @@ msgstr ""
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <vzdevek> vzdevku podeli status operateja (op) kanala (za kar potrebuje "
-"pravice op)"
+msgstr "OP <vzdevek> vzdevku podeli status operateja (op) kanala (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -784,23 +735,17 @@ msgstr "QUOTE <besedilo> strežniku pošlje besedilo v surovi obliki"
 
 #: 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] [<gostitelj>] [<vrata>] [<geslo>] lahko ga uporabite samo "
-"kot /RECONNECT za ponovitev povezave s trenutnim strežnikom ali kot /"
-"RECONNECT ALL za obnovitev povezav na vse povezane strežnike"
+msgstr "RECONNECT [-ssl] [<gostitelj>] [<vrata>] [<geslo>] lahko ga uporabite samo kot /RECONNECT za ponovitev povezave s trenutnim strežnikom ali kot /RECONNECT ALL za obnovitev povezav na vse povezane strežnike"
 
 #: 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 [<gostitelj>] [<vrata>] [<geslo>], lahko ga uporabite samo kot /"
-"RECONNECT za ponovitev povezave na trenutni strežnik ali kot /RECONNECT ALL "
-"za ponovitev povezave na vse odprte strežnike"
+msgstr "RECONNECT [<gostitelj>] [<vrata>] [<geslo>], lahko ga uporabite samo kot /RECONNECT za ponovitev povezave na trenutni strežnik ali kot /RECONNECT ALL za ponovitev povezave na vse odprte strežnike"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -822,15 +767,11 @@ msgstr ""
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <gostitelj> <vrata> <kanal> se poveže na strežnik in se "
-"pridruži kanalu"
+msgstr "SERVCHAN [-ssl] <gostitelj> <vrata> <kanal> se poveže na strežnik in se pridruži kanalu"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <gostitelj> <vrata> <kanal> se poveže na strežnik in se pridruži "
-"kanalu"
+msgstr "SERVCHAN <gostitelj> <vrata> <kanal> se poveže na strežnik in se pridruži kanalu"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -842,9 +783,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <gostitelj> [<vrata>] [<geslo>] poveže se na strežnik, privzeto na "
-"vrata 6667"
+msgstr "SERVER <gostitelj> [<vrata>] [<geslo>] poveže se na strežnik, privzeto na vrata 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -864,7 +803,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 [<tema>] če podamo temo, jo nastavi, sicer pa prikaže trenutno"
 
 #: src/common/outbound.c:4112
@@ -891,8 +831,8 @@ msgstr "LOAD <datoteka> naloži dodatek ali skript"
 
 #: 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,14 +841,13 @@ msgstr "URL <url>, odpre URL v vašem brskalniku"
 
 #: 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 <vzdevek> dodeli glasovni privilegij vzdevku (za kar potrebuje pravice "
-"op)"
+msgstr "VOICE <vzdevek> dodeli glasovni privilegij vzdevku (za kar potrebuje pravice op)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -933,9 +872,7 @@ msgstr "Uporaba:%s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Na to temo ni na voljo pomoči.\n"
+msgstr "\nNa to temo ni na voljo pomoči.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1004,9 +941,7 @@ msgstr "Ali ste prepričani, da strežnik podpira SSL prek teh vrat?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Ne morem določiti imena gostitelja %s\n"
-"Preverite svoje nastavitve IP!\n"
+msgstr "Ne morem določiti imena gostitelja %s\nPreverite svoje nastavitve IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1022,9 +957,7 @@ msgstr "Povezujem se z naslednjim strežnikom v %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Pozor: \"%s\" je neznan kodni nabor. Za omrežje %s ne bo uporabljena nobena "
-"pretvorba."
+msgstr "Pozor: \"%s\" je neznan kodni nabor. Za omrežje %s ne bo uporabljena nobena pretvorba."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1183,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
@@ -1217,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
@@ -1239,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
@@ -1252,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
@@ -1269,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
@@ -2045,9 +1982,7 @@ msgstr "Čas nastavitve prepovedi"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Ne morem prebrati zvočne datoteke:\n"
-"%s"
+msgstr "Ne morem prebrati zvočne datoteke:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3406,18 +3341,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Ne morem dostopati do datoteke: %s\n"
-"%s\n"
-"Nadaljevanje ni možno."
+msgstr "Ne morem dostopati do datoteke: %s\n%s\nNadaljevanje ni možno."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Datoteka v imeniku za prenesene datoteke je večja od datoteke, ki vam je "
-"ponujena. Nadaljevnje ni možno."
+msgstr "Datoteka v imeniku za prenesene datoteke je večja od datoteke, ki vam je ponujena. Nadaljevnje ni možno."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3563,10 +3493,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Ne morem odpreti pisave:\n"
-"\n"
-"%s"
+msgstr "Ne morem odpreti pisave:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3584,18 +3511,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 "
@@ -3606,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 ""
-"Ukaz ^BVstavi v besedilo^B bo vstavil vsebino Podatka 1 v prostor kjer je "
-"bilo pritisnjeno zaporedje tipk ob trenutnem položaju kurzorja"
+msgstr "Ukaz ^BVstavi v besedilo^B bo vstavil vsebino Podatka 1 v prostor kjer je bilo pritisnjeno zaporedje tipk ob trenutnem položaju kurzorja"
 
 #: 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 ""
-"Ukaz ^BNastavi besedilo^B nastavi vnos, kjer je bilo pritisnjeno zaporedje "
-"tipk v vsebino Podatka 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Ukaz ^BNastavi besedilo^B nastavi vnos, kjer je bilo pritisnjeno zaporedje tipk v vsebino Podatka 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 ""
-"^Prejšnji ukaz^B ukaz nastavi vnos, ki vključuje prešjnji vpisan ukaz  - "
-"enako, kot pritisk na tipko za navzgor v ukazni lupini"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "^Prejšnji ukaz^B ukaz nastavi vnos, ki vključuje prešjnji vpisan ukaz  - enako, kot pritisk na tipko za navzgor v ukazni lupini"
 
 #: 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 ""
-"^BNaslednji ukaz^B ukaz nastavi vnos, ki vključuje naslednji vpisan ukaz - "
-"enako, kot pritisk na tipko za navzdol v ukazni lupini"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "^BNaslednji ukaz^B ukaz nastavi vnos, ki vključuje naslednji vpisan ukaz - enako, kot pritisk na tipko za navzdol v ukazni lupini"
 
 #: 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 ""
-"Ta ukaz spremeni besedilo v vnosu, da dokonča nedokončan vzdevek ali ukaz. "
-"Če je podatek 1 nastavljen na dvojno-tabeliranje, bo izbran prejšnji "
-"vzdevek, ne naslednji"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ta ukaz spremeni besedilo v vnosu, da dokonča nedokončan vzdevek ali ukaz. Če je podatek 1 nastavljen na dvojno-tabeliranje, bo izbran prejšnji vzdevek, ne naslednji"
 
 #: 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 ""
-"Ta ukaz zavrti navzgor in navzdol seznam vzdevkov. Če je Podatek 1 "
-"nastavljen na karkoli, se bo seznam zavrtel navzgor, drugače pa navzdol"
+"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 "Ta ukaz zavrti navzgor in navzdol seznam vzdevkov. Če je Podatek 1 nastavljen na karkoli, se bo seznam zavrtel navzgor, drugače pa navzdol"
 
 #: 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 ""
-"Ta ukaz preveri zadnjo besedo, vnešeno v vnosu proti seznamu zamenjav in ga "
-"zamenja, če najde zadetek"
+msgstr "Ta ukaz preveri zadnjo besedo, vnešeno v vnosu proti seznamu zamenjav in ga zamenja, če najde zadetek"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -5791,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
@@ -5801,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
@@ -5853,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
@@ -5963,11 +5876,9 @@ msgstr "Pridobi moj podatke o mojem  IP od strežnika 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 ""
-"Vpraša IRC strežnik za vaš pravi naslov. Uporabljajte to možnost, če imate "
-"naslov oblike 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Vpraša IRC strežnik za vaš pravi naslov. Uporabljajte to možnost, če imate naslov oblike 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6202,14 +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 ""
-"Nekatere spremenjene nastavitve potrebujejo ponovni zagon za uveljavitev."
+msgstr "Nekatere spremenjene nastavitve potrebujejo ponovni zagon za uveljavitev."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6217,11 +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 ""
-"*OPOZORILO*\n"
-"Samodejno prejemanje DCC-jev v vaš domač imenik\n"
-"je lahko zelo nevarno. Nekdo vam lahko pošlje npr.\n"
-".bash_profile"
+msgstr "*OPOZORILO*\nSamodejno prejemanje DCC-jev v vaš domač imenik\nje lahko zelo nevarno. Nekdo vam lahko pošlje npr.\n.bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6335,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
@@ -6352,9 +6257,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/sq.po b/po/sq.po
index 885e9791..5e186faa 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,9 +1,9 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Besnik <besnik@programeshqip.org>, 2014-2016
+# Besnik <besnik@programeshqip.org>, 2014-2016,2018
 # Besnik <besnik@programeshqip.org>, 2014-2015
 # Besnik Bleta <besnik@spymac.com>, 2004
 # Besnik <besnik@programeshqip.org>, 2016,2018
@@ -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: 2018-02-20 16:58+0000\n"
-"Last-Translator: Besnik <besnik@programeshqip.org>\n"
-"Language-Team: Albanian (http://www.transifex.com/hexchat/hexchat/language/"
-"sq/)\n"
-"Language: sq\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: Albanian (http://www.transifex.com/hexchat/hexchat/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -38,21 +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-i është një klient IRC-je i lehtë për t’u përdorur, por prapëseprapë "
-"shumë i zgjerueshëm. Ju lejon të hyni në mënyrë të sigurt, në shumë rrjete "
-"njëherësh, dhe të bisedoni me përdoruesit privatisht ose në kanale, duke "
-"përdorur një ndërfaqe të personalizueshme. Mundeni madje edhe të shkëmbeni "
-"kartela."
+msgstr "HexChat-i është një klient IRC-je i lehtë për t’u përdorur, por prapëseprapë shumë i zgjerueshëm. Ju lejon të hyni në mënyrë të sigurt, në shumë rrjete njëherësh, dhe të bisedoni me përdoruesit privatisht ose në kanale, duke përdorur një ndërfaqe të personalizueshme. Mundeni madje edhe të shkëmbeni kartela."
 
 #: 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-i mbulon veçori të tilla si: DCC, SASL, ndërmjetës, drejtshkrim, "
-"sinjalizime, regjistrim veprimtarie, tema të personalizueshme, dhe "
-"programthe Python/Perl."
+msgstr "HexChat-i mbulon veçori të tilla si: DCC, SASL, ndërmjetës, drejtshkrim, sinjalizime, regjistrim veprimtarie, tema të personalizueshme, dhe programthe Python/Perl."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -303,16 +294,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Nuk keni të drejta shkrimi te %s. Nga ky sesion nuk mund të ruhet asgjë."
+msgstr "Nuk keni të drejta shkrimi te %s. Nga ky sesion nuk mund të ruhet asgjë."
 
 #: 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 ""
-"* Xhirimi i IRC-së si rrënjë është budallallëk! Duhet\n"
-"  të krijoni një Llogari Përdoruesi dhe të përdorni atë për t’u futur.\n"
+msgstr "* Xhirimi i IRC-së si rrënjë është budallallëk! Duhet\n  të krijoni një Llogari Përdoruesi dhe të përdorni atë për t’u futur.\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
@@ -437,9 +425,7 @@ msgstr "ADDBUTON <emër> <veprim>, shton një buton nën një listë përdoruesi
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <Rrjet i ri> <rrjet i ri/6667>, shton te lista e rrjeteve një "
-"rrjet të ri me një shërbyes të ri"
+msgstr "ADDSERVER <Rrjet i ri> <rrjet i ri/6667>, shton te lista e rrjeteve një rrjet të ri me një shërbyes të ri"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -447,8 +433,7 @@ msgstr "ALLCHAN <urd>, u dërgon një urdhër tërë kanaleve ku gjendeni"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHAN <urd>, u dërgon një urdhër tërë kanaleve te shërbyesi i atëçastshëm"
+msgstr "ALLCHAN <urd>, u dërgon një urdhër tërë kanaleve te shërbyesi i atëçastshëm"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -456,8 +441,7 @@ msgstr "ALLSERV <urd>, u dërgon një urdhër tërë shërbyesve ku gjendeni"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<arsye>], ju tregon si të larguar (përdorni /BACK për të kundërtën)"
+msgstr "AWAY [<arsye>], ju tregon si të larguar (përdorni /BACK për të kundërtën)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -468,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ë> [<lloj dëbimi>], dëbon nga kanali i çastit këdo që përputhet me "
-"maskën. Nëse tashmë janë në kanal, kjo nuk i përzë (lyp gjendje operatori "
-"kanali)"
+msgstr "BAN <maskë> [<lloj dëbimi>], dëbon nga kanali i çastit këdo që përputhet me maskën. Nëse tashmë janë në kanal, kjo nuk i përzë (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -479,26 +460,21 @@ msgstr "CHANOPT [-quiet] <ndryshore> [<vlerë>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kodimg>], tregon ose cakton kodimin e përdorur për lidhjen e "
-"atëçastshme"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kodimg>], tregon ose cakton kodimin e përdorur për lidhjen e atëçastshme"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<sasi>], Pastron tekstin nga dritarja e atëçastshme, "
-"ose nga historiku i urdhrave"
+msgstr "CLEAR [ALL|HISTORY|[-]<sasi>], Pastron tekstin nga dritarja e atëçastshme, ose nga historiku i urdhrave"
 
 #: 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 ""
-"CLOSE [-m], Mbyll skedën e atëçastshme, duke mbyllur dritaren, nëse ka vetëm "
-"një skedë të hapur, ose me opsionin \"-m\", mbyll krejt kërkesat."
+msgstr "CLOSE [-m], Mbyll skedën e atëçastshme, duke mbyllur dritaren, nëse ka vetëm një skedë të hapur, ose me opsionin \"-m\", mbyll krejt kërkesat."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
@@ -508,16 +484,13 @@ msgstr "COUNTRY [-s] <code|wildcard>, gjen një kod vendi, p.sh.: sq = Shqipëri
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <nofkë> <mesazh>, i dërgon nofkës një mesazh CTCP, mesazhe të rëndomtë "
-"janë VERSION dhe USERINFO"
+msgstr "CTCP <nofkë> <mesazh>, i dërgon nofkës një mesazh CTCP, mesazhe të rëndomtë janë VERSION dhe USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<channel>], del dhe menjëherë rihyn në kanalin e atëçastshëm, ose në "
-"atë që i jepet"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<channel>], del dhe menjëherë rihyn në kanalin e atëçastshëm, ose në atë që i jepet"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -530,26 +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 <nofkë>                      - prano një kartelë të ofruar\n"
-"DCC SEND [-maxcps=#] <nick> [kartelë]  - dërgo një kartelë te dikush\n"
-"DCC PSEND [-maxcps=#] <nick> [kartelë] - dërgo një kartelë duke përdorur "
-"mënyrën pasive\n"
-"DCC LIST                            - shfaq listë DCC\n"
-"DCC CHAT <nofkë>                     - ofro FJALOSJE DCC për dikë\n"
-"DCC PCHAT <nofkë>                    - ofro FJALOSJE DCC duke përdorur "
-"mënyrën pasive\n"
-"DCC CLOSE <lloj> <nofkë> <kartelë>         shembull:\n"
-"         /dcc close send gjonsherri kartelë.tar.gz"
+msgstr "\nDCC GET <nofkë>                      - prano një kartelë të ofruar\nDCC SEND [-maxcps=#] <nick> [kartelë]  - dërgo një kartelë te dikush\nDCC PSEND [-maxcps=#] <nick> [kartelë] - dërgo një kartelë duke përdorur mënyrën pasive\nDCC LIST                            - shfaq listë DCC\nDCC CHAT <nofkë>                     - ofro FJALOSJE DCC për dikë\nDCC PCHAT <nofkë>                    - ofro FJALOSJE DCC duke përdorur mënyrën pasive\nDCC CLOSE <lloj> <nofkë> <kartelë>         shembull:\n         /dcc close send gjonsherri kartelë.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 <nofkë>, i heq nofkës gjendjen gjysmëoperator kanali për kanalin e "
-"atëçastshëm (lyp gjendje operatori kanali)"
+msgstr "DEHOP <nofkë>, i heq nofkës gjendjen gjysmëoperator kanali për kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -559,17 +519,13 @@ msgstr "DELBUTON <emër>, fshin një buton prej që poshtë liste përdoruesish"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nofkë>, i heq nofkës gjendjen operator kanali në kanalin e atëçastshëm "
-"(lyp gjendje operatori kanali)"
+msgstr "DEOP <nofkë>, i heq nofkës gjendjen operator kanali në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <nofkë>, i heq nofkës gjendjen i zëshëm në kanalin e atëçastshëm "
-"(lyp gjendje operatori kanali)"
+msgstr "DEVOICE <nofkë>, i heq nofkës gjendjen i zëshëm në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -591,10 +547,7 @@ msgstr "ECHO <text>, Shfaq tekst lokalisht"
 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] <urdhër>, përmbush urdhrin. Nëse përdoret flamurka -o, atëherë "
-"përfundimi dërgohet në kanalin e çastit, në të kundërt, jepet te kuti e "
-"atëçastshme për tekstet"
+msgstr "EXEC [-o] <urdhër>, përmbush urdhrin. Nëse përdoret flamurka -o, atëherë përfundimi dërgohet në kanalin e çastit, në të kundërt, jepet te kuti e atëçastshme për tekstet"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -604,9 +557,7 @@ msgstr "EXECCONT, dërgon procesin SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], asgjëson një përmbushje që po kryhet në kanalin e "
-"atëçastshëm. Nëse jepet -9, procesi asgjësohet nga SIGKILL"
+msgstr "EXECKILL [-9], asgjëson një përmbushje që po kryhet në kanalin e atëçastshëm. Nëse jepet -9, procesi asgjësohet nga SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -626,9 +577,7 @@ msgstr "FLUSHQ, asgjëson mesazhe të atëçastshme që pritnin të dërgoheshin
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <strehë> [<portë>], ndërmjetëson te një strehë përmes një porte, me "
-"portë parazgjedhje 23"
+msgstr "GATE <strehë> [<portë>], ndërmjetëson te një strehë përmes një porte, me portë parazgjedhje 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -636,9 +585,7 @@ msgstr "GHOST <nofkë> [fjalëkalim], Asgjëson një emër nofke fantazmë"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <nofkë>, i jep nofkës gjendjen gjysmëoperator kanali (lyp gjendje "
-"operatori kanali)"
+msgstr "HOP <nofkë>, i jep nofkës gjendjen gjysmëoperator kanali (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -651,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ë> <lloje..> <mundësi..>\n"
-"    maskë - maskë strehe për t’u shpërfillur, p.sh.: *!*@*.aol.com\n"
-"    lloje - lloje të dhënash për t’u shpërfillur, një ose të tërë prej:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    mundësi - NOSAVE, QUIET"
+msgstr "IGNORE <maskë> <lloje..> <mundësi..>\n    maskë - maskë strehe për t’u shpërfillur, p.sh.: *!*@*.aol.com\n    lloje - lloje të dhënash për t’u shpërfillur, një ose të tërë prej:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    mundësi - 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 <nofkë> [<kanal>], fton dikë në një kanal, si parazgjedhje tek kanali "
-"i atëçastshëm (lyp gjendje operatori kanali)"
+msgstr "INVITE <nofkë> [<kanal>], fton dikë në një kanal, si parazgjedhje tek kanali i atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -673,17 +613,13 @@ msgstr "JOIN <kanal>, hyhet te kanali"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <nofkë> [arsye], përzë nofkën prej kanalit të atëçastshëm (lyp gjendje "
-"operatori kanali)"
+msgstr "KICK <nofkë> [arsye], përzë nofkën prej kanalit të atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <nofkë> [arsye], dëbon, mandej përzë nofkën prej kanalit të "
-"atëçastshëm (lyp operatori kanali)"
+msgstr "KICKBAN <nofkë> [arsye], dëbon, mandej përzë nofkën prej kanalit të atëçastshëm (lyp operatori kanali)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -695,15 +631,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] [--] <varg>, kërkon në shtytëz për një varg\n"
-"    Përdorni -h që të theksohet vargu i gjetur\n"
-"    Përdorni -m për gjetje siç është shkruar\n"
-"    Përdorni -r kur vargu është Shprehje e Rregullt\n"
-"    Përdorni -- (vizë ndarëse dyshe) që të tregohet fundi i opsioneve, teksa "
-"kërkohet për, le të themi, vargun '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <varg>, kërkon në shtytëz për një varg\n    Përdorni -h që të theksohet vargu i gjetur\n    Përdorni -m për gjetje siç është shkruar\n    Përdorni -r kur vargu është Shprehje e Rregullt\n    Përdorni -- (vizë ndarëse dyshe) që të tregohet fundi i opsioneve, teksa kërkohet për, le të themi, vargun '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -712,50 +641,36 @@ msgstr "LOAD [e] <kartelë>, ngarkon një shtojcë ose një programth"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, U heq gjendjen operator krejt gjysmëoperatorëve të kanalit në "
-"kanalin e atëçastshëm (lyp gjendje operatori kanali)"
+msgstr "MDEHOP, U heq gjendjen operator krejt gjysmëoperatorëve të kanalit në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, U heq gjendje operatori krejt operatorëve të kanalit në kanalin e "
-"atëçastshëm (lyp gjendje operatori kanali)"
+msgstr "MDEOP, U heq gjendje operatori krejt operatorëve të kanalit në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: 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 <veprim>, dërgon veprimin te kanali i atëçastshëm (veprimet shprehen në "
-"vetën e tretë, si /unë hidhet)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <veprim>, dërgon veprimin te kanali i atëçastshëm (veprimet shprehen në vetën e tretë, si /unë hidhet)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
-"MHOP, I hedh në masë tërë përdoruesit në kanalin e atëçastshëm (lyp gjendje "
-"operatori kanali)"
+msgstr "MHOP, I hedh në masë tërë përdoruesit në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Përzë në masë këdo, hiq ju, nga kanali i atëçastshëm (lyp gjendje "
-"operatori kanali)"
+msgstr "MKICK, Përzë në masë këdo, hiq ju, nga kanali i atëçastshëm (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Op-on në masë tërë përdoruesit në kanalin e atëçastshëm (lyp gjendje "
-"operatori kanali)"
+msgstr "MOP, Op-on në masë tërë përdoruesit në kanalin e atëçastshëm (lyp gjendje operatori kanali)"
 
 #: 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"
-msgstr ""
-"MSG <nofkë> <mesazh>, dërgon një mesazh privat, paraprini mesazhin me \".\" "
-"që ta dërgoni te nofka e fundit ose parashtojini \"=\" për fjalosje dcc"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <nofkë> <mesazh>, dërgon një mesazh privat, paraprini mesazhin me \".\" që ta dërgoni te nofka e fundit ose parashtojini \"=\" për fjalosje dcc"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -781,15 +696,11 @@ msgstr "NOTICE <nofkë/kanal> <mesazh>, dërgon një njoftim"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n rrjeti1[,rrjeti2,…]] [<nofkë>], shfaq listën tuaj të njoftimeve "
-"ose shton dikë në të"
+msgstr "NOTIFY [-n rrjeti1[,rrjeti2,…]] [<nofkë>], shfaq listën tuaj të njoftimeve ose shton dikë në të"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <nofkë>, i jep nofkës gjendje operatori kanali (lyp gjendje operatori "
-"kanali)"
+msgstr "OP <nofkë>, i jep nofkës gjendje operatori kanali (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -804,17 +715,13 @@ msgstr "PING <nofkë | kanal>, i dërgon ping CTCP nofkës ose kanalit"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <nofkë> [mesazh], i hap dikujt një dritare të re mesazhesh "
-"private dhe i dërgon një mesazh, po deshët"
+msgstr "QUERY [-nofocus] <nofkë> [mesazh], i hap dikujt një dritare të re mesazhesh private dhe i dërgon një mesazh, po deshët"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <maskë> [<quiettype>], heshton në kanalin e atëçastshëm këdo që "
-"përputhet me maskën, nëse kjo mbulohet nga shërbyesi."
+msgstr "QUIET <maskë> [<quiettype>], heshton në kanalin e atëçastshëm këdo që përputhet me maskën, nëse kjo mbulohet nga shërbyesi."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -826,31 +733,23 @@ msgstr "QUOTE <tekst>, dërgon te shërbyesi tekstin e patrajtuar"
 
 #: 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] [<strehë>] [<portë>] [<fjalëkalim>], Mund të jepet thjesht "
-"si /RECONNECT, për t’u rilidhur me shërbyesin e atëçastshëm, ose si /"
-"RECONNECT ALL, për t’u rilidhur me tërë shërbyesit e hapur"
+msgstr "RECONNECT [-ssl] [<strehë>] [<portë>] [<fjalëkalim>], Mund të jepet thjesht si /RECONNECT, për t’u rilidhur me shërbyesin e atëçastshëm, ose si /RECONNECT ALL, për t’u rilidhur me tërë shërbyesit e hapur"
 
 #: 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 [<strehë>] [<portë>] [<fjalëkalim>], Mund të jepet thjesht si /"
-"RECONNECT për t’u rilidhur me shërbyesin e atëçastshëm ose si /RECONNECT ALL "
-"për t’u rilidhur me tërë shërbyesit e hapur"
+msgstr "RECONNECT [<strehë>] [<portë>] [<fjalëkalim>], Mund të jepet thjesht si /RECONNECT për t’u rilidhur me shërbyesin e atëçastshëm ose si /RECONNECT ALL për t’u rilidhur me tërë shërbyesit e hapur"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <tekst>, dërgojini HexChat-it të dhëna të papërpunuara, si të ishin "
-"marrë prej shërbyesit IRC"
+msgstr "RECV <tekst>, dërgojini HexChat-it të dhëna të papërpunuara, si të ishin marrë prej shërbyesit IRC"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -876,17 +775,13 @@ msgstr "SERVCHAN <strehë> <portë> <kanal>, lidhet dhe hyn në një kanal"
 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] <strehë> [<portë>] [<fjalëkalim>], lidhet me një shërbyes, "
-"porta parazgjedhje është 6667 për lidhje normale, dhe 6697 për lidhje ssl"
+msgstr "SERVER [-ssl] <strehë> [<portë>] [<fjalëkalim>], lidhet me një shërbyes, porta parazgjedhje është 6667 për lidhje normale, dhe 6697 për lidhje ssl"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <strehë> [<portë>] [<fjalëkalim>], lidhet me një shërbyes, porta "
-"parazgjedhje është 6667"
+msgstr "SERVER <strehë> [<portë>] [<fjalëkalim>], lidhet me një shërbyes, porta parazgjedhje është 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -898,8 +793,7 @@ msgstr "SETCURSOR [-|+]<position>, ripozicionon kursorin te kutia e teksteve"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <emër i ri>, ndërron emrin e skedës, tab_trunc mbetet ende në fuqi"
+msgstr "SETTAB <emër i ri>, ndërron emrin e skedës, tab_trunc mbetet ende në fuqi"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -907,10 +801,9 @@ msgstr "SETTEXT <tekst i ri>, zëvendësoni tekstin te kutia e teksteve"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<temë>], e cakton si temë nëse jepet një, përndryshe shfaq temën e "
-"atëçastshme"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<temë>], e cakton si temë nëse jepet një, përndryshe shfaq temën e atëçastshme"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -920,15 +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 <skadencë> <kartelë1> [<kartelë2>] Xixëllo pjesën e panelit mes dy "
-"ikonave.\n"
-"TRAY -f <emër kartele>                  Caktoje panelin sa një ikonë fikse.\n"
-"TRAY -i <numër>                    Xixëllo panelin me një ikonë të "
-"brendshme.\n"
-"TRAY -t <tekst>                      Cakto ndihmëz rreth paneli.\n"
-"TRAY -b <titull> <tekst>              Cakto tullumbace paneli."
+msgstr "\nTRAY -f <skadencë> <kartelë1> [<kartelë2>] Xixëllo pjesën e panelit mes dy ikonave.\nTRAY -f <emër kartele>                  Caktoje panelin sa një ikonë fikse.\nTRAY -i <numër>                    Xixëllo panelin me një ikonë të brendshme.\nTRAY -t <tekst>                      Cakto ndihmëz rreth paneli.\nTRAY -b <titull> <tekst>              Cakto tullumbace paneli."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -944,11 +829,9 @@ msgstr "UNLOAD <emër>, çngarkon një shtojcë ose një programth"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <maskë> [<maskë>…], çheshton maskat e treguara, nëse kjo mbulohet "
-"nga shërbyesi."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <maskë> [<maskë>…], çheshton maskat e treguara, nëse kjo mbulohet nga shërbyesi."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -956,15 +839,13 @@ msgstr "URL <url>, hap një URL në shfletuesin tuaj"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <nofka1> <nofka2> etj, thekson nofkën(at) në listën e "
-"përdoruesve të kanalit"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <nofka1> <nofka2> etj, thekson nofkën(at) në listën e përdoruesve të kanalit"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <nofkë>, jep gjendjen i zëshëm për dikë (lyp gjendje operatori kanali)"
+msgstr "VOICE <nofkë>, jep gjendjen i zëshëm për dikë (lyp gjendje operatori kanali)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -973,9 +854,7 @@ msgstr "WALLCHAN <mesazh>, shkruan mesazhin te tërë kanalet"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <mesazh>, dërgon mesazhin te tërë operatorët e kanalit në kanalin e "
-"atëçastshëm"
+msgstr "WALLCHOP <mesazh>, dërgon mesazhin te tërë operatorët e kanalit në kanalin e atëçastshëm"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -991,9 +870,7 @@ msgstr "Përdorim: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"S’ka ndihmë rreth këtij urdhri.\n"
+msgstr "\nS’ka ndihmë rreth këtij urdhri.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1062,9 +939,7 @@ msgstr "Jeni të sigurt se ky është një shërbyes dhe portë e aftë për SSL
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Nuk ftillohet dot strehëemri %s\n"
-"Kontrolloni Rregullimet tuaja për IP-në!\n"
+msgstr "Nuk ftillohet dot strehëemri %s\nKontrolloni Rregullimet tuaja për IP-në!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1080,9 +955,7 @@ msgstr "Po ciklohet te shërbyesi pasues në %s…\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Kujdes: Shkronjat \"%s\" janë të panjohura. Nuk do të zbatohet ndonjë "
-"shndërrim për rrjetin %s."
+msgstr "Kujdes: Shkronjat \"%s\" janë të panjohura. Nuk do të zbatohet ndonjë shndërrim për rrjetin %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1241,7 +1114,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tFjalosja DCC me %C18$1%O dështoi."
 
 #: 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 "%C24*%O$tU vendos lidhje fjalosjeje DCC me %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
@@ -1275,11 +1149,9 @@ msgstr "%C16,17 Lloj  Për/Nga    Gjendje  Madhësi    Poz     Kartelë"
 
 #: 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"
-msgstr ""
-"%C20*%O$tU mor një kërkesë DCC e keqformuar nga %C18$1%O.$a010%C23*%O$tLënda "
-"e paketës: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tU mor një kërkesë DCC e keqformuar nga %C18$1%O.$a010%C23*%O$tLënda e paketës: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1296,12 +1168,11 @@ msgstr "%C23*%O$tDështoi DCC RECV '%C23$2%O' mbi %C18$1%O."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' nga %C18$3%O i plotësuar %C30[%C24$4%O cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' nga %C18$3%O i plotësuar %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tU vendos lidhje DCC RECV me %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1314,9 +1185,9 @@ msgstr "%C20*%O$tDCC RECV: S'hapet dot '%C23$1%C' për shkrim (%C20$2%O)"
 
 #: src/common/textevents.h:193
 msgid ""
-"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead."
-msgstr ""
-"%C23*%O$tKartela '%C24$1%C' ekziston tashmë, ndaj po ruhet te '%C23$2%O'."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr "%C23*%O$tKartela '%C24$1%C' ekziston tashmë, ndaj po ruhet te '%C23$2%O'."
 
 #: src/common/textevents.h:196
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1329,12 +1200,11 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' mbi %C18$1%O dështoi."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' mbi %C18$2%C e plotësuar %C30[%C24$3%C cps"
-"%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' mbi %C18$2%C e plotësuar %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$tU vendos lidhja DCC SEND me %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
@@ -1431,9 +1301,7 @@ msgstr "%C23*%O$t%C28$1%C është i gabuar. Po provohet me %C18$2%O…"
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tNofka është e gabuar ose tashmë e përdorur. Përdorni /NICK që të "
-"provoni një tjetër."
+msgstr "%C20*%O$tNofka është e gabuar ose tashmë e përdorur. Përdorni /NICK që të provoni një tjetër."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1545,9 +1413,7 @@ msgstr "%C20*%O$tStrehë e panjohur. Ndoshta e keqshkruat?"
 
 #: src/common/textevents.h:400
 msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
-msgstr ""
-"%C20*%O$tNuk hyhet dot te %C22$1%C (%C20Është mbërritur në kufijtë e "
-"përdoruesit%O)"
+msgstr "%C20*%O$tNuk hyhet dot te %C22$1%C (%C20Është mbërritur në kufijtë e përdoruesit%O)"
 
 #: src/common/textevents.h:403
 msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
@@ -1572,9 +1438,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O i plogësht %C23$2%O, hyrja më: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Strehë reale: %C23$2%O, IP Reale: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Strehë reale: %C23$2%O, IP Reale: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1619,9 +1483,7 @@ msgstr "**** PO FILLOHET REGJISTRIMI NË %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* S’hapen dot kartela regjistrimi për shkrim.\n"
-"Kontrolloni lejet tek %s"
+msgstr "* S’hapen dot kartela regjistrimi për shkrim.\nKontrolloni lejet tek %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2118,9 +1980,7 @@ msgstr "Kohë dëbimi"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"S’lexohet dot kartelë tingulli:\n"
-"%s"
+msgstr "S’lexohet dot kartelë tingulli:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3358,9 +3218,7 @@ msgstr "Datë"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Dritaren e Listës së Dëbimeve mundeni ta hapni vetëm kur jeni në një skedë "
-"kanali."
+msgstr "Dritaren e Listës së Dëbimeve mundeni ta hapni vetëm kur jeni në një skedë kanali."
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3481,18 +3339,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"S’hyhet dot në kartelën: %s\n"
-"%s.\n"
-"Rimarrje jo e mundur."
+msgstr "S’hyhet dot në kartelën: %s\n%s.\nRimarrje jo e mundur."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Kartela në drejtorinë e shkarkimit është më e madhe se kartela e ofruar. "
-"Rimarrje jo e mundur."
+msgstr "Kartela në drejtorinë e shkarkimit është më e madhe se kartela e ofruar. Rimarrje jo e mundur."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3638,10 +3491,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Dështoi në hapje shkronjash:\n"
-"\n"
-"%s"
+msgstr "Dështoi në hapje shkronjash:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3659,101 +3509,72 @@ msgstr "Radhë dërgimesh në rrjet: %d bajte"
 
 #: 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 \\\\"
-msgstr ""
-"Veprimi Xhiro Urdhër i xhiron të dhënat te Data 1 si të qenë shtypur te "
-"kutia e teksteve ku shtypët vargun e dhënë të tasteve. Ndaj mund të përmbajë "
-"tekst (i cili do të dërgohet te kanali/personi), urdhra ose urdhra "
-"përdoruesi. Kur xhirohet, krejt shenjat \\n te Data 1 përdoren për të "
-"kufizuar urdhra të veçantë, ndaj është e mundur të xhirohet më shumë se një "
-"urdhër. Nëse dëshironi një shenjë \\ tek teksti aktual, atëherë jepni \\\\"
+"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 "Veprimi Xhiro Urdhër i xhiron të dhënat te Data 1 si të qenë shtypur te kutia e teksteve ku shtypët vargun e dhënë të tasteve. Ndaj mund të përmbajë tekst (i cili do të dërgohet te kanali/personi), urdhra ose urdhra përdoruesi. Kur xhirohet, krejt shenjat \\n te Data 1 përdoren për të kufizuar urdhra të veçantë, ndaj është e mundur të xhirohet më shumë se një urdhër. Nëse dëshironi një shenjë \\ tek teksti aktual, atëherë jepni \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Urdhri Ndrysho Faqe ju kalon nga një faqe e bllokut në një tjetër. Caktoni "
-"për Data 1 faqen tek e cila dëshironi të kaloni. Nëse Data 2 ka një vlerë "
-"çfarëdo, atëherë kalimi do të jetë relativ kundrejt pozicionit të tanishëm. "
-"Caktoni për Data 1 vlerën auto që të kaloni te faqja me veprimtarinë më të "
-"re dhe më të rëndësishme (kërkesat së pari, mandej kanalet me theksime, "
-"kanalet me dialogë, kanalet me të dhëna të tjera)"
+msgstr "Urdhri Ndrysho Faqe ju kalon nga një faqe e bllokut në një tjetër. Caktoni për Data 1 faqen tek e cila dëshironi të kaloni. Nëse Data 2 ka një vlerë çfarëdo, atëherë kalimi do të jetë relativ kundrejt pozicionit të tanishëm. Caktoni për Data 1 vlerën auto që të kaloni te faqja me veprimtarinë më të re dhe më të rëndësishme (kërkesat së pari, mandej kanalet me theksime, kanalet me dialogë, kanalet me të dhëna të tjera)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Urdhri Fut në Shtytëz do të fusë lëndën e Data 1 te pjesa ku u shtyp vargu i "
-"tasteve te pozicioni i atëçastshëm i kursorit"
+msgstr "Urdhri Fut në Shtytëz do të fusë lëndën e Data 1 te pjesa ku u shtyp vargu i tasteve te pozicioni i atëçastshëm i kursorit"
 
 #: 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."
-msgstr ""
-"Urdhri Rrëshqit Në Faqe bën që të rrëshqitet në tekst, lart ose poshtë, një "
-"faqe ose një rresht. Jepini Data 1 vlerën Top, Bottom, Up, Down, +1 ose -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 "Urdhri Rrëshqit Në Faqe bën që të rrëshqitet në tekst, lart ose poshtë, një faqe ose një rresht. Jepini Data 1 vlerën Top, Bottom, Up, Down, +1 ose -1."
 
 #: 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 ""
-"Urdhri Vendos Shtytëz vendos futjen atje ku u shtyp varg tastesh te lënda e "
-"Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Urdhri Vendos Shtytëz vendos futjen atje ku u shtyp varg tastesh te lënda e 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 ""
-"Urdhri Urdhri i Fundit bën që si hyrje të jetë urdhri i fundit i dhënë - "
-"njësoj si shtypja e shigjetës sipër brenda një shelli"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Urdhri Urdhri i Fundit bën që si hyrje të jetë urdhri i fundit i dhënë - njësoj si shtypja e shigjetës sipër brenda një shelli"
 
 #: 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 ""
-"Urdhri Urdhri Pasues e bën zërin në fjalë të përmbajë urdhrin pasues që "
-"jepet - njësoj si shtypja e shigjetës poshtë brenda një shelli"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Urdhri Urdhri Pasues e bën zërin në fjalë të përmbajë urdhrin pasues që jepet - njësoj si shtypja e shigjetës poshtë brenda një shelli"
 
 #: 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 ""
-"Ky urdhër ndryshon tekstin që jepet për të përfunduar një urdhër apo një "
-"nofkë ende jo të plotësuar. Nëse është rregulluar Data 1, atëherë shtypja "
-"dyfish e tastit Tab në një varg do të zgjedhë nofkën e fundit, jo pasuesen"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ky urdhër ndryshon tekstin që jepet për të përfunduar një urdhër apo një nofkë ende jo të plotësuar. Nëse është rregulluar Data 1, atëherë shtypja dyfish e tastit Tab në një varg do të zgjedhë nofkën e fundit, jo pasuesen"
 
 #: 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 ""
-"Ky urdhër kryen lëvizjen lart e poshtë nëpër listë nofkash. Nëse është dhënë "
-"diçka si Data 1 shkohet sipër, ndryshe zbritet poshtë"
+"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 "Ky urdhër kryen lëvizjen lart e poshtë nëpër listë nofkash. Nëse është dhënë diçka si Data 1 shkohet sipër, ndryshe zbritet poshtë"
 
 #: 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 ""
-"Ky urdhër kontrollon fjalën e fundit të dhënë përkundër listës së "
-"zëvendësimeve dhe bën zëvendësim, nëse gjendet përputhje"
+msgstr "Ky urdhër kontrollon fjalën e fundit të dhënë përkundër listës së zëvendësimeve dhe bën zëvendësim, nëse gjendet përputhje"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3781,8 +3602,7 @@ msgstr "Pati një gabim gjatë ngarkimit të formësimit për funksione tastesh"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
-msgstr ""
-"Përzgjidhni një rresht që të merrni të dhëna ndihme mbi Veprimin e tij."
+msgstr "Përzgjidhni një rresht që të merrni të dhëna ndihme mbi Veprimin e tij."
 
 #: src/fe-gtk/fkeys.c:812
 #, c-format
@@ -3881,9 +3701,7 @@ msgstr "Lidhje e plotë te %s."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"Te dritarja e listës së shërbyesve për këtë rrjet s’është dhënë ndonjë kanal "
-"(dhomë fjalosjesh) te e cila të bëhet hyrje e vetvetishme."
+msgstr "Te dritarja e listës së shërbyesve për këtë rrjet s’është dhënë ndonjë kanal (dhomë fjalosjesh) te e cila të bëhet hyrje e vetvetishme."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3931,9 +3749,7 @@ msgstr "Nuk është caktuar temë"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ky shërbyes ka ende %d kanale apo dialogë përshoqëruar atij. Të mbyllen të "
-"tërë?"
+msgstr "Ky shërbyes ka ende %d kanale apo dialogë përshoqëruar atij. Të mbyllen të tërë?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4164,10 +3980,7 @@ msgstr "%d nofka të përzgjedhura."
 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 ""
-"Shtylla e menuve tani është fshehur. Mund ta shfaqni sërish duke shtypur "
-"Control+F9, ose duke djathtasklikuar mbi një pjesë të zbrazët të fushës "
-"kryesore të teksteve."
+msgstr "Shtylla e menuve tani është fshehur. Mund ta shfaqni sërish duke shtypur Control+F9, ose duke djathtasklikuar mbi një pjesë të zbrazët të fushës kryesore të teksteve."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4263,25 +4076,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Urdhra Përdoruesi - Kode speciale:\n"
-"\n"
-"%c  =  kanali i atëçastshëm\n"
-"%e  =  emri i rrjetit të atëçastshëm\n"
-"%m  =  të dhëna makine\n"
-"%n  =  nofka juaj\n"
-"%t  =  koha/data\n"
-"%v  =  Version HexChat-i\n"
-"%2  =  fjala 2\n"
-"%3  =  fjala 3\n"
-"&2  =  fjala 2 në fund të rreshtit\n"
-"&3  =  fjala 3 në fund të rreshtit\n"
-"\n"
-"psh:\n"
-"/cmd Gjon, njatjeta\n"
-"\n"
-"%2 do të ishte \"Gjon\"\n"
-"&2 do të ishte \"Gjon, njatjeta\"."
+msgstr "Urdhra Përdoruesi - Kode speciale:\n\n%c  =  kanali i atëçastshëm\n%e  =  emri i rrjetit të atëçastshëm\n%m  =  të dhëna makine\n%n  =  nofka juaj\n%t  =  koha/data\n%v  =  Version HexChat-i\n%2  =  fjala 2\n%3  =  fjala 3\n&2  =  fjala 2 në fund të rreshtit\n&3  =  fjala 3 në fund të rreshtit\n\npsh:\n/cmd Gjon, njatjeta\n\n%2 do të ishte \"Gjon\"\n&2 do të ishte \"Gjon, njatjeta\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4296,18 +4091,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Butona Liste përdoruesish - Kode Speciale:\n"
-"\n"
-"%a  =  krejt nofkat e përzgjedhura\n"
-"%c  =  kanali i atëçastshëm\n"
-"%e  =  emri i kanalit të atëçastshëm\n"
-"%h  =  strehëemri i nofkës së përzgjedhur\n"
-"%m  =  të dhëna makine\n"
-"%n  =  nofka juaj\n"
-"%s  =  nofka e përzgjedhur\n"
-"%t  =  koha/data\n"
-"%u  =  llogaria e përdoruesit të përzgjedhur"
+msgstr "Butona Liste përdoruesish - Kode Speciale:\n\n%a  =  krejt nofkat e përzgjedhura\n%c  =  kanali i atëçastshëm\n%e  =  emri i kanalit të atëçastshëm\n%h  =  strehëemri i nofkës së përzgjedhur\n%m  =  të dhëna makine\n%n  =  nofka juaj\n%s  =  nofka e përzgjedhur\n%t  =  koha/data\n%u  =  llogaria e përdoruesit të përzgjedhur"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4322,18 +4106,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Butona Dialogësh - Kode specialë:\n"
-"\n"
-"%a  =  krejt nofkat e përzgjedhura\n"
-"%c  =  kanali i atëçastshëm\n"
-"%e  =  emri i rrjetit të atëçastshëm\n"
-"%h  =  strehëemri i nofkës së përzgjedhur\n"
-"%m  =  të dhëna makine\n"
-"%n  =  nofka juaj\n"
-"%s  =  nofka e përzgjedhur\n"
-"%t  =  koha/data\n"
-"%u  =  llogari e përdoruesit të përzgjedhur"
+msgstr "Butona Dialogësh - Kode specialë:\n\n%a  =  krejt nofkat e përzgjedhura\n%c  =  kanali i atëçastshëm\n%e  =  emri i rrjetit të atëçastshëm\n%h  =  strehëemri i nofkës së përzgjedhur\n%m  =  të dhëna makine\n%n  =  nofka juaj\n%s  =  nofka e përzgjedhur\n%t  =  koha/data\n%u  =  llogari e përdoruesit të përzgjedhur"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4349,19 +4122,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Përgjigje CTCP - Kode specialë:\n"
-"\n"
-"%d  =  të dhëna (krejt ctcp)\n"
-"%e  =  emri i rrjetit të atëçastshëm\n"
-"%m  =  të dhëna makine\n"
-"%s  =  nofka që dërgoi ctcp\n"
-"%t  =  kohë/datë\n"
-"%2  =  fjala 2\n"
-"%3  =  fjala 3\n"
-"&2  =  fjala 2 në fund të një rreshti\n"
-"&3  =  fjala 3 në fund të një rreshti\n"
-"\n"
+msgstr "Përgjigje CTCP - Kode specialë:\n\n%d  =  të dhëna (krejt ctcp)\n%e  =  emri i rrjetit të atëçastshëm\n%m  =  të dhëna makine\n%s  =  nofka që dërgoi ctcp\n%t  =  kohë/datë\n%2  =  fjala 2\n%3  =  fjala 3\n&2  =  fjala 2 në fund të një rreshti\n&3  =  fjala 3 në fund të një rreshti\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4373,14 +4134,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"Trajtues URL-sh - Kode speciale:\n"
-"\n"
-"%s  =  Vargu URL\n"
-"\n"
-"Vendosja e një ! në fillim të urdhrit\n"
-"tregon që do të duhej dërguar te\n"
-"një shell, në vend se për HexChat-in"
+msgstr "Trajtues URL-sh - Kode speciale:\n\n%s  =  Vargu URL\n\nVendosja e një ! në fillim të urdhrit\ntregon që do të duhej dërguar te\nnjë shell, në vend se për HexChat-in"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4909,9 +4663,7 @@ msgstr "Duhet të keni dy nofka unike."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Mënyra se si identifikoni veten kundrejt shërbyesit. Për metoda të "
-"personalizuara hyrjesh përdorni urdhra lidhjeje."
+msgstr "Mënyra se si identifikoni veten kundrejt shërbyesit. Për metoda të personalizuara hyrjesh përdorni urdhra lidhjeje."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4936,11 +4688,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Nofkë\n"
-"%p=Fjalëkalim\n"
-"%r=Emri i vërtetë\n"
-"%u=Emër përdoruesi"
+msgstr "%n=Nofkë\n%p=Fjalëkalim\n%r=Emri i vërtetë\n%u=Emër përdoruesi"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5004,8 +4752,7 @@ msgstr "Fjalëkalim:"
 
 #: src/fe-gtk/servlistgui.c:1891
 msgid "Password used for login. If in doubt, leave blank."
-msgstr ""
-"Fjalëkalim i përdorur për hyrjet. Nëse jeni në mëdyshje, lëreni të zbrazët."
+msgstr "Fjalëkalim i përdorur për hyrjet. Nëse jeni në mëdyshje, lëreni të zbrazët."
 
 #: src/fe-gtk/servlistgui.c:1896
 msgid "Character set:"
@@ -5048,9 +4795,7 @@ msgstr "_Renditi"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"E rendit listën e rrjeteve sipas rendit alfabetik. Përdorni shkurtoret Shift"
-"+Up dhe Shift+Down që të lëvizni një rresht."
+msgstr "E rendit listën e rrjeteve sipas rendit alfabetik. Përdorni shkurtoret Shift+Up dhe Shift+Down që të lëvizni një rresht."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5400,9 +5145,7 @@ msgstr "Fjalorë për t’u përdorur:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Përdorni kode gjuhësh (si te \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
-"Zërat e shumtë ndajini me presje."
+msgstr "Përdorni kode gjuhësh (si te \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nZërat e shumtë ndajini me presje."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5498,8 +5241,7 @@ msgstr "Shfaq ikona për mënyra përdoruesi"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Te lista e përdoruesve përdor ikona grafike, në vend se simbole teksti."
+msgstr "Te lista e përdoruesve përdor ikona grafike, në vend se simbole teksti."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5527,9 +5269,7 @@ msgstr "Gjurmim të Larguarish"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Ndiq gjendjen i larguar të përdoruesve dhe tregoji ata me një ngjyrë të "
-"ndryshme"
+msgstr "Ndiq gjendjen i larguar të përdoruesve dhe tregoji ata me një ngjyrë të ndryshme"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5719,9 +5459,8 @@ msgid "Chat window"
 msgstr "Dritare fjalosjeje"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Shpejtësi Maksimum Shpërngulesh Kartelash (Bajte për Sekondë)"
+msgstr "Shpejtësi Maksimum Shpërnguljesh Kartelash (Bajte për Sekondë)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5775,17 +5514,13 @@ msgstr "Prodho një tingull beep gjatë:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Gjatë akteve të përzgjedhura luaj tingullin e sistemi për \"Njoftim Mesazhi "
-"të Atypëratyshëm\""
+msgstr "Gjatë akteve të përzgjedhura luaj tingullin e sistemi për \"Njoftim Mesazhi të Atypëratyshëm\""
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Gjatë akteve të përzgjedhura luaj \"message-new-instant\" nga tema e "
-"tingujve freedesktop.org"
+msgstr "Gjatë akteve të përzgjedhura luaj \"message-new-instant\" nga tema e tingujve freedesktop.org"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5860,9 +5595,7 @@ msgstr "Nofka për t’u theksuar përherë:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Ndajini fjalët e shumëfishta me presje.\n"
-"Pranohen shenjat e gjithëpushtetshme."
+msgstr "Ndajini fjalët e shumëfishta me presje.\nPranohen shenjat e gjithëpushtetshme."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5918,9 +5651,7 @@ msgstr "WHOIS gjatë njoftimesh"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Dërgon një /WHOIS kur një përdorues që e keni te lista juaj e njoftimeve "
-"lidhet me kanalin."
+msgstr "Dërgon një /WHOIS kur një përdorues që e keni te lista juaj e njoftimeve lidhet me kanalin."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5962,10 +5693,7 @@ msgstr "Tekstin e përzgjedhur kopjoje vetvetiu"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Kopjoje tekstin e përzgjedhur te e papastra, kur lëshohet butoni i majtë i "
-"miut. Përndryshe, Ctrl+Shift+C do ta kopjojë tekstin e përzgjedhur te e "
-"papastra."
+msgstr "Kopjoje tekstin e përzgjedhur te e papastra, kur lëshohet butoni i majtë i miut. Përndryshe, Ctrl+Shift+C do ta kopjojë tekstin e përzgjedhur te e papastra."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -5973,12 +5701,9 @@ msgstr "Përfshi vetvetiu vula kohore"
 
 #: 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."
-msgstr ""
-"Përfshi vetvetiu vula kohore te rreshta të kopjuar teksti. Përndryshe, "
-"përfshi vula kohore nëse tasti Shift mbahet i shtypur teksa përzgjidhet "
-"tekst."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Përfshi vetvetiu vula kohore te rreshta të kopjuar teksti. Përndryshe, përfshi vula kohore nëse tasti Shift mbahet i shtypur teksa përzgjidhet tekst."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5986,12 +5711,9 @@ msgstr "Përfshi vetvetiu të dhëna ngjyrash"
 
 #: 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."
-msgstr ""
-"Përfshi vetvetiu të dhëna ngjyre në rreshta të kopjuar teksti.  Përndryshe, "
-"përfshi të dhëna ngjyre nëse tasti Ctrl mbahet i shtypur teksa përzgjidhet "
-"tekst."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Përfshi vetvetiu të dhëna ngjyre në rreshta të kopjuar teksti.  Përndryshe, përfshi të dhëna ngjyre nëse tasti Ctrl mbahet i shtypur teksa përzgjidhet tekst."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6011,8 +5733,7 @@ msgstr "Listat shfaqi përmbledhtas"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Përdorni më pak hapësirë mes rreshtave të pemës listë/kanal përdoruesi."
+msgstr "Përdorni më pak hapësirë mes rreshtave të pemës listë/kanal përdoruesi."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -6022,9 +5743,7 @@ msgstr "Nëse mbulohet, përdor kohë shërbyesi"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Shfaq vula kohore të furnizuara nga shërbyesi, nëse ai e mbulon zgjerimin "
-"time-server."
+msgstr "Shfaq vula kohore të furnizuara nga shërbyesi, nëse ai e mbulon zgjerimin time-server."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6044,10 +5763,9 @@ msgstr "Lloj Dëbimi:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Provo të përdorësh këtë maskë dëbimi kur kryen dëbim ose heshtim. (lyp "
+"Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
+msgstr "Provo të përdorësh këtë maskë dëbimi kur kryen dëbim ose heshtim. (lyp irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6108,11 +5826,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6156,11 +5874,9 @@ msgstr "Adresën time merre prej shërbyesit 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 ""
-"Pyet shërbyesin IRC për adresën tuaj të vërtetë. Përdoreni nëse keni një "
-"adresë 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Pyet shërbyesin IRC për adresën tuaj të vërtetë. Përdoreni nëse keni një adresë 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6207,9 +5923,8 @@ msgid "Proxy Authentication"
 msgstr "Mirëfilltësim Ndërmjetësi"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Përdor mirëfilltësim (vetëm HTTP ose Socks5)"
+msgstr "Përdor mirëfilltësim (vetëm HTTP ose SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6231,9 +5946,7 @@ msgstr "Shërbyesi do të përgjigjet me emrin e përdoruesit për rrjetet"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Duhet të keni leje për përgjimin e kësaj porte. Nëse s’bëhet fjalë për 113 "
-"(si parazgjedhje, 0 shpie te kjo), duhet të formësoni port-forwarding."
+msgstr "Duhet të keni leje për përgjimin e kësaj porte. Nëse s’bëhet fjalë për 113 (si parazgjedhje, 0 shpie te kjo), duhet të formësoni port-forwarding."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6395,22 +6108,15 @@ msgstr "Kategori"
 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 ""
-"Nuk mund ta vendosni dot pemën në krye ose në bisht!\n"
-"Ju lutemi, kaloni së pari te skema <b>Skeda</b> te menuja <b>Parje</b>."
+msgstr "Nuk mund ta vendosni dot pemën në krye ose në bisht!\nJu lutemi, kaloni së pari te skema <b>Skeda</b> te menuja <b>Parje</b>."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Mundësia Emër i Vërtetë nuk mund të lihet e zbrazët. Po kalohet te \"realname"
-"\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Mundësia Emër i Vërtetë nuk mund të lihet e zbrazët. Po kalohet te \"realname\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"U ndryshuan disa rregullime të cilat lypin rinisje, për të hyrë në fuqi "
-"plotësisht."
+msgstr "U ndryshuan disa rregullime të cilat lypin rinisje, për të hyrë në fuqi plotësisht."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6418,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 ""
-"*KUJDES*\n"
-"Vetëpranimi i DCC-së në drejtorinë tuaj shtëpi\n"
-"mund të jetë i rrezikshëm dhe është i shfrytëzueshëm. P.sh:\n"
-"Dikush mund t’ju dërgojë një .bash_profile"
+msgstr "*KUJDES*\nVetëpranimi i DCC-së në drejtorinë tuaj shtëpi\nmund të jetë i rrezikshëm dhe është i shfrytëzueshëm. P.sh:\nDikush mund t’ju dërgojë një .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6522,8 +6224,7 @@ msgstr "Hap një URL irc://shërbyes:portë/kanal"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: Dështoi marrja e të dhënave. Ose kjo nuk mbulohet ose pati gabim."
+msgstr "Sysinfo: Dështoi marrja e të dhënave. Ose kjo nuk mbulohet ose pati gabim."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6537,12 +6238,9 @@ msgstr "Sysinfo: %s është vendosur si: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Rregullimet e vlefshme janë: announce dhe hide_* për çdo pjesë "
-"informacioni. p.sh. hide_os. Po qe se nuk i jepet një vlerë, do të shfaqë "
-"vlerën e atëçastshme (ose parazgjedhjen).\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Rregullimet e vlefshme janë: announce dhe hide_* për çdo pjesë informacioni. p.sh. hide_os. Po qe se nuk i jepet një vlerë, do të shfaqë vlerën e atëçastshme (ose parazgjedhjen).\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6557,9 +6255,3 @@ msgstr "Shtojca %s u ngarkua\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Shtojca %s u shngarkua\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/sr.po b/po/sr.po
index b78d00c1..f621a6ec 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,26 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # o Zoltan Čala <zolika@sezampro.yu>, 1999
-# Велимир Мајсторов <majstorov@gmail.com>, 2013-2015
+# Велимир Майсторов <majstorov@gmail.com>, 2013-2015
 # Zlatan Vasović <inactive+ZDroid@transifex.com>, 2013-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-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: Serbian (http://www.transifex.com/hexchat/hexchat/language/"
-"sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/hexchat/hexchat/language/sr/)\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%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -301,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 као\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
@@ -455,9 +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 <шаблон> [<врста>], забрана за све кориснике обухваћене шаблоном од "
-"приступа каналу. Ако су већ на каналу, не избацује их (за то треба бити „оп‟)"
+msgstr "BAN <шаблон> [<врста>], забрана за све кориснике обухваћене шаблоном од приступа каналу. Ако су већ на каналу, не избацује их (за то треба бити „оп‟)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -465,10 +459,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 ""
@@ -490,14 +483,13 @@ 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"
-msgstr ""
-"CYCLE [<канал>] излази из тренутног канала и одмах се поново придружује"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<канал>] излази из тренутног канала и одмах се поново придружује"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -510,25 +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 <име>                      - прихвати понуђену датотеку\n"
-"DCC SEND [-maxcps=#] <име> <дат>   - пошаљи некоме датотеку\n"
-"DCC PSEND [-maxcps=#] <име> <дат>   - пошаљи некоме датотеку, пасиван начин\n"
-"DCC LIST                           - покажи списак за DCC\n"
-"DCC CHAT <име>                     - понуди разговор преко DCC\n"
-"DCC PCHAT <име>                     - понуди разговор преко DCC, пасиван "
-"начин\n"
-"DCC CLOSE <тип> <име> <дат>            пример:\n"
-"         /dcc close send пераперић датотека.tar.gz"
+msgstr "\nDCC GET <име>                      - прихвати понуђену датотеку\nDCC SEND [-maxcps=#] <име> <дат>   - пошаљи некоме датотеку\nDCC PSEND [-maxcps=#] <име> <дат>   - пошаљи некоме датотеку, пасиван начин\nDCC LIST                           - покажи списак за DCC\nDCC CHAT <име>                     - понуди разговор преко DCC\nDCC PCHAT <име>                     - понуди разговор преко DCC, пасиван начин\nDCC CLOSE <тип> <име> <дат>            пример:\n         /dcc close send пераперић датотека.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"
@@ -566,9 +546,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"
@@ -578,9 +556,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"
@@ -621,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 <шаблон> <типови...> <избори...>\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"
@@ -661,14 +630,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 када je реч регуларни израз⏎\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 када je реч регуларни израз⏎\nКористи -- (дупла цртица) за завршавање опција за претрагу, рецимо, реч '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -677,8 +640,7 @@ 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)"
@@ -686,11 +648,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 <радња>, шаље опис радње на овај канал (радње се пишу у трећем лицу, "
-"нпр. /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)"
@@ -707,8 +667,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
@@ -735,9 +695,7 @@ msgstr "NOTICE <корисник/канал> <порука>, шаље обаве
 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)"
@@ -746,8 +704,7 @@ 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"
@@ -775,23 +732,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 ""
@@ -823,17 +774,13 @@ msgstr "SERVCHAN <рач.> <порт> <канал>, повезује се и у�
 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 за нормалне конекције, и 6697 за ssl конекције"
+msgstr "SERVER [-ssl] <хост> [<порт>] [<лозинка>], повезује са сервером, подразумевани порт је 6667 за нормалне конекције, и 6697 за ssl конекције"
 
 #: 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>]"
@@ -853,9 +800,9 @@ msgstr "SETTEXT <нови текст>, замењује текст у оквир
 
 #: 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 ""
@@ -865,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 <време> <датотека 1> [<датотека 2>] Трепћи платоом између две "
-"иконице.⏎\n"
-"TRAY -f <датотека> Постави плато на фиксирану иконицу.⏎\n"
-"TRAY -i <број> Трепћи платоом уз интерну иконицу.⏎\n"
-"TRAY -t <тeкст> Постави тултип платоа.⏎\n"
-"TRAY -b <наслов> <текст> Постави балон платоа."
+msgstr "\nTRAY -f <време> <датотека 1> [<датотека 2>] Трепћи платоом између две иконице.⏎\nTRAY -f <датотека> Постави плато на фиксирану иконицу.⏎\nTRAY -i <број> Трепћи платоом уз интерну иконицу.⏎\nTRAY -t <тeкст> Постави тултип платоа.⏎\nTRAY -b <наслов> <текст> Постави балон платоа."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -888,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
@@ -898,10 +838,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)"
@@ -930,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,8 +890,7 @@ msgstr ""
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Нема hexchat_plugin_init симбола; да ли је ово стварно HexChat додатак?"
+msgstr "Нема hexchat_plugin_init симбола; да ли је ово стварно HexChat додатак?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1002,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"
@@ -1020,9 +954,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."
@@ -1181,7 +1113,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC разговор са %C18$1%O је прекинут."
 
 #: 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
@@ -1215,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
@@ -1237,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
@@ -1250,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
@@ -1267,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
@@ -1326,8 +1262,7 @@ msgstr "%OЛиста игнорисања је празна."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tНе могу да се прикључим %C22$1%C (%C20Канал је само за позване%O)"
+msgstr "%C20*%O$tНе могу да се прикључим %C22$1%C (%C20Канал је само за позване%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1547,9 +1482,7 @@ msgstr "**** ПОЧЕТАК ЗАПИСА У ДНЕВНИКУ У %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Не могу да отворим лог датотеку (датотеке) за писање. Проверите\n"
-"дозволе %s"
+msgstr "* Не могу да отворим лог датотеку (датотеке) за писање. Проверите\nдозволе %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -3284,9 +3217,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
@@ -3407,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."
@@ -3564,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"
@@ -3585,18 +3508,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 "
@@ -3607,65 +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 ""
-"Наредба ^BУбаци у запис^B ће убацити садржај поља Data 1 на место на ком је "
-"био фокус када је притиснута комбинација тастера"
+msgstr "Наредба ^BУбаци у запис^B ће убацити садржај поља 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 ""
-"Команда ^BПостави запис^B пребацује садржај поља Data 1 на место које је "
-"било у фокусу"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Команда ^BПостави запис^B пребацује садржај поља 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 ""
-"Команда ^BПоследња команда^B уписује последњу унету команду, као када се у "
-"шкољци притисне стрелица нагоре"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Команда ^BПоследња команда^B уписује последњу унету команду, као када се у шкољци притисне стрелица нагоре"
 
 #: 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 ""
-"Команда ^BНаредна команда^B уписује команду која је следећа на реду, слично "
-"као притисак на стрелицу надоле у шкољци"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Команда ^BНаредна команда^B уписује команду која је следећа на реду, слично као притисак на стрелицу надоле у шкољци"
 
 #: 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 попуњено, дупли притисак на табулатор бира "
-"последње име, не следеће"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ова команда мења текст у линији за унос тако што довршава непотпуно име или команду. Ако је поље Data 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 ""
-"Овом командом се можете шетати горе-доле кроз листу имена. Ако је 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"
@@ -3840,9 +3748,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?"
@@ -4215,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 одговори - посебни кодови:\n"
-"\n"
-"%d = подаци (цео CTCP)\n"
-"%e = назив тренутне мреже\n"
-"%m = информације о машини\n"
-"%s = кирисник који је послао CTCP\n"
-"%t = време/датум\n"
-"%2 = друга реч\n"
-"%3 = трећа реч\n"
-"&2 = друга реч ка крају линије\n"
-"&3 = трећа реч ка крају линије\n"
-"\n"
+msgstr "CTCP одговори - посебни кодови:\n\n%d = подаци (цео CTCP)\n%e = назив тренутне мреже\n%m = информације о машини\n%s = кирисник који је послао CTCP\n%t = време/датум\n%2 = друга реч\n%3 = трећа реч\n&2 = друга реч ка крају линије\n&3 = трећа реч ка крају линије\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5700,9 +5594,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:"
@@ -5808,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
@@ -5818,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
@@ -5870,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
@@ -5980,11 +5873,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 ""
-"Упитајте ИРЦ сервер да сазнате вашу адресу. Корисни уколико је права адреса "
-"из опсега 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Упитајте ИРЦ сервер да сазнате вашу адресу. Корисни уколико је права адреса из опсега 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6219,10 +6110,8 @@ msgid ""
 msgstr ""
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Опција правог имена не може остати празна. Вредност се враћа на „realname“."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Опција правог имена не може остати празна. Вредност се враћа на „realname“."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
@@ -6234,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
@@ -6352,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
@@ -6369,9 +6254,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index d3be94f9..b035baad 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
-# Велимир Мајсторов <majstorov@gmail.com>, 2013
+# Велимир Майсторов <majstorov@gmail.com>, 2013
 # o Zoltan Čala <zolika@sezampro.yu>, 1999
 # Zlatan Vasović <inactive+ZDroid@transifex.com>, 2013
+# Zlatan Vasović <inactive+ZDroid@transifex.com>, 2013
+# Велимир Майсторов <majstorov@gmail.com>, 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 18:41+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: Serbian (Latin) (http://www.transifex.com/hexchat/hexchat/"
-"language/sr%40latin/)\n"
-"Language: sr@latin\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/hexchat/hexchat/language/sr@latin/)\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%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
 #: data/misc/io.github.Hexchat.appdata.xml.in:5
@@ -301,9 +301,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* Nije dobra ideja da koristite IRC kao\n"
-"  administrator. Bolje je napraviti nalog.\n"
+msgstr "* Nije dobra ideja da koristite IRC kao\n  administrator. Bolje je napraviti nalog.\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
@@ -436,8 +434,7 @@ msgstr "ALLCHAN <naredba>, šalje komandu na sve kanale gde ste povezani"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <komanda>, šalje komandu ka svim kanalima na trenutnom serveru"
+msgstr "ALLCHANL <komanda>, šalje komandu ka svim kanalima na trenutnom serveru"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -456,9 +453,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 <šablon> [<vrsta>], zabrana za sve korisnike obuhvaćene šablonom od "
-"pristupa kanalu. Ako su već na kanalu, ne izbacuje ih (za to treba biti „op‟)"
+msgstr "BAN <šablon> [<vrsta>], zabrana za sve korisnike obuhvaćene šablonom od pristupa kanalu. Ako su već na kanalu, ne izbacuje ih (za to treba biti „op‟)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -466,10 +461,9 @@ msgstr "CHANOPT [-quiet] <promenljiva> [<vrednost>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<enkoding>], dobija ili podešava enkoding korišćen za trenutnu "
-"konekciju"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<enkoding>], dobija ili podešava enkoding korišćen za trenutnu konekciju"
 
 #: src/common/outbound.c:3946
 msgid ""
@@ -491,13 +485,12 @@ msgstr "COUNTRY [-s] <kod|šablon>, traži kod zemlje, npr: au = australija"
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <ime> <poruka>, šalje CTCP poruku na dato ime, poput VERSION ili "
-"USERINFO"
+msgstr "CTCP <ime> <poruka>, šalje CTCP poruku na dato ime, poput VERSION ili 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
@@ -511,26 +504,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 <ime>                      - prihvati ponuđenu datoteku\n"
-"DCC SEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku\n"
-"DCC PSEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku, pasivan "
-"način\n"
-"DCC LIST                           - pokaži spisak za DCC\n"
-"DCC CHAT <ime>                     - ponudi razgovor preko DCC\n"
-"DCC PCHAT <ime>                     - ponudi razgovor preko DCC, pasivan "
-"način\n"
-"DCC CLOSE <tip> <ime> <dat>            primer:\n"
-"         /dcc close send peraperić datoteka.tar.gz"
+msgstr "\nDCC GET <ime>                      - prihvati ponuđenu datoteku\nDCC SEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku\nDCC PSEND [-maxcps=#] <ime> <dat>   - pošalji nekome datoteku, pasivan način\nDCC LIST                           - pokaži spisak za DCC\nDCC CHAT <ime>                     - ponudi razgovor preko DCC\nDCC PCHAT <ime>                     - ponudi razgovor preko DCC, pasivan način\nDCC CLOSE <tip> <ime> <dat>            primer:\n         /dcc close send peraperić datoteka.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 <ime>, sklanja polu-op zvanje za ime na trenutnom kanalu (potreban "
-"je„op)‟"
+msgstr "DEHOP <ime>, sklanja polu-op zvanje za ime na trenutnom kanalu (potreban je„op)‟"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -568,9 +548,7 @@ msgstr "ECHO <tekst>, ispisuje tekst"
 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] <naredba>, izvrši naredbu. Ako je data oznaka -o onda se "
-"ispisšalje na trenutni kanal, inače se ispisuje u okviru za tekst."
+msgstr "EXEC [-o] <naredba>, izvrši naredbu. Ako je data oznaka -o onda se ispisšalje na trenutni kanal, inače se ispisuje u okviru za tekst."
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -580,9 +558,7 @@ msgstr "EXECCONT, šalje procesu SIGCONT"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], zaustavlja poziv exec u ovoj sesiji. Ako je dato i -9 procesu "
-"se šalje SIGKILL"
+msgstr "EXECKILL [-9], zaustavlja poziv exec u ovoj sesiji. Ako je dato i -9 procesu se šalje SIGKILL"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -623,20 +599,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 <šablon> <tipovi...> <izbori...>\n"
-"    šablon - šablon za ime računara, npr. *!*@.aol.com\n"
-"    tipovi - šta zanemariti, jedan ili više iz skupa:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    izbori  - NOSAVE, QUIET"
+msgstr "IGNORE <šablon> <tipovi...> <izbori...>\n    šablon - šablon za ime računara, npr. *!*@.aol.com\n    tipovi - šta zanemariti, jedan ili više iz skupa:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    izbori  - 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 <ime> [<kanal>], poziva ime da se priključi kanalu, misli se na "
-"trenutni ako se ne navede (potreban je op)"
+msgstr "INVITE <ime> [<kanal>], poziva ime da se priključi kanalu, misli se na trenutni ako se ne navede (potreban je op)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -663,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
@@ -674,8 +642,7 @@ msgstr "LOAD [-e] <dat.>, učitava dodatak ili skriptu"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, oduzima zvanje svim polu-operatorima na ovom kanalu (potreban je op)"
+msgstr "MDEHOP, oduzima zvanje svim polu-operatorima na ovom kanalu (potreban je op)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -683,11 +650,9 @@ msgstr "MDEOP, oduzima zvanje svim operatorima na ovom kanalu (potreban je op)"
 
 #: 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 <radnja>, šalje opis radnje na ovaj kanal (radnje se pišu u trećem licu, "
-"npr. /me skače"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <radnja>, šalje opis radnje na ovaj kanal (radnje se pišu u trećem licu, npr. /me skače"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -704,8 +669,8 @@ msgstr "MOP, svima na kanalu dodeljuje zvanje operatora (potreban je op)"
 
 #: 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,9 +697,7 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n network1[,network2,...]] [<nadimak>], prikazuje Vašu listu "
-"obaveštenja ili dodaje nekoga na nju"
+msgstr "NOTIFY [-n network1[,network2,...]] [<nadimak>], prikazuje Vašu listu obaveštenja ili dodaje nekoga na nju"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -743,8 +706,7 @@ msgstr "OP <ime>, daje zvanje operatora ovom imenu (potreban je op)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<razlog>], napušta kanal, i to trenutni ako se ne navede"
+msgstr "PART [<kanal>] [<razlog>], napušta kanal, i to trenutni ako se ne navede"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -772,23 +734,17 @@ msgstr "QUOTE <tekst>, šalje sirovi tekst serveru"
 
 #: 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] [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /"
-"RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno "
-"spajanje na sve otvorene servere"
+msgstr "RECONNECT [-ssl] [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na sve otvorene servere"
 
 #: 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 [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT "
-"za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na "
-"sve otvorene servere"
+msgstr "RECONNECT [<rač.>] [<port>] [<lozinka>], može se koristiti i samo /RECONNECT za ponovno spajanje na server ili kao /RECONNECT ALL za ponovno spajanje na sve otvorene servere"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -820,17 +776,13 @@ msgstr "SERVCHAN <rač.> <port> <kanal>, povezuje se i učlani na kanal"
 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] <host> [<port>] [<lozinka>], povezuje sa serverom, "
-"podrazumevani port je 6667 za normalne konekcije, i 6697 za ssl konekcije"
+msgstr "SERVER [-ssl] <host> [<port>] [<lozinka>], povezuje sa serverom, podrazumevani port je 6667 za normalne konekcije, i 6697 za ssl konekcije"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <rač.> [<port>] [<lozinka>], povezuje se na server, uzima da je port "
-"6667"
+msgstr "SERVER <rač.> [<port>] [<lozinka>], povezuje se na server, uzima da je port 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -850,9 +802,9 @@ msgstr "SETTEXT <novi tekst>, zamenjuje tekst u okviru za unos"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<tema>], postavlja temu ako je navedena, inače prikaže trenutnu temu"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<tema>], postavlja temu ako je navedena, inače prikaže trenutnu temu"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -878,8 +830,8 @@ msgstr "UNLOAD <ime>, ukloni dodatak ili skript"
 
 #: 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
@@ -888,10 +840,9 @@ msgstr "URL <url>, otvara URL u pregledniku mreže"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <ime1> <ime2> itd, naglašava imena u spisku korisnika "
-"kanala"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <ime1> <ime2> itd, naglašava imena u spisku korisnika kanala"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -920,9 +871,7 @@ msgstr "Upotreba: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Za ovu naredbu pomoć nije dostupna.\n"
+msgstr "\nZa ovu naredbu pomoć nije dostupna.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -943,8 +892,7 @@ msgstr ""
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Nema hexchat_plugin_init simbola; da li je ovo stvarno HexChat dodatak?"
+msgstr "Nema hexchat_plugin_init simbola; da li je ovo stvarno HexChat dodatak?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -992,9 +940,7 @@ msgstr "Da li ste sigurni da je ovo SSL server i port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Računar %s naizgled ne postoji\n"
-"Proverite podešavanja za IP!\n"
+msgstr "Računar %s naizgled ne postoji\nProverite podešavanja za IP!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1010,9 +956,7 @@ msgstr "Pokušavam vezu sa sledećim serverom u %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Upozorenje: Skup znakova „%s‟ nije poznat. Za mrežu %s se zato neće "
-"koristiti konverzija."
+msgstr "Upozorenje: Skup znakova „%s‟ nije poznat. Za mrežu %s se zato neće koristiti konverzija."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1171,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
@@ -1205,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
@@ -1227,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
@@ -1240,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
@@ -1257,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
@@ -1316,8 +1264,7 @@ msgstr "%OLista ignorisanja je prazna."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tNe mogu da se priključim %C22$1%C (%C20Kanal je samo za pozvane%O)"
+msgstr "%C20*%O$tNe mogu da se priključim %C22$1%C (%C20Kanal je samo za pozvane%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1537,9 +1484,7 @@ msgstr "**** POČETAK ZAPISA U DNEVNIKU U %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Ne mogu da otvorim log datoteku (datoteke) za pisanje. Proverite\n"
-"dozvole %s"
+msgstr "* Ne mogu da otvorim log datoteku (datoteke) za pisanje. Proverite\ndozvole %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -3274,9 +3219,7 @@ msgstr "Datum"
 
 #: src/fe-gtk/banlist.c:785
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr ""
-"Spisak ućutkanih se može otvoriti samo ako je otvoren jezičak za prikaz "
-"kanala"
+msgstr "Spisak ućutkanih se može otvoriti samo ako je otvoren jezičak za prikaz kanala"
 
 #: src/fe-gtk/banlist.c:808
 #, c-format
@@ -3397,18 +3340,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Ne mogu da pristupim: %s\n"
-"%s.\n"
-"Nastavljanje nije moguće."
+msgstr "Ne mogu da pristupim: %s\n%s.\nNastavljanje nije moguće."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Datoteka koja je prethodno preuzeta je veća nego ponuđena. Zato nije moguće "
-"nastaviti prenos."
+msgstr "Datoteka koja je prethodno preuzeta je veća nego ponuđena. Zato nije moguće nastaviti prenos."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3554,10 +3492,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Ne može se otvoriti font:\n"
-"\n"
-"%s"
+msgstr "Ne može se otvoriti font:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3575,18 +3510,18 @@ msgstr "Mrežni red slanja: bajtova: %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 "
@@ -3601,53 +3536,46 @@ 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"
-msgstr ""
-"Ova komanda menja tekst u liniji za unos tako što dovršava nepotpuno ime ili "
-"komandu. Ako je polje Data 1 popunjeno, dupli pritisak na tabulator bira "
-"poslednje ime, ne sledeće"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ova komanda menja tekst u liniji za unos tako što dovršava nepotpuno ime ili komandu. Ako je polje Data 1 popunjeno, dupli pritisak na tabulator bira poslednje ime, ne sledeće"
 
 #: 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 ""
-"Ovom komandom se možete šetati gore-dole kroz listu imena. Ako je Data 1 "
-"postavljeno na bilo šta, kretaćete se na gore, inače na dole"
+"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 "Ovom komandom se možete šetati gore-dole kroz listu imena. Ako je Data 1 postavljeno na bilo šta, kretaćete se na gore, inače na dole"
 
 #: 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 ""
-"Ova komanda proverava da li se poslednja uneta reč nalazi na spisku za "
-"zamene, i zamenjuje je ako je pronađe"
+msgstr "Ova komanda proverava da li se poslednja uneta reč nalazi na spisku za zamene, i zamenjuje je ako je pronađe"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3822,9 +3750,7 @@ msgstr "Tema nije postavljena"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Ovaj server ima ukupno ovoliko kanala: %d ili dijaloga. Da li želite da ih "
-"sve zatvorite?"
+msgstr "Ovaj server ima ukupno ovoliko kanala: %d ili dijaloga. Da li želite da ih sve zatvorite?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -5776,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
@@ -5786,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
@@ -5838,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
@@ -5948,11 +5875,9 @@ msgstr "Saznaj IP ovog računara od servera"
 
 #: 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 ""
-"Upitajte IRC server da saznate vašu adresu. Korisni ukoliko je prava adresa "
-"iz opsega 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Upitajte IRC server da saznate vašu adresu. Korisni ukoliko je prava adresa iz opsega 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6187,14 +6112,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 ""
-"Neke izmene će postati vidljive tek kada sledeći put pokrenete program."
+msgstr "Neke izmene će postati vidljive tek kada sledeći put pokrenete program."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6202,11 +6125,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 ""
-"*UPOZORENJE*\n"
-"Automatsko prihvatanje DCC zahteva u kućnom\n"
-"direktorijumu je opasno i može se iskoristiti.\n"
-"Npr. neko može poslati datoteku .bash_profile"
+msgstr "*UPOZORENJE*\nAutomatsko prihvatanje DCC zahteva u kućnom\ndirektorijumu je opasno i može se iskoristiti.\nNpr. neko može poslati datoteku .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6320,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
@@ -6337,9 +6256,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/sv.po b/po/sv.po
index 091219d6..f9d76f80 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,32 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Åke Engelbrektson, 2016
 # Åke Engelbrektson, 2016
-# Anders Jonsson <transifex@norsjovallen.se>, 2016
+# Anders Jonsson <transifex@norsjovallen.se>, 2016,2018
 # Chessax Nemeth <chessax@hotmail.com>, 2015
 # Jakob <jakob@knugen.nu>, 2012,2014,2016
 # Jakob <jakob@knugen.nu>, 2012
 # Jan Lindblom <janlindblom@fastmail.fm>, 2016
 # obskyr <lpsamuelm@gmail.com>, 2014
-# Luna Jernberg <bittin@cafe8bitar.se>, 2014
+# Luna Jernberg <bittin@cafe8bitar.se>, 2014,2018
 # Luna Jernberg <bittin@cafe8bitar.se>, 2014
 # obskyr <lpsamuelm@gmail.com>, 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-23 18:37+0000\n"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Swedish (http://www.transifex.com/hexchat/hexchat/language/"
-"sv/)\n"
-"Language: sv\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-08-07 19:01+0000\n"
+"Last-Translator: Anders Jonsson <transifex@norsjovallen.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/hexchat/hexchat/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -45,18 +44,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 är en lättanvänd men även utbyggbar IRC-klient. Den låter dig "
-"ansluta säkert till flera nätverk och prata med användare privat eller i "
-"kanaler med ett anpassningsbart utseende. Du kan till och med överföra filer."
+msgstr "HexChat är en lättanvänd men även utbyggbar IRC-klient. Den låter dig ansluta säkert till flera nätverk och prata med användare privat eller i kanaler med ett anpassningsbart utseende. Du kan till och med överföra filer."
 
 #: 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 stödjer funktioner som: DCC, SASL, proxytjänster, stavningskontroll, "
-"notifikationer, loggning, egna teman, och Python/Perl-skript."
+msgstr "HexChat stödjer funktioner som: DCC, SASL, proxytjänster, stavningskontroll, notifikationer, loggning, egna teman, och Python/Perl-skript."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -73,7 +67,7 @@ msgstr "IM;Chatt;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -276,7 +270,7 @@ msgstr "Ange orsak för att sparka ut %s:"
 
 #: src/common/hexchat.c:938
 msgid "Send File"
-msgstr ""
+msgstr "Skicka fil"
 
 #: src/common/hexchat.c:939
 msgid "Dialog"
@@ -307,17 +301,13 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr ""
-"Du har inte skrivrättigheter till %s. Ingenting från den här sessionen kan "
-"bli sparat"
+msgstr "Du har inte skrivrättigheter till %s. Ingenting från den här sessionen kan bli sparat"
 
 #: 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 ""
-"* Att köra IRC som root är dumt! Du bör skapa ett\n"
-"  användarkonto och använda det för att logga in.\n"
+msgstr "* Att köra IRC som root är dumt! Du bör skapa ett\n  användarkonto och använda det för att logga in.\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
@@ -442,9 +432,7 @@ msgstr "ADDBUTTON <namn> <åtgärd>, lägger till en knapp under användarlistan
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <NyttNätverk> <nyserver/6667>, lägger till ett nytt nätverk med en "
-"ny server i nätverkslistan"
+msgstr "ADDSERVER <NyttNätverk> <nyserver/6667>, lägger till ett nytt nätverk med en ny server i nätverkslistan"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -452,19 +440,15 @@ msgstr "ALLCHAN <kmdo>, skickar ett kommando till alla kanaler du är inne i"
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ALLCHANL <cmd>, skickar ett kommando till alla kanaler på den nuvarande "
-"servern"
+msgstr "ALLCHANL <cmd>, skickar ett kommando till alla kanaler på den nuvarande servern"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr ""
-"ALLSERV <kmdo>, skickar ett kommando till alla servrar du är ansluten till"
+msgstr "ALLSERV <kmdo>, skickar ett kommando till alla servrar du är ansluten till"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<orsak>], anger att du är frånvarande (använd /BACK för att återställa)"
+msgstr "AWAY [<orsak>], anger att du är frånvarande (använd /BACK för att återställa)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -475,10 +459,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> [<bannlysningstyp>], bannlyser alla som matchar masken från den "
-"aktuella kanalen. Om de redan är på kanalen kommer detta inte att sparka ut "
-"dem (kräver kanaloperatörsstatus)"
+msgstr "BAN <mask> [<bannlysningstyp>], bannlyser alla som matchar masken från den aktuella kanalen. Om de redan är på kanalen kommer detta inte att sparka ut dem (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -486,47 +467,37 @@ msgstr "CHANOPT [-quiet] <variabel> [<värde>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kodning>], hämta eller ställ in kodningen som används för den "
-"nuvarande anslutningen"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kodning>], hämta eller ställ in kodningen som används för den nuvarande anslutningen"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLLEAT [ALL|HISTORY|[-]<mängd>], tömmer det nuvarande text-fönstret eller "
-"kommando-historiken"
+msgstr "CLLEAT [ALL|HISTORY|[-]<mängd>], tömmer det nuvarande text-fönstret eller kommando-historiken"
 
 #: 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 ""
-"CLOSE [-m], Stänger nuvarande flik, stänger fönstret om detta är den enda "
-"öppna fliken, eller stänger alla förfrågningar med flaggan \"-m\"."
+msgstr "CLOSE [-m], Stänger nuvarande flik, stänger fönstret om detta är den enda öppna fliken, eller stänger alla förfrågningar med flaggan \"-m\"."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <kod|jokertecken>, söker efter en landskod, exempelvis se = "
-"Sverige"
+msgstr "COUNTRY [-s] <kod|jokertecken>, söker efter en landskod, exempelvis se = Sverige"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <smeknamn> <meddelande>, skickar CTCP-meddelandet till smeknamn, "
-"vanliga meddelanden är VERSION och USERINFO"
+msgstr "CTCP <smeknamn> <meddelande>, skickar CTCP-meddelandet till smeknamn, vanliga meddelanden är VERSION och USERINFO"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanal>], lämnar aktuell eller angiven kanal och går omedelbart in i "
-"den igen"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanal>], lämnar aktuell eller angiven kanal och går omedelbart in i den igen"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -539,24 +510,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 <smeknamn>                     - ta emot en erbjuden fil\n"
-"DCC SEND [-maxcps=#] <smeknamn> [fil]  - skicka en fil till någon\n"
-"DCC PSEND [-maxcps=#] <smeknamn> [fil] - skicka en fil i passivt läge\n"
-"DCC LIST                               - visa DCC-lista\n"
-"DCC CHAT <smeknamn>                    - erbjud någon DCC-chatt\n"
-"DCC PCHAT <smeknamn>                   - erbjud DCC-chatt i passivt läge\n"
-"DCC CLOSE <typ> <smeknamn> <fil>         exempel:\n"
-"         /dcc close send nisse fil.tar.gz"
+msgstr "\nDCC GET <smeknamn>                     - ta emot en erbjuden fil\nDCC SEND [-maxcps=#] <smeknamn> [fil]  - skicka en fil till någon\nDCC PSEND [-maxcps=#] <smeknamn> [fil] - skicka en fil i passivt läge\nDCC LIST                               - visa DCC-lista\nDCC CHAT <smeknamn>                    - erbjud någon DCC-chatt\nDCC PCHAT <smeknamn>                   - erbjud DCC-chatt i passivt läge\nDCC CLOSE <typ> <smeknamn> <fil>         exempel:\n         /dcc close send nisse fil.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 <smeknamn>, tar bort halvkanaloperatörsstatus från smeknamnet på den "
-"aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "DEHOP <smeknamn>, tar bort halvkanaloperatörsstatus från smeknamnet på den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -566,17 +526,13 @@ msgstr "DELBUTTON <namn>, tar bort en knapp under användarlistan"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <smeknamn>, tar bort kanaloperatörsstatus från smeknamnet på den "
-"aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "DEOP <smeknamn>, tar bort kanaloperatörsstatus från smeknamnet på den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <smeknamn>, tar bort röststatus från smeknamnet på den aktuella "
-"kanalen (kräver kanaloperatörsstatus)"
+msgstr "DEVOICE <smeknamn>, tar bort röststatus från smeknamnet på den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -598,9 +554,7 @@ msgstr "ECHO <text>, skriver ut text lokalt"
 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] <kommando>, kör kommandot. Om flaggan -o används skickas utdata "
-"till den aktuella kanalen, annars skrivs den ut i det aktuella textfältet"
+msgstr "EXEC [-o] <kommando>, kör kommandot. Om flaggan -o används skickas utdata till den aktuella kanalen, annars skrivs den ut i det aktuella textfältet"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -610,9 +564,7 @@ msgstr "EXECCONT, skickar SIGCONT til processen"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], dödar en körande exekvering i den aktuella sessionen. Om -9 "
-"anges kommer processen att SIGKILL:as"
+msgstr "EXECKILL [-9], dödar en körande exekvering i den aktuella sessionen. Om -9 anges kommer processen att SIGKILL:as"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -632,8 +584,7 @@ msgstr "FLUSHQ, tömmer den aktuella serverns sändkö"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <värd> [<port>], tunnlar genom en värd, standardvärde på port är 23"
+msgstr "GATE <värd> [<port>], tunnlar genom en värd, standardvärde på port är 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -641,9 +592,7 @@ msgstr "GHOST <smeknamn> [lösenord], dödar ett spökande smeknamn"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <smeknamn>, ger halvkanaloperatörsstatus till smeknamn (kräver "
-"kanaloperatörsstatus)"
+msgstr "HOP <smeknamn>, ger halvkanaloperatörsstatus till smeknamn (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -656,20 +605,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> <typer..> <alternativ..>\n"
-"    mask - värdmask att ignorera, exempelvis: *!*@*.aol.com\n"
-"    typer - datatyper att ignorera, en eller alla av:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    alternativ - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <typer..> <alternativ..>\n    mask - värdmask att ignorera, exempelvis: *!*@*.aol.com\n    typer - datatyper att ignorera, en eller alla av:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    alternativ - 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 <smeknamn> [<kanal>], bjuder in någon till en kanal, "
-"standardalternativet är den aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "INVITE <smeknamn> [<kanal>], bjuder in någon till en kanal, standardalternativet är den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -678,17 +620,13 @@ msgstr "JOIN <kanal>, går in i kanalen"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <smeknamn> [orsak], sparkar ut smeknamnet från den aktuella kanalen "
-"(kräver kanaloperatörsstatus)"
+msgstr "KICK <smeknamn> [orsak], sparkar ut smeknamnet från den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <smeknamn> [orsak], bannlyser och sparkar sedan ut smeknamn från den "
-"aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "KICKBAN <smeknamn> [orsak], bannlyser och sparkar sedan ut smeknamn från den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -700,16 +638,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] [--] <textsträng>, söker efter en textsträng i "
-"bufferten\n"
-"Använd -h för att markera funna textsträngar\n"
-"Använd -m för att matcha skiftläge\n"
-"Använd -r när textsträng är ett reguljärt uttryck\n"
-"Använd -- (dubbelt bindestreck) för att avsluta alternativ vid sökning av, "
-"säg, textsträngen '-r'"
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <textsträng>, söker efter en textsträng i bufferten\nAnvänd -h för att markera funna textsträngar\nAnvänd -m för att matcha skiftläge\nAnvänd -r när textsträng är ett reguljärt uttryck\nAnvänd -- (dubbelt bindestreck) för att avsluta alternativ vid sökning av, säg, textsträngen '-r'"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -718,23 +648,17 @@ msgstr "LOAD [-e] <fil>, läser in en insticksmodul eller ett skript"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, tar bort halvkanaloperatörsstatus från alla halvkanaloperatörer i "
-"den aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "MDEHOP, tar bort halvkanaloperatörsstatus från alla halvkanaloperatörer i den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, tar bort kanaloperatörsstatus från alla kanaloperatörer i den "
-"aktuella kanalen (kräver kanaloperatörsstatus)"
+msgstr "MDEOP, tar bort kanaloperatörsstatus från alla kanaloperatörer i den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: 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 <händelse>, skickar händelsen till den aktuella kanalen (händelserna "
-"skrivs i tredje person, som exempelvis /me hoppar)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <händelse>, skickar händelsen till den aktuella kanalen (händelserna skrivs i tredje person, som exempelvis /me hoppar)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -743,23 +667,17 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, sparkar ut alla utom dig själv från den aktuella kanalen (kräver "
-"kanaloperatörsstatus)"
+msgstr "MKICK, sparkar ut alla utom dig själv från den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, ger kanaloperatörsstatus till alla användare i den aktuella kanalen "
-"(kräver kanaloperatörsstatus)"
+msgstr "MOP, ger kanaloperatörsstatus till alla användare i den aktuella kanalen (kräver kanaloperatörsstatus)"
 
 #: 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"
-msgstr ""
-"MSG <smeknamn> <meddelande>, skickar ett privat meddelande, skicka till \"."
-"\" för senaste smeknamn eller lägg till \"=\" före smeknamnen för dcc chatt."
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <smeknamn> <meddelande>, skickar ett privat meddelande, skicka till \".\" för senaste smeknamn eller lägg till \"=\" före smeknamnen för dcc chatt."
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -785,22 +703,16 @@ msgstr "NOTICE <smeknamn/kanal> <meddelande>, skickar en notis"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n nätverk1[,nätverk2,...]] [<smeknamn>], visar din "
-"notifieringslista eller lägger till någon till den"
+msgstr "NOTIFY [-n nätverk1[,nätverk2,...]] [<smeknamn>], visar din notifieringslista eller lägger till någon till den"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <smeknamn>, ger kanaloperatörsstatus till smeknamn (kräver "
-"kanaloperatörsstatus)"
+msgstr "OP <smeknamn>, ger kanaloperatörsstatus till smeknamn (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kanal>] [<orsak>], lämnar kanalen, standardalternativet är den "
-"aktuella kanalen"
+msgstr "PART [<kanal>] [<orsak>], lämnar kanalen, standardalternativet är den aktuella kanalen"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -810,17 +722,13 @@ msgstr "PING <smeknamn | kanal>, CTCP-pingar smeknamn eller kanal"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <smeknamn> [meddelande], öppnar upp ett nytt privmsg "
-"fönster för någon och skickar eventuellt meddelande"
+msgstr "QUERY [-nofocus] <smeknamn> [meddelande], öppnar upp ett nytt privmsg fönster för någon och skickar eventuellt meddelande"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask> [<tysttyp>], tysta alla som matchar masken i aktuell kanal om "
-"servern stödjer det."
+msgstr "QUIET <mask> [<tysttyp>], tysta alla som matchar masken i aktuell kanal om servern stödjer det."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -832,32 +740,23 @@ msgstr "QUOTE <text>, skickar texten i rå form till servern"
 
 #: 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] [<värd>] [<port>] [<lösenord>], kan anropas bara som /"
-"RECONNECT för att återansluta till den aktuella servern eller med /RECONNECT "
-"ALL för att återansluta till alla de öppna servrarna"
+msgstr "RECONNECT [-ssl] [<värd>] [<port>] [<lösenord>], kan anropas bara som /RECONNECT för att återansluta till den aktuella servern eller med /RECONNECT ALL för att återansluta till alla de öppna servrarna"
 
 #: 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 [<värd>] [<port>] [<lösenord>] [<ssl>] "
-"[<acceptera_ogiltigt_cert>], kan anropas bara som /RECONNECT för att "
-"återansluta till den aktuella servern eller med /RECONNECT ALL för att "
-"återansluta till alla de öppna servrarna"
+msgstr "RECONNECT [<värd>] [<port>] [<lösenord>] [<ssl>] [<acceptera_ogiltigt_cert>], kan anropas bara som /RECONNECT för att återansluta till den aktuella servern eller med /RECONNECT ALL för att återansluta till alla de öppna servrarna"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <text>, skickar rådata till HexChat som om det togs emot från IRC "
-"servern"
+msgstr "RECV <text>, skickar rådata till HexChat som om det togs emot från IRC servern"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -883,17 +782,13 @@ msgstr "SERVCHAN <värd> <port> <kanal>, ansluter och går in i en kanal"
 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] <host> [<port>] [<password>], ansluter till en server, "
-"standardport är 6667 för normala anslutningar och 6697 för ssl anslutningar"
+msgstr "SERVER [-ssl] <host> [<port>] [<password>], ansluter till en server, standardport är 6667 för normala anslutningar och 6697 för ssl anslutningar"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <värd> [<port>] [<lösenord>], ansluter till en server, standardporten "
-"är 6667"
+msgstr "SERVER <värd> [<port>] [<lösenord>], ansluter till en server, standardporten är 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -913,10 +808,9 @@ msgstr "SETTEXT <ny text>, ersätter texten i inmatningsfältet"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<ämne>], ställer in ämnet om något anges, annars visar det aktuellt "
-"ämne"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<ämne>], ställer in ämnet om något anges, annars visar det aktuellt ämne"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -926,13 +820,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 <tidsgräns> <fil1> [<fil2>] Blinka lådan mellan två ikoner.\n"
-"TRAY -f <filnamn>                   Ställ in lådan till en fast ikon.\n"
-"TRAY -i <nummer>                    Blinka lådan med en intern ikon.\n"
-"TRAY -t <text>                      Ställ in verktygstips för lådan.\n"
-"TRAY -b <titel> <text>              Ställ in ballongtext för lådan."
+msgstr "\nTRAY -f <tidsgräns> <fil1> [<fil2>] Blinka lådan mellan två ikoner.\nTRAY -f <filnamn>                   Ställ in lådan till en fast ikon.\nTRAY -i <nummer>                    Blinka lådan med en intern ikon.\nTRAY -t <text>                      Ställ in verktygstips för lådan.\nTRAY -b <titel> <text>              Ställ in ballongtext för lådan."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -948,11 +836,9 @@ msgstr "UNLOAD <namn>, glömmer en insticksmodul eller ett skript"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mask> [<mask>...], ta bort tyst för angivna masker om servern "
-"stödjer det."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mask> [<mask>...], ta bort tyst för angivna masker om servern stödjer det."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -960,15 +846,13 @@ msgstr "URL <url>, öppnar en URL i din webbläsare"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <smeknamn1> <smeknamn2> etc, färgmärker smeknamn i "
-"kanalens användarlista"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <smeknamn1> <smeknamn2> etc, färgmärker smeknamn i kanalens användarlista"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <smeknamn>, ger röststatus till någon (kräver kanaloperatörsstatus)"
+msgstr "VOICE <smeknamn>, ger röststatus till någon (kräver kanaloperatörsstatus)"
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
@@ -977,9 +861,7 @@ msgstr "WALLCHAN <meddelande>, skriver meddelandet i alla kanaler"
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <meddelande>, skickar meddelandet till alla kanaloperatörer på den "
-"aktuella kanalen"
+msgstr "WALLCHOP <meddelande>, skickar meddelandet till alla kanaloperatörer på den aktuella kanalen"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -995,9 +877,7 @@ msgstr "Användning: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Ingen hjälp tillgänglig för det kommandot.\n"
+msgstr "\nIngen hjälp tillgänglig för det kommandot.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1018,9 +898,7 @@ msgstr "Okänt kommando %s. Prova /help\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"Ingen hexchat_plugin_init symbol; är detta verkligen en HexChat-"
-"insticksmodul?"
+msgstr "Ingen hexchat_plugin_init symbol; är detta verkligen en HexChat-insticksmodul?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1068,9 +946,7 @@ msgstr "Är du säker på att detta är en SSL-kapabel server och port?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Kan inte slå upp värdnamnet %s\n"
-"Kontrollera dina IP-inställningar!\n"
+msgstr "Kan inte slå upp värdnamnet %s\nKontrollera dina IP-inställningar!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1086,9 +962,7 @@ msgstr "Byter till nästa server i %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Varning: Teckentabellen \"%s\" är okänd. Ingen konvertering kommer att "
-"tillämpas för nätverket %s."
+msgstr "Varning: Teckentabellen \"%s\" är okänd. Ingen konvertering kommer att tillämpas för nätverket %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1247,9 +1121,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT till %C18$1%O avbruten."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC CHAT-anslutning etablerad till %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 "%C24*%O$tDCC CHAT-anslutning etablerad till %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1269,8 +1143,7 @@ msgstr "%C24*%O$tErbjuder redan CHAT till %C18$1%O"
 
 #: src/common/textevents.h:160
 msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
-msgstr ""
-"%C20*%O$tDCC $1 anslutningsförsök till %C18$2%O misslyckades (%C20$3%O)"
+msgstr "%C20*%O$tDCC $1 anslutningsförsök till %C18$2%O misslyckades (%C20$3%O)"
 
 #: src/common/textevents.h:163
 msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
@@ -1283,11 +1156,9 @@ 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"
-msgstr ""
-"%C20*%O$tTog emot en felaktigt formulerad DCC begäran från %C18$1%O."
-"$a010%C23*%O$tPaketets innehåll: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$tTog emot en felaktigt formulerad DCC begäran från %C18$1%O.$a010%C23*%O$tPaketets innehåll: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1304,13 +1175,12 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O' till %C18$1%O avbruten."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O' från %C18$3%O färdig %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O' från %C18$3%O färdig %C30[%C24$4%O cps%C30]%O"
 
 #: src/common/textevents.h:184
-msgid "%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV anslutning etablerad till %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 "%C24*%O$tDCC RECV anslutning etablerad till %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
 msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
@@ -1322,7 +1192,8 @@ msgstr "%C20*%O$tDCC RECV: Kan inte öppna '%C23$1%C' för skrivning (%C20$2%O)"
 
 #: 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 "%C23*%O$tFilen '%C24$1%C' finns redan, sparar som '%C23$2%O' istället."
 
 #: src/common/textevents.h:196
@@ -1336,13 +1207,12 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C' till %C18$1%O avbruten."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C' till %C18$2%C färdig %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C' till %C18$2%C färdig %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND anslutning etablerad till %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 "%C24*%O$tDCC SEND anslutning etablerad till %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1438,9 +1308,7 @@ msgstr "%C23*%O$t%C28$1%C är felaktig. Försöker igen med %C18$2%O..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tSmeknamn är felaktigt eller används redan. Använd /NICK för att "
-"prova ett annat."
+msgstr "%C20*%O$tSmeknamn är felaktigt eller används redan. Använd /NICK för att prova ett annat."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1577,9 +1445,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O inaktivt %C23$2%O, signon: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Verklig Värd: %C23$2%O, Verklig IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Verklig Värd: %C23$2%O, Verklig IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1624,9 +1490,7 @@ msgstr "**** PÅBÖRJADE LOGGANDE VID %s\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Kan inte öppna log fil(er) för skrivning. Kolla\n"
-"behörigheter på %s"
+msgstr "* Kan inte öppna log fil(er) för skrivning. Kolla\nbehörigheter på %s"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2123,9 +1987,7 @@ msgstr "Bannlysningstid"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Kan inte läsa ljudfilen:\n"
-"%s"
+msgstr "Kan inte läsa ljudfilen:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3484,18 +3346,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Kan inte komma åt fil: %s\n"
-"%s.\n"
-"Återupptagning inte möjlig."
+msgstr "Kan inte komma åt fil: %s\n%s.\nÅterupptagning inte möjlig."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Filen i hämtningskatalogen är större än den fil som erbjudits. "
-"Återupptagning är inte möjlig."
+msgstr "Filen i hämtningskatalogen är större än den fil som erbjudits. Återupptagning är inte möjlig."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3641,10 +3498,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Misslyckades med att öppna typsnitt:\n"
-"\n"
-"%s"
+msgstr "Misslyckades med att öppna typsnitt:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3662,100 +3516,72 @@ msgstr "Sändkö för nätverket: %d byte"
 
 #: 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 \\\\"
-msgstr ""
-"Körkommandot kör datan i Data 1 som om den hade skrivits in i "
-"inmatningsfältet där du angav tangentsekvensen. Därför kan det innehålla "
-"text (som kommer att skickas till kanalen/personen), kommandon eller "
-"användarkommandon. Vid körning används alla \\n-tecken i Data 1 för att "
-"avgränsa separata kommandon så det är möjligt att köra mer än ett kommando. "
-"Om du vill ha ett faktiskt \\ i texten som körs så ange \\\\"
+"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 "Körkommandot kör datan i Data 1 som om den hade skrivits in i inmatningsfältet där du angav tangentsekvensen. Därför kan det innehålla text (som kommer att skickas till kanalen/personen), kommandon eller användarkommandon. Vid körning används alla \\n-tecken i Data 1 för att avgränsa separata kommandon så det är möjligt att köra mer än ett kommando. Om du vill ha ett faktiskt \\ i texten som körs så ange \\\\"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Byt sida-kommandot byter mellan olika sidor i anteckningsboken. Sätt Data 1 "
-"till sidan du will byta till. Om data 2 är satt till någonting så kommer "
-"bytet vara relativt till nuvarande position. Sätt Data 1 till auto för att "
-"byta till sidan med nyast och viktigast aktivitet (query först, sedan "
-"kanaler med färgmarkeringar, kanaler med dialog, kanaler med annan data)"
+msgstr "Byt sida-kommandot byter mellan olika sidor i anteckningsboken. Sätt Data 1 till sidan du will byta till. Om data 2 är satt till någonting så kommer bytet vara relativt till nuvarande position. Sätt Data 1 till auto för att byta till sidan med nyast och viktigast aktivitet (query först, sedan kanaler med färgmarkeringar, kanaler med dialog, kanaler med annan data)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Kommandot Infoga i buffert kommer att infoga innehållet i Data 1 i fältet "
-"där tangentkombinationen trycktes vid nuvarande markörposition"
+msgstr "Kommandot Infoga i buffert kommer att infoga innehållet i Data 1 i fältet där tangentkombinationen trycktes vid nuvarande markörposition"
 
 #: 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."
-msgstr ""
-"Rulla sida-kommandot rullar textmanicken upp eller ned en sida eller en rad. "
-"Sätt data 1 till antingen Top, Bottom, Up, Down, +1 eller -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 "Rulla sida-kommandot rullar textmanicken upp eller ned en sida eller en rad. Sätt data 1 till antingen Top, Bottom, Up, Down, +1 eller -1."
 
 #: 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 ""
-"Kommandot Ställ in buffert ställer in fältet där tangentkombinationen "
-"trycktes till innehållet i Data 1"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Kommandot Ställ in buffert ställer in fältet där tangentkombinationen trycktes till innehållet i 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 ""
-"Kommandot Senaste kommando gör att fältet innehåller det senast angivna "
-"kommandot - samma som att trycka uppåtpil i skalet"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Kommandot Senaste kommando gör att fältet innehåller det senast angivna kommandot - samma som att trycka uppåtpil i skalet"
 
 #: 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 ""
-"Kommandot Nästa kommando gör att fältet innehåller nästa kommando som angavs "
-"- samma som att trycka nedåtpil i skalet"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Kommandot Nästa kommando gör att fältet innehåller nästa kommando som angavs - samma som att trycka nedåtpil i skalet"
 
 #: 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 ""
-"Detta kommando ändrar texten i fältet för att komplettera ett inkomplett "
-"smeknamn eller kommando. Om Data 1 är satt kommer dubbla tabulatortryck i en "
-"sträng att välja det senaste smeknamnet, inte nästa"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Detta kommando ändrar texten i fältet för att komplettera ett inkomplett smeknamn eller kommando. Om Data 1 är satt kommer dubbla tabulatortryck i en sträng att välja det senaste smeknamnet, inte nästa"
 
 #: 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 ""
-"Detta kommando rullar upp och ner i listan med smeknamn. Om Data 1 är satt "
-"till någonting rullar det upp, annars rullar det ner"
+"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 "Detta kommando rullar upp och ner i listan med smeknamn. Om Data 1 är satt till någonting rullar det upp, annars rullar det ner"
 
 #: 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 ""
-"Detta kommando kontrollerar det senast angivna ordet i fältet mot "
-"ersättningslistan och ersätter det om det hittar en träff"
+msgstr "Detta kommando kontrollerar det senast angivna ordet i fältet mot ersättningslistan och ersätter det om det hittar en träff"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3779,8 +3605,7 @@ msgstr "Spara indataraden i historiken men skicka inte den till servern"
 
 #: src/fe-gtk/fkeys.c:218
 msgid "There was an error loading key bindings configuration"
-msgstr ""
-"Det inträffade ett fel vid inläsning av tangentbindningskonfigurationen"
+msgstr "Det inträffade ett fel vid inläsning av tangentbindningskonfigurationen"
 
 #: src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
@@ -3883,7 +3708,7 @@ msgstr "Anslutning till %s klar."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
+msgstr "I serverlistfönstret har ingen kanal (chattrum) angetts för att gå in i automatiskt för detta nätverk."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3903,11 +3728,11 @@ msgstr "Om du vet namnet på kanalen du vill gå in i, ange den här."
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "Ö_ppna kanallistan."
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "Att hämta kanallistan kan ta en minut eller två."
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -3931,9 +3756,7 @@ msgstr "Inget ämne är satt"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Denna server har fortfarande %d kanaler eller dialoger associerade med den. "
-"Stänga dem alla?"
+msgstr "Denna server har fortfarande %d kanaler eller dialoger associerade med den. Stänga dem alla?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4164,9 +3987,7 @@ msgstr "%d smeknamn markerade."
 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 ""
-"Menyraden är nu dold. Du kan visa den genom att trycka Kontroll+F9 eller "
-"högerklicka på en tom del av huvudtextrutan."
+msgstr "Menyraden är nu dold. Du kan visa den genom att trycka Kontroll+F9 eller högerklicka på en tom del av huvudtextrutan."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4208,7 +4029,7 @@ msgstr "Användarmeny - %s"
 #. sep
 #: src/fe-gtk/menu.c:1147
 msgid "Edit This Menu"
-msgstr ""
+msgstr "Redigera denna meny"
 
 #: src/fe-gtk/menu.c:1293
 msgid "Marker line disabled."
@@ -4236,7 +4057,7 @@ msgstr "Markeringsradtillstånd okänt."
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
-msgstr ""
+msgstr "Hämta kanallista"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
@@ -4262,25 +4083,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Användarkommandon - Specialkoder:\n"
-"\n"
-"%c  =  aktuell kanal\n"
-"%e  =  aktuellt nätverksnamn\n"
-"%m  =  maskininfo\n"
-"%n  =  ditt smeknamn\n"
-"%t  =  tid/datum\n"
-"%v  =  HexChat version\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 till slutet av raden\n"
-"&3  =  ord 3 till slutet av raden\n"
-"\n"
-"t.ex.:\n"
-"/cmd john hello\n"
-"\n"
-"%2 skulle vara \"john\"\n"
-"&2 skulle vara \"john hello\"."
+msgstr "Användarkommandon - Specialkoder:\n\n%c  =  aktuell kanal\n%e  =  aktuellt nätverksnamn\n%m  =  maskininfo\n%n  =  ditt smeknamn\n%t  =  tid/datum\n%v  =  HexChat version\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 till slutet av raden\n&3  =  ord 3 till slutet av raden\n\nt.ex.:\n/cmd john hello\n\n%2 skulle vara \"john\"\n&2 skulle vara \"john hello\"."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4295,18 +4098,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Knappar i användarlista - Specialkoder:\n"
-"\n"
-"%a  =  alla markerade smeknamn\n"
-"%c  =  aktuell kanal\n"
-"%e  =  aktuellt nätverksnamn\n"
-"%h  =  markerat smeknamns värdnamn\n"
-"%m  =  maskininfo\n"
-"%n  =  ditt smeknamn\n"
-"%s  =  markerad smeknamn\n"
-"%t  =  tid/datum\n"
-"%u  =  markerad användares konto"
+msgstr "Knappar i användarlista - Specialkoder:\n\n%a  =  alla markerade smeknamn\n%c  =  aktuell kanal\n%e  =  aktuellt nätverksnamn\n%h  =  markerat smeknamns värdnamn\n%m  =  maskininfo\n%n  =  ditt smeknamn\n%s  =  markerad smeknamn\n%t  =  tid/datum\n%u  =  markerad användares konto"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4321,18 +4113,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Dialogknappar - Specialkoder:\n"
-"\n"
-"%a  =  alla markerade smeknamn\n"
-"%c  =  aktuell kanal\n"
-"%e  =  aktuellt nätverksnamn\n"
-"%h  =  markerat smeknamns värdnamn\n"
-"%m  =  maskininfo\n"
-"%n  =  ditt smeknamn\n"
-"%s  =  markerat smeknamn\n"
-"%t  =  tid/datum\n"
-"%u  =  markerad användares konto"
+msgstr "Dialogknappar - Specialkoder:\n\n%a  =  alla markerade smeknamn\n%c  =  aktuell kanal\n%e  =  aktuellt nätverksnamn\n%h  =  markerat smeknamns värdnamn\n%m  =  maskininfo\n%n  =  ditt smeknamn\n%s  =  markerat smeknamn\n%t  =  tid/datum\n%u  =  markerad användares konto"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4348,19 +4129,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP-svar - specialkoder:\n"
-"\n"
-"%d  =  data (hela ctcp-kommandot)\n"
-"%e  =  aktuellt nätverksnamn\n"
-"%m  =  datorinformation\n"
-"%s  =  smeknamnet som skickade ctcp-kommandot\n"
-"%t  =  tid/datum\n"
-"%2  =  ord 2\n"
-"%3  =  ord 3\n"
-"&2  =  ord 2 till slutet på raden\n"
-"&3  =  ord 3 till slutet på raden\n"
-"\n"
+msgstr "CTCP-svar - specialkoder:\n\n%d  =  data (hela ctcp-kommandot)\n%e  =  aktuellt nätverksnamn\n%m  =  datorinformation\n%s  =  smeknamnet som skickade ctcp-kommandot\n%t  =  tid/datum\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 till slutet på raden\n&3  =  ord 3 till slutet på raden\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4372,14 +4141,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL-hanterare - Specialkoder:\n"
-"\n"
-"%s  =  URL-textsträng\n"
-"\n"
-"Angivelse av ett ! framför kommandot\n"
-"indikerar att det ska skickas till\n"
-"ett skal istället för HexChat"
+msgstr "URL-hanterare - Specialkoder:\n\n%s  =  URL-textsträng\n\nAngivelse av ett ! framför kommandot\nindikerar att det ska skickas till\nett skal istället för HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4426,7 +4188,7 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "Nätverksli_sta"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4434,23 +4196,23 @@ msgstr "_Ny"
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr ""
+msgstr "Serverflik"
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr ""
+msgstr "Kanalflik"
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr ""
+msgstr "Serverfönster"
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr ""
+msgstr "Kanalfönster"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr ""
+msgstr "_Läs in insticksmodul eller skript"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4475,7 +4237,7 @@ msgstr "An_vändarlista"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr ""
+msgstr "_Knappar för användarlista"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4523,11 +4285,11 @@ msgstr "Återa_nslut"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr ""
+msgstr "_Gå in i en kanal"
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr ""
+msgstr "Kanal_lista"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
@@ -4548,35 +4310,35 @@ msgstr "_Inställningar"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr ""
+msgstr "Automatisk ersättning"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "CTCP-svar"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "Dialogknappar"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Tangentbordsgenvägar"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "Texthändelser"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "URL-hanterare"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "Användarkommandon"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "Knappar för användarlista"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
@@ -4589,15 +4351,15 @@ msgstr "_Fönster"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "_Bannlysningslista"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "Direktchatt."
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "Fil_överföringar"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
@@ -4605,20 +4367,20 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "Ignoreringslista"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "_Insticksmoduler och skript"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "_Rålogg"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "_URL-fångare"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
@@ -4638,7 +4400,7 @@ msgstr "T_öm text"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr ""
+msgstr "Spara text"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4646,7 +4408,7 @@ msgstr "Sök"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr ""
+msgstr "Sök text"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
@@ -4908,9 +4670,7 @@ msgstr "Du måste ha två unika smeknamn."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Sättet du identifierar dig på gentemot servern. För anpassad login-metod "
-"använd anslutningskommandon."
+msgstr "Sättet du identifierar dig på gentemot servern. För anpassad login-metod använd anslutningskommandon."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4935,11 +4695,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Smeknamn\n"
-"%p=Lösenord\n"
-"%r=Verkligt namn\n"
-"%u=Användarnamn"
+msgstr "%n=Smeknamn\n%p=Lösenord\n%r=Verkligt namn\n%u=Användarnamn"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5046,7 +4802,7 @@ msgstr "_Sortera"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "Sorterar nätverkslistan i alfabetisk ordning. Använd tangenterna Skift+Upp och Skift+Ner för att flytta en rad."
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5322,19 +5078,19 @@ msgstr "Inställningar för genomskinlighet"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "Fönsteropacitet:"
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "Tidsstämplar"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "Aktivera tidsstämplar"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "Tidsstämpelformat:"
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5370,7 +5126,7 @@ msgstr "Inmatningsfält"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "Använd typsnittet och färgerna för textfält"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5396,9 +5152,7 @@ msgstr "Ordlistor att använda:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Använd landskoder (som i \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
-"Separera flera poster med komma."
+msgstr "Använd landskoder (som i \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSeparera flera poster med komma."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5434,11 +5188,11 @@ msgstr "Grafiskt"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Ö, operatörer först"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Ö-A, operatörer sist"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5450,19 +5204,19 @@ msgstr "Osorterad"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "Vänster (övre)"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "Vänster (nedre)"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "Höger (övre)"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "Höger (nedre)"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5522,7 +5276,7 @@ msgstr "Frånvarospårning"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "Spåra frånvarostatus för användare och markera dem i en annan färg"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5653,8 +5407,7 @@ msgstr "Öppna verktyg i:"
 
 #: src/fe-gtk/setup.c:328
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr ""
-"Öppna DCC-, ignorerings-, notifieringsfönster osv. i flikar eller fönster?"
+msgstr "Öppna DCC-, ignorerings-, notifieringsfönster osv. i flikar eller fönster?"
 
 #: src/fe-gtk/setup.c:335
 msgid "Messages"
@@ -5714,7 +5467,7 @@ msgstr "Chattfönster"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "Maximal hastighet för filöverföringar (byte per sekund)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5768,16 +5521,13 @@ msgstr "Spela upp en ljudsignal vid:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr ""
-"Spela \"Instant Message Notification\"-systemljud vid markerade händelser."
+msgstr "Spela \"Instant Message Notification\"-systemljud vid markerade händelser."
 
 #: src/fe-gtk/setup.c:410 src/fe-gtk/setup.c:454
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Spela \"message-new-instant\" från freedesktop.org ljudtemat vid markerade "
-"händelser."
+msgstr "Spela \"message-new-instant\" från freedesktop.org ljudtemat vid markerade händelser."
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5830,8 +5580,7 @@ msgstr "Färgmarkerade meddelanden"
 #: src/fe-gtk/setup.c:515
 msgid ""
 "Highlighted messages are ones where your nickname is mentioned, but also:"
-msgstr ""
-"Färgmarkerade meddelanden är sådana där ditt smeknamn nämns i, men även:"
+msgstr "Färgmarkerade meddelanden är sådana där ditt smeknamn nämns i, men även:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:472 src/fe-gtk/setup.c:495
 #: src/fe-gtk/setup.c:517
@@ -5853,9 +5602,7 @@ msgstr "Smeknamn att alltid färgmarkera:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Separera flera ord med kommatecken.\n"
-"Jokertecken accepteras."
+msgstr "Separera flera ord med kommatecken.\nJokertecken accepteras."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5911,8 +5658,7 @@ msgstr "WHOIS vid notifiering"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Skicka en /WHOIS när en användare kopplar upp sig i din notifieringslista."
+msgstr "Skicka en /WHOIS när en användare kopplar upp sig i din notifieringslista."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5954,17 +5700,17 @@ msgstr "Kopiera automatiskt markerad text"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Kopiera markerad text till urklipp när vänster musknapp släpps. Annars kommer Ctrl+Skift+C kopiera markerad text till urklipp."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+msgstr "Inkludera automatiskt tidsstämplar"
 
 #: 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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Inkludera automatiskt tidsstämplar i kopierade rader av text. Inkludera annars tidsstämplar om Skift-tangenten hålls ned vid markering."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5972,9 +5718,9 @@ msgstr "Inkludera automatiskt färginformation"
 
 #: 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Inkludera automatiskt färginformation i kopierade rader av text. Inkludera annars färginformation om Ctrl-tangenten hålls ned vid markering."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6004,9 +5750,7 @@ msgstr "Använd servertid om det stöds"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Visa tidsstämplar som erhållits från servern om det stödjer tids-server-"
-"tillägget."
+msgstr "Visa tidsstämplar som erhållits från servern om det stödjer tids-server-tillägget."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6026,10 +5770,9 @@ msgstr "Bannlysningstyp:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Försök att använda denna bannlysningsmask vid bannlysning eller tystning. "
-"(kräver irc_who_join)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Försök att använda denna bannlysningsmask vid bannlysning eller tystning. (kräver irc_who_join)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6090,11 +5833,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6106,15 +5849,15 @@ msgstr "Auto"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "Alla anslutningar"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "Endast IRC-server"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "Endast DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6138,11 +5881,9 @@ msgstr "Hämta min adress från IRC-servern"
 
 #: 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 ""
-"Fråga IRC-servern efter din verkliga adress. Använd detta om du har en "
-"adress av typen 192.168.*.*!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Fråga IRC-servern efter din verkliga adress. Använd detta om du har en adress av typen 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6190,7 +5931,7 @@ msgstr "Proxyautentisering"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "Använd autentisering (endast HTTP eller SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6212,9 +5953,7 @@ msgstr "Servern kommer svara med nätverkets användarnamn"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Du måste ha tillåtelse att lyssna på denna port. Om inte 113 (0 väljer denna "
-"som standard) så måste du konfigurera port-forwarding."
+msgstr "Du måste ha tillåtelse att lyssna på denna port. Om inte 113 (0 väljer denna som standard) så måste du konfigurera port-forwarding."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6376,21 +6115,15 @@ msgstr "Kategorier"
 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 ""
-"Du kan inte placera trädet på övre eller undre delen!\n"
-"Ändra till <b>Flikar</b>-layouten i <b>Visa</b>-menyn först."
+msgstr "Du kan inte placera trädet på övre eller undre delen!\nÄndra till <b>Flikar</b>-layouten i <b>Visa</b>-menyn först."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Alternativet Verkligt namn kan inte lämnas blankt. Faller tillbaka till "
-"\"realname\"."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Alternativet Verkligt namn kan inte lämnas blankt. Faller tillbaka till \"realname\"."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"En del inställningar ändrades som kräver en omstart för att börja gälla."
+msgstr "En del inställningar ändrades som kräver en omstart för att börja gälla."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6398,12 +6131,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 ""
-"*VARNING*\n"
-"Att automatiskt acceptera DCC till din\n"
-"hemkatalog kan vara farligt och utnyttjas\n"
-"av andra. Någon kan till exempel skicka\n"
-"dig en .bash_profile"
+msgstr "*VARNING*\nAtt automatiskt acceptera DCC till din\nhemkatalog kan vara farligt och utnyttjas\nav andra. Någon kan till exempel skicka\ndig en .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6503,9 +6231,7 @@ msgstr "Öppna en irc://server:port/kanal URL"
 
 #: plugins/sysinfo/sysinfo.c:128
 msgid "Sysinfo: Failed to get info. Either not supported or error."
-msgstr ""
-"Sysinfo: Kunde inte hämta info. Antingen stöds det inte eller så gick något "
-"fel."
+msgstr "Sysinfo: Kunde inte hämta info. Antingen stöds det inte eller så gick något fel."
 
 #: plugins/sysinfo/sysinfo.c:133
 msgid "Sysinfo: No info by that name\n"
@@ -6519,12 +6245,9 @@ msgstr "Sysinfo: %s är satt till: %d\n"
 #: 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"
-msgstr ""
-"Sysinfo: Giltiga inställningar är: announce och hide_* för varje bit "
-"information. T.ex. hide_os. Utan ett värde visas nuvarande (eller standard-) "
-"inställning.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sysinfo: Giltiga inställningar är: announce och hide_* för varje bit information. T.ex. hide_os. Utan ett värde visas nuvarande (eller standard-) inställning.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6539,9 +6262,3 @@ msgstr "Insticksmodul %s inläst\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "Insticksmodul %s frigjord\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/th.po b/po/th.po
index 7691143c..02b7e7c2 100644
--- a/po/th.po
+++ b/po/th.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:
 # Seksan Poltree <seksan.poltree@gmail.com>, 2007
 # Suttiwit Sukpinit <ormie.suttiwit@gmail.com>, 2012
@@ -9,14 +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: Thai (http://www.transifex.com/hexchat/hexchat/language/th/)\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\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 โดยเป็น 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
@@ -433,9 +431,7 @@ msgstr "ALLCHAN <คำสั่ง>, ส่งคำสั่งไปยัง
 
 #: src/common/outbound.c:3937
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr ""
-"ซินแท็กซ์ของคำสั่งนี้: ALLCHANL <คำสั่งใน IRC>, ส่งคำสั่งของ IRC ไปทุกๆ "
-"ชาแนล์ที่เปิดอยู่บนเน็ตเวิร์คนี้"
+msgstr "ซินแท็กซ์ของคำสั่งนี้: ALLCHANL <คำสั่งใน IRC>, ส่งคำสั่งของ IRC ไปทุกๆ ชาแนล์ที่เปิดอยู่บนเน็ตเวิร์คนี้"
 
 #: src/common/outbound.c:3939
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
@@ -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 <มาสก์> [<รูปแบบการแบน>], ประกาศสั่งห้ามทุก ๆ คนที่ตรงกับมาสก์จากแชนแนลปัจจุบัน. "
-"ถ้าพวกเขาอยู่ที่แชนแนลนี้แล้ว นี่จะไม่ได้เตะพวกเขาออกไป (จำเป็นต้องมี chanop)"
+msgstr "BAN <มาสก์> [<รูปแบบการแบน>], ประกาศสั่งห้ามทุก ๆ คนที่ตรงกับมาสก์จากแชนแนลปัจจุบัน. ถ้าพวกเขาอยู่ที่แชนแนลนี้แล้ว นี่จะไม่ได้เตะพวกเขาออกไป (จำเป็นต้องมี chanop)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -464,7 +458,8 @@ msgstr "ซินแทกซ์ของคำสั่งนี้: CHANOPT [-
 
 #: 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 "ซินแทกซ์ของคำสั่งนี้: CHARSET [<รหัสภาษา>], บอกหรือเปลี่ยนรหัสภาษาที่ใช้แสดงผล"
 
 #: src/common/outbound.c:3946
@@ -487,13 +482,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 "CYCLE [<channel>], แยกแชนแนลปัจจุบันหรือที่เสนอให้ และกลับเข้าร่วมในทันที"
 
 #: src/common/outbound.c:3956
@@ -507,24 +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 <ชื่อเล่น>                      - ยอมรับไฟล์ที่ได้รับการเสนอให้\n"
-"DCC SEND [-maxcps=#] <ชื่อเล่น> [ไฟล์]  - ส่งไฟล์ไปหาใครซักคน\n"
-"DCC PSEND [-maxcps=#] <ชื่อเล่น> [ไฟล์] - ส่งไฟล์ซักไฟล์โดยใช้โหมด passive\n"
-"DCC LIST                            - show DCC list\n"
-"DCC CHAT <ชื่อเล่น>                     - เสนอ DCC CHAT ให้กับใครซักคน\n"
-"DCC PCHAT <ชื่อเล่น>                    - เสนอ DCC CHAT โดยใช้โหมด passive\n"
-"DCC CLOSE <รูปแบบ> <ชื่อเล่น> <ไฟล์>         ตัวอย่าง:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <ชื่อเล่น>                      - ยอมรับไฟล์ที่ได้รับการเสนอให้\nDCC SEND [-maxcps=#] <ชื่อเล่น> [ไฟล์]  - ส่งไฟล์ไปหาใครซักคน\nDCC PSEND [-maxcps=#] <ชื่อเล่น> [ไฟล์] - ส่งไฟล์ซักไฟล์โดยใช้โหมด passive\nDCC LIST                            - show DCC list\nDCC CHAT <ชื่อเล่น>                     - เสนอ DCC CHAT ให้กับใครซักคน\nDCC PCHAT <ชื่อเล่น>                    - เสนอ DCC CHAT โดยใช้โหมด passive\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 <ชื่อเล่น>, ลบสถานะ chanhalf-op จาก 'ชื่อเล่น' ในแชนแนลปัจจุบัน (จำเป็นต้องมี "
-"chanop)"
+msgstr "DEHOP <ชื่อเล่น>, ลบสถานะ chanhalf-op จาก 'ชื่อเล่น' ในแชนแนลปัจจุบัน (จำเป็นต้องมี chanop)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -534,15 +517,13 @@ msgstr "DELBUTTON <ชื่อ>, ลบปุ่มภายใต้ราย�
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <ชื่อเล่น>, ลบสถานะ chanop จาก 'ชื่อเล่น' ในแชนแนลปัจจุบัน (จำเป็นต้องมี chanop)"
+msgstr "DEOP <ชื่อเล่น>, ลบสถานะ 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"
@@ -564,9 +545,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"
@@ -576,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"
@@ -602,9 +579,7 @@ msgstr "GATE <โฮสต์> [<พอร์ต>], พร็อกซี่ไ�
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr ""
-"ซินแทกซ์ของคำสั่งนี้: GHOST <ชื่อ IRC> [รหัสผ่าน NickServ], เวลา Lag "
-"ใช้คำสั่งนี้ในการให้ชื่อเล่นที่ Lag อยู่ แล้วจะสามารถใช้ชื่อเล่นเดิมได้"
+msgstr "ซินแทกซ์ของคำสั่งนี้: GHOST <ชื่อ IRC> [รหัสผ่าน NickServ], เวลา Lag ใช้คำสั่งนี้ในการให้ชื่อเล่นที่ Lag อยู่ แล้วจะสามารถใช้ชื่อเล่นเดิมได้"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
@@ -621,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 <มาสก์> <รูปแบบ..> <ตัวเลือก..>\n"
-"    มาสก์ - มาสก์ของโฮสต์ที่จะเพิกเฉย, เช่น: *!*@*.aol.com\n"
-"    รูปแบบ - ชนิดรูปแบบของข้อมูลที่จะเพิกเฉย, อย่างหนึ่งหรือทั้งหมดของ:\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    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 <ชื่อเล่น> [<แชนแนล>], เชิญชวนใครซักคนเข้าสู่แชนแนลหนึ่ง ๆ, โดยปกติคือแชนแนลปัจจุบัน "
-"(จำเป็นต้องมี chanop)"
+msgstr "INVITE <ชื่อเล่น> [<แชนแนล>], เชิญชวนใครซักคนเข้าสู่แชนแนลหนึ่ง ๆ, โดยปกติคือแชนแนลปัจจุบัน (จำเป็นต้องมี chanop)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -661,15 +629,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 ก่อนเติมข้อความสั้นเพื่อ ใช้วิธีการหาข้อความสั้นในสนทนาแบบ Regex 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 ก่อนเติมข้อความสั้นเพื่อ ใช้วิธีการหาข้อความสั้นในสนทนาแบบ Regex Expression.\nเพิ่ม -- ก่อนเติมข้อความสั้นเพื่อที่จะสามารถเติมข้อความสั้นได้"
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -678,8 +639,7 @@ msgstr "LOAD [-e] <ไฟล์>, โหลดปลั๊กอินหรื�
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Mass deop ของ chanhalf-ops ทั้งหมดในแชนแนลปัจจุบัน (จำเป็นต้องมี chanop)"
+msgstr "MDEHOP, Mass deop ของ chanhalf-ops ทั้งหมดในแชนแนลปัจจุบัน (จำเป็นต้องมี chanop)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
@@ -687,11 +647,9 @@ msgstr "MDEOP, Mass deop ของ chanops ทั้งหมดในแชน�
 
 #: 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 <ปฏิบัติการ>, ส่งการปฏิบัติการไปยังแชนแนลปัจจุบัน (การปฏิบิการถูกเขียนขึ้นโดยบุคคลที่ 3, "
-"อย่างเช่น /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <ปฏิบัติการ>, ส่งการปฏิบัติการไปยังแชนแนลปัจจุบัน (การปฏิบิการถูกเขียนขึ้นโดยบุคคลที่ 3, อย่างเช่น /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -708,8 +666,8 @@ msgstr "MOP, Mass op ของผู้ใช้ทั้งหมดในแ�
 
 #: 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
@@ -736,9 +694,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)"
@@ -775,23 +731,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 ""
@@ -823,33 +773,21 @@ msgstr "SERVCHAN <โฮสต์> <พอร์ต> <แชนแนล>, เ�
 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] <URL ของเซิฟเวอร์> [<พอร์ด>] "
-"[<รหัสผ่านในการใช้เซิฟเวอร์>], เข้าถึงเซิฟเวอร์ที่ระบุไว้\n"
-"ถ้าพอร์ดไม่ได้ระบุไว้ จะเข้าเซิฟเวอร์โดยใช้พอร์ด 6667.\n"
-"ถ้าระบุ \"-ssl\" แต่ไม่ได้ระบุพอร์ด พอร์ดจะเป็น 6697 โดยอัตโนมัติ\n"
-"ไม่ต้องระบุรหัสผ่านถ้าเซิฟเวิอร์ไม่ต้องใช้รหัสผ่านในการเข้าถึง"
+msgstr "ซินแท็กซ์ของคำสั่งนี้: SERVER [-ssl] <URL ของเซิฟเวอร์> [<พอร์ด>] [<รหัสผ่านในการใช้เซิฟเวอร์>], เข้าถึงเซิฟเวอร์ที่ระบุไว้\nถ้าพอร์ดไม่ได้ระบุไว้ จะเข้าเซิฟเวอร์โดยใช้พอร์ด 6667.\nถ้าระบุ \"-ssl\" แต่ไม่ได้ระบุพอร์ด พอร์ดจะเป็น 6697 โดยอัตโนมัติ\nไม่ต้องระบุรหัสผ่านถ้าเซิฟเวิอร์ไม่ต้องใช้รหัสผ่านในการเข้าถึง"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [พอร์ต>] [<รหัสผ่าน>], เชื่อมต่อไปยังเซิร์ฟเวอร์, พอร์ตมาตรฐานคือ 6667"
+msgstr "SERVER <host> [พอร์ต>] [<รหัสผ่าน>], เชื่อมต่อไปยังเซิร์ฟเวอร์, พอร์ตมาตรฐานคือ 6667"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
-msgstr ""
-"ซินแท็กซ์ของคำสั่งนี้: SET [-e] [-off|-on] [-quiet] [ชื่อตัวแปร] "
-"[<ข้อมูลใหม่เพื่อที่จะใส่ในตัวแปร>]\n"
-"* off = ปิด, ตั้งค่าเป็น True. \n"
-"   on = เปิด, ตั้งค่าเป็น False."
+msgstr "ซินแท็กซ์ของคำสั่งนี้: SET [-e] [-off|-on] [-quiet] [ชื่อตัวแปร] [<ข้อมูลใหม่เพื่อที่จะใส่ในตัวแปร>]\n* off = ปิด, ตั้งค่าเป็น True. \n   on = เปิด, ตั้งค่าเป็น False."
 
 #: src/common/outbound.c:4105
 msgid "SETCURSOR [-|+]<position>, reposition the cursor in the inputbox"
-msgstr ""
-"ซินแท็กซ์ของคำสั่งนี้: SETCURSOR [-|+] <ตำแหน่งของเคอเซอร์>, "
-"ปรับเปลี่ยนตำแหน่งของเคอเซอร์ใน InputBox."
+msgstr "ซินแท็กซ์ของคำสั่งนี้: SETCURSOR [-|+] <ตำแหน่งของเคอเซอร์>, ปรับเปลี่ยนตำแหน่งของเคอเซอร์ใน InputBox."
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
@@ -861,7 +799,8 @@ msgstr "ซินแท็กซ์ของคำสั่งนี้: SETTEXT
 
 #: 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
@@ -872,13 +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 <เวลาหมด> <ไฟล์1> [<ไฟล์2>] กระพริบถามระหว่างสองไอคอน.\n"
-"TRAY -f <ชื่อไฟล์>                      ตั้งถามสำหรับไอคอนที่ถูกตรึง.\n"
-"TRAY -i <ตัวเลข>                       กระพริบถาดด้วยไอคอนภายใน.\n"
-"TRAY -t <ข้อความ>                     ตั้งค่าข้อความช่วยเหลือของถาด.\n"
-"TRAY -b <ชื่อเรื่อง> <ข้อความ>              ตั้งค่าบอลลูนของถาด."
+msgstr "\nTRAY -f <เวลาหมด> <ไฟล์1> [<ไฟล์2>] กระพริบถามระหว่างสองไอคอน.\nTRAY -f <ชื่อไฟล์>                      ตั้งถามสำหรับไอคอนที่ถูกตรึง.\nTRAY -i <ตัวเลข>                       กระพริบถาดด้วยไอคอนภายใน.\nTRAY -t <ข้อความ>                     ตั้งค่าข้อความช่วยเหลือของถาด.\nTRAY -b <ชื่อเรื่อง> <ข้อความ>              ตั้งค่าบอลลูนของถาด."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -894,8 +827,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
@@ -904,9 +837,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> etc, เน้นชื่อเล่น(s) ในรายชื่อผู้ใช้ของแชนแนล"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <ชื่อเล่น1> <ชื่อเล่น2> etc, เน้นชื่อเล่น(s) ในรายชื่อผู้ใช้ของแชนแนล"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -935,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"
@@ -1006,9 +937,7 @@ msgstr "คุณแน่ใจหรือว่านี่เป็นเซ
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"ไม่สามารถวิเคราะชื่อของโฮสต์ %s\n"
-"ตรวจสอบการตั้งค่าไอพีของคุณ!\n"
+msgstr "ไม่สามารถวิเคราะชื่อของโฮสต์ %s\nตรวจสอบการตั้งค่าไอพีของคุณ!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1183,7 +1112,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT ถึง %C18$1%O ได้ถูกยกเลิก"
 
 #: 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 "%C24*%O$tDCC CHAT เชื่อมต่อได้แล้วกับ %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
@@ -1217,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
@@ -1239,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
@@ -1252,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
@@ -1269,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
@@ -1548,8 +1481,7 @@ msgstr "**** เริ่มบันทึกการทำงานที่
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* ไม่สามารถเขียนไฟล์ล็อกได้ โปรดตรวจสอบว่าคุณได้รับอนุญาตในการเขียนไฟล์บน \"%s\" แล้วหรือไม่"
+msgstr "* ไม่สามารถเขียนไฟล์ล็อกได้ โปรดตรวจสอบว่าคุณได้รับอนุญาตในการเขียนไฟล์บน \"%s\" แล้วหรือไม่"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2046,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"
@@ -3407,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 ""
@@ -3562,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"
@@ -3583,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 "
@@ -3605,60 +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 ""
-"คำสั่ง Last Command ตั้งค่าตัวรับข้อมูลไปยังคำสั่งล่าสุดที่ถูกป้อน - เช่นเดียวกับการกดลูกศรขึ้นในเชลล์"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "คำสั่ง Last Command ตั้งค่าตัวรับข้อมูลไปยังคำสั่งล่าสุดที่ถูกป้อน - เช่นเดียวกับการกดลูกศรขึ้นในเชลล์"
 
 #: 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 ตั้งค่าตัวรับข้อมูลไปยังคำสั่งถัดไปที่ถูกป้อน - เช่นเดียวกับการกดลูกศรลงในเชลล์"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "คำสั่ง Next Command ตั้งค่าตัวรับข้อมูลไปยังคำสั่งถัดไปที่ถูกป้อน - เช่นเดียวกับการกดลูกศรลงในเชลล์"
 
 #: 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"
@@ -4206,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
@@ -5797,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
@@ -5807,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
@@ -5859,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
@@ -5969,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 "ร้องขอเซิร์ฟเวอร์ IRC ด้วยที่อยู่จริงของคุณ. ใช้นี่ถ้าคุณมีที่อยู่เป็น 192.168.*.* !"
 
 #: src/fe-gtk/setup.c:640
@@ -6203,13 +6106,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
@@ -6222,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 "*คำเตือน*\nการรับ DCC อัตโนมัติไปยังไดเร็กทอรีบ้านของคุณ\nอาจจะอันตรายและสร้างความเสียหายได้. เช่น:\nบางคนอาจจะสามารถส่ง .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6340,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
@@ -6357,9 +6253,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/tr.po b/po/tr.po
index e44103ea..8bb927e4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,11 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # atekinalp <alper.tekinalp@gmail.com>, 2017
+# atekinalp <alper.tekinalp@gmail.com>, 2017
 # tarakbumba <tarakbumba@gmail.com>, 2014
-# Demiray “tulliana” Muhterem <mdemiray@msn.com>, 2014
+# Demiray Muhterem <mdemiray@msn.com>, 2014,2018
+# Demiray Muhterem <mdemiray@msn.com>, 2014,2018
 # Erdoğan Şahin, 2016-2017
 # Erdoğan Şahin, 2017
 # Erdoğan Şahin, 2017
@@ -19,23 +21,22 @@
 # osmanos <osman.erkan@yandex.com>, 2014
 # zeugma <sunder67@hotmail.com>, 2015
 # tarakbumba <tarakbumba@gmail.com>, 2014,2017
+# TingPing <tingping@tingping.se>, 2014,2018
 # TingPing <tingping@tingping.se>, 2014
-# TingPing <tingping@tingping.se>, 2014
-# Ufuk UYUMAZ <ufukuyumaz@gmail.com>, 2013,2016
+# 3494efdfe99795dce7df1bfa0b737fa2, 2013,2016
 # zeugma <sunder67@hotmail.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:51+0000\n"
-"Last-Translator: atekinalp <alper.tekinalp@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/hexchat/hexchat/language/"
-"tr/)\n"
-"Language: tr\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-11-03 08:11+0000\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/hexchat/hexchat/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -54,19 +55,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 kullanımı kolay ve işlevleri arttırılabilir bir IRC İstemcisidir. "
-"Kişiselleştirilebilir bir arayüz kullanarak birden fazla ağa güvenli şekilde "
-"bağlanmanızı ve kullanıcılarla özel olarak veya kanallar üzerinde sohbet "
-"etmenizi sağlar. Hatta dosya aktarımı da yapabilirsiniz."
+msgstr "HexChat kullanımı kolay ve işlevleri arttırılabilir bir IRC İstemcisidir. Kişiselleştirilebilir bir arayüz kullanarak birden fazla ağa güvenli şekilde bağlanmanızı ve kullanıcılarla özel olarak veya kanallar üzerinde sohbet etmenizi sağlar. Hatta dosya aktarımı da yapabilirsiniz."
 
 #: 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 şu özellikleri destekler: DCC, SASL, vekil sunucular, yazım "
-"denetimi, alarmlar, günlük kaydı, kişisel temalar ve Python/Perl betikleri."
+msgstr "HexChat şu özellikleri destekler: DCC, SASL, vekil sunucular, yazım denetimi, alarmlar, günlük kaydı, kişisel temalar ve Python/Perl betikleri."
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:22
 msgid "Main Chat Window"
@@ -323,9 +318,7 @@ msgstr "%s üzerine yazma yetkiniz yok. Bu oturumdan hiç bir şey kaydedilemez.
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* IRC'yi root olarak çalıştırmak aptalca!\n"
-" Bir kullanıcı hesabı oluşturup giriş yapmak için kullanmalısın.\n"
+msgstr "* IRC'yi root olarak çalıştırmak aptalca!\n Bir kullanıcı hesabı oluşturup giriş yapmak için kullanmalısı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
@@ -347,9 +340,7 @@ msgstr "%s tarafından CTCP yağmuruna tutuluyorsunuz, %s yoksayılıyor\n"
 #: src/common/ignore.c:397
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr ""
-"%s tarafından MSG yağmuruna tutuluyorsunuz, gui_autoopen_dialog KAPALI "
-"olarak ayarlanıyor.\n"
+msgstr "%s tarafından MSG yağmuruna tutuluyorsunuz, gui_autoopen_dialog KAPALI olarak ayarlanıyor.\n"
 
 #: src/common/inbound.c:1282
 #, c-format
@@ -452,9 +443,7 @@ msgstr "ADDBUTTON <isim> <eylem>, kullanıcı listesinin altına bir düğme ekl
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr ""
-"ADDSERVER <YeniAğ> <yenisunucu/6667>, ağ listesine yeni bir sunucu ile yeni "
-"bir ağ ekler"
+msgstr "ADDSERVER <YeniAğ> <yenisunucu/6667>, ağ listesine yeni bir sunucu ile yeni bir ağ ekler"
 
 #: src/common/outbound.c:3935
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -470,9 +459,7 @@ msgstr "ALLSERV <komut>, bulunduğunuz tüm sunuculara bir komut gönderir"
 
 #: src/common/outbound.c:3940
 msgid "AWAY [<reason>], sets you away (use /BACK to unset)"
-msgstr ""
-"AWAY [<sebep>], sizi uzak olarak ayarlar (ayarı kaldırmak için /BACK "
-"kullanın)"
+msgstr "AWAY [<sebep>], sizi uzak olarak ayarlar (ayarı kaldırmak için /BACK kullanın)"
 
 #: src/common/outbound.c:3941
 msgid "BACK, sets you back (not away)"
@@ -483,9 +470,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> [<yasaktipi>], mevcut kanaldaki maskeyle eşleşen herkesi "
-"yasaklar. Zaten kanalda olanlar tekmelenmez (chanop'a ihtiyaç duyar)"
+msgstr "BAN <mask> [<yasaktipi>], mevcut kanaldaki maskeyle eşleşen herkesi yasaklar. Zaten kanalda olanlar tekmelenmez (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -493,45 +478,37 @@ msgstr "CHANOPT [-quiet] <değişken> [<değer>]"
 
 #: src/common/outbound.c:3945
 msgid ""
-"CHARSET [<encoding>], get or set the encoding used for the current connection"
-msgstr ""
-"CHARSET [<kodlama>], geçerli bağlantı için kullanılan kodlamayı alır veya "
-"ayarlar"
+"CHARSET [<encoding>], get or set the encoding used for the current "
+"connection"
+msgstr "CHARSET [<kodlama>], geçerli bağlantı için kullanılan kodlamayı alır veya ayarlar"
 
 #: src/common/outbound.c:3946
 msgid ""
 "CLEAR [ALL|HISTORY|[-]<amount>], Clears the current text window or command "
 "history"
-msgstr ""
-"CLEAR [ALL|HISTORY|[-]<miktar>], Geçerli metin penceresini veya komut "
-"geçmişini temizler"
+msgstr "CLEAR [ALL|HISTORY|[-]<miktar>], Geçerli metin penceresini veya komut geçmişini temizler"
 
 #: 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 ""
-"CLOSE [-m], Geçerli sekmeyi kapatır, tek açık sekme ise pencereyi kapatır "
-"veya \"-m\" bayrağı ile tüm sorguları kapatır."
+msgstr "CLOSE [-m], Geçerli sekmeyi kapatır, tek açık sekme ise pencereyi kapatır veya \"-m\" bayrağı ile tüm sorguları kapatır."
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <kod|joker>, bir ülke kodu bulur, örneğin: au = avustralya"
+msgstr "COUNTRY [-s] <kod|joker>, bir ülke kodu bulur, örneğin: au = avustralya"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <rumuz> <ileti>, CTCP iletisini rumuza gönderir, genel mesajlar VERSION "
-"ve USERINFO'dur"
+msgstr "CTCP <rumuz> <ileti>, CTCP iletisini rumuza gönderir, genel mesajlar VERSION ve USERINFO'dur"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kanal>], geçerli veya verilen kanaldan kopar ve hemen yeniden katılır"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kanal>], geçerli veya verilen kanaldan kopar ve hemen yeniden katılır"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -544,26 +521,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 <takmaad>                      - önerilen bir dosyayı kabul et\n"
-"DCC SEND [-maxcps=#] <takmaad> [dosya]  - birine bir dosya gönder\n"
-"DCC PSEND [-maxcps=#] <takmaad> [dosya] - pasif kip kullanarak bir dosya "
-"gönder\n"
-"DCC LIST                            - DCC listesini göster\n"
-"DCC CHAT <takmaad>                     - birine DCC SOHBETi öner\n"
-"DCC PCHAT <takmaad>                    - pasif kip kullanarak birine DCC "
-"SOHBETi öner\n"
-"DCC CLOSE <tip> <takmaad> <dosya>         örnek:\n"
-"         /dcc close send alpert file.tar.gz"
+msgstr "\nDCC GET <takmaad>                      - önerilen bir dosyayı kabul et\nDCC SEND [-maxcps=#] <takmaad> [dosya]  - birine bir dosya gönder\nDCC PSEND [-maxcps=#] <takmaad> [dosya] - pasif kip kullanarak bir dosya gönder\nDCC LIST                            - DCC listesini göster\nDCC CHAT <takmaad>                     - birine DCC SOHBETi öner\nDCC PCHAT <takmaad>                    - pasif kip kullanarak birine DCC SOHBETi öner\nDCC CLOSE <tip> <takmaad> <dosya>         örnek:\n         /dcc close send alpert 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 <rumuz>, mevcut kanaldaki rumuzdan chanhalf-op durumunu kaldırır "
-"(chanop'a ihtiyaç duyar)"
+msgstr "DEHOP <rumuz>, mevcut kanaldaki rumuzdan chanhalf-op durumunu kaldırır (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -573,17 +537,13 @@ msgstr "DELBUTTON <isim>, kullanıcı listesinin altındaki bir düğmeyi siler"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <rumuz>, mevcut kanaldaki rumuzdan chanop durumunu kaldırır (chanop'a "
-"ihtiyaç duyar)"
+msgstr "DEOP <rumuz>, mevcut kanaldaki rumuzdan chanop durumunu kaldırır (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <rumuz>, mevcut kanaldaki rumuzdan ses durumunu kaldırır (chanop'a "
-"ihtiyaç duyar)"
+msgstr "DEVOICE <rumuz>, mevcut kanaldaki rumuzdan ses durumunu kaldırır (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -605,9 +565,7 @@ msgstr "ECHO <metin>, Metni yerel olarak basar"
 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] <komut>, komutu çalıştırır. -o bayrağı kullanılırsa çıkış geçerli "
-"kanala gönderilir, yoksa geçerli metin kutusuna yazdırılır"
+msgstr "EXEC [-o] <komut>, komutu çalıştırır. -o bayrağı kullanılırsa çıkış geçerli kanala gönderilir, yoksa geçerli metin kutusuna yazdırılır"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
@@ -617,9 +575,7 @@ msgstr "EXECCONT, sürece SIGCONT gönderir"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], geçerli oturumda çalışan bir exec'i öldürür. -9 verilirse "
-"sürece SIGKILL gönderilir"
+msgstr "EXECKILL [-9], geçerli oturumda çalışan bir exec'i öldürür. -9 verilirse sürece SIGKILL gönderilir"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -639,9 +595,7 @@ msgstr "FLUSHQ, geçerli sunucunun gönderim kuyruğunu temizler"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <host> [<port>], bir sunucu aracılığıyla vekiller, port varsayılan "
-"olarak 23"
+msgstr "GATE <host> [<port>], bir sunucu aracılığıyla vekiller, port varsayılan olarak 23"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -649,8 +603,7 @@ msgstr "GHOST <rumuz> [parola], Hayalet bir rumuzu öldürür"
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <rumuz>, rumuza chanhalf-op statüsünü verir (chanop'a ihtiyaç duyar)"
+msgstr "HOP <rumuz>, rumuza chanhalf-op statüsünü verir (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
@@ -663,20 +616,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> <tipler..> <seçenekler..>\n"
-"    mask - yoksayılacak makine maskesi, örn: *!*@*.aol.com\n"
-"    tipler - yoksayılacak veri tipleri, şunlardan biri veya tamamı:\n"
-"            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n"
-"    seçenekler - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <tipler..> <seçenekler..>\n    mask - yoksayılacak makine maskesi, örn: *!*@*.aol.com\n    tipler - yoksayılacak veri tipleri, şunlardan biri veya tamamı:\n            PRIV, CHAN, NOTI, CTCP, DCC, INVI, ALL\n    seçenekler - 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 <rumuz> [<kanal>], birisini bir kanala çağırır, varsayılan olarak "
-"geçerli kanal (chanop'a ihtiyaç duyar)"
+msgstr "INVITE <rumuz> [<kanal>], birisini bir kanala çağırır, varsayılan olarak geçerli kanal (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -685,17 +631,13 @@ msgstr "JOIN <kanal>, kanala katılır"
 #: src/common/outbound.c:4021
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr ""
-"KICK <rumuz> [sebep], rumuzu geçerli kanaldan tekmeler (chanop'a ihtiyaç "
-"duyar)"
+msgstr "KICK <rumuz> [sebep], rumuzu geçerli kanaldan tekmeler (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:4023
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <rumuz> [sebep], yasaklar, sonra rumuzu mevcut kanaldan tekmeler "
-"(chanop'a ihtiyaç duyar)"
+msgstr "KICKBAN <rumuz> [sebep], yasaklar, sonra rumuzu mevcut kanaldan tekmeler (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -707,15 +649,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] [--] <string>, tamponda bir karakter dizisini arar\n"
-"    Bulunan karakter dizisini vurgulamak için -h kullan\n"
-"    Büyük/küçük karakter duyarlı eşleşme için -m kullan\n"
-"    Karakter dizisi bir Düzenli İfade olduğunda -r kullan\n"
-"    '-r' gibi bir karakter dizisi araken seçenekleri sonlandırmak için -- "
-"(iki tire) kullan."
+"    Use -- (double hyphen) to end options when searching for, say, the string '-r'"
+msgstr "LASTLOG [-h] [-m] [-r] [--] <string>, tamponda bir karakter dizisini arar\n    Bulunan karakter dizisini vurgulamak için -h kullan\n    Büyük/küçük karakter duyarlı eşleşme için -m kullan\n    Karakter dizisi bir Düzenli İfade olduğunda -r kullan\n    '-r' gibi bir karakter dizisi araken seçenekleri sonlandırmak için -- (iki tire) kullan."
 
 #: src/common/outbound.c:4034
 msgid "LOAD [-e] <file>, loads a plugin or script"
@@ -724,50 +659,36 @@ msgstr "LOAD [-e] <dosya>, bir eklenti veya betik dosyası yükler"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, Mevcut kanaldaki tüm chanhalf-ops'ları toplu olarak deop'lar "
-"(chanop'a ihtiyaç duyuyor)"
+msgstr "MDEHOP, Mevcut kanaldaki tüm chanhalf-ops'ları toplu olarak deop'lar (chanop'a ihtiyaç duyuyor)"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, Mevcut kanaldaki tüm chanops'ları toplu olarak deop'lar (chanop'a "
-"ihtiyaç duyuyor)"
+msgstr "MDEOP, Mevcut kanaldaki tüm chanops'ları toplu olarak deop'lar (chanop'a ihtiyaç duyuyor)"
 
 #: 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 <eylem>, eylemi geçerli kanala gönderir (eylemler 3. şahsa yazılır, "
-"örneğin /me jumps)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <eylem>, eylemi geçerli kanala gönderir (eylemler 3. şahsa yazılır, örneğin /me jumps)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
-msgstr ""
-"MHOP, Mevcut kanaldaki tüm kullanıcıları toplu olarak hop'lar (chanop'a "
-"ihtiyacı var)"
+msgstr "MHOP, Mevcut kanaldaki tüm kullanıcıları toplu olarak hop'lar (chanop'a ihtiyacı var)"
 
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, Sizin dışındaki herkesi geçerli kanaldan toplu olarak tekmeler "
-"(chanop'a ihtiyaç duyar)"
+msgstr "MKICK, Sizin dışındaki herkesi geçerli kanaldan toplu olarak tekmeler (chanop'a ihtiyaç duyar)"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, Mevcut kanaldaki tüm kullanıcıları toplu olarak op'lar (chanop'a "
-"ihtiyacı var)"
+msgstr "MOP, Mevcut kanaldaki tüm kullanıcıları toplu olarak op'lar (chanop'a ihtiyacı var)"
 
 #: 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"
-msgstr ""
-"MSG <rumuz> <mesaj>, özel bir ileti gönder, son takma ada göndermek için \"."
-"\" mesajla veya dcc sohbeti için \"= \" ile ön ekle"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <rumuz> <mesaj>, özel bir ileti gönder, son takma ada göndermek için \".\" mesajla veya dcc sohbeti için \"= \" ile ön ekle"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -793,9 +714,7 @@ msgstr "NOTICE <rumuz/kanal><ileti>, bir bildirim gönderir"
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n ağ1 [, ağ2, ...]] [<rumuz>], bildirim listenizi görüntüler veya "
-"ona birisini ekler"
+msgstr "NOTIFY [-n ağ1 [, ağ2, ...]] [<rumuz>], bildirim listenizi görüntüler veya ona birisini ekler"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
@@ -804,8 +723,7 @@ msgstr "OP <rumuz>, rumuza chanop durumu verir (chanop'a ihtiyaç duyar)"
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"BÖLÜM [<kanal>] [<neden>], kanaldan ayrıl, varsayılan olarak mevcut kanaldan"
+msgstr "BÖLÜM [<kanal>] [<neden>], kanaldan ayrıl, varsayılan olarak mevcut kanaldan"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
@@ -815,17 +733,13 @@ msgstr "PING <rumuz | kanal>, CTCP rumuz veya kanalı ping'ler"
 msgid ""
 "QUERY [-nofocus] <nick> [message], opens up a new privmsg window to someone "
 "and optionally sends a message"
-msgstr ""
-"QUERY [-nofocus] <rumuz> [mesaj], birine yeni bir özel mesaj penceresi açar "
-"ve isteğe bağlı olarak bir mesaj gönderir"
+msgstr "QUERY [-nofocus] <rumuz> [mesaj], birine yeni bir özel mesaj penceresi açar ve isteğe bağlı olarak bir mesaj gönderir"
 
 #: src/common/outbound.c:4073
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <mask> [<quiettype>], sunucu tarafından destekleniyorsa mevcut "
-"kanaldaki mask ile eşleşen herkesi sessizleştirir."
+msgstr "QUIET <mask> [<quiettype>], sunucu tarafından destekleniyorsa mevcut kanaldaki mask ile eşleşen herkesi sessizleştirir."
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -837,31 +751,23 @@ msgstr "QUOTE <metin>, metni ham formda sunucuya gönderir"
 
 #: 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>] [<parola>], Sadece şu anki sunucuya "
-"yeniden bağlanmak için /RECONNECT olarak çağırılabilir veya açık tüm "
-"sunuculara yeniden bağlanmak için /RECONNECT ALL ile çağrılabilir"
+msgstr "RECONNECT [-ssl] [<host>] [<port>] [<parola>], Sadece şu anki sunucuya yeniden bağlanmak için /RECONNECT olarak çağırılabilir veya açık tüm sunuculara yeniden bağlanmak için /RECONNECT ALL ile çağrılabilir"
 
 #: 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>], Sadece geçerli sunucuya tekrar "
-"bağlamak için /RECONNECT olarak veya tüm açık sunuculara yeniden bağlanmak "
-"için /RECONNECT ALL olarak çağrılabilir"
+msgstr "RECONNECT [<host>] [<port>] [<password>], Sadece geçerli sunucuya tekrar bağlamak için /RECONNECT olarak veya tüm açık sunuculara yeniden bağlanmak için /RECONNECT ALL olarak çağrılabilir"
 
 #: src/common/outbound.c:4085
 msgid ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <metin>, Ham verileri HexChat'e gönderir, sanki IRC sunucusundan "
-"alınmış gibi"
+msgstr "RECV <metin>, Ham verileri HexChat'e gönderir, sanki IRC sunucusundan alınmış gibi"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -887,17 +793,13 @@ msgstr "SERVCHAN <host> <port> <kanal>, bir kanala bağlanır ve katılır"
 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] <host> [<port>] [<parola>], bir sunucuya bağlanır, normal "
-"bağlantılar için varsayılan port 6667 ve ssl bağlantıları için 6697 olur"
+msgstr "SERVER [-ssl] <host> [<port>] [<parola>], bir sunucuya bağlanır, normal bağlantılar için varsayılan port 6667 ve ssl bağlantıları için 6697 olur"
 
 #: src/common/outbound.c:4102
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <host> [<port>] [<parola>], bir sunucuya bağlanır, varsayılan "
-"bağlantı noktası 6667'dir"
+msgstr "SERVER <host> [<port>] [<parola>], bir sunucuya bağlanır, varsayılan bağlantı noktası 6667'dir"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -909,9 +811,7 @@ msgstr "SETCURSOR [-|+] <konum>, imleci girdi kutusunda yeniden konumlandırın"
 
 #: src/common/outbound.c:4106
 msgid "SETTAB <new name>, change a tab's name, tab_trunc limit still applies"
-msgstr ""
-"SETTAB <yeni isim>, bir sekmenin adını değiştir, tab_trunc sınırı yine de "
-"geçerlidir"
+msgstr "SETTAB <yeni isim>, bir sekmenin adını değiştir, tab_trunc sınırı yine de geçerlidir"
 
 #: src/common/outbound.c:4107
 msgid "SETTEXT <new text>, replace the text in the input box"
@@ -919,9 +819,9 @@ msgstr "SETTEXT <yeni metin>, giriş kutusundaki metni değiştir"
 
 #: src/common/outbound.c:4110
 msgid ""
-"TOPIC [<topic>], sets the topic if one is given, else shows the current topic"
-msgstr ""
-"TOPIC [<konu>], konuyu verilirse ayarlar, yoksa geçerli konuyu gösterir"
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<konu>], konuyu verilirse ayarlar, yoksa geçerli konuyu gösterir"
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -931,14 +831,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 <zamanaşımı> <dosya1> [<dosya2>] İki simge arasında yanıp sön.\n"
-"TRAY -f <dosyaadı>                  Tepsiyi sabit bir simgeye ayarla.\n"
-"TRAY -i <sayı>                    Tepsiyi dahili bir simge ile yakıp "
-"söndür.\n"
-"TRAY -t <metin>                      Tepsi ipuöunu ayarla.\n"
-"TRAY -b <başlık> <metin>              Tepsi balonunu ayarla."
+msgstr "\nTRAY -f <zamanaşımı> <dosya1> [<dosya2>] İki simge arasında yanıp sön.\nTRAY -f <dosyaadı>                  Tepsiyi sabit bir simgeye ayarla.\nTRAY -i <sayı>                    Tepsiyi dahili bir simge ile yakıp söndür.\nTRAY -t <metin>                      Tepsi ipuöunu ayarla.\nTRAY -b <başlık> <metin>              Tepsi balonunu ayarla."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -954,11 +847,9 @@ msgstr "UNLOAD <isim>, bir eklenti veya betik dosyasını kaldırır"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <mask> [<mask> ...], sunucu tarafından destekleniyorsa, belirtilen "
-"maskların sessizliğini kaldırır."
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <mask> [<mask> ...], sunucu tarafından destekleniyorsa, belirtilen maskların sessizliğini kaldırır."
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -966,10 +857,9 @@ msgstr "URL <url>, tarayıcınızda bir URL açar"
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <rumuz1> <rumuz2> vs, kanal kullanıcı listesindeki "
-"rumuzları vurgular"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <rumuz1> <rumuz2> vs, kanal kullanıcı listesindeki rumuzları vurgular"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
@@ -998,9 +888,7 @@ msgstr "Kullanım: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Bu komutta yardım yok.\n"
+msgstr "\nBu komutta yardım yok.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1021,8 +909,7 @@ msgstr "Bilinmeyen Komut %s. /help dene\n"
 
 #: src/common/plugin.c:403
 msgid "No hexchat_plugin_init symbol; is this really a HexChat plugin?"
-msgstr ""
-"hexchat_plugin_init sembolü yok; bu gerçekten bir HexChat eklentisi mi?"
+msgstr "hexchat_plugin_init sembolü yok; bu gerçekten bir HexChat eklentisi mi?"
 
 #: src/common/plugin-identd.c:175
 #, c-format
@@ -1063,17 +950,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 ""
-"Bunun SSL özellikli bir sunucu ve bağlantı noktası olduğundan emin misiniz?\n"
+msgstr "Bunun SSL özellikli bir sunucu ve bağlantı noktası olduğundan emin misiniz?\n"
 
 #: src/common/server.c:876
 #, c-format
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Ana makine adı %s çözümlenemiyor\n"
-"IP Ayarlarınızı kontrol edin!\n"
+msgstr "Ana makine adı %s çözümlenemiyor\nIP Ayarlarınızı kontrol edin!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1089,9 +973,7 @@ msgstr "%s içindeki sonraki sunucuya geçiliyor...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Uyarı:\"%s\" karakter seti bilinmiyor. Ağ %s için hiçbir dönüşüm "
-"uygulanmayacak."
+msgstr "Uyarı:\"%s\" karakter seti bilinmiyor. Ağ %s için hiçbir dönüşüm uygulanmayacak."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1163,7 +1045,7 @@ msgstr "%UKanal          Kullanıcılar   Konu"
 
 #: src/common/textevents.h:70
 msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
-msgstr "%C22*%O$t%C26$1%O, %C24$2$3%O kipini %C22$4%O'de ayarlar"
+msgstr "%C22*%O$t%C26$1%O, %C24$2$3%O kipi %C22$4%O kullanıcısı için ayarlandı"
 
 #: src/common/textevents.h:73
 msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
@@ -1215,7 +1097,7 @@ msgstr "%C22*%O$tKanal %C22$1%O url: %C24$2"
 
 #: src/common/textevents.h:115
 msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O %C18$2%O a ses verir"
+msgstr "%C22*%O$t%C26$1%O %C18$2%O kullanıcısına konuşma izni verdi"
 
 #: src/common/textevents.h:118
 msgid "%C23*%O$tConnected. Now logging in."
@@ -1250,9 +1132,9 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$tDCC CHAT %C18$1%O iptal edildi."
 
 #: src/common/textevents.h:145
-msgid "%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC CHAT şurası ile bağlantı sağlandı %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 "%C24*%O$tDCC CHAT şurası ile bağlantı sağlandı %C18$1%C %C30[%C24$2%C30]%O"
 
 #: src/common/textevents.h:148
 msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
@@ -1285,11 +1167,9 @@ msgstr "%C16,17 Tip  To/From    Durum  Boyut    Kon     Dosya"
 
 #: 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"
-msgstr ""
-"%C20*%O$t%C18$1%O.$a010%C23*%O dan bozuk bir DCC isteği alındı$tPaket "
-"içeriği: %C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$t%C18$1%O.$a010%C23*%O dan bozuk bir DCC isteği alındı$tPaket içeriği: %C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1306,11 +1186,11 @@ msgstr "%C23*%O$tDCC RECV '%C23$2%O', %C18$1%O a iptal edildi."
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC RECV '%C23$1%O', %C18$3%O dan tamalandı %C30[%C24$4%O cps%C30]%O"
+msgstr "%C24*%O$tDCC RECV '%C23$1%O', %C18$3%O dan tamalandı %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$tDCC RECV bağlantısı sağlandı %C18$1 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1323,7 +1203,8 @@ msgstr "%C20*%O$tDCC RECV: '%C23$1%C' yazma için açılamadı (%C20$2%O)"
 
 #: 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 "%C23*%O$t%C24$1%C' dosyası zaten var, '%C23$2%O' olarak kaydediliyor."
 
 #: src/common/textevents.h:196
@@ -1337,13 +1218,12 @@ msgstr "%C23*%O$tDCC SEND '%C23$2%C', %C18$1%O a iptal edildi."
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$tDCC SEND '%C23$1%C',%C18$2%C a tamamlandı %C30[%C24$3%C cps%C30]%O"
+msgstr "%C24*%O$tDCC SEND '%C23$1%C',%C18$2%C a tamamlandı %C30[%C24$3%C cps%C30]%O"
 
 #: src/common/textevents.h:205
-msgid "%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
-msgstr ""
-"%C24*%O$tDCC GÖNDERME bağlantısı %C18$1 %C30[%O%C24$2%C30]%O ile sağlandı"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr "%C24*%O$tDCC GÖNDERME bağlantısı %C18$1 %C30[%O%C24$2%C30]%O ile sağlandı"
 
 #: src/common/textevents.h:208
 msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
@@ -1359,8 +1239,7 @@ msgstr "%C20*%O$tDCC $1 '%C23$2%C', %C18$3%O a takıldı, iptal ediliyor."
 
 #: src/common/textevents.h:217
 msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
-msgstr ""
-"%C20*%O$tDCC $1 '%C23$2%C', %C18$3%O a zaman aşımına uğradı, iptal ediliyor."
+msgstr "%C20*%O$tDCC $1 '%C23$2%C', %C18$3%O a zaman aşımına uğradı, iptal ediliyor."
 
 #: src/common/textevents.h:220
 msgid "%C24*%O$t%C18$1%O deleted from notify list."
@@ -1402,8 +1281,7 @@ msgstr "%OYok sayma listesi boş."
 
 #: src/common/textevents.h:250
 msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
-msgstr ""
-"%C20*%O$tKatılamadı %C22$1%C (%C20Kanala sadece davetiye ile girilir%O)"
+msgstr "%C20*%O$tKatılamadı %C22$1%C (%C20Kanala sadece davetiye ile girilir%O)"
 
 #: src/common/textevents.h:253
 msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
@@ -1441,9 +1319,7 @@ msgstr "%C23*%O$t%C28$1%C hatalı. %C18$2%O ile yeniden deneniyor..."
 #: src/common/textevents.h:283
 msgid ""
 "%C20*%O$tNickname is erroneous or already in use. Use /NICK to try another."
-msgstr ""
-"%C20*%O$tTakma ad hatalı ya da zaten kullanımda. Başka bir tane için /NICK "
-"dene."
+msgstr "%C20*%O$tTakma ad hatalı ya da zaten kullanımda. Başka bir tane için /NICK dene."
 
 #: src/common/textevents.h:286
 msgid "%C20*%O$tNo such DCC."
@@ -1547,7 +1423,7 @@ msgstr "%C22*%O$t%C26$1%C konuyu şuna değiştirdi: $2%O"
 
 #: src/common/textevents.h:394
 msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
-msgstr "%C22*%O$t%C22$1%C için konu %C26$2%C tarafından ayarlandı (%C24$3%O)"
+msgstr "%C22*%O$t%C22$1%C odası için konu %C26$2%C kullanıcısı tarafından ayarlandı (%C24$3%O)"
 
 #: src/common/textevents.h:397
 msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
@@ -1580,13 +1456,11 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O boşta %C23$2%O, giriş: %C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O Gerçek Makine: %C23$2%O, Gerçek IP: "
-"%C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O Gerçek Makine: %C23$2%O, Gerçek IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
-msgstr "%C19*%O$tŞimdi %C22$2%O de konuşuyor"
+msgstr "%C19*%O$tŞimdi %C22$2%O odasında konuşma iznin var"
 
 #: src/common/textevents.h:442
 msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
@@ -1627,9 +1501,7 @@ msgstr "**** GÜNLÜKLEME %s de BAŞLIYOR\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* Yazma için günlük dosyası(ları) açılamıyor.\n"
-"%s üzerindeki izinleri kontrol edin"
+msgstr "* Yazma için günlük dosyası(ları) açılamıyor.\n%s üzerindeki izinleri kontrol edin"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2126,9 +1998,7 @@ msgstr "Yasaklanma zamanı"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Ses dosyası okunamıyor:\n"
-"%s"
+msgstr "Ses dosyası okunamıyor:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3346,8 +3216,7 @@ msgstr "Bazı yasakları seçmelisiniz."
 #: src/fe-gtk/banlist.c:568
 #, c-format
 msgid "Are you sure you want to remove all listed items in %s?"
-msgstr ""
-"%s içindeki listelenen tüm ögeleri kaldırmak istediğinizden emin misiniz?"
+msgstr "%s içindeki listelenen tüm ögeleri kaldırmak istediğinizden emin misiniz?"
 
 #: src/fe-gtk/banlist.c:726
 msgid "Type"
@@ -3488,18 +3357,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Dosyaya erişilemiyor: %s\n"
-"%s\n"
-"Devam edilemez."
+msgstr "Dosyaya erişilemiyor: %s\n%s\nDevam edilemez."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"İndirme dizinindeki dosya sunulan dosyadan daha büyük. Devam etmek mümkün "
-"değil."
+msgstr "İndirme dizinindeki dosya sunulan dosyadan daha büyük. Devam etmek mümkün değil."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3645,9 +3509,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Yazı tipi açılamadı:\\:n\n"
-"%s"
+msgstr "Yazı tipi açılamadı:\\:n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3665,102 +3527,72 @@ msgstr "Ağ gönderme kuyruğu: %d bayt"
 
 #: 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 \\\\"
-msgstr ""
-"Komutu Çalıştır eylemi, Veri 1'deki verileri, tuş dizisine bastığınız giriş "
-"kutusuna yazılmış gibi çalıştırır. Böylece, metin (kanal/kişiye "
-"gönderilecek), komutlar veya kullanıcı komutlarını içerebilir. Verilerdeki "
-"tüm \\n karakterleri çalıştırdığınızda, ayrı komutları birbirinden ayırmak "
-"için kullanılır; böylece birden fazla komut çalıştırmak mümkündür. Çalışan "
-"gerçek metin de bir \\ kullanmak istiyorsanız, \\\\ girin"
+"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 "Komutu Çalıştır eylemi, Veri 1'deki verileri, tuş dizisine bastığınız giriş kutusuna yazılmış gibi çalıştırır. Böylece, metin (kanal/kişiye gönderilecek), komutlar veya kullanıcı komutlarını içerebilir. Verilerdeki tüm \\n karakterleri çalıştırdığınızda, ayrı komutları birbirinden ayırmak için kullanılır; böylece birden fazla komut çalıştırmak mümkündür. Çalışan gerçek metin de bir \\ kullanmak istiyorsanız, \\\\ girin"
 
 #: 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 "
 "other data)"
-msgstr ""
-"Sayfayı Değiştir komutu not defterindeki sayfalar arasında geçiş yapar. Veri "
-"1'i, geçiş yapmak istediğiniz sayfaya ayarlayın. Veri 2 herhangi bir şeye "
-"ayarlanırsa, geçiş mevcut konuma göre olacaktır. En güncel ve önemli "
-"etkinliğe sahip olan sayfaya geçmek için Veri 1'i otomatik olarak ayarlayın "
-"(önce sorgular, ardından vurgulanan kanallar, diyaloğu olan kanallar, diğer "
-"verilerle kanallar)"
+msgstr "Sayfayı Değiştir komutu not defterindeki sayfalar arasında geçiş yapar. Veri 1'i, geçiş yapmak istediğiniz sayfaya ayarlayın. Veri 2 herhangi bir şeye ayarlanırsa, geçiş mevcut konuma göre olacaktır. En güncel ve önemli etkinliğe sahip olan sayfaya geçmek için Veri 1'i otomatik olarak ayarlayın (önce sorgular, ardından vurgulanan kanallar, diyaloğu olan kanallar, diğer verilerle kanallar)"
 
 #: src/fe-gtk/fkeys.c:145
 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 ""
-"Arabelleğe Ekle komutu, Veri 1'in içeriğini, geçerli imleç konumunda tuş "
-"sırasının basıldığı girdiye yerleştirecektir"
+msgstr "Arabelleğe Ekle komutu, Veri 1'in içeriğini, geçerli imleç konumunda tuş sırasının basıldığı girdiye yerleştirecektir"
 
 #: 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."
-msgstr ""
-"Sayfa Kaydırma komutu, metin parçacıklarını bir sayfa veya bir satır yukarı "
-"veya aşağı doğru kaydırır. Veri 1'i Üst, Alt, Yukarı, Aşağı, +1 veya -1 "
-"değerlerine ayarlayın."
+"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 "Sayfa Kaydırma komutu, metin parçacıklarını bir sayfa veya bir satır yukarı veya aşağı doğru kaydırır. Veri 1'i Üst, Alt, Yukarı, Aşağı, +1 veya -1 değerlerine ayarlayın."
 
 #: 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 ""
-"Tampon Ayarla komutu, anahtar dizisinin girildiği girdiyi Veri 1 içeriğine "
-"ayarlar"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Tampon Ayarla komutu, anahtar dizisinin girildiği girdiyi Veri 1 içeriğine ayarlar"
 
 #: 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 ""
-"Son Komut komutu girdiyi, girilen son komutu içerecek şekilde ayarlar - bir "
-"kabuğa basılmasıyla aynıdır"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Son Komut komutu girdiyi, girilen son komutu içerecek şekilde ayarlar - bir kabuğa basılmasıyla aynıdır"
 
 #: 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 ""
-"Sonraki Komut komutu girdiyi, girilen sonraki komutu içerecek şekilde "
-"ayarlar - bir kabukta aşağı basma ile aynı"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Sonraki Komut komutu girdiyi, girilen sonraki komutu içerecek şekilde ayarlar - bir kabukta aşağı basma ile aynı"
 
 #: 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 ""
-"Bu komut, eksik bir takma ad veya komutu tamamlamak için girişteki metni "
-"değiştirir. Veri 1 ayarlanırsa, bir dizedeki çift tab, sonraki takma adı "
-"değil son takma adı seçecektir"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Bu komut, eksik bir takma ad veya komutu tamamlamak için girişteki metni değiştirir. Veri 1 ayarlanırsa, bir dizedeki çift tab, sonraki takma adı değil son takma adı seçecektir"
 
 #: 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 ""
-"Bu komut, takma adlar listesinde yukarı ve aşağı kayar. Veri 1 herhangi bir "
-"şeye ayarlanırsa, yukarı doğru kaydırılır, yoksa aşağı kaydırır"
+"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 "Bu komut, takma adlar listesinde yukarı ve aşağı kayar. Veri 1 herhangi bir şeye ayarlanırsa, yukarı doğru kaydırılır, yoksa aşağı kaydırır"
 
 #: 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 ""
-"Bu komut, girişte girilen son kelimeyi değiştirme listesine karşı kontrol "
-"eder ve bir eşleşme bulursa onu değiştirir"
+msgstr "Bu komut, girişte girilen son kelimeyi değiştirme listesine karşı kontrol eder ve bir eşleşme bulursa onu değiştirir"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3887,9 +3719,7 @@ msgstr "%s'e bağlantı tamamlandı."
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
-"Sunucu listesi penceresinde, bu ağ için otomatik olarak katılmak için hiç "
-"kanal (sohbet odası) yok."
+msgstr "Sunucu listesi penceresinde, bu ağ için otomatik olarak katılmak için hiç kanal (sohbet odası) yok."
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3937,9 +3767,7 @@ msgstr "Konu ayarlanmadı"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Bu sunucu hala %d kanal veya onunla ilişkili diyaloglara sahip. Hepsi "
-"kapatılsın mı?"
+msgstr "Bu sunucu hala %d kanal veya onunla ilişkili diyaloglara sahip. Hepsi kapatılsın mı?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4170,9 +3998,7 @@ msgstr "%d takma ad seçildi."
 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 ""
-"Menü Çubuğu şimdi gizlendi. Ctrl+F9 tuşlarına basarak veya ana metin "
-"alanının boş bir bölümünü sağ tıklatarak tekrar gösterebilirsiniz."
+msgstr "Menü Çubuğu şimdi gizlendi. Ctrl+F9 tuşlarına basarak veya ana metin alanının boş bir bölümünü sağ tıklatarak tekrar gösterebilirsiniz."
 
 #: src/fe-gtk/menu.c:972
 msgid "Open Link in Browser"
@@ -4268,25 +4094,7 @@ msgid ""
 "\n"
 "%2 would be \"john\"\n"
 "&2 would be \"john hello\"."
-msgstr ""
-"Kullanıcı komutları - Özel kodlar:\n"
-"\n"
-"%c  =  mevcut kanal\n"
-"%e  =  mevcut ağ ismi\n"
-"%m  =  makine bilgisi\n"
-"%n  =  takma adın\n"
-"%t  =  zaman/tarih\n"
-"%v  =  HexChat sürümü\n"
-"%2  =  kelime 2\n"
-"%3  =  kelime 3\n"
-"&2  =  kelime 2 den satır sonuna\n"
-"&3  =  kelime 3 den satır sonuna\n"
-"\n"
-"eg:\n"
-"/cmd alper merhaba\n"
-"\n"
-"%2 \"alper\" olur\n"
-"&2 \"alper merhaba\" olur."
+msgstr "Kullanıcı komutları - Özel kodlar:\n\n%c  =  mevcut kanal\n%e  =  mevcut ağ ismi\n%m  =  makine bilgisi\n%n  =  takma adın\n%t  =  zaman/tarih\n%v  =  HexChat sürümü\n%2  =  kelime 2\n%3  =  kelime 3\n&2  =  kelime 2 den satır sonuna\n&3  =  kelime 3 den satır sonuna\n\neg:\n/cmd alper merhaba\n\n%2 \"alper\" olur\n&2 \"alper merhaba\" olur."
 
 #: src/fe-gtk/menu.c:1486
 msgid ""
@@ -4301,18 +4109,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"Kullanıcı Listesi Düğmeleri - Özel kodlar:\n"
-"\n"
-"%a  =  tüm seçili takma adlar\n"
-"%c  =  mevcut kanall\n"
-"%e  =  mevcut ağ ismi\n"
-"%h  =  seçili takma adın makine adı\n"
-"%m  =  makine bilgisi\n"
-"%n  =  takma adın\n"
-"%s  =  seçili takma ad\n"
-"%t  =  zaman/tarih\n"
-"%u  =  seçili kullanıcıların hesabı"
+msgstr "Kullanıcı Listesi Düğmeleri - Özel kodlar:\n\n%a  =  tüm seçili takma adlar\n%c  =  mevcut kanall\n%e  =  mevcut ağ ismi\n%h  =  seçili takma adın makine adı\n%m  =  makine bilgisi\n%n  =  takma adın\n%s  =  seçili takma ad\n%t  =  zaman/tarih\n%u  =  seçili kullanıcıların hesabı"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4327,18 +4124,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"İletişim Penceresi Düğmeleri - Özel kodlar:\n"
-"\n"
-"%a  =  tüm seçili takma adlar\n"
-"%c  =  mevcut kanal\n"
-"%e = mevcut ağ ismi\n"
-"%h  =  seçili takma adın makine adı\n"
-"%m  =  makine bilgisi\n"
-"%n  =  takma adın\n"
-"%s  =  seçili takma ad\n"
-"%t  =  zaman/tarih\n"
-"%u  =  seçili kullanıcıların hesabı"
+msgstr "İletişim Penceresi Düğmeleri - Özel kodlar:\n\n%a  =  tüm seçili takma adlar\n%c  =  mevcut kanal\n%e = mevcut ağ ismi\n%h  =  seçili takma adın makine adı\n%m  =  makine bilgisi\n%n  =  takma adın\n%s  =  seçili takma ad\n%t  =  zaman/tarih\n%u  =  seçili kullanıcıların hesabı"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4354,19 +4140,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"CTCP Cevapları - Özel kodlar:\n"
-"\n"
-"%d  =  veri (tüm ctcp)\n"
-"%e  =  mevcut ağ ismi\n"
-"%m  =  makine bilgisi\n"
-"%s  =  ctcp gönderenin takma adı\n"
-"%t  =  zaman/tarih\n"
-"%2  =  kelime 2\n"
-"%3  =  kelime 3\n"
-"&2  =  kelime 2 den satır sonuna\n"
-"&3  =  kelime 3 ten satır sonuna\n"
-"\n"
+msgstr "CTCP Cevapları - Özel kodlar:\n\n%d  =  veri (tüm ctcp)\n%e  =  mevcut ağ ismi\n%m  =  makine bilgisi\n%s  =  ctcp gönderenin takma adı\n%t  =  zaman/tarih\n%2  =  kelime 2\n%3  =  kelime 3\n&2  =  kelime 2 den satır sonuna\n&3  =  kelime 3 ten satır sonuna\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -4378,14 +4152,7 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL İşleyiciler - Özel kodlar:\n"
-"\n"
-"%s  =  URL karakter dizisi\n"
-"\n"
-"Komut başına bir ! koymak\n"
-"bunun HexChat yerine bir kabuğa\n"
-"gönderileceğini ifade eder"
+msgstr "URL İşleyiciler - Özel kodlar:\n\n%s  =  URL karakter dizisi\n\nKomut başına bir ! koymak\nbunun HexChat yerine bir kabuğa\ngönderileceğini ifade eder"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
@@ -4456,7 +4223,7 @@ msgstr "Kanal Penceresi"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr "Ek_lenti veya Script Yükle"
+msgstr "_Eklenti veya Betik Yükle"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4914,9 +4681,7 @@ msgstr "İki farklı takma ismin olması gerekir."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"Kendinizi sunucuya tanımlama şekliniz. Özel giriş yöntemleri için bağlanma "
-"komutlarını kullanın."
+msgstr "Kendinizi sunucuya tanımlama şekliniz. Özel giriş yöntemleri için bağlanma komutlarını kullanın."
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
@@ -4941,11 +4706,7 @@ msgid ""
 "%p=Password\n"
 "%r=Real name\n"
 "%u=User name"
-msgstr ""
-"%n=Takma ad\n"
-"%p=Parola\n"
-"%r=Gerçek isim\n"
-"%u=Kullanıcı ismi"
+msgstr "%n=Takma ad\n%p=Parola\n%r=Gerçek isim\n%u=Kullanıcı ismi"
 
 #: src/fe-gtk/servlistgui.c:1801
 msgid "Key (Password)"
@@ -5052,9 +4813,7 @@ msgstr "_Sırala"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
-"Ağ listesini alfabetik sıraya göre sıralar. Bir satır taşımak için SHIFT-"
-"YUKARI ve SHIFT-AŞAĞI tuşlarını kullanın"
+msgstr "Ağ listesini alfabetik sıraya göre sıralar. Bir satır taşımak için SHIFT-YUKARI ve SHIFT-AŞAĞI tuşlarını kullanın"
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5404,9 +5163,7 @@ msgstr "Kullanılacak sözlükler:"
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr ""
-"Dil kodlarını kullan (\"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" gibi).\n"
-"Birden çok girdiyi virgülle ayırın."
+msgstr "Dil kodlarını kullan (\"%LOCALAPPDATA%\\enchant\\myspell\\dicts\" gibi).\nBirden çok girdiyi virgülle ayırın."
 
 #: src/fe-gtk/setup.c:201
 msgid "Use language codes. Separate multiple entries with commas."
@@ -5502,8 +5259,7 @@ msgstr "Kullanıcı kipleri için simgeleri göster"
 
 #: src/fe-gtk/setup.c:257
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr ""
-"Kullanıcı listesinde metin sembolleri yerine grafik simgelerini kullan."
+msgstr "Kullanıcı listesinde metin sembolleri yerine grafik simgelerini kullan."
 
 #: src/fe-gtk/setup.c:258
 msgid "Color nicknames in userlist"
@@ -5531,8 +5287,7 @@ msgstr "Uzakta İzleme"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
-"Kullanıcıların uzakta durumunu izle ve onları farklı bir renkle işaretle"
+msgstr "Kullanıcıların uzakta durumunu izle ve onları farklı bir renkle işaretle"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5722,9 +5477,8 @@ msgid "Chat window"
 msgstr "Sohbet penceresi"
 
 #: src/fe-gtk/setup.c:363
-#, fuzzy
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr "Azami Dosya Aktarma Hızları (Saniyede bayt)"
+msgstr "Azami Dosya Aktarım Hızı (Saniyelik byte)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5784,9 +5538,7 @@ msgstr "Seçilen etkinliklerde \"Anlık İleti Bildirimi\" sistem sesini çal"
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"Seçilen etkinlikler üzerine freedesktop.org ses temasından \"message-new-"
-"instant\"ı çal"
+msgstr "Seçilen etkinlikler üzerine freedesktop.org ses temasından \"message-new-instant\"ı çal"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5861,9 +5613,7 @@ msgstr "Daima vurgulanacak takma adlar:"
 msgid ""
 "Separate multiple words with commas.\n"
 "Wildcards are accepted."
-msgstr ""
-"Birden fazla kelimeyi virgülle ayırın.\n"
-"Joker karakterler kabul edilir."
+msgstr "Birden fazla kelimeyi virgülle ayırın.\nJoker karakterler kabul edilir."
 
 #: src/fe-gtk/setup.c:444
 msgid "Bounce dock icon on:"
@@ -5919,8 +5669,7 @@ msgstr "Bildirimde WHOIS"
 
 #: src/fe-gtk/setup.c:538
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
-"Bir kullanıcı bildirim listenizde çevrimiçi olduğunda bir /WHOIS gönderir."
+msgstr "Bir kullanıcı bildirim listenizde çevrimiçi olduğunda bir /WHOIS gönderir."
 
 #: src/fe-gtk/setup.c:539
 msgid "Hide join and part messages"
@@ -5962,9 +5711,7 @@ msgstr "Seçili metni otomatik olarak kopyala"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
-"Sol fare düğmesi kaldırıldığında seçili metni panoya kopyala. Diğer türlü, "
-"Ctrl+Shift+C seçili metni kopyalayacak."
+msgstr "Sol fare düğmesi kaldırıldığında seçili metni panoya kopyala. Diğer türlü, Ctrl+Shift+C seçili metni kopyalayacak."
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
@@ -5972,12 +5719,9 @@ msgstr "Zaman damgaların ı otomatik dahil et"
 
 #: 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."
-msgstr ""
-"Zaman damgalarını kopyalanan metin satırlarına otomatik olarak dahil et. "
-"Diğer türlü, zaman damgalarını Shift tuşu seçim sırasında basılı ise dahil "
-"et."
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "Zaman damgalarını kopyalanan metin satırlarına otomatik olarak dahil et. Diğer türlü, zaman damgalarını Shift tuşu seçim sırasında basılı ise dahil et."
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5985,11 +5729,9 @@ msgstr "Renk bilgilerini otomatik olarak ekle"
 
 #: 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."
-msgstr ""
-"Renk bilgisini kopyalanan metin satırlarına otomatik olarak dahil et. Diğer "
-"türlü, renk bilgisini Ctrl tuşu seçim sırasında basılı ise dahil et."
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "Renk bilgisini kopyalanan metin satırlarına otomatik olarak dahil et. Diğer türlü, renk bilgisini Ctrl tuşu seçim sırasında basılı ise dahil et."
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -6009,8 +5751,7 @@ msgstr "Listeleri kompakt kipte göster"
 
 #: src/fe-gtk/setup.c:574
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
-"Kullanıcı listesi/kanal ağacı satırları arasında daha az boşluk kullan."
+msgstr "Kullanıcı listesi/kanal ağacı satırları arasında daha az boşluk kullan."
 
 #: src/fe-gtk/setup.c:575
 msgid "Use server time if supported"
@@ -6020,9 +5761,7 @@ msgstr "Destekleniyorsa sunucu saatini kullan"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr ""
-"Zaman sunucusu uzantısını destekliyorsa, sunucudan alınan zaman damgalarını "
-"görüntüle."
+msgstr "Zaman sunucusu uzantısını destekliyorsa, sunucudan alınan zaman damgalarını görüntüle."
 
 #: src/fe-gtk/setup.c:576
 msgid "Automatically reconnect to servers on disconnect"
@@ -6042,10 +5781,9 @@ msgstr "Yasak Tipi:"
 
 #: src/fe-gtk/setup.c:579
 msgid ""
-"Attempt to use this banmask when banning or quieting. (requires irc_who_join)"
-msgstr ""
-"Yasaklama ya da sessizleştirme sırasında bu ban maskesini kullanmaya çalış. "
-"(irc_who_join gerektirir)"
+"Attempt to use this banmask when banning or quieting. (requires "
+"irc_who_join)"
+msgstr "Yasaklama ya da sessizleştirme sırasında bu ban maskesini kullanmaya çalış. (irc_who_join gerektirir)"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
 msgid "Logging"
@@ -6106,11 +5844,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6154,11 +5892,9 @@ msgstr "IRC sunucusundan adresimi al"
 
 #: 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 sunucusuna gerçek adresini sorar. 192.168.*.* adresiniz varsa bunu "
-"kullanın!"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "IRC sunucusuna gerçek adresini sorar. 192.168.*.* adresiniz varsa bunu kullanın!"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6205,9 +5941,8 @@ msgid "Proxy Authentication"
 msgstr "Vekil Sunucu Kimlik Doğrulaması"
 
 #: src/fe-gtk/setup.c:653
-#, fuzzy
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr "Kullanıcı yetkilendirme (Sadece HTTP veya Socks5)"
+msgstr "Kimlik doğrulaması kullan (HTTP ya da sadece SOCKS5)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6229,9 +5964,7 @@ msgstr "Sunucu, ağların kullanıcı adı ile yanıt verecektir"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"Bu portu dinleme izninizin olması gerekir. 113 değilse (0 varsayılan değer "
-"ise) port yönlendirme işlemini yapmanız gerekir."
+msgstr "Bu portu dinleme izninizin olması gerekir. 113 değilse (0 varsayılan değer ise) port yönlendirme işlemini yapmanız gerekir."
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6393,22 +6126,15 @@ msgstr "Kategoriler"
 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 ""
-"Ağacı üst veya alt kısımlara yerleştiremezsiniz!\n"
-"Lütfen, <b>Görünüm</b> menüsündeki <b>Sekmeler</ b> düzenini değiştirin."
+msgstr "Ağacı üst veya alt kısımlara yerleştiremezsiniz!\nLütfen, <b>Görünüm</b> menüsündeki <b>Sekmeler</ b> düzenini değiştirin."
 
 #: src/fe-gtk/setup.c:2254
-msgid ""
-"The Real name option cannot be left blank. Falling back to \"realname\"."
-msgstr ""
-"Gerçek isim seçeneği boş bırakılamaz.\n"
-"\"gerçek isim\" olarak geri çevriliyor."
+msgid "The Real name option cannot be left blank. Falling back to \"realname\"."
+msgstr "Gerçek isim seçeneği boş bırakılamaz.\n\"gerçek isim\" olarak geri çevriliyor."
 
 #: src/fe-gtk/setup.c:2261
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
-"Tam olarak etkili olması için yeniden başlatma gerektiren bazı ayarlar "
-"değiştirildi."
+msgstr "Tam olarak etkili olması için yeniden başlatma gerektiren bazı ayarlar değiştirildi."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6416,11 +6142,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 ""
-"*UYARI*\n"
-"DCC'yi otomatik olarak ev dizininize kabul etme\n"
-"tehlikeli olabilir ve yararlanılabilir. Örneğin:\n"
-"Birisi size bir .bash_profile gönderebilir."
+msgstr "*UYARI*\nDCC'yi otomatik olarak ev dizininize kabul etme\ntehlikeli olabilir ve yararlanılabilir. Örneğin:\nBirisi size bir .bash_profile gönderebilir."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6534,12 +6256,9 @@ msgstr "Sistem Bilgisi: %s şu şekilde ayarlandı: %d\n"
 #: 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"
-msgstr ""
-"Sistem Bilgisi: Geçerli ayarlar: her bilgi parçası için announce ve hide_ *. "
-"Örneğin hide_os. Bir değer olmadan geçerli (veya varsayılan) ayarı "
-"gösterecektir.\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "Sistem Bilgisi: Geçerli ayarlar: her bilgi parçası için announce ve hide_ *. Örneğin hide_os. Bir değer olmadan geçerli (veya varsayılan) ayarı gösterecektir.\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6554,9 +6273,3 @@ msgstr "%s eklenti yüklendi\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "%s eklenti kaldırıldı\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/uk.po b/po/uk.po
index 3a863b98..92ef428e 100644
--- a/po/uk.po
+++ b/po/uk.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:
 # Maxim Dubovoy <max@mylinux.com.ua>, 2003
 # Oleksandr Kunytsia <xakep@snark.ukma.kiev.ua>, 2004
 # partizan <serg.partizan@gmail.com>, 2009
+# partizan <serg.partizan@gmail.com>, 2009
 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: Ukrainian (http://www.transifex.com/hexchat/hexchat/language/"
-"uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/hexchat/hexchat/language/uk/)\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%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (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
@@ -301,9 +300,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
@@ -400,8 +397,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
@@ -456,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 <маска> [<тип>], заборонити доступ до каналу всім, хто відповідає "
-"вказаній масці. Якщо користувачі вже з'єднані з каналом, вони не будуть "
-"відключені (для цього потрібно бути оператором каналу)"
+msgstr "BAN <маска> [<тип>], заборонити доступ до каналу всім, хто відповідає вказаній масці. Якщо користувачі вже з'єднані з каналом, вони не будуть відключені (для цього потрібно бути оператором каналу)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -467,7 +460,8 @@ msgstr "CHANOPT [-quiet] <змінна> [<значення>]"
 
 #: 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,20 +478,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <код|метасимвол>, знайти код країни, наприклад: au = australia"
+msgstr "COUNTRY [-s] <код|метасимвол>, знайти код країни, наприклад: 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 <нікнейм> <повідомлення>, надіслати повідомлення 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
@@ -511,23 +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 <нікнейм>                     - прийняти запропонований файл\n"
-"DCC SEND [-maxcps=#] <нікнейм> [файл] - надіслати комусь файл\n"
-"DCC PSEND [-maxcps=#] <нікнейм> [файл]- надіслати файл у пасивному режимі\n"
-"DCC LIST                                 - показати список DCC\n"
-"DCC CHAT <нікнейм>                    - запропонувати розмову через DCC\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\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 <нікнейм>, зняти статус напівоператор каналу (chanhalf-op) у особи на "
-"поточному каналі (потребує прав адміністратора каналу)"
+msgstr "DEHOP <нікнейм>, зняти статус напівоператор каналу (chanhalf-op) у особи на поточному каналі (потребує прав адміністратора каналу)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -537,17 +519,13 @@ msgstr "DELBUTTON <ім'я>, видалити кнопку зі списку к�
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <нікнейм>, зняти права оператора (chanop) у вказаної особи на поточному "
-"каналі (потребує прав адміністратора каналу)"
+msgstr "DEOP <нікнейм>, зняти права оператора (chanop) у вказаної особи на поточному каналі (потребує прав адміністратора каналу)"
 
 #: 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"
@@ -569,10 +547,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"
@@ -582,9 +557,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"
@@ -612,9 +585,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"
@@ -627,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 <маска> <типи..> <параметри..>\n"
-"    маска     - маска ігнорованого вузла, наприклад: *!*@*.aol.com\n"
-"    типи       - типи ігнорованих даних, один або декілька з наступних:\n"
-"                PRIV, CHAN, NOTI, CTCP, INVI, ALL\n"
-"    параметри - NOSAVE, QUIET"
+msgstr "IGNORE <маска> <типи..> <параметри..>\n    маска     - маска ігнорованого вузла, наприклад: *!*@*.aol.com\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"
@@ -667,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
@@ -678,23 +641,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)"
@@ -703,19 +660,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 ""
-"MDEOP, надати всім користувачам поточного каналу права оператора (потребує "
-"прав оператора)"
+msgstr "MDEOP, надати всім користувачам поточного каналу права оператора (потребує прав оператора)"
 
 #: 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,15 +696,11 @@ 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 <нікнейм>, надати вказаній особі права оператора каналу (потребує прав "
-"оператора)"
+msgstr "OP <нікнейм>, надати вказаній особі права оператора каналу (потребує прав оператора)"
 
 #: src/common/outbound.c:4067
 msgid ""
@@ -783,23 +733,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 ""
@@ -821,15 +765,11 @@ 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 ""
@@ -841,9 +781,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>]"
@@ -863,10 +801,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 ""
@@ -876,28 +813,15 @@ 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>] Почерговий показ двох значків у області "
-"сповіщення.\n"
-"TRAY -f <назвафайлу>                Постійний значок у області сповіщення.\n"
-"TRAY -i <число>                     Миготіння внутрішнього значка у області "
-"сповіщення.\n"
-"TRAY -t <текст>                     Встановити підказку у області "
-"сповіщення.\n"
-"TRAY -b <заголовок> <текст>         Встановити спливаючу підказку у області "
-"сповіщення."
+msgstr "\nTRAY -f <таймаут> <файл1> [<файл2>] Почерговий показ двох значків у області сповіщення.\nTRAY -f <назвафайлу>                Постійний значок у області сповіщення.\nTRAY -i <число>                     Миготіння внутрішнього значка у області сповіщення.\nTRAY -t <текст>                     Встановити підказку у області сповіщення.\nTRAY -b <заголовок> <текст>         Встановити спливаючу підказку у області сповіщення."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <маска> [<маска>...], скасувати заборону доступу до каналу всім, хто "
-"відповідає масці."
+msgstr "UNBAN <маска> [<маска>...], скасувати заборону доступу до каналу всім, хто відповідає масці."
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
-msgstr ""
-"UNIGNORE <маска> [QUIET] - скасувати ігнорування повідомлень з певною маскою"
+msgstr "UNIGNORE <маска> [QUIET] - скасувати ігнорування повідомлень з певною маскою"
 
 #: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
@@ -905,8 +829,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,15 +839,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"
@@ -932,9 +854,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
@@ -950,9 +870,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 +939,7 @@ msgstr "Ви впевнені це що сумісний з SSL сервер?\n"
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Неможливо визначити назву вузла %s\n"
-"Перевірте параметри мережі!\n"
+msgstr "Неможливо визначити назву вузла %s\nПеревірте параметри мережі!\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1039,9 +955,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."
@@ -1200,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
@@ -1234,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
@@ -1256,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
@@ -1269,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
@@ -1286,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
@@ -2062,9 +1980,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,17 +3339,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."
@@ -3579,10 +3491,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"
@@ -3600,18 +3509,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 "
@@ -3622,65 +3531,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 ""
-"Ця команда замінює текст в полі вводу для завершення незакінченого нікнейму "
-"або команди. Якщо Data 1 встановлено, подвійне натискання клавіші табуляції "
-"вибере не наступний, а останній нікнейм"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Ця команда замінює текст в полі вводу для завершення незакінченого нікнейму або команди. Якщо Data 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 ""
-"Команда прокручує список користувачів вгору або вниз. Якщо 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"
@@ -4228,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 - Спеціальні коди:\n"
-"\n"
-"%d  =  дані (повний ctcp)\n"
-"%m  =  інформація про машину\n"
-"%e  =  назва поточної мережі\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%m  =  інформація про машину\n%e  =  назва поточної мережі\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
@@ -5713,9 +5595,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:"
@@ -5821,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
@@ -5831,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
@@ -5883,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
@@ -5993,11 +5874,9 @@ msgstr "Отримувати власну IP адресу з 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 ""
-"Виконайте команду /WHOIS для свого нікнейму, щоб визначити сою реальну "
-"адресу. Використовуйте це, якщо ваша адреса 192.168.*.* !"
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Виконайте команду /WHOIS для свого нікнейму, щоб визначити сою реальну адресу. Використовуйте це, якщо ваша адреса 192.168.*.* !"
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6229,19 +6108,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 ""
@@ -6249,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 ""
-"*ПОПЕРЕДЖЕННЯ*\n"
-"Автоматичне приймання DCC до вашої домашньої теки\n"
-"може бути небезпечним. Наприклад:\n"
-"хтось може надіслати вам .bash_profile"
+msgstr "*ПОПЕРЕДЖЕННЯ*\nАвтоматичне приймання DCC до вашої домашньої теки\nможе бути небезпечним. Наприклад:\nхтось може надіслати вам .bash_profile"
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6367,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
@@ -6384,9 +6255,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/vi.po b/po/vi.po
index fef56ec3..e4dbfa79 100644
--- a/po/vi.po
+++ b/po/vi.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: Vietnamese (http://www.transifex.com/hexchat/hexchat/language/"
-"vi/)\n"
-"Language: vi\n"
+"Language-Team: Vietnamese (http://www.transifex.com/hexchat/hexchat/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\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 ""
-"• Chạy IRC với tư cách người chủ (root) là không an toàn. •\n"
-"Bạn nên tạo một tài khoản người dùng và sử dụng nó để đăng nhập.\n"
+msgstr "• Chạy IRC với tư cách người chủ (root) là không an toàn. •\nBạn nên tạo một tài khoản người dùng và sử dụng nó để đăng nhập.\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
@@ -396,9 +393,7 @@ msgstr "Các lệnh xác định bởi bổ sung:"
 
 #: src/common/outbound.c:2303
 msgid "Type /HELP <command> for more information, or /HELP -l"
-msgstr ""
-"Hãy gõ lệnh « /HELP <lệnh> » để xem thông tin thêm (help: trợ giúp), hay « /"
-"HELP -l »."
+msgstr "Hãy gõ lệnh « /HELP <lệnh> » để xem thông tin thêm (help: trợ giúp), hay « /HELP -l »."
 
 #: src/common/outbound.c:2390
 #, c-format
@@ -420,9 +415,7 @@ msgstr "Bổ sung đó từ chối bỏ nặp.\n"
 
 #: src/common/outbound.c:3932
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr ""
-"ADDBUTTON <tên> <hành_động>, _thêm_ một _cái nút_ bên dưới danh sách người "
-"dùng"
+msgstr "ADDBUTTON <tên> <hành_động>, _thêm_ một _cái nút_ bên dưới danh sách người dùng"
 
 #: src/common/outbound.c:3933
 msgid ""
@@ -455,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 <bộ_lọc> [<kiểu_đuổi>], _đuổi_ mọi người khớp với bộ lọc này ra kênh "
-"hiện tại. Cần quyền quan trị kệnh (chanop) để đuổi ra người nào đang trên "
-"kênh"
+msgstr "BAN <bộ_lọc> [<kiểu_đuổi>], _đuổi_ mọi người khớp với bộ lọc này ra kênh hiện tại. Cần quyền quan trị kệnh (chanop) để đuổi ra người nào đang trên kênh"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -466,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
@@ -483,22 +474,19 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY  [-s] <mã|ký_tự_đại_diện>, tìm thấy _quốc gia_, v.d. mã « au » = Úc"
+msgstr "COUNTRY  [-s] <mã|ký_tự_đại_diện>, tìm thấy _quốc gia_, v.d. mã « au » = Úc"
 
 #: src/common/outbound.c:3952
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr ""
-"CTCP <tên_hiệu> <tin_nhẳn>, gởi cho <tên_hiệu> <tin nhẳn> CTCP: hai tin nhẳn "
-"thường là VERSION (phiên bản) và USERINFO (thông tin người dùng)"
+msgstr "CTCP <tên_hiệu> <tin_nhẳn>, gởi cho <tên_hiệu> <tin nhẳn> CTCP: hai tin nhẳn thường là VERSION (phiên bản) và USERINFO (thông tin người dùng)"
 
 #: src/common/outbound.c:3954
 msgid ""
-"CYCLE [<channel>], parts the current or given channel and immediately rejoins"
-msgstr ""
-"CYCLE [<kênh>], rời kênh này hay kênh hiện tại rồi vào lại ngay (_quay lại_)"
+"CYCLE [<channel>], parts the current or given channel and immediately "
+"rejoins"
+msgstr "CYCLE [<kênh>], rời kênh này hay kênh hiện tại rồi vào lại ngay (_quay lại_)"
 
 #: src/common/outbound.c:3956
 msgid ""
@@ -511,59 +499,33 @@ 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 <tên_hiệu> \t\tchấp nhận tập tin đã đưa ra (_lấy_)\n"
-"DCC SEND [-maxcps=#] <tên_hiệu> [tập_tin]\n"
-"\t_gởi_ [tập tin] cho <tên hiệu> (max. : tối đa)\n"
-"DCC PSEND [-maxcps=#] <tên_hiệu> [tập_tin]\n"
-"\t_gởi_ [tập_tin] cho <tên_hiệu> bằng chế độ _bị động_\n"
-"DCC LIST   \t\t\t\thiển thị _danh sách_ DCC\n"
-"DCC CHAT <tên_hiệu> \tđưa ra _trò chuyện_ DCC với <tên hiệu>\n"
-"DCC PCHAT <tên_hiệu>\n"
-"\tđưa ra _trờ chuyện_ DCC với <tên_hiệu> bằng chế độ _bị động_\n"
-"DCC CLOSE <kiểu> <tên_hiệu> <tập_tin>   (_đóng_)      thí dụ:\n"
-"         </dcc close send nguyenvan tập_tin.tar.gz>\n"
-"\tgởi cho người nguyenvan tập_tin.tar.gz rồi đóng kết nối DCC"
+msgstr "\nDCC GET <tên_hiệu> \t\tchấp nhận tập tin đã đưa ra (_lấy_)\nDCC SEND [-maxcps=#] <tên_hiệu> [tập_tin]\n\t_gởi_ [tập tin] cho <tên hiệu> (max. : tối đa)\nDCC PSEND [-maxcps=#] <tên_hiệu> [tập_tin]\n\t_gởi_ [tập_tin] cho <tên_hiệu> bằng chế độ _bị động_\nDCC LIST   \t\t\t\thiển thị _danh sách_ DCC\nDCC CHAT <tên_hiệu> \tđưa ra _trò chuyện_ DCC với <tên hiệu>\nDCC PCHAT <tên_hiệu>\n\tđưa ra _trờ chuyện_ DCC với <tên_hiệu> bằng chế độ _bị động_\nDCC CLOSE <kiểu> <tên_hiệu> <tập_tin>   (_đóng_)      thí dụ:\n         </dcc close send nguyenvan tập_tin.tar.gz>\n\tgởi cho người nguyenvan tập_tin.tar.gz rồi đóng kết nối DCC"
 
 #: src/common/outbound.c:3968
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr ""
-"DEHOP <tên_hiệu>, bỏ ra <tên hiệu> trạng thái quản trị kênh nửa (chanhalf-"
-"op) trên kênh hiện tại (cần quyền quản trị kênh)\n"
-"[DE (bỏ ra) Half (nửa) OPerator (quản trị viên)]"
+msgstr "DEHOP <tên_hiệu>, bỏ ra <tên hiệu> trạng thái quản trị kênh nửa (chanhalf-op) trên kênh hiện tại (cần quyền quản trị kênh)\n[DE (bỏ ra) Half (nửa) OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
-msgstr ""
-"DELBUTTON <tên>, xóa bỏ cái nút <tên> ra dưới danh sách người dùng\n"
-"[DELete (xóa bỏ) BUTTON (nút)]"
+msgstr "DELBUTTON <tên>, xóa bỏ cái nút <tên> ra dưới danh sách người dùng\n[DELete (xóa bỏ) BUTTON (nút)]"
 
 #: src/common/outbound.c:3972
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <tên_hiệu>, bỏ ra <tên hiệu> trạng thái quản trị kênh (chanop) trên "
-"kênh hiện tại (cần quyền quản trị kênh (chanop))\n"
-"[DE (bỏ) OPerator (quản trị viên)]"
+msgstr "DEOP <tên_hiệu>, bỏ ra <tên hiệu> trạng thái quản trị kênh (chanop) trên kênh hiện tại (cần quyền quản trị kênh (chanop))\n[DE (bỏ) OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:3974
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEVOICE <tên_hiệu>, bỏ ra <tên hiệu> trạng thái tiếng nói trên kênh hiện tại "
-"(cần quyền quản trị kênh [chanop])\n"
-"[DE (bỏ) VOICE (tiếng nói)]"
+msgstr "DEVOICE <tên_hiệu>, bỏ ra <tên hiệu> trạng thái tiếng nói trên kênh hiện tại (cần quyền quản trị kênh [chanop])\n[DE (bỏ) VOICE (tiếng nói)]"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
-msgstr ""
-"DISCON, ngắt kết nối ra máy phục vụ\n"
-"[DISCONnect (ngắt kết nối)]"
+msgstr "DISCON, ngắt kết nối ra máy phục vụ\n[DISCONnect (ngắt kết nối)]"
 
 #: src/common/outbound.c:3976
 msgid "DNS <nick|host|ip>, Resolves an IP or hostname"
@@ -575,48 +537,31 @@ msgstr ""
 
 #: src/common/outbound.c:3978
 msgid "ECHO <text>, Prints text locally"
-msgstr ""
-"ECHO <đoạn>, in ra <đoạn> một cách địa phương\n"
-"[ECHO (vọng, phản hồi)]"
+msgstr "ECHO <đoạn>, in ra <đoạn> một cách địa phương\n[ECHO (vọng, phản hồi)]"
 
 #: src/common/outbound.c:3981
 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] <lệnh>, chạy <lệnh>. Nếu thêm cờ « -o », gởi dữ liệu xuất cho kênh "
-"hiện tại, nếu không thì in ra nó vào hộp văn bản hiện tại\n"
-"[EXECute (thực hiện)]"
+msgstr "EXEC [-o] <lệnh>, chạy <lệnh>. Nếu thêm cờ « -o », gởi dữ liệu xuất cho kênh hiện tại, nếu không thì in ra nó vào hộp văn bản hiện tại\n[EXECute (thực hiện)]"
 
 #: src/common/outbound.c:3983
 msgid "EXECCONT, sends the process SIGCONT"
-msgstr ""
-"EXECCONT, gởi tiến trình SIGCONT\n"
-"[EXECute (thực hiện) CONTinue (tiếp tục)\n"
-"SIGnal (tín hiệu) CONTinue (tiếp tục)]"
+msgstr "EXECCONT, gởi tiến trình SIGCONT\n[EXECute (thực hiện) CONTinue (tiếp tục)\nSIGnal (tín hiệu) CONTinue (tiếp tục)]"
 
 #: src/common/outbound.c:3986
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr ""
-"EXECKILL [-9], buộc kết thúc tiến trình đang chạy trong phiên làm việc hiện "
-"tại. Nếu thêm cờ « -9 », SIGKILL tiến trình này\n"
-"[EXECute (thực hiện) KILL (buộc kết thúc)\n"
-"SIGnal (tín hiệu) KILL (buộc kết thúc)]"
+msgstr "EXECKILL [-9], buộc kết thúc tiến trình đang chạy trong phiên làm việc hiện tại. Nếu thêm cờ « -9 », SIGKILL tiến trình này\n[EXECute (thực hiện) KILL (buộc kết thúc)\nSIGnal (tín hiệu) KILL (buộc kết thúc)]"
 
 #: src/common/outbound.c:3988
 msgid "EXECSTOP, sends the process SIGSTOP"
-msgstr ""
-"EXECSTOP, gởi tiến trình SIGSTOP\n"
-"[EXECute (thực hiện) STOP (dừng)\n"
-"SIGnal (tín hiệu) STOP (dừng)]"
+msgstr "EXECSTOP, gởi tiến trình SIGSTOP\n[EXECute (thực hiện) STOP (dừng)\nSIGnal (tín hiệu) STOP (dừng)]"
 
 #: src/common/outbound.c:3989
 msgid "EXECWRITE, sends data to the processes stdin"
-msgstr ""
-"EXECWRITE, gởi dữ liệu cho thiết bị nhập chuẩn của tiến trình\n"
-"[EXECute (thi hành) WRITE (ghi)]"
+msgstr "EXECWRITE, gởi dữ liệu cho thiết bị nhập chuẩn của tiến trình\n[EXECute (thi hành) WRITE (ghi)]"
 
 #: src/common/outbound.c:3993
 msgid "EXPORTCONF, exports HexChat settings"
@@ -624,15 +569,11 @@ msgstr ""
 
 #: src/common/outbound.c:3996
 msgid "FLUSHQ, flushes the current server's send queue"
-msgstr ""
-"FLUSHQ, xóa sạch hàng đợi gởi của máy phục vụ hiện tại\n"
-"[FLUSH (xoá sạch) Queue (hàng đời)]"
+msgstr "FLUSHQ, xóa sạch hàng đợi gởi của máy phục vụ hiện tại\n[FLUSH (xoá sạch) Queue (hàng đời)]"
 
 #: src/common/outbound.c:3998
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr ""
-"GATE <máy_phục_vụ> [<cổng>], sử dụng máy ủy nhiệm; <cổng> mặc định là 23\n"
-"[GATE (cổng)]"
+msgstr "GATE <máy_phục_vụ> [<cổng>], sử dụng máy ủy nhiệm; <cổng> mặc định là 23\n[GATE (cổng)]"
 
 #: src/common/outbound.c:4003
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
@@ -640,16 +581,11 @@ msgstr ""
 
 #: src/common/outbound.c:4008
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr ""
-"HOP <tên_hiệu>, đưa ra <tên hiệu> trạng thái quản trị kênh nửa (cần quyền "
-"quản trị kênh [chanop])\n"
-"[Half (nửa) OPerator (quản trị viên)]"
+msgstr "HOP <tên_hiệu>, đưa ra <tên hiệu> trạng thái quản trị kênh nửa (cần quyền quản trị kênh [chanop])\n[Half (nửa) OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:4009
 msgid "ID <password>, identifies yourself to nickserv"
-msgstr ""
-"ID <mật_khẩu>, nhận diện bạn với máy phục vụ tên hiệu\n"
-"[IDentify (nhận diện)]"
+msgstr "ID <mật_khẩu>, nhận diện bạn với máy phục vụ tên hiệu\n[IDentify (nhận diện)]"
 
 #: src/common/outbound.c:4011
 msgid ""
@@ -658,29 +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 <bộ_lọc> <kiểu...> <tùy_chọn...> »\n"
-"[IGNORE (bỏ qua)]\n"
-"    bộ lọc\t\tbộ lọc máy cần bỏ qua, v.d. « *!*@*.aol.com »\n"
-"    kiểu\t\tkiểu dữ liệu cần bỏ qua, giá trị là một hay tất cả của:\n"
-"     \tPRIV\t\tPRIVate (riêng)\n"
-"\tCHAN\tCHANnel (kênh)\n"
-"\tNOTI\tNOTIfy, NOTIce (thông báo)\n"
-"\tCTCP\n"
-"\tDCC \tDirect Chat Channel (kênh trò chuyện trực tiếp)\n"
-"\tINVI\t\tINVIte (mời)\n"
-"\tALL \t\t(tất cả)\n"
-"    tùy chọn\n"
-"\tNOSAVE \t(không lưu)\n"
-"\tQUIET \t(không hiện chi tiết)"
+msgstr "IGNORE <bộ_lọc> <kiểu...> <tùy_chọn...> »\n[IGNORE (bỏ qua)]\n    bộ lọc\t\tbộ lọc máy cần bỏ qua, v.d. « *!*@*.aol.com »\n    kiểu\t\tkiểu dữ liệu cần bỏ qua, giá trị là một hay tất cả của:\n     \tPRIV\t\tPRIVate (riêng)\n\tCHAN\tCHANnel (kênh)\n\tNOTI\tNOTIfy, NOTIce (thông báo)\n\tCTCP\n\tDCC \tDirect Chat Channel (kênh trò chuyện trực tiếp)\n\tINVI\t\tINVIte (mời)\n\tALL \t\t(tất cả)\n    tùy chọn\n\tNOSAVE \t(không lưu)\n\tQUIET \t(không hiện chi tiết)"
 
 #: src/common/outbound.c:4018
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr ""
-"INVITE <tên_hiệu> [<kênh>], _mời_ <tên hiệu> vào <kênh>; mặc định là kênh "
-"hiện tại (cần quyền quản trị kênh [chanop])"
+msgstr "INVITE <tên_hiệu> [<kênh>], _mời_ <tên hiệu> vào <kênh>; mặc định là kênh hiện tại (cần quyền quản trị kênh [chanop])"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -707,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
@@ -718,26 +637,17 @@ msgstr "LOAD [-e] <tập_tin>, _nạp_ một bổ sung hay tập lệnh"
 #: src/common/outbound.c:4037
 msgid ""
 "MDEHOP, Mass deop's all chanhalf-ops in the current channel (needs chanop)"
-msgstr ""
-"MDEHOP, bỏ trạng thái quản trị kênh nửa (chanhalf-op) ra mọi người trên kênh "
-"hiện tại (cần quyền quản trị kênh [chanop])\n"
-"[Mass (số nhiều) DE (bỏ) Half (nửa) OPerator (quản trị viên)]"
+msgstr "MDEHOP, bỏ trạng thái quản trị kênh nửa (chanhalf-op) ra mọi người trên kênh hiện tại (cần quyền quản trị kênh [chanop])\n[Mass (số nhiều) DE (bỏ) Half (nửa) OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:4039
 msgid "MDEOP, Mass deop's all chanops in the current channel (needs chanop)"
-msgstr ""
-"MDEOP, bỏ trạng thái quản trị kênh (chanop) ra mọi người trên kênh hiện tại "
-"(cần quyền quản trị kênh [chanop])\n"
-"[Mass (số nhiều) DE (bỏ) OPerator (quản trị viên)]"
+msgstr "MDEOP, bỏ trạng thái quản trị kênh (chanop) ra mọi người trên kênh hiện tại (cần quyền quản trị kênh [chanop])\n[Mass (số nhiều) DE (bỏ) OPerator (quản trị viên)]"
 
 #: 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 <hành_động>, gởi <hành động> cho kênh hiện tại (v.d. « /me jumps » gởi « "
-"<tên hiệu> nhảy »\n"
-"[ME (tôi, mình)]"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <hành_động>, gởi <hành động> cho kênh hiện tại (v.d. « /me jumps » gởi « <tên hiệu> nhảy »\n[ME (tôi, mình)]"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -746,22 +656,16 @@ msgstr ""
 #: src/common/outbound.c:4047
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr ""
-"MKICK, đá mọi người (trừ bạn) ra kênh hiện tại (cần quyền quản trị kênh "
-"[chanop])\n"
-"[Mass (số nhiều) KICK (đá)]"
+msgstr "MKICK, đá mọi người (trừ bạn) ra kênh hiện tại (cần quyền quản trị kênh [chanop])\n[Mass (số nhiều) KICK (đá)]"
 
 #: src/common/outbound.c:4050
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
-msgstr ""
-"MOP, đưa ra mọi người dùng có trạng thái quản trị kênh (chanop) trên kênh "
-"hiện tại (cần quyền quản trị kênh [chanop])\n"
-"[Mass (số nhiều) OPerator (quản trị viên)]"
+msgstr "MOP, đưa ra mọi người dùng có trạng thái quản trị kênh (chanop) trên kênh hiện tại (cần quyền quản trị kênh [chanop])\n[Mass (số nhiều) OPerator (quản trị viên)]"
 
 #: 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
@@ -770,21 +674,15 @@ msgstr ""
 
 #: src/common/outbound.c:4056
 msgid "NCTCP <nick> <message>, Sends a CTCP notice"
-msgstr ""
-"NCTCP <tên_hiệu> <tin_nhẳn>, gởi thông báo CTCP\n"
-"[Notice (thông báo) CTCP]"
+msgstr "NCTCP <tên_hiệu> <tin_nhẳn>, gởi thông báo CTCP\n[Notice (thông báo) CTCP]"
 
 #: src/common/outbound.c:4057
 msgid "NEWSERVER [-noconnect] <hostname> [<port>]"
-msgstr ""
-"NEWSERVER [-noconnect] <tên_máy> [<cổng>]\n"
-"[SERVER (máy phục vụ) NEW (mới); no connect (không kết nối)]"
+msgstr "NEWSERVER [-noconnect] <tên_máy> [<cổng>]\n[SERVER (máy phục vụ) NEW (mới); no connect (không kết nối)]"
 
 #: src/common/outbound.c:4058
 msgid "NICK <nickname>, sets your nick"
-msgstr ""
-"NICK <tên_hiệu>, đặt <tên hiệu> của bạn\n"
-"[NICKname (tên hiệu [viết tắt])]"
+msgstr "NICK <tên_hiệu>, đặt <tên hiệu> của bạn\n[NICKname (tên hiệu [viết tắt])]"
 
 #: src/common/outbound.c:4061
 msgid "NOTICE <nick/channel> <message>, sends a notice"
@@ -794,31 +692,20 @@ msgstr ""
 msgid ""
 "NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or "
 "adds someone to it"
-msgstr ""
-"NOTIFY [-n mạng1[,mạng2,...]] [<tên_hiệu>], hiển thị danh sách _thông báo_ "
-"của bạn, hoặc thêm <tên_hiệu> vào nó"
+msgstr "NOTIFY [-n mạng1[,mạng2,...]] [<tên_hiệu>], hiển thị danh sách _thông báo_ của bạn, hoặc thêm <tên_hiệu> vào nó"
 
 #: src/common/outbound.c:4065
 msgid "OP <nick>, gives chanop status to the nick (needs chanop)"
-msgstr ""
-"OP <tên_hiệu>, đưa ra <tên hiệu> có trạng thái quản trị kênh (chanop) (cần "
-"quyền quản trị kênh [chanop])\n"
-"[OPerator (quản trị viên)]"
+msgstr "OP <tên_hiệu>, đưa ra <tên hiệu> có trạng thái quản trị kênh (chanop) (cần quyền quản trị kênh [chanop])\n[OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:4067
 msgid ""
 "PART [<channel>] [<reason>], leaves the channel, by default the current one"
-msgstr ""
-"PART [<kênh>] [<lý_do>], rời <kênh> đi; mặc định là kênh hiện tại\n"
-"[dePART (rời đi)]"
+msgstr "PART [<kênh>] [<lý_do>], rời <kênh> đi; mặc định là kênh hiện tại\n[dePART (rời đi)]"
 
 #: src/common/outbound.c:4069
 msgid "PING <nick | channel>, CTCP pings nick or channel"
-msgstr ""
-"PING <tên_hiệu | kênh>, thực hiện tiến trình « ping » CTCP với <tên hiêu> "
-"hay <kênh>\n"
-"[Tiến trình ping gửi chỉ một gói tin để thử ra nếu kết nối hoạt động hay "
-"không; nó gửi lại đến khi bạn ngắt nó.]"
+msgstr "PING <tên_hiệu | kênh>, thực hiện tiến trình « ping » CTCP với <tên hiêu> hay <kênh>\n[Tiến trình ping gửi chỉ một gói tin để thử ra nếu kết nối hoạt động hay không; nó gửi lại đến khi bạn ngắt nó.]"
 
 #: src/common/outbound.c:4071
 msgid ""
@@ -834,37 +721,25 @@ msgstr ""
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
-msgstr ""
-"QUIT [<lý_do>], ngắt kết nối ra máy phục vụ hiện tại\n"
-"[QUIT (_thoát_)]"
+msgstr "QUIT [<lý_do>], ngắt kết nối ra máy phục vụ hiện tại\n[QUIT (_thoát_)]"
 
 #: src/common/outbound.c:4077
 msgid "QUOTE <text>, sends the text in raw form to the server"
-msgstr ""
-"QUOTE <chuỗi>, gởi <chuỗi> dạng thô cho máy phục vụ\n"
-"[QUOTE (trích dẫn)]"
+msgstr "QUOTE <chuỗi>, gởi <chuỗi> dạng thô cho máy phục vụ\n[QUOTE (trích dẫn)]"
 
 #: 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] [<máy>] [<cổng>] [<mật_khẩu>], có thể tái kết nối đến mấy "
-"phục vụ hiện tại khi chỉ đơn giản dùng « /RECONNECT », hoặc tái kết nối đến "
-"mọi máy phục vụ đang mở dùng « /RECONNECT ALL »\n"
-"[RECONNECT (tái kết nối); (phương pháp SSL bảo vệ dữ liệu cần truyền)]"
+msgstr "RECONNECT [-ssl] [<máy>] [<cổng>] [<mật_khẩu>], có thể tái kết nối đến mấy phục vụ hiện tại khi chỉ đơn giản dùng « /RECONNECT », hoặc tái kết nối đến mọi máy phục vụ đang mở dùng « /RECONNECT ALL »\n[RECONNECT (tái kết nối); (phương pháp SSL bảo vệ dữ liệu cần truyền)]"
 
 #: 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 [<máy>] [<cổng>] [<mật_khẩu>], có thể tái kết nối đến mấy phục vụ "
-"hiện tại chỉ đơn giản dùng « /RECONNECT », hoặc tái kết nối đến mọi máy phục "
-"vụ đang mở dùng « /RECONNECT ALL »\n"
-"[RECONNECT (tái kết nối); không có SSL bảo vệ dữ liệu)]"
+msgstr "RECONNECT [<máy>] [<cổng>] [<mật_khẩu>], có thể tái kết nối đến mấy phục vụ hiện tại chỉ đơn giản dùng « /RECONNECT », hoặc tái kết nối đến mọi máy phục vụ đang mở dùng « /RECONNECT ALL »\n[RECONNECT (tái kết nối); không có SSL bảo vệ dữ liệu)]"
 
 #: src/common/outbound.c:4085
 msgid ""
@@ -878,9 +753,7 @@ msgstr ""
 
 #: src/common/outbound.c:4088
 msgid "SAY <text>, sends the text to the object in the current window"
-msgstr ""
-"SAY <chuỗi>, gởi <chuỗi> cho đối tượng trong cửa sổ hiện tại\n"
-"[SAY (_nói_)]"
+msgstr "SAY <chuỗi>, gởi <chuỗi> cho đối tượng trong cửa sổ hiện tại\n[SAY (_nói_)]"
 
 #: src/common/outbound.c:4089
 msgid "SEND <nick> [<file>]"
@@ -888,16 +761,11 @@ msgstr "SEND <tên_hiệu> [<tập_tin>], _gởi_ <tập tin> cho <tên hiệu>"
 
 #: src/common/outbound.c:4092
 msgid "SERVCHAN [-ssl] <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN [-ssl] <máy> <cổng> <kênh>, kết nối đến <kênh> rồi vào nó\n"
-"[SERVer (máy phục vụ) CHANnel (kênh); phương pháp SSL bảo vệ dữ liệu cần "
-"truyền)]"
+msgstr "SERVCHAN [-ssl] <máy> <cổng> <kênh>, kết nối đến <kênh> rồi vào nó\n[SERVer (máy phục vụ) CHANnel (kênh); phương pháp SSL bảo vệ dữ liệu cần truyền)]"
 
 #: src/common/outbound.c:4095
 msgid "SERVCHAN <host> <port> <channel>, connects and joins a channel"
-msgstr ""
-"SERVCHAN <máy> <cổng> <kênh>, kết nối đến <kênh> rồi vào nó\n"
-"[SERVer (máy phục vụ) CHANnel (kênh); không có SSL bảo vệ dữ liệu)]"
+msgstr "SERVCHAN <máy> <cổng> <kênh>, kết nối đến <kênh> rồi vào nó\n[SERVer (máy phục vụ) CHANnel (kênh); không có SSL bảo vệ dữ liệu)]"
 
 #: src/common/outbound.c:4099
 msgid ""
@@ -909,10 +777,7 @@ msgstr ""
 msgid ""
 "SERVER <host> [<port>] [<password>], connects to a server, the default port "
 "is 6667"
-msgstr ""
-"SERVER <máy> [<cổng>] [<mật_khẩu>], kết nối đến <mấy> phục vụ ; cổng mặc "
-"định là số 6667\n"
-"[SERVER (máy phục vụ); không có SSL bảo vệ dữ liệu)]"
+msgstr "SERVER <máy> [<cổng>] [<mật_khẩu>], kết nối đến <mấy> phục vụ ; cổng mặc định là số 6667\n[SERVER (máy phục vụ); không có SSL bảo vệ dữ liệu)]"
 
 #: src/common/outbound.c:4104
 msgid "SET [-e] [-off|-on] [-quiet] <variable> [<value>]"
@@ -932,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 [<chủ_đè>], lập <chủ đề> nếu nó đã cho, nếu không thì hiển thị chủ đề "
-"hiện tại."
+"TOPIC [<topic>], sets the topic if one is given, else shows the current "
+"topic"
+msgstr "TOPIC [<chủ_đè>], lập <chủ đề> nếu nó đã cho, nếu không thì hiển thị chủ đề hiện tại."
 
 #: src/common/outbound.c:4112
 msgid ""
@@ -945,37 +809,24 @@ 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 <thời hạn> <tập tin 1> [<tập tin 2>] Chớp khay giữa hai biểu tượng.\n"
-"TRAY -f <tập tin>                  Đặt khay là biểu tượng riêng.\n"
-"TRAY -i <số>                    Chớp khay với biểu tượng bên trong.\n"
-"TRAY -t <chuỗi>                      Đặt mẹo công cụ của khay.\n"
-"TRAY -b <tựa> <chuỗi>              Đặt khung thoại của khay."
+msgstr "\nTRAY -f <thời hạn> <tập tin 1> [<tập tin 2>] Chớp khay giữa hai biểu tượng.\nTRAY -f <tập tin>                  Đặt khay là biểu tượng riêng.\nTRAY -i <số>                    Chớp khay với biểu tượng bên trong.\nTRAY -t <chuỗi>                      Đặt mẹo công cụ của khay.\nTRAY -b <tựa> <chuỗi>              Đặt khung thoại của khay."
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
-msgstr ""
-"UNBAN <bộ_lọc> [<bộ_lọc>...], bỏ trạng thái bị đuổi ra những bộ lọc đã ghi "
-"rõ\n"
-"[UN (hủy) BAN (đuổi)]"
+msgstr "UNBAN <bộ_lọc> [<bộ_lọc>...], bỏ trạng thái bị đuổi ra những bộ lọc đã ghi rõ\n[UN (hủy) BAN (đuổi)]"
 
 #: src/common/outbound.c:4120
 msgid "UNIGNORE <mask> [QUIET]"
-msgstr ""
-"UNIGNORE <bộ_lọc> [QUIET]\n"
-"[UN (hủy) IGNORE (bỏ qua); QUIET (không hiện chi tiết)]"
+msgstr "UNIGNORE <bộ_lọc> [QUIET]\n[UN (hủy) IGNORE (bỏ qua); QUIET (không hiện chi tiết)]"
 
 #: src/common/outbound.c:4121
 msgid "UNLOAD <name>, unloads a plugin or script"
-msgstr ""
-"UNLOAD <tên>, bỏ nạp một bổ sung hay văn lệnh\n"
-"[UN (hủy) LOAD (nạp)]"
+msgstr "UNLOAD <tên>, bỏ nạp một bổ sung hay văn lệnh\n[UN (hủy) LOAD (nạp)]"
 
 #: 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
@@ -984,31 +835,22 @@ msgstr "URL <url>, mở địa chỉ <url> trong trình duyệt Mạng của b�
 
 #: src/common/outbound.c:4126
 msgid ""
-"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel userlist"
-msgstr ""
-"USELECT [-a] [-s] <tên_hiệu1> <tên_hiệu2> v.v., tô sáng những tên hiệu này "
-"trong danh sách các người dùng trên kênh\n"
-"[User (người dùng) SELECT (lựa chọn)]"
+"USELECT [-a] [-s] <nick1> <nick2> etc, highlights nick(s) in channel "
+"userlist"
+msgstr "USELECT [-a] [-s] <tên_hiệu1> <tên_hiệu2> v.v., tô sáng những tên hiệu này trong danh sách các người dùng trên kênh\n[User (người dùng) SELECT (lựa chọn)]"
 
 #: src/common/outbound.c:4129
 msgid "VOICE <nick>, gives voice status to someone (needs chanop)"
-msgstr ""
-"VOICE <tên_hiệu>, đưa ra <tên hiệu> trạng thái _tiếng nói_ (cần quyền quản "
-"trị kênh [chanop])."
+msgstr "VOICE <tên_hiệu>, đưa ra <tên hiệu> trạng thái _tiếng nói_ (cần quyền quản trị kênh [chanop])."
 
 #: src/common/outbound.c:4131
 msgid "WALLCHAN <message>, writes the message to all channels"
-msgstr ""
-"WALLCHAN <thông_điệp>, ghi <thông_điệp> vào mọi kênh\n"
-"[Write (ghi) ALL (mọị) CHANnel (kênh)]"
+msgstr "WALLCHAN <thông_điệp>, ghi <thông_điệp> vào mọi kênh\n[Write (ghi) ALL (mọị) CHANnel (kênh)]"
 
 #: src/common/outbound.c:4133
 msgid ""
 "WALLCHOP <message>, sends the message to all chanops on the current channel"
-msgstr ""
-"WALLCHOP <thông_điệp>, gởi <thông_điệp> cho mọi quản trị kênh [chanop] trên "
-"kênh hiện tại\n"
-"[Write (ghi) ALL (mọi) CHannel (kênh) OPerator (quản trị viên)]"
+msgstr "WALLCHOP <thông_điệp>, gởi <thông_điệp> cho mọi quản trị kênh [chanop] trên kênh hiện tại\n[Write (ghi) ALL (mọi) CHannel (kênh) OPerator (quản trị viên)]"
 
 #: src/common/outbound.c:4166
 #, c-format
@@ -1024,9 +866,7 @@ msgstr "Cách sử dụng: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr ""
-"\n"
-"Không có trợ giúp về lệnh đó.\n"
+msgstr "\nKhông có trợ giúp về lệnh đó.\n"
 
 #: src/common/outbound.c:4204
 msgid "No such command.\n"
@@ -1095,9 +935,7 @@ msgstr "Bạn có chắc điều này là máy phục vụ và cổng có khả
 msgid ""
 "Cannot resolve hostname %s\n"
 "Check your IP Settings!\n"
-msgstr ""
-"Không tìm thấy tên máy %s.\n"
-"Hãy kiểm tra thiết lập IP của bạn.\n"
+msgstr "Không tìm thấy tên máy %s.\nHãy kiểm tra thiết lập IP của bạn.\n"
 
 #: src/common/server.c:881
 msgid "Proxy traversal failed.\n"
@@ -1113,8 +951,7 @@ msgstr "Đang quay lại đến mấy phục vụ kế tiếp trong %s...\n"
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
 "network %s."
-msgstr ""
-"Cảnh báo : không biết bộ ký tự « %s » nên không chuyển đổi cho mạng %s."
+msgstr "Cảnh báo : không biết bộ ký tự « %s » nên không chuyển đổi cho mạng %s."
 
 #: src/common/textevents.h:7
 msgid "%C18*%O$t%C18$1%O added to notify list."
@@ -1273,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
@@ -1307,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
@@ -1329,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
@@ -1342,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
@@ -1359,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
@@ -2135,9 +1976,7 @@ msgstr "Thời gian đuổi ra"
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr ""
-"Không thể đọc tập tin âm thanh:\n"
-"%s"
+msgstr "Không thể đọc tập tin âm thanh:\n%s"
 
 #: src/common/util.c:119
 msgid "Remote host closed socket"
@@ -3496,18 +3335,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr ""
-"Không thể truy cập tập tin: %s\n"
-"%s.\n"
-"Nên không thể tiếp tục lại."
+msgstr "Không thể truy cập tập tin: %s\n%s.\nNên không thể tiếp tục lại."
 
 #: src/fe-gtk/dccgui.c:536
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr ""
-"Tập tin nằm trong thư mục tải về là lớn hơn điều đã đưa ra nên không thể "
-"tiếp tục lại."
+msgstr "Tập tin nằm trong thư mục tải về là lớn hơn điều đã đưa ra nên không thể tiếp tục lại."
 
 #: src/fe-gtk/dccgui.c:540
 msgid "Cannot resume the same file from two people."
@@ -3653,10 +3487,7 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr ""
-"Lỗi mở phông chữ :\n"
-"\n"
-"%s"
+msgstr "Lỗi mở phông chữ :\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:715
 msgid "Search buffer is empty.\n"
@@ -3674,18 +3505,18 @@ msgstr "Hàng đợi gởi mạng: %d byte"
 
 #: 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 "
@@ -3696,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 ""
-"Lệnh « Chèn vào bộ đệm » chèn nội dung của « Dữ liệu 1 » vào trường nơi bạn "
-"đã bấm dãy phím đó, tại vị tri con trỏ hiện có"
+msgstr "Lệnh « Chèn vào bộ đệm » chèn nội dung của « Dữ liệu 1 » vào trường nơi bạn đã bấm dãy phím đó, tại vị tri con trỏ hiện có"
 
 #: 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 ""
-"Lệnh « Đặt bộ đệm » đặt trường nơi dãy phím được nhập thành nội dung của « "
-"Dữ liệu 1 »"
+"The Set Buffer command sets the entry where the key sequence was entered "
+"to the contents of Data 1"
+msgstr "Lệnh « Đặt bộ đệm » đặt trường nơi dãy phím được nhập thành nội dung của « Dữ liệu 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 ""
-"Lệnh « Lệnh cuối » đặt trường để chứa lệnh mới nhập — giống như khi bấm phím "
-"mũi tên lên trong trình bao"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "Lệnh « Lệnh cuối » đặt trường để chứa lệnh mới nhập — giống như khi bấm phím mũi tên lên trong trình bao"
 
 #: 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 ""
-"Lệnh « Lệnh kế » đặt trường chứa lệnh kế tiếp được nhập — giống như khi bấm "
-"phím mũi tên xuống trong trình bao"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "Lệnh « Lệnh kế » đặt trường chứa lệnh kế tiếp được nhập — giống như khi bấm phím mũi tên xuống trong trình bao"
 
 #: 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 ""
-"Lệnh này thay đổi đoạn chữ trong trường nhập để nhập xong tên hiệu hay lệnh "
-"chưa hoàn thành. Nếu « Dữ liệu 1 » đã được đặt, việc bám phím Tab hai lần "
-"trong chuỗi sẽ chọn tên hiệu trước, không phải tên hiệu sau."
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "Lệnh này thay đổi đoạn chữ trong trường nhập để nhập xong tên hiệu hay lệnh chưa hoàn thành. Nếu « Dữ liệu 1 » đã được đặt, việc bám phím Tab hai lần trong chuỗi sẽ chọn tên hiệu trước, không phải tên hiệu sau."
 
 #: 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 ""
-"Lệnh này cuộn lên và xuống danh sách các tên hiệu. Nếu « Dữ liệu 1 » được "
-"đặt thành gì, nó sẽ cuộn lên, nếu không thì nó sẽ cuộn xuống."
+"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 "Lệnh này cuộn lên và xuống danh sách các tên hiệu. Nếu « Dữ liệu 1 » được đặt thành gì, nó sẽ cuộn lên, nếu không thì nó sẽ cuộn xuống."
 
 #: 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 ""
-"Lệnh này so sánh từ mới nhập vào trường với danh sách thay thế, và thay thế "
-"nó nếu tìm thấy từ khớp"
+msgstr "Lệnh này so sánh từ mới nhập vào trường với danh sách thay thế, và thay thế nó nếu tìm thấy từ khớp"
 
 #: src/fe-gtk/fkeys.c:161
 msgid "This command moves the front tab left by one"
@@ -3929,9 +3745,7 @@ msgstr "Chưa đặt chủ đề"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr ""
-"Máy phục vụ này vẫn còn có %d kênh hay đối thoại được liên quan đến nó. Đóng "
-"hết không?"
+msgstr "Máy phục vụ này vẫn còn có %d kênh hay đối thoại được liên quan đến nó. Đóng hết không?"
 
 #: src/fe-gtk/maingui.c:1177
 msgid "Quit HexChat?"
@@ -4304,19 +4118,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr ""
-"Trả lời CTCP — mã đặc biệt:\n"
-"\n"
-"%d  \t\tdữ liệu (toàn bộ CTCP)\n"
-"%e  \t\ttên mạng hiện có\n"
-"%m  \t\tthông tin về máy\n"
-"%s  \t\ttên hiệu đã gởi CTCP\n"
-"%t  \t\tgiờ/ngày\n"
-"%2  \t\ttừ 2\n"
-"%3  \t\ttừ 3\n"
-"&2  \t\ttừ 2 đến kết thúc dòng\n"
-"&3  \t\ttừ 3 đến kết thúc dòng\n"
-"\n"
+msgstr "Trả lời CTCP — mã đặc biệt:\n\n%d  \t\tdữ liệu (toàn bộ CTCP)\n%e  \t\ttên mạng hiện có\n%m  \t\tthông tin về máy\n%s  \t\ttên hiệu đã gởi CTCP\n%t  \t\tgiờ/ngày\n%2  \t\ttừ 2\n%3  \t\ttừ 3\n&2  \t\ttừ 2 đến kết thúc dòng\n&3  \t\ttừ 3 đến kết thúc dòng\n\n"
 
 #: src/fe-gtk/menu.c:1519
 #, c-format
@@ -5895,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
@@ -5905,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
@@ -5957,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
@@ -6067,11 +5870,9 @@ msgstr "Lấy địa chỉ của tôi từ máy phục vụ 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 ""
-"Gọi địa chỉ thật của bạn từ máy phục vụ IRC. Hãy bật tùy chon này nếu bạn có "
-"địa chỉ số « 192.168.*.* »."
+"Asks the IRC server for your real address. Use this if you have a "
+"192.168.*.* address!"
+msgstr "Gọi địa chỉ thật của bạn từ máy phục vụ IRC. Hãy bật tùy chon này nếu bạn có địa chỉ số « 192.168.*.* »."
 
 #: src/fe-gtk/setup.c:640
 msgid "DCC IP address:"
@@ -6303,20 +6104,15 @@ msgstr "Loại"
 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 ""
-"Không thể đặt cây bên trên hay bên dưới.\n"
-"Trước hết hãy chuyển đổi sang bố trí <b>Thanh</b> trong trình đơn <b>Xem</b>."
+msgstr "Không thể đặt cây bên trên hay bên dưới.\nTrước hết hãy chuyển đổi sang bố trí <b>Thanh</b> trong trình đơn <b>Xem</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 ""
-"Một sô thiết lập đã được thay đổi nên cần phải khởi chạy lại để hoạt động "
-"đầy đủ."
+msgstr "Một sô thiết lập đã được thay đổi nên cần phải khởi chạy lại để hoạt động đầy đủ."
 
 #: src/fe-gtk/setup.c:2269
 msgid ""
@@ -6324,13 +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 ""
-"•• CẢNH BÁO ••\n"
-"Việc tự động chấp nhận DCC vào thư mục\n"
-"chính của bạn có lẽ nguy hiểm và cho phép\n"
-"người khác tấn công hệ thống của bạn.\n"
-"V.d. người khác có thể gởi cho bạn\n"
-"một « .bash_profile »."
+msgstr "•• CẢNH BÁO ••\nViệc tự động chấp nhận DCC vào thư mục\nchính của bạn có lẽ nguy hiểm và cho phép\nngười khác tấn công hệ thống của bạn.\nV.d. người khác có thể gởi cho bạn\nmột « .bash_profile »."
 
 #: src/fe-gtk/setup.c:2293
 #, c-format
@@ -6444,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
@@ -6461,9 +6251,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/wa.po b/po/wa.po
index c9cf2706..6266bb61 100644
--- a/po/wa.po
+++ b/po/wa.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:
 # Pablo Saratxaga <pablo@walon.org>, 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: Walloon (http://www.transifex.com/hexchat/hexchat/language/"
-"wa/)\n"
-"Language: wa\n"
+"Language-Team: Walloon (http://www.transifex.com/hexchat/hexchat/language/wa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: wa\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 ""
-"* C' est vormint biesse di s' raloyî a l' IRC dizo root!\n"
-"  Vos dvrîz fé on conte uzeu eyet l' eployî po vs elodjî.\n"
+msgstr "* C' est vormint biesse di s' raloyî a l' IRC dizo root!\n  Vos dvrîz fé on conte uzeu eyet l' eployî po vs elodjî.\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
@@ -6248,9 +6252,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ea01a1b..2d21713a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,12 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the hexchat package.
-#
+# 
 # Translators:
 # Aron Xu <happyaron.xu@gmail.com>, 2010
+# bababababanana1, 2014
 # Dalin <ayi880@hotmail.com>, 2003
 # Eleanor Chen <chenyueg@gmail.com>, 2010
 # highwind <highwindmx@126.com>, 2014
+# highwind <highwindmx@126.com>, 2014
 # bababababanana1, 2014
 # Michael Jay Tong <michaeljayt@gmail.com>, 2014,2016
 # Minor revision by Walte <webmaster@www.linuxfans.org>, 2003
@@ -15,21 +17,22 @@
 # Sarah Smith <sarahs@redhat.com>, 2003
 # SEPTEM <septeman@gmail.com>, 2006
 # Tong Hui <tonghuix@gmail.com>, 2014,2016
+# yich <yichangshengwu@hotmail.com>, 2018
+# Zhustec <zhustec@foxmail.com>, 2018
 # Zhuyuan Liu <gtkdict@yahoo.com.cn>, 2005
 # Zong Yaotang <zong@cosix.com.au>, 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-23 18:37+0000\n"
-"Last-Translator: TingPing <tingping@tingping.se>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/hexchat/hexchat/"
-"language/zh_CN/)\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2018-04-03 16:10-0400\n"
+"PO-Revision-Date: 2018-11-30 11:08+0000\n"
+"Last-Translator: yich <yichangshengwu@hotmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/hexchat/hexchat/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -48,17 +51,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"
@@ -75,7 +74,7 @@ msgstr "IM;聊天;"
 #: data/misc/io.github.Hexchat.desktop.in.in:8
 #: data/misc/io.github.Hexchat.ThemeManager.desktop.in:5
 msgid "hexchat"
-msgstr ""
+msgstr "hexchat"
 
 #: data/misc/io.github.Hexchat.desktop.in.in:19
 msgid "Open Safe Mode"
@@ -278,7 +277,7 @@ msgstr "输入踢出 %s 的原因:"
 
 #: src/common/hexchat.c:938
 msgid "Send File"
-msgstr ""
+msgstr "发送文件"
 
 #: src/common/hexchat.c:939
 msgid "Dialog"
@@ -315,9 +314,7 @@ msgstr "你没有 %s 的写入权限。此会话中的信息不可保存。"
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* 不要以 root 身份执行 IRC！您应该\n"
-"  使用普通用户帐号来登录。\n"
+msgstr "* 不要以 root 身份执行 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
@@ -469,9 +466,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,7 +474,8 @@ msgstr "CHANOPT [-quiet] <变量名> [<值>]"
 
 #: 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 "CHARSET [<编码字符集>]，获取及设置当前连接所使用的编码字符集"
 
 #: src/common/outbound.c:3946
@@ -492,26 +488,22 @@ msgstr "CLEAR [ALL|HISTORY|[-]<amount>]，清空当前的窗口文本或命令�
 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 ""
-"CLOSE【关闭】 [-m]，关闭当前选项卡，关闭当前的唯一活动窗口，或者是关闭所有查"
-"询的 -m 选项。"
+msgstr "CLOSE【关闭】 [-m]，关闭当前选项卡，关闭当前的唯一活动窗口，或者是关闭所有查询的 -m 选项。"
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <国家地区代码|通配符>，查看国家代码对应的国家名，比如 :cn = 中国"
+msgstr "COUNTRY [-s] <国家地区代码|通配符>，查看国家代码对应的国家名，比如 :cn = 中国"
 
 #: 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,25 +517,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 <昵称>                     - 接收昵称为 <昵称> 者使用 DCC 发送给\n"
-"                                      您的文件\n"
-"DCC SEND [-maxcps=#] <昵称> [文件] - 使用 DCC 发送文件给 <昵称>\n"
-"DCC PSEND [-maxcps=#] <昵称> [文件] - 使用被动模式 DCC 发送文件给 <昵称>\n"
-"DCC LIST                           - 显示 DCC 列表\n"
-"DCC CHAT <昵称>                    - 与 <昵称> 进行 DCC 直连聊天\n"
-"DCC PCHAT <昵称>                    - 使用 DCC 被动模式与 <昵称> 聊天\n"
-"DCC CLOSE <类型> <昵称> <文件>         例如:\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <昵称>                     - 接收昵称为 <昵称> 者使用 DCC 发送给\n                                      您的文件\nDCC SEND [-maxcps=#] <昵称> [文件] - 使用 DCC 发送文件给 <昵称>\nDCC PSEND [-maxcps=#] <昵称> [文件] - 使用被动模式 DCC 发送文件给 <昵称>\nDCC LIST                           - 显示 DCC 列表\nDCC CHAT <昵称>                    - 与 <昵称> 进行 DCC 直连聊天\nDCC PCHAT <昵称>                    - 使用 DCC 被动模式与 <昵称> 聊天\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"
@@ -553,17 +533,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"
@@ -585,9 +561,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"
@@ -597,9 +571,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"
@@ -640,20 +612,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，INVI，ALL\n"
-"    选项 - 忽略选项：NOSAVE，QUIET"
+msgstr "IGNORE <掩码> <类型..> <选项..>\n    掩码 - 要忽略的主机掩码，比如 *!*@*.aol.com\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"
@@ -668,9 +633,7 @@ msgstr "KICK <昵称> [原因]，将该昵称从当前频道中踢出 (需要具
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr ""
-"KICKBAN <昵称> [原因]，把 <昵称> 踢出当前频道，并禁止再次进入(需要具有频道管"
-"理员身份)"
+msgstr "KICKBAN <昵称> [原因]，把 <昵称> 踢出当前频道，并禁止再次进入(需要具有频道管理员身份)"
 
 #: src/common/outbound.c:4026
 msgid "LAGCHECK, forces a new lag check"
@@ -682,14 +645,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"
@@ -706,11 +663,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 <动作>，向当前频道中发送一个动作(动作使用英语的第 3 人称陈述，例如 /me 跳"
-"一下)"
+"ME <action>, sends the action to the current channel (actions are written in"
+" the 3rd person, like /me jumps)"
+msgstr "ME <动作>，向当前频道中发送一个动作(动作使用英语的第 3 人称陈述，例如 /me 跳一下)"
 
 #: src/common/outbound.c:4045
 msgid "MHOP, Mass hop's all users in the current channel (needs chanop)"
@@ -727,11 +682,9 @@ 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"
-msgstr ""
-"MSG <昵称> <消息>，发送私信, 昵称为 \".\" 发送给上一个昵称的用户，或者以 \"="
-"\" 开头发送 dcc 聊天"
+"MSG <nick> <message>, sends a private message, message \".\" to send to last"
+" nick or prefix with \"=\" for dcc chat"
+msgstr "MSG <昵称> <消息>，发送私信, 昵称为 \".\" 发送给上一个昵称的用户，或者以 \"=\" 开头发送 dcc 聊天"
 
 #: src/common/outbound.c:4054
 msgid "NAMES [channel], Lists the nicks on the channel"
@@ -757,8 +710,7 @@ msgstr "NOTICE <昵称/频道> <消息>，发送一条通知"
 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)"
@@ -783,9 +735,7 @@ msgstr "QUERY [-nofocus] <昵称> [消息]，打开新私聊窗口，选择性�
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr ""
-"QUIET <掩码> [<静默类型>]，在服务器支持的情况下将当前服务器中满足掩码的每个人"
-"设为静默状态。"
+msgstr "QUIET <掩码> [<静默类型>]，在服务器支持的情况下将当前服务器中满足掩码的每个人设为静默状态。"
 
 #: src/common/outbound.c:4075
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -797,28 +747,23 @@ 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 ""
 "RECV <text>, send raw data to HexChat, as if it was received from the IRC "
 "server"
-msgstr ""
-"RECV <text>，向 HexChat 发送原始数据，就好像从 IRC 服务器上接收到的一样"
+msgstr "RECV <text>，向 HexChat 发送原始数据，就好像从 IRC 服务器上接收到的一样"
 
 #: src/common/outbound.c:4086
 msgid "RELOAD <name>, reloads a plugin or script"
@@ -844,9 +789,7 @@ msgstr "SERVCHAN <主机> <端口号> <频道>，连接服务器并进入某频�
 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 ""
@@ -872,7 +815,8 @@ msgstr "SETTEXT <新文本>，替换输入框中的文本"
 
 #: 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
@@ -883,13 +827,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>] 在托盘中使用两个图标进行闪烁。\n"
-"TRAY -f <文件名>                  设置托盘为固定图标。\n"
-"TRAY -i <数字>                    使用内部图标闪烁托盘。\n"
-"TRAY -t <文本>                      设置托盘工具提示。\n"
-"TRAY -b <标题> <文本>              设置托盘气泡通知。"
+msgstr "\nTRAY -f <时间> <文件1> [<文件2>] 在托盘中使用两个图标进行闪烁。\nTRAY -f <文件名>                  设置托盘为固定图标。\nTRAY -i <数字>                    使用内部图标闪烁托盘。\nTRAY -t <文本>                      设置托盘工具提示。\nTRAY -b <标题> <文本>              设置托盘气泡通知。"
 
 #: src/common/outbound.c:4119
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -905,10 +843,9 @@ msgstr "UNLOAD <名称>，卸载插件或脚本"
 
 #: src/common/outbound.c:4123
 msgid ""
-"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the "
-"server."
-msgstr ""
-"UNQUIET <掩码> [<掩码>...]，在服务器支持测情况下解除指定掩码的静默状态。"
+"UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
+" server."
+msgstr "UNQUIET <掩码> [<掩码>...]，在服务器支持测情况下解除指定掩码的静默状态。"
 
 #: src/common/outbound.c:4124
 msgid "URL <url>, opens a URL in your browser"
@@ -916,7 +853,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 "USELECT [-a] [-s] <昵称1> <昵称2>...，在频道用户列表中以高亮度标示昵称"
 
 #: src/common/outbound.c:4129
@@ -946,9 +884,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"
@@ -1017,9 +953,7 @@ msgstr "您确信该服务器的此端口支持 SSL？\n"
 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"
@@ -1194,7 +1128,8 @@ msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr "%C23*%O$t 中止了与 %C18$1%O 的 DCC 直连聊天。"
 
 #: 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 "%C24*%O$t 已与 %C18$1%C %C30[%C24$2%C30]%O 建立了 DCC 直连聊天连接"
 
 #: src/common/textevents.h:148
@@ -1228,11 +1163,9 @@ 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"
-msgstr ""
-"%C20*%O$t 收到来自 %C18$1%O 的有错的 DCC 请求。$a010%C23*%O$t 数据包内容:"
-"%C23$2%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O"
+msgstr "%C20*%O$t 收到来自 %C18$1%O 的有错的 DCC 请求。$a010%C23*%O$t 数据包内容:%C23$2%O"
 
 #: src/common/textevents.h:172
 msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
@@ -1249,12 +1182,11 @@ msgstr "%C23*%O$t 到 %C18$1%O 的 DCC RECV 连接 '%C23$2%O'  已中断。"
 #: src/common/textevents.h:181
 msgid ""
 "%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
-msgstr ""
-"%C24*%O$t 来自 %C18$3%O DCC RECV 连接 '%C23$1%O'  完成 %C30[%C24$4%O cps"
-"%C30]%O"
+msgstr "%C24*%O$t 来自 %C18$3%O DCC RECV 连接 '%C23$1%O'  完成 %C30[%C24$4%O cps%C30]%O"
 
 #: 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 "%C24*%O$t 建立与 %C18$1 的 DCC RECV 连接 %C30[%O%C24$2%C30]%O"
 
 #: src/common/textevents.h:187
@@ -1267,7 +1199,8 @@ msgstr "%C20*%O$t DCC RECV：无法打开 %C23$1%C 进行写入(%C20$2%O)。 "
 
 #: 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 "%C23*%O$t 文件 '%C24$1%C' 已存在，将把文件另存为 '%C23$2%O'。"
 
 #: src/common/textevents.h:196
@@ -1281,12 +1214,11 @@ msgstr "%C23*%O$t 到 %C18$1%O 的 DCC SEND 连接 '%C23$2%C' 已中断。"
 #: src/common/textevents.h:202
 msgid ""
 "%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
-msgstr ""
-"%C24*%O$t 到 %C18$2%C 的 DCC SEND 连接 '%C23$1%C'  完成 %C30[%C24$3%C cps"
-"%C30]%O"
+msgstr "%C24*%O$t 到 %C18$2%C 的 DCC SEND 连接 '%C23$1%C'  完成 %C30[%C24$3%C cps%C30]%O"
 
 #: 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 "%C24*%O$t 已建立到 %C18$1 %C30[%O%C24$2%C30]%O 的 DCC SEND 连接"
 
 #: src/common/textevents.h:208
@@ -1520,8 +1452,7 @@ msgstr "%C23*%O$t%C28[%C18$1%C28]%O 发呆 %C23$2%O，登录时间：%C23$3%O"
 #: src/common/textevents.h:430
 msgid ""
 "%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
-msgstr ""
-"%C23*%O$t%C28[%C18$1%C28]%O 真实主机: %C23$2%O，真实 IP: %C30[%C23$3%C30]%O"
+msgstr "%C23*%O$t%C28[%C18$1%C28]%O 真实主机: %C23$2%O，真实 IP: %C30[%C23$3%C30]%O"
 
 #: src/common/textevents.h:439
 msgid "%C19*%O$tNow talking on %C22$2%O"
@@ -1566,9 +1497,7 @@ msgstr "**** 聊天记录于 %s 开始记录\n"
 msgid ""
 "* Can't open log file(s) for writing. Check the\n"
 "permissions on %s"
-msgstr ""
-"* 无法以可写入方式打开日志(log)文件。\n"
-"请检查 %s 的权限"
+msgstr "* 无法以可写入方式打开日志(log)文件。\n请检查 %s 的权限"
 
 #: src/common/text.c:960
 msgid "Left message"
@@ -2065,9 +1994,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"
@@ -3310,7 +3237,7 @@ msgstr "您只能在一个频道的标签页下打开屏蔽列表窗口。"
 #: src/fe-gtk/banlist.c:808
 #, c-format
 msgid "Ban List (%s) - %s"
-msgstr ""
+msgstr "屏蔽列表 (%s) - %s"
 
 #: src/fe-gtk/banlist.c:843 src/fe-gtk/notifygui.c:429
 msgid "Remove"
@@ -3348,7 +3275,7 @@ msgstr "复制频道主题(_T)"
 #: src/fe-gtk/chanlist.c:720
 #, c-format
 msgid "Channel List (%s) - %s"
-msgstr ""
+msgstr "频道列表 (%s) - %s"
 
 #: src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3426,10 +3353,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 ""
@@ -3444,7 +3368,7 @@ msgstr "不能续传来自两个人的同一文件"
 #: src/fe-gtk/dccgui.c:803
 #, c-format
 msgid "Uploads and Downloads - %s"
-msgstr ""
+msgstr "上传和下载 - %s"
 
 #: src/fe-gtk/dccgui.c:820 src/fe-gtk/dccgui.c:1063 src/fe-gtk/notifygui.c:124
 msgid "Status"
@@ -3501,7 +3425,7 @@ msgstr "打开目录..."
 #: src/fe-gtk/dccgui.c:1050
 #, c-format
 msgid "DCC Chat List - %s"
-msgstr ""
+msgstr "DCC 聊天列表 - %s"
 
 #: src/fe-gtk/dccgui.c:1065
 msgid "Recv"
@@ -3581,10 +3505,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"
@@ -3602,31 +3523,23 @@ 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 \\\\"
-msgstr ""
-"“Run Command” 会执行 Data 1 中的数据，就如同您是在输入按键序列后出现的输入框"
-"中键入这些数据一样。这样，它就会包含文本 (这些文本会被发送给频道或某人)、命令"
-"或用户命令。执行时，Data 1 中所有“\\n”字符 被用来分隔命令，因此您可以执行不止"
-"一个命令。如果您想在执行的文本中包含字符“\\”，您应该输入“\\\\”"
+"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 "“Run Command” 会执行 Data 1 中的数据，就如同您是在输入按键序列后出现的输入框中键入这些数据一样。这样，它就会包含文本 (这些文本会被发送给频道或某人)、命令或用户命令。执行时，Data 1 中所有“\\n”字符 被用来分隔命令，因此您可以执行不止一个命令。如果您想在执行的文本中包含字符“\\”，您应该输入“\\\\”"
 
 #: 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 "
 "other data)"
-msgstr ""
-"“Change Page”命令在您笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签"
-"页。如果 Data 2 被设置成任意值，切换标签页的数将相对于当前位置。Data 1 设置为"
-"自动将自动切换到最近最重要的活动中(优先处理最近请求，其次显示高亮频道，再次显"
-"示有对话的频道，最后显示其他 data 的频道)"
+msgstr "“Change Page”命令在您笔记本中的标签页间切换。将 Data 1 设置成您要切换的标签页。如果 Data 2 被设置成任意值，切换标签页的数将相对于当前位置。Data 1 设置为自动将自动切换到最近最重要的活动中(优先处理最近请求，其次显示高亮频道，再次显示有对话的频道，最后显示其他 data 的频道)"
 
 #: src/fe-gtk/fkeys.c:145
 msgid ""
@@ -3636,47 +3549,40 @@ 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."
-msgstr ""
-"“Scroll Page” 命令在文本窗口组件中上下滚动一页或一行。设置 Data 1 为 Top、"
-"Bottom、Up、DOWN、+1 或 -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 "“Scroll Page” 命令在文本窗口组件中上下滚动一页或一行。设置 Data 1 为 Top、Bottom、Up、DOWN、+1 或 -1。"
 
 #: 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” 命令把接收到按键序列后的输入区域设置为数据 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 ""
-"“Last Command” 命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "“Last Command” 命令把输入区域设为前一个命令 - 和在终端中按向上箭头效果相同"
 
 #: 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” 命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "“Next Command” 命令把输入区域设为下一个命令 - 和在终端中按向下箭头效果相同"
 
 #: 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 被设"
-"置，那么，按两次 Tab 键会选择上一次使用的昵称，而非下一个昵称"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "该命令改变输入区域中的文本，补全未输入完毕的用户昵称或命令。如果数据 1 被设置，那么，按两次 Tab 键会选择上一次使用的昵称，而非下一个昵称"
 
 #: 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 ""
@@ -3715,7 +3621,7 @@ msgstr "选择一行查看对应动作的信息。"
 #: src/fe-gtk/fkeys.c:812
 #, c-format
 msgid "Keyboard Shortcuts - %s"
-msgstr ""
+msgstr "键盘快捷键 - %s"
 
 #: src/fe-gtk/gtkutil.c:130
 msgid "Cannot write to that file."
@@ -3761,7 +3667,7 @@ msgstr "输入要忽略的掩码："
 #: src/fe-gtk/ignoregui.c:350
 #, c-format
 msgid "Ignore list - %s"
-msgstr ""
+msgstr "忽略列表 - %s"
 
 #: src/fe-gtk/ignoregui.c:360
 msgid "Ignore Stats:"
@@ -3798,7 +3704,7 @@ msgstr "频道名称过短，请重新尝试。"
 #: src/fe-gtk/joind.c:133
 #, c-format
 msgid "Connection Complete - %s"
-msgstr ""
+msgstr "连接完成 - %s"
 
 #: src/fe-gtk/joind.c:162
 #, c-format
@@ -3809,7 +3715,7 @@ msgstr "成功建立到 %s 的连接。"
 msgid ""
 "In the server list window, no channel (chat room) has been entered to be "
 "automatically joined for this network."
-msgstr ""
+msgstr "在服务器列表窗口，没有添加自动进入的频道(聊天室)。"
 
 #: src/fe-gtk/joind.c:177
 msgid "What would you like to do next?"
@@ -3829,11 +3735,11 @@ msgstr "如果您知道想要进入的频道的名称，请在此输入。"
 
 #: src/fe-gtk/joind.c:210
 msgid "O_pen the channel list."
-msgstr ""
+msgstr "打开频道列表(_P)。"
 
 #: src/fe-gtk/joind.c:216
 msgid "Retrieving the channel list may take a minute or two."
-msgstr ""
+msgstr "取回频道列表可能需要一两分钟。"
 
 #: src/fe-gtk/joind.c:223
 msgid "_Always show this dialog after connecting."
@@ -4088,9 +3994,7 @@ msgstr "已选择 %d 个昵称。"
 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"
@@ -4127,12 +4031,12 @@ msgstr "自动连接(_A)"
 #: src/fe-gtk/menu.c:1138
 #, c-format
 msgid "User menu - %s"
-msgstr ""
+msgstr "用户菜单 - %s"
 
 #. sep
 #: src/fe-gtk/menu.c:1147
 msgid "Edit This Menu"
-msgstr ""
+msgstr "编辑这个菜单"
 
 #: src/fe-gtk/menu.c:1293
 msgid "Marker line disabled."
@@ -4160,7 +4064,7 @@ msgstr "标记线状态未知。"
 
 #: src/fe-gtk/menu.c:1396
 msgid "Retrieve channel list"
-msgstr ""
+msgstr "获取频道列表"
 
 #: src/fe-gtk/menu.c:1462
 msgid " has been build without plugin support."
@@ -4186,25 +4090,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 ""
@@ -4219,18 +4105,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"用户列表按钮 - 特殊代码：\n"
-"\n"
-"%a  =  所有选取的用户\n"
-"%c  =  当前频道\n"
-"%e  =  当前网络名称\n"
-"%h  =  选取昵称的主机名\n"
-"%m  =  机器信息\n"
-"%n  =  您的昵称\n"
-"%s  =  选取的昵称\n"
-"%t  =  时间/日期\n"
-"%u = 选取的用户账号"
+msgstr "用户列表按钮 - 特殊代码：\n\n%a  =  所有选取的用户\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  选取昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n%u = 选取的用户账号"
 
 #: src/fe-gtk/menu.c:1497
 msgid ""
@@ -4245,18 +4120,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr ""
-"对话按钮 - 特殊代码:\n"
-"\n"
-"%a  =  所有选取的昵称\n"
-"%c  =  当前频道\n"
-"%e  =  当前网络名称\n"
-"%h  =  所选取昵称的主机名\n"
-"%m  =  机器信息\n"
-"%n  =  您的昵称\n"
-"%s  =  选取的昵称\n"
-"%t  =  时间/日期\n"
-"%u = 选取的用户账号"
+msgstr "对话按钮 - 特殊代码:\n\n%a  =  所有选取的昵称\n%c  =  当前频道\n%e  =  当前网络名称\n%h  =  所选取昵称的主机名\n%m  =  机器信息\n%n  =  您的昵称\n%s  =  选取的昵称\n%t  =  时间/日期\n%u = 选取的用户账号"
 
 #: src/fe-gtk/menu.c:1508
 msgid ""
@@ -4272,19 +4136,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
@@ -4296,29 +4148,22 @@ msgid ""
 "Putting a ! in front of the command\n"
 "indicates it should be sent to a\n"
 "shell instead of HexChat"
-msgstr ""
-"URL 处理程序 - 特殊代码:\n"
-"\n"
-"%s  =  URL 字符串\n"
-"\n"
-"在命令前加一个 “!” 表示\n"
-"该命令应被发送到 shell 而\n"
-"非 HexChat"
+msgstr "URL 处理程序 - 特殊代码:\n\n%s  =  URL 字符串\n\n在命令前加一个 “!” 表示\n该命令应被发送到 shell 而\n非 HexChat"
 
 #: src/fe-gtk/menu.c:1529
 #, c-format
 msgid "User Defined Commands - %s"
-msgstr ""
+msgstr "用户定义命令 - %s"
 
 #: src/fe-gtk/menu.c:1538
 #, c-format
 msgid "Userlist Popup menu -  %s"
-msgstr ""
+msgstr "用户列表弹出菜单 -  %s"
 
 #: src/fe-gtk/menu.c:1546
 #, c-format
 msgid "Replace - %s"
-msgstr ""
+msgstr "替换 - %s"
 
 #: src/fe-gtk/menu.c:1547
 msgid "Replace with"
@@ -4327,22 +4172,22 @@ msgstr "使用以下替换"
 #: src/fe-gtk/menu.c:1554
 #, c-format
 msgid "URL Handlers - %s"
-msgstr ""
+msgstr "URL 处理程序 - %s"
 
 #: src/fe-gtk/menu.c:1574
 #, c-format
 msgid "Userlist buttons - %s"
-msgstr ""
+msgstr "用户列表按钮 - %s"
 
 #: src/fe-gtk/menu.c:1582
 #, c-format
 msgid "Dialog buttons - %s"
-msgstr ""
+msgstr "对话框按钮 - %s"
 
 #: src/fe-gtk/menu.c:1591
 #, c-format
 msgid "CTCP Replies - %s"
-msgstr ""
+msgstr "CTCP 回应 - %s"
 
 #: src/fe-gtk/menu.c:1757
 msgid "He_xChat"
@@ -4350,7 +4195,7 @@ msgstr "HexChat(_X)"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr ""
+msgstr "网络列表(_S)"
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
@@ -4358,23 +4203,23 @@ msgstr "添加(_N)"
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr ""
+msgstr "服务器标签页"
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr ""
+msgstr "频道标签页"
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr ""
+msgstr "服务器窗口"
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr ""
+msgstr "频道窗口"
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr ""
+msgstr "载入插件或脚本(_L)"
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
@@ -4399,7 +4244,7 @@ msgstr "用户菜单(_U)"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr ""
+msgstr "用户列表按钮(_S)"
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4447,11 +4292,11 @@ msgstr "重新连接(_R)"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr ""
+msgstr "进入频道(_J)"
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr ""
+msgstr "频道列表(_L)"
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
@@ -4472,39 +4317,39 @@ msgstr "首选项(_P)"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr ""
+msgstr "自动替换"
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
-msgstr ""
+msgstr "CTCP 回应"
 
 #: src/fe-gtk/menu.c:1817
 msgid "Dialog Buttons"
-msgstr ""
+msgstr "对话框按钮"
 
 #: src/fe-gtk/menu.c:1818
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "键盘快捷键"
 
 #: src/fe-gtk/menu.c:1819
 msgid "Text Events"
-msgstr ""
+msgstr "文本事件"
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr ""
+msgstr "URL 处理程序"
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
-msgstr ""
+msgstr "用户命令"
 
 #: src/fe-gtk/menu.c:1822
 msgid "User List Buttons"
-msgstr ""
+msgstr "用户列表按钮"
 
 #: src/fe-gtk/menu.c:1823
 msgid "User List Popup"
-msgstr ""
+msgstr "用户列表弹出菜单"
 
 #. 52
 #: src/fe-gtk/menu.c:1825
@@ -4513,36 +4358,36 @@ msgstr "窗口(_W)"
 
 #: src/fe-gtk/menu.c:1826
 msgid "_Ban List"
-msgstr ""
+msgstr "屏蔽列表(_B)"
 
 #: src/fe-gtk/menu.c:1828
 msgid "Direct Chat"
-msgstr ""
+msgstr "直连聊天"
 
 #: src/fe-gtk/menu.c:1829
 msgid "File _Transfers"
-msgstr ""
+msgstr "文件传输(_T)"
 
 #: src/fe-gtk/menu.c:1830
 msgid "Friends List"
-msgstr ""
+msgstr "好友列表"
 
 #: src/fe-gtk/menu.c:1831
 msgid "Ignore List"
-msgstr ""
+msgstr "忽略列表"
 
 #: src/fe-gtk/menu.c:1832
 msgid "_Plugins and Scripts"
-msgstr ""
+msgstr "插件和脚本(_P)"
 
 #: src/fe-gtk/menu.c:1833
 msgid "_Raw Log"
-msgstr ""
+msgstr "原始记录(_R)"
 
 #. 61
 #: src/fe-gtk/menu.c:1834
 msgid "_URL Grabber"
-msgstr ""
+msgstr "URL 抓取程序(_U)"
 
 #: src/fe-gtk/menu.c:1836
 msgid "Reset Marker Line"
@@ -4562,7 +4407,7 @@ msgstr "清空文本(_L)"
 
 #: src/fe-gtk/menu.c:1840
 msgid "Save Text"
-msgstr ""
+msgstr "保存文本"
 
 #: src/fe-gtk/menu.c:1842
 msgid "Search"
@@ -4570,7 +4415,7 @@ msgstr "搜索"
 
 #: src/fe-gtk/menu.c:1843
 msgid "Search Text"
-msgstr ""
+msgstr "搜索文本"
 
 #: src/fe-gtk/menu.c:1844
 msgid "Search Next"
@@ -4646,7 +4491,7 @@ msgstr "此处允许使用逗号分隔多个网络。"
 #: src/fe-gtk/notifygui.c:409
 #, c-format
 msgid "Friends List - %s"
-msgstr ""
+msgstr "好友列表 - %s"
 
 #: src/fe-gtk/notifygui.c:433
 msgid "Open Dialog"
@@ -4727,7 +4572,7 @@ msgstr "返回(_B)"
 #: src/fe-gtk/plugin-tray.c:634
 #, c-format
 msgid "Highlighted message from: %s (%s) - %s"
-msgstr ""
+msgstr "高亮消息来自：%s（%s）-%s"
 
 #: src/fe-gtk/plugin-tray.c:637
 #, c-format
@@ -4737,7 +4582,7 @@ msgstr ""
 #: src/fe-gtk/plugin-tray.c:657
 #, c-format
 msgid "Channel message from: %s (%s) - %s"
-msgstr ""
+msgstr "频道消息来自：%s（%s）-%s"
 
 #: src/fe-gtk/plugin-tray.c:660
 #, c-format
@@ -4747,7 +4592,7 @@ msgstr ""
 #: src/fe-gtk/plugin-tray.c:684
 #, c-format
 msgid "Private message from: %s (%s) - %s"
-msgstr ""
+msgstr "私聊消息来自：%s（%s）-%s"
 
 #: src/fe-gtk/plugin-tray.c:687
 #, c-format
@@ -4779,7 +4624,7 @@ msgstr "选择要载入的插件或脚本"
 #: src/fe-gtk/plugingui.c:241
 #, c-format
 msgid "Plugins and Scripts - %s"
-msgstr ""
+msgstr "插件和脚本 - %s"
 
 #: src/fe-gtk/plugingui.c:256
 msgid "_Load..."
@@ -4801,7 +4646,7 @@ msgstr "另存为..."
 #: src/fe-gtk/rawlog.c:112
 #, c-format
 msgid "Raw Log (%s) - %s"
-msgstr ""
+msgstr "原始记录 (%s) - %s"
 
 #: src/fe-gtk/rawlog.c:133
 msgid "Clear Raw Log"
@@ -4832,13 +4677,12 @@ msgstr "您必须拥有两个昵称."
 msgid ""
 "The way you identify yourself to the server. For custom login methods use "
 "connect commands."
-msgstr ""
-"您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
+msgstr "您向服务器发送的个人身份识别信息。如果需要自定义登录方法请使用 连接命令。"
 
 #: src/fe-gtk/servlistgui.c:1710
 #, c-format
 msgid "Edit %s - %s"
-msgstr ""
+msgstr "编辑 %s - %s"
 
 #: src/fe-gtk/servlistgui.c:1731
 msgid "Servers"
@@ -4858,11 +4702,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)"
@@ -4935,7 +4775,7 @@ msgstr "字符集："
 #: src/fe-gtk/servlistgui.c:1977
 #, c-format
 msgid "Network List - %s"
-msgstr ""
+msgstr "网络列表 - %s"
 
 #: src/fe-gtk/servlistgui.c:1989
 msgid "User Information"
@@ -4969,7 +4809,7 @@ msgstr "排序(_S)"
 msgid ""
 "Sorts the network list in alphabetical order. Use Shift+Up and Shift+Down "
 "keys to move a row."
-msgstr ""
+msgstr "按字母顺序排列网络列表。使用SHIFT+上下方向键来移动行。"
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
@@ -5245,19 +5085,19 @@ msgstr "透明度设置"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr ""
+msgstr "窗口透明度："
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr ""
+msgstr "时间戳"
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr ""
+msgstr "启用时间戳"
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr ""
+msgstr "时间戳格式："
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5293,7 +5133,7 @@ msgstr "输入框"
 
 #: src/fe-gtk/setup.c:192
 msgid "Use the text box font and colors"
-msgstr ""
+msgstr "使用文本框字体及颜色"
 
 #: src/fe-gtk/setup.c:193
 msgid "Render colors and attributes"
@@ -5319,9 +5159,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."
@@ -5357,11 +5195,11 @@ msgstr "图形化的"
 
 #: src/fe-gtk/setup.c:223
 msgid "A-Z, ops first"
-msgstr ""
+msgstr "A-Z，管理员置顶"
 
 #: src/fe-gtk/setup.c:225
 msgid "Z-A, ops last"
-msgstr ""
+msgstr "Z-A，管理员置底"
 
 #: src/fe-gtk/setup.c:226
 msgid "Z-A"
@@ -5373,19 +5211,19 @@ msgstr "不排序"
 
 #: src/fe-gtk/setup.c:233 src/fe-gtk/setup.c:245
 msgid "Left (upper)"
-msgstr ""
+msgstr "左上"
 
 #: src/fe-gtk/setup.c:234 src/fe-gtk/setup.c:246
 msgid "Left (lower)"
-msgstr ""
+msgstr "左下"
 
 #: src/fe-gtk/setup.c:235 src/fe-gtk/setup.c:247
 msgid "Right (upper)"
-msgstr ""
+msgstr "右上"
 
 #: src/fe-gtk/setup.c:236 src/fe-gtk/setup.c:248
 msgid "Right (lower)"
-msgstr ""
+msgstr "右下"
 
 #: src/fe-gtk/setup.c:237
 msgid "Top"
@@ -5445,7 +5283,7 @@ msgstr "追踪离开状态"
 
 #: src/fe-gtk/setup.c:264
 msgid "Track the away status of users and mark them in a different color"
-msgstr ""
+msgstr "追踪用户的离开状态并且以不同颜色标记"
 
 #: src/fe-gtk/setup.c:265
 msgid "On channels smaller than:"
@@ -5636,7 +5474,7 @@ msgstr "聊天窗口"
 
 #: src/fe-gtk/setup.c:363
 msgid "Maximum File Transfer Speeds (Byte per Second)"
-msgstr ""
+msgstr "最大文件传输速度(字节每秒)"
 
 #: src/fe-gtk/setup.c:364
 msgid "One upload:"
@@ -5696,8 +5534,7 @@ msgstr "在选择的事件上播放系统 \"即时消息提醒\" 声音"
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr ""
-"在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
+msgstr "在选择的事件上播放来自 freedesktop.org 的 \"message-new-instant\" 声音主题"
 
 #: src/fe-gtk/setup.c:412 src/fe-gtk/setup.c:456
 msgid "Play a GTK beep upon the selected events"
@@ -5772,9 +5609,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:"
@@ -5872,17 +5707,17 @@ msgstr "自动复制已选中文本"
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, Ctrl+Shift+C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "在释放鼠标左键时将选中文本复制到剪贴板。否则，使用 CTRL+SHIFT+C 将选中文本复制到剪贴板。"
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr ""
+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."
-msgstr ""
+"Automatically include timestamps in copied lines of text. Otherwise, include"
+" timestamps if the Shift key is held down while selecting."
+msgstr "自动在复制的每行文本后加上时间戳，否则，在选择时按下 SHIFT 键后包含时间戳。"
 
 #: src/fe-gtk/setup.c:564
 msgid "Automatically include color information"
@@ -5890,9 +5725,9 @@ 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."
-msgstr ""
+"Automatically include color information in copied lines of text.  Otherwise,"
+" include color information if the Ctrl key is held down while selecting."
+msgstr "自动在复制的每行文本中加上颜色信息，否则，在选择时按下 CONTROL 键后包含颜色信息。"
 
 #: src/fe-gtk/setup.c:570
 msgid "Real name:"
@@ -5942,7 +5777,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 "尝试在屏蔽或者设置静默时使用该屏蔽掩码 (需要 irc_who_join)。"
 
 #: src/fe-gtk/setup.c:586 src/fe-gtk/setup.c:1883
@@ -6004,11 +5840,11 @@ msgstr "Wingate"
 
 #: src/fe-gtk/setup.c:614
 msgid "SOCKS4"
-msgstr ""
+msgstr "SOCKS4"
 
 #: src/fe-gtk/setup.c:615
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: src/fe-gtk/setup.c:616
 msgid "HTTP"
@@ -6020,15 +5856,15 @@ msgstr "自动"
 
 #: src/fe-gtk/setup.c:625
 msgid "All connections"
-msgstr ""
+msgstr "所有连接"
 
 #: src/fe-gtk/setup.c:626
 msgid "IRC server only"
-msgstr ""
+msgstr "仅 IRC 服务器"
 
 #: src/fe-gtk/setup.c:627
 msgid "DCC only"
-msgstr ""
+msgstr "仅 DCC"
 
 #: src/fe-gtk/setup.c:633
 msgid "Your Address"
@@ -6052,11 +5888,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:"
@@ -6068,11 +5902,11 @@ msgstr "发送文件时声称您使用此地址。"
 
 #: src/fe-gtk/setup.c:642
 msgid "First DCC listen port:"
-msgstr ""
+msgstr "第一个 DCC 文件监听端口："
 
 #: src/fe-gtk/setup.c:643
 msgid "Last DCC listen port:"
-msgstr ""
+msgstr "最后一个 DCC 文件监听端口："
 
 #: src/fe-gtk/setup.c:644
 msgid "!Leave ports at zero for full range."
@@ -6104,7 +5938,7 @@ msgstr "代理服务器验证"
 
 #: src/fe-gtk/setup.c:653
 msgid "Use authentication (HTTP or SOCKS5 only)"
-msgstr ""
+msgstr "使用验证(仅支持 HTTP 或 Socks5 代理服务器)"
 
 #: src/fe-gtk/setup.c:654
 msgid "Username:"
@@ -6126,8 +5960,7 @@ msgstr "服务器会返回网络用户名"
 msgid ""
 "You must have permissions to listen on this port. If not 113 (0 defaults to "
 "this) then you must configure port-forwarding."
-msgstr ""
-"你必须有监听此端口的权限。若不是 113 (0 默认是这个) 你必须配置端口转发。"
+msgstr "你必须有监听此端口的权限。若不是 113 (0 默认是这个) 你必须配置端口转发。"
 
 #: src/fe-gtk/setup.c:1110
 msgid "Select an Image File"
@@ -6289,13 +6122,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 "真实姓名选项不能留空。回落到 “realname”。"
 
 #: src/fe-gtk/setup.c:2261
@@ -6308,16 +6138,12 @@ 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
 msgid "Preferences - %s"
-msgstr ""
+msgstr "首选项 - %s"
 
 #: src/fe-gtk/sexy-spell-entry.c:571
 msgid "<i>(no suggestions)</i>"
@@ -6383,7 +6209,7 @@ msgstr "确认"
 #: src/fe-gtk/urlgrab.c:198
 #, c-format
 msgid "URL Grabber - %s"
-msgstr ""
+msgstr "URL 抓取程序 - %s"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Clear list"
@@ -6426,11 +6252,9 @@ msgstr "系统信息：%s 被设置为：%d\n"
 #: 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"
-msgstr ""
-"系统信息：有效的信息是：通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没"
-"有值的话将会显示当前 (或默认) 设置。\n"
+"information. e.g. hide_os. Without a value it will show current (or default)"
+" setting.\n"
+msgstr "系统信息：有效的信息是：通知并为每一条信息加前缀 hide_* 。比如 hide_os。若没有值的话将会显示当前 (或默认) 设置。\n"
 
 #: plugins/sysinfo/sysinfo.c:190
 msgid "Sysinfo: Invalid variable name\n"
@@ -6445,9 +6269,3 @@ msgstr "插件 %s 已载入\n"
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr "插件 %s 以卸载\n"
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9e568be1..039d23aa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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:
 # Anthony Fok <foka@debian.org>, 2001
 # Dalin <ayi880@hotmail.com>, 2003
@@ -11,20 +11,20 @@
 # Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004
 # Sarah Smith <sarahs@redhat.com>, 2003
 # Walte <webmaster@www.linuxfans.org>, 2003
+# whyme <random3098@gmail.com>, 2012
 # Zong Yaotang <zong@cosix.com.au>, 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: Chinese (Taiwan) (http://www.transifex.com/hexchat/hexchat/"
-"language/zh_TW/)\n"
-"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/hexchat/hexchat/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/misc/io.github.Hexchat.appdata.xml.in:4
@@ -306,9 +306,7 @@ msgstr ""
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
-msgstr ""
-"* 最好不要以 root 身分執行 IRC！您應該\n"
-"  建立一般使用者帳號來登入。\n"
+msgstr "* 最好不要以 root 身分執行 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
@@ -460,9 +458,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>]，禁止所有符合 mask 的使用者進入目前的聊天室。如果他們"
-"已在該聊天室，這個命令不會把他們踢出去(需要有 chanop 身分)"
+msgstr "BAN <mask> [<bantype>]，禁止所有符合 mask 的使用者進入目前的聊天室。如果他們已在該聊天室，這個命令不會把他們踢出去(需要有 chanop 身分)"
 
 #: src/common/outbound.c:3944
 msgid "CHANOPT [-quiet] <variable> [<value>]"
@@ -470,7 +466,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,20 +484,18 @@ msgstr ""
 
 #: src/common/outbound.c:3950
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr ""
-"COUNTRY [-s] <code|wildcard>，查看國家代碼對應的國家名，比如：tw = 臺灣"
+msgstr "COUNTRY [-s] <code|wildcard>，查看國家代碼對應的國家名，比如：tw = 臺灣"
 
 #: 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>，給暱稱為 <nick> 者發送 CTCP 訊息，常用訊息是 VERSION "
-"和 USERINFO"
+msgstr "CTCP <nick> <message>，給暱稱為 <nick> 者發送 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
@@ -514,24 +509,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>                     - 接收暱稱為 <nick> 者發送給您的檔案\n"
-"DCC SEND [-maxcps=#] <nick> [file] - 發送檔案給某人\n"
-"DCC PSEND [-maxcps=#] <nick> [file] - 使用被動模式發送檔案給某人\n"
-"DCC LIST                           - 顯示 DCC 清單\n"
-"DCC CHAT <nick>                    - 與某人密談\n"
-"DCC PCHAT <nick>                    - 使用被動模式與某人密談\n"
-"DCC CLOSE <type> <nick> <file>         例如：\n"
-"         /dcc close send johnsmith file.tar.gz"
+msgstr "\nDCC GET <nick>                     - 接收暱稱為 <nick> 者發送給您的檔案\nDCC SEND [-maxcps=#] <nick> [file] - 發送檔案給某人\nDCC PSEND [-maxcps=#] <nick> [file] - 使用被動模式發送檔案給某人\nDCC LIST                           - 顯示 DCC 清單\nDCC CHAT <nick>                    - 與某人密談\nDCC PCHAT <nick>                    - 使用被動模式與某人密談\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>，取消目前聊天室內暱稱為 <nick> 者的 chanhalf-op 身分(需要有 "
-"chanop 身分)"
+msgstr "DEHOP <nick>，取消目前聊天室內暱稱為 <nick> 者的 chanhalf-op 身分(需要有 chanop 身分)"
 
 #: src/common/outbound.c:3970
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -541,15 +525,13 @@ msgstr "DELBUTTON <name>，刪除使用者清單下的一個按鈕"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr ""
-"DEOP <nick>，取消暱稱為 <nick> 者在本聊天室的 chanop 身分(需要有 chanop 身分)"
+msgstr "DEOP <nick>，取消暱稱為 <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>，取消暱稱為 <nick> 者在本聊天室的發言權(需要有 chanop 身分)"
+msgstr "DEVOICE <nick>，取消暱稱為 <nick> 者在本聊天室的發言權(需要有 chanop 身分)"
 
 #: src/common/outbound.c:3975
 msgid "DISCON, Disconnects from server"
@@ -571,9 +553,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"
@@ -583,9 +563,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"
@@ -626,20 +604,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，INVI，ALL\n"
-"    options - NOSAVE, QUIET"
+msgstr "IGNORE <mask> <types..> <options..>\n    mask - 欲忽略的主機遮罩，比如 *!*@*.aol.com\n    types - 欲忽略資料的類型，以下選項之一或全部：\n            PRIV，CHAN，NOTI，CTCP，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>]，邀請暱稱為 <nick> 者加入聊天室，預設為目前聊天室"
-"(需要有 chanop 身分)"
+msgstr "INVITE <nick> [<channel>]，邀請暱稱為 <nick> 者加入聊天室，預設為目前聊天室(需要有 chanop 身分)"
 
 #: src/common/outbound.c:4019
 msgid "JOIN <channel>, joins the channel"
@@ -666,8 +637,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,11 +655,9 @@ msgstr "MDEOP，取消目前聊天室中所有 chanop 的權限 (需要有 chano
 
 #: 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)"
@@ -706,8 +674,8 @@ msgstr "MOP，給本聊天室中所有使用者 chanop 身分(需要有 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
@@ -771,21 +739,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 ""
@@ -843,7 +807,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
@@ -870,8 +835,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
@@ -880,9 +845,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)"
@@ -911,9 +876,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"
@@ -982,9 +945,7 @@ msgstr "您確信此伺服器和輸出入埠支援‧SSL ？\n"
 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"
@@ -1159,7 +1120,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
@@ -1193,8 +1155,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
@@ -1215,7 +1177,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
@@ -1228,7 +1191,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
@@ -1245,7 +1209,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
@@ -2021,9 +1986,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"
@@ -3382,10 +3345,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 ""
@@ -3537,10 +3497,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"
@@ -3558,18 +3515,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 "
@@ -3580,51 +3537,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 ""
-"「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"
+"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 ""
-"「Last Command」命令把輸入格設為前一個命令 - 和在終端中按向上箭頭效果相同"
+"The Last Command command sets the entry to contain the last command "
+"entered - the same as pressing up in a shell"
+msgstr "「Last Command」命令把輸入格設為前一個命令 - 和在終端中按向上箭頭效果相同"
 
 #: 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」命令把輸入格設為下一個命令 - 和在終端中按向下箭頭效果相同"
+"The Next Command command sets the entry to contain the next command "
+"entered - the same as pressing down in a shell"
+msgstr "「Next Command」命令把輸入格設為下一個命令 - 和在終端中按向下箭頭效果相同"
 
 #: 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 被設"
-"定，那麼，雙擊 tab 鍵會選擇最後一個暱稱，而非下一個"
+"or command. If Data 1 is set then double-tabbing in a string will select the"
+" last nick, not the next"
+msgstr "該命令改變輸入格中文字，來完成未輸入完畢的使用者暱稱或命令。如果資料 1 被設定，那麼，雙擊 tab 鍵會選擇最後一個暱稱，而非下一個"
 
 #: 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 ""
@@ -5757,8 +5707,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 +5717,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 +5769,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 +5880,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 +6117,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 +6130,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
@@ -6300,8 +6244,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 +6261,3 @@ msgstr ""
 #, c-format
 msgid "%s plugin unloaded\n"
 msgstr ""
-
-#~ msgid "Socks4"
-#~ msgstr "Socks4"
-
-#~ msgid "Socks5"
-#~ msgstr "Socks5"
diff --git a/readme.md b/readme.md
index 0ab8fe6a..35a0e99b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# HexChat [![Build Status](http://img.shields.io/travis/hexchat/hexchat/master.svg?style=flat)](https://travis-ci.org/hexchat/hexchat) [![Build Status](https://img.shields.io/appveyor/ci/TingPing/hexchat/master.svg?style=flat)](https://ci.appveyor.com/project/TingPing/hexchat)
+# HexChat
 
 HexChat is an IRC client for Windows and UNIX-like operating systems.  
 See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  
diff --git a/src/common/chanopt.c b/src/common/chanopt.c
index 1870c99c..67cb46cf 100644
--- a/src/common/chanopt.c
+++ b/src/common/chanopt.c
@@ -58,6 +58,7 @@ typedef struct
 
 static const channel_options chanopt[] =
 {
+	{"alert_balloon", NULL, S_F(alert_balloon)},
 	{"alert_beep", "BEEP", S_F(alert_beep)},
 	{"alert_taskbar", NULL, S_F(alert_taskbar)},
 	{"alert_tray", "TRAY", S_F(alert_tray)},
@@ -182,6 +183,7 @@ typedef struct
 {
 	/* Per-Channel Alerts */
 	/* use a byte, because we need a pointer to each element */
+	guint8 alert_balloon;
 	guint8 alert_beep;
 	guint8 alert_taskbar;
 	guint8 alert_tray;
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 33a883bf..bc191f43 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.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>StaticLibrary</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

diff --git a/src/common/dcc.c b/src/common/dcc.c
index 51f6d661..df129e68 100644
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -1618,13 +1618,13 @@ dcc_accept (GIOChannel *source, GIOCondition condition, struct DCC *dcc)
 }
 
 guint32
-dcc_get_my_address (void)	/* the address we'll tell the other person */
+dcc_get_my_address (session *sess)	/* the address we'll tell the other person */
 {
 	struct hostent *dns_query;
 	guint32 addr = 0;
 
-	if (prefs.hex_dcc_ip_from_server && prefs.dcc_ip)
-		addr = prefs.dcc_ip;
+	if (prefs.hex_dcc_ip_from_server && sess->server->dcc_ip)
+		addr = sess->server->dcc_ip;
 	else if (prefs.hex_dcc_ip[0])
 	{
 	   dns_query = gethostbyname ((const char *) prefs.hex_dcc_ip);
@@ -1710,7 +1710,7 @@ dcc_listen_init (struct DCC *dcc, session *sess)
 	/*if we have a dcc_ip, we use that, so the remote client can connect*/
 	/*else we try to take an address from hex_dcc_ip*/
 	/*if something goes wrong we tell the client to connect to our LAN ip*/
-	dcc->addr = dcc_get_my_address ();
+	dcc->addr = dcc_get_my_address (sess);
 
 	/*if nothing else worked we use the address we bound to*/
 	if (dcc->addr == 0)
diff --git a/src/common/dcc.h b/src/common/dcc.h
index 379385e6..74028205 100644
--- a/src/common/dcc.h
+++ b/src/common/dcc.h
@@ -124,7 +124,7 @@ void dcc_chat (session *sess, char *nick, int passive);
 void handle_dcc (session *sess, char *nick, char *word[], char *word_eol[],
 					  const message_tags_data *tags_data);
 void dcc_show_list (session *sess);
-guint32 dcc_get_my_address (void);
+guint32 dcc_get_my_address (session *sess);
 void dcc_get_with_destfile (struct DCC *dcc, char *utf8file);
 
 #endif
diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index 347cf1ce..9be2e56d 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -493,6 +493,7 @@ session_new (server *serv, char *from, int type, int focus)
 	sess->logfd = -1;
 	sess->type = type;
 
+	sess->alert_balloon = SET_DEFAULT;
 	sess->alert_beep = SET_DEFAULT;
 	sess->alert_taskbar = SET_DEFAULT;
 	sess->alert_tray = SET_DEFAULT;
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 8c4a6a41..d8effa1f 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -75,7 +75,7 @@
 #define DOMAINLEN	100
 #define NICKLEN		64				/* including the NULL, so 63 really */
 #define CHANLEN		300
-#define PDIWORDS		32
+#define PDIWORDS	32
 #define USERNAMELEN 10
 #define HIDDEN_CHAR	8			/* invisible character for xtext */
 
@@ -301,8 +301,8 @@ struct hexchatprefs
 	char hex_irc_user_name[127];
 	char hex_net_bind_host[127];
 	char hex_net_proxy_host[64];
-	char hex_net_proxy_pass[32];
-	char hex_net_proxy_user[32];
+	char hex_net_proxy_pass[256];
+	char hex_net_proxy_user[256];
 	char hex_stamp_log_format[64];
 	char hex_stamp_text_format[64];
 	char hex_text_background[PATHLEN + 1];
@@ -313,7 +313,6 @@ struct hexchatprefs
 
 	/* these are the private variables */
 	guint32 local_ip;
-	guint32 dcc_ip;
 
 	unsigned int wait_on_exit;	/* wait for logs to be flushed to disk IF we're connected */
 
@@ -364,6 +363,7 @@ typedef struct session
 {
 	/* Per-Channel Alerts */
 	/* use a byte, because we need a pointer to each element */
+	guint8 alert_balloon;
 	guint8 alert_beep;
 	guint8 alert_taskbar;
 	guint8 alert_tray;
@@ -482,6 +482,10 @@ typedef struct server
 	int proxy_sok4;
 	int proxy_sok6;
 	int id;					/* unique ID number (for plugin API) */
+
+	/* dcc_ip moved from hexchatprefs to make it per-server */
+	guint32 dcc_ip;
+
 #ifdef USE_OPENSSL
 	SSL_CTX *ctx;
 	SSL *ssl;
@@ -566,6 +570,7 @@ typedef struct server
 	unsigned int have_idmsg:1;		/* freenode's IDENTIFY-MSG */
 	unsigned int have_accnotify:1; /* cap account-notify */
 	unsigned int have_extjoin:1;	/* cap extended-join */
+	unsigned int have_account_tag:1;	/* cap account-tag */
 	unsigned int have_server_time:1;	/* cap server-time */
 	unsigned int have_sasl:1;		/* SASL capability */
 	unsigned int have_except:1;	/* ban exemptions +e */
@@ -575,6 +580,7 @@ typedef struct server
 	unsigned int sasl_mech;			/* mechanism for sasl auth */
 	unsigned int sent_capend:1;	/* have sent CAP END yet */
 	unsigned int waiting_on_cap:1;	/* waiting on another line of CAP LS */
+	unsigned int waiting_on_sasl:1; /* waiting on sasl */
 #ifdef USE_OPENSSL
 	unsigned int use_ssl:1;				  /* is server SSL capable? */
 	unsigned int accept_invalid_cert:1;/* ignore result of server's cert. verify */
diff --git a/src/common/inbound.c b/src/common/inbound.c
index fb8eb511..7175b2ae 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -815,7 +815,9 @@ inbound_topictime (server *serv, char *chan, char *nick, time_t stamp,
 	if (!sess)
 		sess = serv->server_session;
 
-	tim[24] = 0;	/* get rid of the \n */
+	if (tim != NULL)
+		tim[24] = 0;	/* get rid of the \n */
+
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_TOPICDATE, sess, chan, nick, tim, NULL, 0,
 								  tags_data->timestamp);
 }
@@ -1420,7 +1422,7 @@ inbound_foundip (session *sess, char *ip, const message_tags_data *tags_data)
 	HostAddr = gethostbyname (ip);
 	if (HostAddr)
 	{
-		prefs.dcc_ip = ((struct in_addr *) HostAddr->h_addr)->s_addr;
+		sess->server->dcc_ip = ((struct in_addr *) HostAddr->h_addr)->s_addr;
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_FOUNDIP, sess->server->server_session,
 									  inet_ntoa (*((struct in_addr *) HostAddr->h_addr)),
 									  NULL, NULL, NULL, 0, tags_data->timestamp);
@@ -1489,7 +1491,7 @@ inbound_banlist (session *sess, time_t stamp, char *chan, char *mask,
 	server *serv = sess->server;
 	char *nl;
 
-	if (stamp <= 0)
+	if (stamp <= 0 || time_str == NULL)
 	{
 		time_str = "";
 	}
@@ -1669,6 +1671,8 @@ inbound_toggle_caps (server *serv, const char *extensions_str, gboolean enable)
 			serv->have_server_time = enable;
 		else if (!strcmp (extension, "away-notify"))
 			serv->have_awaynotify = enable;
+		else if (!strcmp (extension, "account-tag"))
+			serv->have_account_tag = enable;
 		else if (!strcmp (extension, "sasl"))
 		{
 			serv->have_sasl = enable;
@@ -1722,6 +1726,9 @@ static const char * const supported_caps[] = {
 	"userhost-in-names",
 	"cap-notify",
 	"chghost",
+	"setname",
+	"invite-notify",
+	"account-tag",
 
 	/* ZNC */
 	"znc.in/server-time-iso",
@@ -1768,7 +1775,6 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 {
 	char buffer[500];	/* buffer for requesting capabilities and emitting the signal */
 	gboolean want_cap = FALSE; /* format the CAP REQ string based on previous capabilities being requested or not */
-	gboolean want_sasl = FALSE; /* CAP END shouldn't be sent when SASL is requested, it needs further responses */
 	char **extensions;
 	int i;
 
@@ -1806,7 +1812,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 		/* if the SASL password is set AND auth mode is set to SASL, request SASL auth */
 		if (!g_strcmp0 (extension, "sasl") &&
 			((serv->loginmethod == LOGIN_SASL && strlen (serv->password) != 0)
-				|| (serv->loginmethod == LOGIN_SASLEXTERNAL && serv->have_cert)))
+				|| serv->loginmethod == LOGIN_SASLEXTERNAL))
 		{
 			if (value)
 			{
@@ -1816,7 +1822,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 				serv->sasl_mech = sasl_mech;
 			}
 			want_cap = TRUE;
-			want_sasl = TRUE;
+			serv->waiting_on_sasl = TRUE;
 			g_strlcat (buffer, "sasl ", sizeof(buffer));
 			continue;
 		}
@@ -1842,7 +1848,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 									  tags_data->timestamp);
 		tcp_sendf (serv, "%s\r\n", g_strchomp (buffer));
 	}
-	if (!want_sasl && !serv->waiting_on_cap)
+	if (!serv->waiting_on_sasl && !serv->waiting_on_cap)
 	{
 		/* if we use SASL, CAP END is dealt via raw numerics */
 		serv->sent_capend = TRUE;
@@ -1851,13 +1857,25 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 }
 
 void
-inbound_cap_nak (server *serv, const message_tags_data *tags_data)
+inbound_cap_nak (server *serv, char *extensions_str, const message_tags_data *tags_data)
 {
-	if (!serv->waiting_on_cap && !serv->sent_capend)
+	char **extensions;
+	int i;
+
+	extensions = g_strsplit (extensions_str, " ", 0);
+	for (i=0; extensions[i]; i++)
+	{
+		if (!g_strcmp0 (extensions[i], "sasl"))
+			serv->waiting_on_sasl = FALSE;
+	}
+
+	if (!serv->waiting_on_cap && !serv->waiting_on_sasl && !serv->sent_capend)
 	{
 		serv->sent_capend = TRUE;
 		tcp_send_len (serv, "CAP END\r\n", 9);
 	}
+
+	g_strfreev (extensions);
 }
 
 void
diff --git a/src/common/inbound.h b/src/common/inbound.h
index 83e78d5d..6e7c171f 100644
--- a/src/common/inbound.h
+++ b/src/common/inbound.h
@@ -92,7 +92,7 @@ void inbound_cap_ack (server *serv, char *nick, char *extensions,
 							 const message_tags_data *tags_data);
 void inbound_cap_ls (server *serv, char *nick, char *extensions,
 							const message_tags_data *tags_data);
-void inbound_cap_nak (server *serv, const message_tags_data *tags_data);
+void inbound_cap_nak (server *serv, char *extensions, const message_tags_data *tags_data);
 void inbound_cap_list (server *serv, char *nick, char *extensions,
 							  const message_tags_data *tags_data);
 void inbound_cap_del (server *serv, char *nick, char *extensions,
diff --git a/src/common/meson.build b/src/common/meson.build
index a0d6ce2b..492227b2 100644
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -93,10 +93,6 @@ endif
 
 if get_option('with-plugin')
   common_deps += libgmodule_dep
-  common_cflags += '-DHEXCHATLIBDIR="@0@"'.format(join_paths(get_option('prefix'),
-                                                  get_option('libdir'),
-                                                  'hexchat/plugins'))
-
   install_headers('hexchat-plugin.h')
 endif
 
@@ -109,6 +105,7 @@ hexchat_common = static_library('hexchatcommon',
 )
 
 hexchat_common_dep = declare_dependency(
+  sources: [textevents] + marshal,
   link_with: hexchat_common,
   include_directories: common_includes,
   compile_args: common_cflags,
diff --git a/src/common/modes.c b/src/common/modes.c
index c65bf279..3c0ac8ab 100644
--- a/src/common/modes.c
+++ b/src/common/modes.c
@@ -735,6 +735,8 @@ handle_mode (server * serv, char *word[], char *word_eol[],
 		if (!(*word[i + offset]))
 			break;
 		num_args++;
+		if (word[i + offset][0] == ':')
+			break;
 	}
 
 	/* count the number of modes (without the -/+ chars */
@@ -765,7 +767,7 @@ handle_mode (server * serv, char *word[], char *word_eol[],
 			if ((all_modes_have_args || mode_has_arg (serv, sign, *modes)) && arg < (num_args + 1))
 			{
 				arg++;
-				argstr = word[arg + offset];
+				argstr = STRIP_COLON(word, word_eol, arg+offset);
 			}
 			handle_single_mode (&mr, sign, *modes, nick, chan,
 									  argstr, numeric_324 || prefs.hex_irc_raw_modes,
diff --git a/src/common/outbound.c b/src/common/outbound.c
index 96fb7fe4..614aad38 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3287,7 +3287,7 @@ cmd_send (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	if (!word[2][0])
 		return FALSE;
 
-	addr = dcc_get_my_address ();
+	addr = dcc_get_my_address (sess);
 	if (addr == 0)
 	{
 		/* use the one from our connected server socket */
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 0aa8859d..d3f3b7ca 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -115,6 +115,34 @@ enum
 	HOOK_DELETED      = 1 << 7  /* marked for deletion */
 };
 
+enum
+{
+	CHANNEL_FLAG_CONNECTED             = 1 << 0,
+	CHANNEL_FLAG_CONNECING             = 1 << 1,
+	CHANNEL_FLAG_AWAY                  = 1 << 2,
+	CHANNEL_FLAG_END_OF_MOTD           = 1 << 3,
+	CHANNEL_FLAG_HAS_WHOX              = 1 << 4,
+	CHANNEL_FLAG_HAS_IDMSG             = 1 << 5,
+	CHANNEL_FLAG_HIDE_JOIN_PARTS       = 1 << 6,
+	CHANNEL_FLAG_HIDE_JOIN_PARTS_UNSET = 1 << 7,
+	CHANNEL_FLAG_BEEP                  = 1 << 8,
+	CHANNEL_FLAG_BEEP_UNSET            = 1 << 9,
+	CHANNEL_FLAG_UNUSED                = 1 << 10,
+	CHANNEL_FLAG_LOGGING               = 1 << 11,
+	CHANNEL_FLAG_LOGGING_UNSET         = 1 << 12,
+	CHANNEL_FLAG_SCROLLBACK            = 1 << 13,
+	CHANNEL_FLAG_SCROLLBACK_UNSET      = 1 << 14,
+	CHANNEL_FLAG_STRIP_COLORS          = 1 << 15,
+	CHANNEL_FLAG_STRIP_COLORS_UNSET    = 1 << 16,
+	CHANNEL_FLAG_TRAY                  = 1 << 17,
+	CHANNEL_FLAG_TRAY_UNSET            = 1 << 18,
+	CHANNEL_FLAG_TASKBAR               = 1 << 19,
+	CHANNEL_FLAG_TASKBAR_UNSET         = 1 << 20,
+	CHANNEL_FLAG_BALLOON               = 1 << 21,
+	CHANNEL_FLAG_BALLOON_UNSET         = 1 << 22,
+	CHANNEL_FLAG_COUNT                 = 23
+};
+
 GSList *plugin_list = NULL;	/* export for plugingui.c */
 static GSList *hook_list = NULL;
 
@@ -355,7 +383,8 @@ plugin_kill_all (void)
 	}
 }
 
-#ifdef USE_PLUGIN
+#if defined(USE_PLUGIN) || defined(WIN32)
+/* used for loading plugins, and in fe-gtk/notifications/notification-windows.c */
 
 GModule *
 module_load (char *filename)
@@ -384,6 +413,10 @@ module_load (char *filename)
 	return handle;
 }
 
+#endif
+
+#ifdef USE_PLUGIN
+
 /* load a plugin from a filename. Returns: NULL-success or an error string */
 
 char *
@@ -676,11 +709,11 @@ check_and_invalidate(void *plug_, void *killsess_)
 int
 plugin_emit_dummy_print (session *sess, char *name)
 {
-	char *word[32];
+	char *word[PDIWORDS];
 	int i;
 
 	word[0] = name;
-	for (i = 1; i < 32; i++)
+	for (i = 1; i < PDIWORDS; i++)
 		word[i] = "\000";
 
 	i = plugin_hook_run (sess, name, word, NULL, NULL, HOOK_PRINT);
@@ -1544,7 +1577,11 @@ hexchat_list_int (hexchat_plugin *ph, hexchat_list *xlist, const char *name)
 {
 	guint32 hash = str_hash (name);
 	gpointer data = ph->context;
-	int tmp = 0;
+
+	int channel_flag;
+	int channel_flags[CHANNEL_FLAG_COUNT];
+	int channel_flags_used = 0;
+
 	int type = LIST_CHANNELS;
 
 	/* a NULL xlist is a shortcut to current "channels" context */
@@ -1605,48 +1642,38 @@ hexchat_list_int (hexchat_plugin *ph, hexchat_list *xlist, const char *name)
 		case 0xd1b:	/* id */
 			return ((struct session *)data)->server->id;
 		case 0x5cfee87:	/* flags */
-			/* used if alert_taskbar is unset */                 /* 20 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->alert_taskbar;      /* 19 */
-			tmp <<= 1;
-			/* used if alert_tray is unset */                    /* 18 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->alert_tray;         /* 17 */
-			tmp <<= 1;
-			/* used if text_strip is unset */                    /* 16 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->text_strip;          /* 15 */
-			tmp <<= 1;
-			/* used if text_scrollback is unset */               /* 14 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->text_scrollback;    /* 13 */
-			tmp <<= 1;
-			/* used if text_logging is unset */                  /* 12 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->text_logging;       /* 11 */
-			tmp <<= 1;
-			/* unused for historical reasons */                  /* 10 */
-			tmp <<= 1;
-			/* used if alert_beep is unset */                    /* 9 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->alert_beep;         /* 8 */
-			tmp <<= 1;
-			/* used if text_hidejoinpart is unset */              /* 7 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->text_hidejoinpart;   /* 6 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->have_idmsg; /* 5 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->have_whox;  /* 4 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->end_of_motd;/* 3 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->is_away;    /* 2 */
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->connecting; /* 1 */ 
-			tmp <<= 1;
-			tmp |= ((struct session *)data)->server->connected;  /* 0 */
-			return tmp;
+			channel_flags[0] = ((struct session *)data)->server->connected;
+			channel_flags[1] = ((struct session *)data)->server->connecting;
+			channel_flags[2] = ((struct session *)data)->server->is_away;
+			channel_flags[3] = ((struct session *)data)->server->end_of_motd;
+			channel_flags[4] = ((struct session *)data)->server->have_whox;
+			channel_flags[5] = ((struct session *)data)->server->have_idmsg;
+			channel_flags[6] = ((struct session *)data)->text_hidejoinpart;
+			channel_flags[7] = ((struct session *)data)->text_hidejoinpart == SET_DEFAULT;
+			channel_flags[8] = ((struct session *)data)->alert_beep;
+			channel_flags[9] = ((struct session *)data)->alert_beep == SET_DEFAULT;
+			channel_flags[10] = 0; /* unused for historical reasons */
+			channel_flags[11] = ((struct session *)data)->text_logging;
+			channel_flags[12] = ((struct session *)data)->text_logging == SET_DEFAULT;
+			channel_flags[13] = ((struct session *)data)->text_scrollback;
+			channel_flags[14] = ((struct session *)data)->text_scrollback == SET_DEFAULT;
+			channel_flags[15] = ((struct session *)data)->text_strip;
+			channel_flags[16] = ((struct session *)data)->text_strip == SET_DEFAULT;
+			channel_flags[17] = ((struct session *)data)->alert_tray;
+			channel_flags[18] = ((struct session *)data)->alert_tray == SET_DEFAULT;
+			channel_flags[19] = ((struct session *)data)->alert_taskbar;
+			channel_flags[20] = ((struct session *)data)->alert_taskbar == SET_DEFAULT;
+			channel_flags[21] = ((struct session *)data)->alert_balloon;
+			channel_flags[22] = ((struct session *)data)->alert_balloon == SET_DEFAULT;
+
+			/* Set flags */
+			for (channel_flag = 0; channel_flag < CHANNEL_FLAG_COUNT; ++channel_flag) {
+				if (channel_flags[channel_flag]) {
+					channel_flags_used |= 1 << channel_flag;
+				}
+			}
+
+			return channel_flags_used;
 		case 0x1a192: /* lag */
 			return ((struct session *)data)->server->lag;
 		case 0x1916144c: /* maxmodes */
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 776d1434..c8e44b62 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -60,8 +60,8 @@ irc_login (server *serv, char *user, char *realname)
 
 	tcp_sendf (serv,
 				  "NICK %s\r\n"
-				  "USER %s %s %s :%s\r\n",
-				  serv->nick, user, user, serv->servername, realname);
+				  "USER %s 0 * :%s\r\n",
+				  serv->nick, user, realname);
 }
 
 static void
@@ -454,7 +454,8 @@ channel_date (session *sess, char *chan, char *timestr,
 {
 	time_t timestamp = (time_t) atol (timestr);
 	char *tim = ctime (&timestamp);
-	tim[24] = 0;	/* get rid of the \n */
+	if (tim != NULL)
+		tim[24] = 0;	/* get rid of the \n */
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANDATE, sess, chan, tim, NULL, NULL, 0,
 								  tags_data->timestamp);
 }
@@ -602,7 +603,8 @@ process_numeric (session * sess, int n,
 			else
 			{
 				tim = ctime (&timestamp);
-				tim[19] = 0; 	/* get rid of the \n */
+				if (tim != NULL)
+					tim[19] = 0; 	/* get rid of the \n */
 				EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS4T, whois_sess, word[4],
 											  outbuf, tim, NULL, 0, tags_data->timestamp);
 			}
@@ -621,7 +623,7 @@ process_numeric (session * sess, int n,
 	case 319:
 		if (!serv->skip_next_whois)
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS2, whois_sess, word[4],
-										  word_eol[5] + 1, NULL, NULL, 0,
+										  word_eol[5][0] == ':' ? word_eol[5] + 1 : word_eol[5], NULL, NULL, 0,
 										  tags_data->timestamp);
 		break;
 
@@ -714,7 +716,7 @@ process_numeric (session * sess, int n,
 		break;
 
 	case 333:
-		inbound_topictime (serv, word[4], word[5], atol (word[6]), tags_data);
+		inbound_topictime (serv, word[4], word[5], atol (STRIP_COLON(word, word_eol, 6)), tags_data);
 		break;
 
 #if 0
@@ -726,7 +728,7 @@ process_numeric (session * sess, int n,
 #endif
 
 	case 341:						  /* INVITE ACK */
-		EMIT_SIGNAL_TIMESTAMP (XP_TE_UINVITE, sess, word[4], word[5],
+		EMIT_SIGNAL_TIMESTAMP (XP_TE_UINVITE, sess, word[4], STRIP_COLON(word, word_eol, 5),
 									  serv->servername, NULL, 0, tags_data->timestamp);
 		break;
 
@@ -957,6 +959,7 @@ process_numeric (session * sess, int n,
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_SASLRESPONSE, serv->server_session, word[1],
 									  word[2], word[3], ++word_eol[4], 0,
 									  tags_data->timestamp);
+		serv->waiting_on_sasl = FALSE;
 		if (!serv->sent_capend)
 		{
 			serv->sent_capend = TRUE;
@@ -1007,6 +1010,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						 const message_tags_data *tags_data)
 {
 	server *serv = sess->server;
+	char *account;
 	char ip[128], nick[NICKLEN];
 	char *text, *ex;
 	int len = strlen (type);
@@ -1025,6 +1029,14 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 		ex[0] = '!';
 	}
 
+
+	/** Update the account for this message's source. */
+	if (serv->have_account_tag)
+	{
+		account = tags_data->account && *tags_data->account ? tags_data->account : "*";
+		inbound_account (serv, nick, account, tags_data);
+	}
+
 	if (len == 4)
 	{
 		guint32 t;
@@ -1142,7 +1154,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 		{
 
 		case WORDL('A','C','C','O'):
-			inbound_account (serv, nick, word[3], tags_data);
+			inbound_account (serv, nick, STRIP_COLON(word, word_eol, 3), tags_data);
 			return;
 
 		case WORDL('A', 'U', 'T', 'H'):
@@ -1150,20 +1162,26 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 			return;
 
 		case WORDL('C', 'H', 'G', 'H'):
-			inbound_user_info (sess, NULL, word[3], word[4], NULL, nick, NULL,
+			inbound_user_info (sess, NULL, word[3], STRIP_COLON(word, word_eol, 4), NULL, nick, NULL,
+							   NULL, 0xff, tags_data);
+			return;
+
+		case WORDL('S', 'E', 'T', 'N'):
+			inbound_user_info (sess, NULL, NULL, NULL, NULL, nick, STRIP_COLON(word, word_eol, 3),
 							   NULL, 0xff, tags_data);
 			return;
 
 		case WORDL('I','N','V','I'):
 			if (ignore_check (word[1], IG_INVI))
 				return;
-			
-			if (word[4][0] == ':')
-				EMIT_SIGNAL_TIMESTAMP (XP_TE_INVITED, sess, word[4] + 1, nick,
-											  serv->servername, NULL, 0,
+
+			text = STRIP_COLON(word, word_eol, 4);
+			if (serv->p_cmp (word[3], serv->nick))
+				EMIT_SIGNAL_TIMESTAMP (XP_TE_INVITEDOTHER, sess, text, nick,
+											  word[3], serv->servername, 0,
 											  tags_data->timestamp);
 			else
-				EMIT_SIGNAL_TIMESTAMP (XP_TE_INVITED, sess, word[4], nick,
+				EMIT_SIGNAL_TIMESTAMP (XP_TE_INVITED, sess, text, nick,
 											  serv->servername, NULL, 0,
 											  tags_data->timestamp);
 				
@@ -1241,10 +1259,13 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 							text++;
 					}
 					len = strlen (text);
-					if (text[0] == 1 && text[len - 1] == 1)	/* ctcp */
+					if (text[0] == 1)	/* ctcp */
 					{
 						char *new_pdibuf = NULL;
-						text[len - 1] = 0;
+						if (text[len - 1] == 1)
+						{
+							text[len - 1] = 0;
+						}
 						text++;
 						if (g_ascii_strncasecmp (text, "ACTION", 6) != 0)
 							flood_check (nick, ip, serv, sess, 0);
@@ -1330,7 +1351,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 				}
 				else if (strncasecmp (word[4], "NAK", 3) == 0)
 				{
-					inbound_cap_nak (serv, tags_data);
+					inbound_cap_nak (serv, word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5], tags_data);
 				}
 				else if (strncasecmp (word[4], "LIST", 4) == 0)	
 				{
@@ -1513,6 +1534,9 @@ handle_message_tags (server *serv, const char *tags_str,
 		*value = '\0';
 		value++;
 
+		if (serv->have_account_tag && !strcmp (key, "account"))
+			tags_data->account = g_strdup (value);
+
 		if (serv->have_server_time && !strcmp (key, "time"))
 			handle_message_tag_time (value, tags_data);
 	}
@@ -1610,10 +1634,17 @@ irc_inline (server *serv, char *buf, int len)
 	}
 
 xit:
+	message_tags_data_free (&tags_data);
 	g_free (pdibuf);
 }
 
 void
+message_tags_data_free (message_tags_data *tags_data)
+{
+	g_clear_pointer (&tags_data->account, g_free);
+}
+
+void
 proto_fill_her_up (server *serv)
 {
 	serv->p_inline = irc_inline;
diff --git a/src/common/proto-irc.h b/src/common/proto-irc.h
index a7b4029c..0f72c644 100644
--- a/src/common/proto-irc.h
+++ b/src/common/proto-irc.h
@@ -25,18 +25,24 @@
 
 #define MESSAGE_TAGS_DATA_INIT			\
 	{									\
+		NULL, /* account name */		\
 		(time_t)0, /* timestamp */		\
 	}
 
+#define STRIP_COLON(word, word_eol, idx) (word)[(idx)][0] == ':' ? (word_eol)[(idx)]+1 : (word)[(idx)]
+
 /* Message tag information that might be passed along with a server message
  *
  * See http://ircv3.atheme.org/specification/capability-negotiation-3.1
  */
 typedef struct 
 {
+	char *account;
 	time_t timestamp;
 } message_tags_data;
 
+void message_tags_data_free (message_tags_data *tags_data);
+
 void proto_fill_her_up (server *serv);
 
 #endif
diff --git a/src/common/server.c b/src/common/server.c
index 3db0a963..5c645eb5 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -200,13 +200,35 @@ tcp_send_len (server *serv, char *buf, int len)
 	}
 	else
 	{
-		/* WHO/MODE get the lowest priority */
-		if (g_ascii_strncasecmp (dbuf + 1, "WHO ", 4) == 0 ||
-		/* but only MODE queries, not changes */
-			(g_ascii_strncasecmp (dbuf + 1, "MODE", 4) == 0 &&
-			 strchr (dbuf, '-') == NULL &&
-			 strchr (dbuf, '+') == NULL))
+		/* WHO gets the lowest priority */
+		if (g_ascii_strncasecmp (dbuf + 1, "WHO ", 4) == 0)
 			dbuf[0] = 0;
+		/* as do MODE queries (but not changes) */
+		else if (g_ascii_strncasecmp (dbuf + 1, "MODE ", 5) == 0)
+		{
+			char *mode_str, *mode_str_end, *loc;
+			/* skip spaces before channel/nickname */
+			for (mode_str = dbuf + 5; *mode_str == ' '; ++mode_str);
+			/* skip over channel/nickname */
+			mode_str = strchr (mode_str, ' ');
+			if (mode_str)
+			{
+				/* skip spaces before mode string */
+				for (; *mode_str == ' '; ++mode_str);
+				/* find spaces after end of mode string */
+				mode_str_end = strchr (mode_str, ' ');
+				/* look for +/- within the mode string */
+				loc = strchr (mode_str, '-');
+				if (loc && (!mode_str_end || loc < mode_str_end))
+					goto keep_priority;
+				loc = strchr (mode_str, '+');
+				if (loc && (!mode_str_end || loc < mode_str_end))
+					goto keep_priority;
+			}
+			dbuf[0] = 0;
+keep_priority:
+			;
+		}
 	}
 
 	serv->outbound_queue = g_slist_append (serv->outbound_queue, dbuf);
@@ -1094,6 +1116,7 @@ traverse_socks5 (int print_fd, int sok, char *serverAddr, int port)
 	if (auth)
 	{
 		int len_u=0, len_p=0;
+		unsigned char *u_p_buf;
 
 		/* authentication sub-negotiation (RFC1929) */
 		if (buf[1] != 2)  /* UPA not supported by server */
@@ -1102,18 +1125,22 @@ traverse_socks5 (int print_fd, int sok, char *serverAddr, int port)
 			return 1;
 		}
 
-		memset (buf, 0, sizeof(buf));
-
 		/* form the UPA request */
 		len_u = strlen (prefs.hex_net_proxy_user);
 		len_p = strlen (prefs.hex_net_proxy_pass);
-		buf[0] = 1;
-		buf[1] = len_u;
-		memcpy (buf + 2, prefs.hex_net_proxy_user, len_u);
-		buf[2 + len_u] = len_p;
-		memcpy (buf + 3 + len_u, prefs.hex_net_proxy_pass, len_p);
 
-		send (sok, buf, 3 + len_u + len_p, 0);
+        packetlen = 2 + len_u + 1 + len_p;
+		u_p_buf = g_malloc0 (packetlen);
+
+		u_p_buf[0] = 1;
+		u_p_buf[1] = len_u;
+		memcpy (u_p_buf + 2, prefs.hex_net_proxy_user, len_u);
+		u_p_buf[2 + len_u] = len_p;
+		memcpy (u_p_buf + 3 + len_u, prefs.hex_net_proxy_pass, len_p);
+
+		send (sok, u_p_buf, packetlen, 0);
+		g_free(u_p_buf);
+
 		if ( recv (sok, buf, 2, 0) != 2 )
 			goto read_error;
 		if ( buf[1] != 0 )
@@ -1757,6 +1784,7 @@ server_set_defaults (server *serv)
 	serv->have_idmsg = FALSE;
 	serv->have_accnotify = FALSE;
 	serv->have_extjoin = FALSE;
+	serv->have_account_tag = FALSE;
 	serv->have_server_time = FALSE;
 	serv->have_sasl = FALSE;
 	serv->have_except = FALSE;
diff --git a/src/common/servlist.c b/src/common/servlist.c
index 449f982b..79a5694b 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -54,15 +54,13 @@ static const struct defaultserver def[] =
 	/* Invalid hostname in cert */
 	{0,			"irc.2600.net"},
 
-	{"2ch", 0, 0, "iso-2022-jp", 0, 0},
-	{0,			"irc.2ch.sc"},
-	{0,			"irc.nurs.or.jp"},
-	{0,			"irc.juggler.jp"},
-
 	{"AccessIRC",	0},
 	/* Self signed */
 	{0,			"irc.accessirc.net"},
 
+	{"ACN", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"global.acn.gr"},
+
 	{"AfterNET", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.afternet.org"},
 
@@ -125,6 +123,13 @@ static const struct defaultserver def[] =
 	{"DarkMyst", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.darkmyst.org"},
 
+#ifdef USE_OPENSSL
+	{"darkscience", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.darkscience.net"},
+	{0,			"irc.drk.sc"},
+	{0,			"irc.darkscience.ws"},
+#endif
+
 	{"Dark-Tou-Net",	0},
 	{0,			"irc.d-t-net.de"},
 
@@ -166,9 +171,6 @@ static const struct defaultserver def[] =
 	/* irc. points to chat. but many users and urls still reference it */
 	{0,				"irc.freenode.net"},
 
-	{"Furnet", 0, 0, 0, 0, 0, TRUE},
-	{0,			"irc.furnet.org"},
-
 	{"GalaxyNet",	0},
 	{0,			"irc.galaxynet.org"},
 
@@ -196,6 +198,12 @@ static const struct defaultserver def[] =
 #endif
 	{0,			"irc.globalgamers.net"},
 
+#ifdef USE_OPENSSL
+	{"hackint", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.hackint.org"},
+	{0,			"irc.eu.hackint.org"},
+#endif
+
 	{"Hashmark",	0},
 	{0,			"irc.hashmark.net"},
 
@@ -231,10 +239,18 @@ static const struct defaultserver def[] =
 	{"Krstarica", 0},
 	{0,			"irc.krstarica.com"},
 
+#ifdef USE_OPENSSL
+	{"LibertaCasa", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.liberta.casa"},
+#endif
+
 	{"LibraIRC", 0},
 	/* Self signed */
 	{0,			"irc.librairc.net"},
 
+	{"Libera.Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.libera.chat"},
+
 #ifdef USE_OPENSSL
 	{"LinkNet",	0},
 	{0,			"irc.link-net.org/+7000"},
@@ -246,9 +262,6 @@ static const struct defaultserver def[] =
 	{"MIXXnet",		0},
 	{0,			"irc.mixxnet.net"},
 
-	{"Moznet", 0, 0, 0, 0, 0, TRUE},
-	{0,			"irc.mozilla.org"},
-	
 	{"ObsidianIRC",  0},
 	/* Self signed */
 	{0,      "irc.obsidianirc.net"}, 
@@ -273,9 +286,12 @@ static const struct defaultserver def[] =
 	{0,			"irc.ponychat.net"},
 
 	{"PTNet.org",	0},
-	/* Note that the network suggests ISO-8859-1 but most users ignore this */
+	{0,			"irc.ptnet.org"},
 	{0,			"uevora.ptnet.org"},
-	{0,			"vianetworks.ptnet.org"},
+	{0,			"claranet.ptnet.org"},
+	{0,			"sonaquela.ptnet.org"},
+	{0,			"uc.ptnet.org"},
+	{0,			"ipg.ptnet.org"},
 
 	{"QuakeNet", 0, 0, 0, LOGIN_CHALLENGEAUTH},
 	{0,			"irc.quakenet.org"},
@@ -299,6 +315,9 @@ static const struct defaultserver def[] =
 	{"Serenity-IRC",	0},
 	{0,			"irc.serenity-irc.net"},
 
+	{"SimosNap", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,            "irc.simosnap.com"},
+
 	{"SlashNET",	0},
 	/* Self signed */
 	{0,			"irc.slashnet.org"},
@@ -340,7 +359,18 @@ static const struct defaultserver def[] =
 
 	{"Techtronix",	0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.techtronix.net"},
+	
+	{"tilde.chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.tilde.chat"},
 
+#ifdef USE_OPENSSL
+	{"TripSit", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.tripsit.me"},
+	{0,			"newirc.tripsit.me"},
+	{0,			"coconut.tripsit.me"},
+	{0,			"innsbruck.tripsit.me"},
+#endif	
+	
 	{"TURLINet", 0, 0, 0, 0, 0, TRUE},
 	/* Other servers use CP1251 and invalid certs */
 	{0,			"irc.servx.ru"},
@@ -358,6 +388,9 @@ static const struct defaultserver def[] =
 
 	{"Xertion", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.xertion.org"},
+	
+	{"DeltaPool", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.deltapool.net"},
 
 	{0,0}
 };
@@ -928,7 +961,7 @@ servlist_load_defaults (void)
 {
 	int i = 0, j = 0;
 	ircnet *net = NULL;
-	guint def_hash = g_str_hash ("freenode");
+	guint def_hash = g_str_hash ("Libera.Chat");
 
 	while (1)
 	{
diff --git a/src/common/text.c b/src/common/text.c
index 4a274f98..b0a90e03 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -1295,6 +1295,13 @@ static char * const pevt_invited_help[] = {
 	N_("Server Name"),
 };
 
+static char * const pevt_invitedother_help[] = {
+	N_("Channel Name"),
+	N_("Nick of person who sent the invite"),
+	N_("Nick of person who was invited"),
+	N_("Server Name"),
+};
+
 static char * const pevt_usersonchan_help[] = {
 	N_("Channel Name"),
 	N_("Users"),
diff --git a/src/common/textevents.in b/src/common/textevents.in
index 9790c18d..14bd4b06 100644
--- a/src/common/textevents.in
+++ b/src/common/textevents.in
@@ -496,6 +496,12 @@ pevt_invited_help
 %C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)
 3
 
+Invited Other
+XP_TE_INVITEDOTHER
+pevt_invitedother_help
+%C24*%O$t%C26$3%C has been invited to %C22$1%O by %C18$2%O (%C29$4%O)
+4
+
 Join
 XP_TE_JOIN
 pevt_join_help
diff --git a/src/common/url.c b/src/common/url.c
index a741fb04..6a1d09e8 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -518,6 +518,8 @@ struct
 	{ "pop",       "/", URI_AUTHORITY | URI_OPT_USERINFO | URI_PATH },
 	{ "nfs",       "/", URI_AUTHORITY | URI_OPT_USERINFO | URI_PATH },
 	{ "smb",       "/", URI_AUTHORITY | URI_OPT_USERINFO | URI_PATH },
+	{ "gopher",    "/", URI_AUTHORITY | URI_PATH },
+	{ "gemini",    "/", URI_AUTHORITY | URI_PATH },
 	{ "ssh",       "",  URI_AUTHORITY | URI_OPT_USERINFO },
 	{ "sip",       "",  URI_AUTHORITY | URI_USERINFO },
 	{ "sips",      "",  URI_AUTHORITY | URI_USERINFO },
diff --git a/src/common/userlist.c b/src/common/userlist.c
index 0f28a000..5f2d67f2 100644
--- a/src/common/userlist.c
+++ b/src/common/userlist.c
@@ -101,13 +101,15 @@ userlist_set_account (struct session *sess, char *nick, char *account)
 	user = userlist_find (sess, nick);
 	if (user)
 	{
-		g_free (user->account);
-			
 		if (strcmp (account, "*") == 0)
-			user->account = NULL;
-		else
+		{
+			g_clear_pointer (&user->account, g_free);
+		} else if (g_strcmp0 (user->account, account))
+		{
+			g_free (user->account);
 			user->account = g_strdup (account);
-			
+		}
+
 		/* gui doesnt currently reflect login status, maybe later
 		fe_userlist_rehash (sess, user); */
 	}
@@ -130,8 +132,11 @@ userlist_add_hostname (struct session *sess, char *nick, char *hostname,
 			g_free (user->hostname);
 			user->hostname = g_strdup (hostname);
 		}
-		if (!user->realname && realname && *realname)
+		if (realname && *realname && g_strcmp0 (user->realname, realname) != 0)
+		{
+			g_free (user->realname);
 			user->realname = g_strdup (realname);
+		}
 		if (!user->servername && servername)
 			user->servername = g_strdup (servername);
 		if (!user->account && account && strcmp (account, "0") != 0)
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 9d068a1b..ee3e847c 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -293,10 +293,10 @@ create_input_style (GtkStyle *style)
 		GtkSettings *settings = gtk_settings_get_default ();
 		char *theme_name;
 
-		/* gnome-themes-standard 3.20 relies on images to do theming
+		/* gnome-themes-standard 3.20+ relies on images to do theming
 		 * so we have to override that. */
 		g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
-		if (g_str_has_prefix (theme_name, "Adwaita"))
+		if (g_str_has_prefix (theme_name, "Adwaita") || g_str_has_prefix (theme_name, "Yaru"))
 			gtk_rc_parse_string (adwaita_workaround_rc);
 		g_free (theme_name);
 
diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index 61d0a074..06df36dc 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.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>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index f1d3da50..ce3cbcae 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -247,7 +247,7 @@ joind_show_dialog (server *serv)
 							G_CALLBACK (joind_ok_cb), serv);
 							
 	if (serv->network)
-		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0)
+		if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0)
 		{
 			gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
 		}
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index efeaaaeb..4e5baaa0 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -53,6 +53,10 @@
 #include "sexy-spell-entry.h"
 #include "gtkutil.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
 #define GUI_SPACING (3)
 #define GUI_BORDER (0)
 
@@ -1516,14 +1520,32 @@ static void
 mg_create_alertmenu (session *sess, GtkWidget *menu)
 {
 	GtkWidget *submenu;
+	int hex_balloon, hex_beep, hex_tray, hex_flash;
+
+
+	switch (sess->type) {
+		case SESS_DIALOG:
+			hex_balloon = prefs.hex_input_balloon_priv;
+			hex_beep = prefs.hex_input_beep_priv;
+			hex_tray = prefs.hex_input_tray_priv;
+			hex_flash = prefs.hex_input_flash_priv;
+			break;
+		default:
+			hex_balloon = prefs.hex_input_balloon_chans;
+			hex_beep = prefs.hex_input_beep_chans;
+			hex_tray = prefs.hex_input_tray_chans;
+			hex_flash = prefs.hex_input_flash_chans;
+	}
+
+	submenu = menu_quick_sub(_("_Extra Alerts"), menu, NULL, XCMENU_MNEMONIC, -1);
 
-	submenu = menu_quick_sub (_("_Extra Alerts"), menu, NULL, XCMENU_MNEMONIC, -1);
+	mg_perchan_menu_item(_("Show Notifications"), submenu, &sess->alert_balloon, hex_balloon);
 
-	mg_perchan_menu_item (_("Beep on _Message"), submenu, &sess->alert_beep, prefs.hex_input_beep_chans);
+	mg_perchan_menu_item(_("Beep on _Message"), submenu, &sess->alert_beep, hex_beep);
 
-	mg_perchan_menu_item (_("Blink Tray _Icon"), submenu, &sess->alert_tray, prefs.hex_input_tray_chans);
+	mg_perchan_menu_item(_("Blink Tray _Icon"), submenu, &sess->alert_tray, hex_tray);
 
-	mg_perchan_menu_item (_("Blink Task _Bar"), submenu, &sess->alert_taskbar, prefs.hex_input_flash_chans);
+	mg_perchan_menu_item(_("Blink Task _Bar"), submenu, &sess->alert_taskbar, hex_flash);
 }
 
 static void
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 097093b4..233715e5 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1002,6 +1002,18 @@ menu_chan_part (GtkWidget * menu, char *chan)
 }
 
 static void
+menu_chan_focus (GtkWidget * menu, char *chan)
+{
+	char tbuf[256];
+
+	if (current_sess)
+	{
+		g_snprintf (tbuf, sizeof tbuf, "doat %s gui focus", chan);
+		handle_command (current_sess, tbuf, FALSE);
+	}
+}
+
+static void
 menu_chan_join (GtkWidget * menu, char *chan)
 {
 	char tbuf[256];
@@ -1018,8 +1030,11 @@ menu_chanmenu (struct session *sess, GdkEventButton * event, char *chan)
 {
 	GtkWidget *menu;
 	int is_joined = FALSE;
+	session * chan_session;
+
+	chan_session = find_channel (sess->server, chan);
 
-	if (find_channel (sess->server, chan))
+	if (chan_session)
 		is_joined = TRUE;
 
 	g_free (str_copy);
@@ -1035,6 +1050,9 @@ menu_chanmenu (struct session *sess, GdkEventButton * event, char *chan)
 												 str_copy);
 	else
 	{
+		if (chan_session != current_sess)
+			menu_quick_item_with_callback (menu_chan_focus, _("Focus Channel"), menu,
+													 str_copy);
 		menu_quick_item_with_callback (menu_chan_part, _("Part Channel"), menu,
 												 str_copy);
 		menu_quick_item_with_callback (menu_chan_cycle, _("Cycle Channel"), menu,
diff --git a/src/fe-gtk/meson.build b/src/fe-gtk/meson.build
index f11580bb..3dfc7427 100644
--- a/src/fe-gtk/meson.build
+++ b/src/fe-gtk/meson.build
@@ -39,13 +39,9 @@ if gtk_dep.get_pkgconfig_variable('target') == 'x11'
   hexchat_gtk_deps += dependency('x11')
 endif
 
-hexchat_gtk_cflags = [
-  '-fPIE'
-]
+hexchat_gtk_cflags = []
 
-hexchat_gtk_ldflags = [
-  '-pie'
-]
+hexchat_gtk_ldflags = []
 
 if get_option('with-libnotify')
   hexchat_gtk_sources += 'notifications/notification-libnotify.c'
@@ -84,11 +80,16 @@ resources = gnome.compile_resources('resources',
   extra_args: ['--manual-register']
 )
 
+if host_machine.system() == 'windows'
+  hexchat_gtk_ldflags += '-Wl,-e,mainCRTStartup'
+endif
+
 executable('hexchat',
   sources:  resources + hexchat_gtk_sources,
   dependencies: hexchat_gtk_deps,
   c_args: hexchat_gtk_cflags,
   link_args: hexchat_gtk_ldflags,
+  pie: true,
   install: true,
   gui_app: true,
 )
diff --git a/src/fe-gtk/notifications/notifications-winrt.vcxproj b/src/fe-gtk/notifications/notifications-winrt.vcxproj
index 1f392b6b..2f6ffc99 100644
--- a/src/fe-gtk/notifications/notifications-winrt.vcxproj
+++ b/src/fe-gtk/notifications/notifications-winrt.vcxproj
@@ -1,62 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="notification-winrt.cpp">

-      <CompileAsWinRT>true</CompileAsWinRT>

-    </ClCompile>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{C53145CC-D021-40C9-B97C-0249AB9A43C9}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>notifications-winrt</RootNamespace>

-    <ProjectName>notifications-winrt</ProjectName>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Label="Configuration">

-    <PlatformToolset>v140</PlatformToolset>

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  <Import Project="..\..\..\win32\hexchat.props" />

-  <PropertyGroup>

-    <TargetName>hcnotifications-winrt</TargetName>

-    <OutDir>$(HexChatRel)plugins\</OutDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SDLCheck>true</SDLCheck>

-      <AdditionalUsingDirectories>$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>$(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <MinimumRequiredVersion>6.03</MinimumRequiredVersion>

-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SDLCheck>true</SDLCheck>

-      <AdditionalUsingDirectories>$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>

-    </ClCompile>

-    <Link>

-      <AdditionalDependencies>$(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <MinimumRequiredVersion>6.03</MinimumRequiredVersion>

-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="notification-winrt.cpp">
+      <CompileAsWinRT>true</CompileAsWinRT>
+    </ClCompile>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C53145CC-D021-40C9-B97C-0249AB9A43C9}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>notifications-winrt</RootNamespace>
+    <ProjectName>notifications-winrt</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v142</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="..\..\..\win32\hexchat.props" />
+  <PropertyGroup>
+    <TargetName>hcnotifications-winrt</TargetName>
+    <OutDir>$(HexChatRel)plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalUsingDirectories>$(VC_LibraryPath_VC_x86_Store)\references;$(WindowsSDK_UnionMetadataPath);$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <MinimumRequiredVersion>6.03</MinimumRequiredVersion>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES_MEMORY;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;NDEBUG;_WINDOWS;_USRDLL;NOTIFICATIONS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalUsingDirectories>$(VC_LibraryPath_VC_x86_Store)\references;$(WindowsSDK_UnionMetadataPath);$(VCInstallDir)vcpackages;$(FrameworkSdkDir)References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>$(DepLibs);mincore.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <MinimumRequiredVersion>6.03</MinimumRequiredVersion>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index 6c6cfaeb..9bdf46fc 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -89,7 +89,9 @@ pixmap_load_from_file (char *filename)
 static GdkPixbuf *
 load_pixmap (const char *filename)
 {
-	GdkPixbuf *pixbuf;
+	GdkPixbuf *pixbuf, *scaledpixbuf;
+	const char *scale;
+	int iscale;
 
 	gchar *path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S "%s.png", get_xdir (), filename);
 	pixbuf = gdk_pixbuf_new_from_file (path, 0);
@@ -102,6 +104,24 @@ load_pixmap (const char *filename)
 		g_free (path);
 	}
 
+	// Hack to avoid unbearably tiny icons on HiDPI screens.
+	scale = g_getenv ("GDK_SCALE");
+	if (scale)
+	{
+		iscale = atoi (scale);
+		if (iscale > 0)
+		{
+			scaledpixbuf = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * iscale,
+				gdk_pixbuf_get_height (pixbuf) * iscale, GDK_INTERP_BILINEAR);
+
+			if (scaledpixbuf)
+			{
+				g_object_unref (pixbuf);
+				pixbuf = scaledpixbuf;
+			}
+		}
+	}
+
 	g_warn_if_fail (pixbuf != NULL);
 
 	return pixbuf;
diff --git a/src/fe-gtk/plugin-notification.c b/src/fe-gtk/plugin-notification.c
index 3ac89244..29478d7a 100644
--- a/src/fe-gtk/plugin-notification.c
+++ b/src/fe-gtk/plugin-notification.c
@@ -25,6 +25,9 @@
 
 static hexchat_plugin *ph;
 
+const int CHANNEL_FLAG_BALLOON       = 1 << 21;
+const int CHANNEL_FLAG_BALLOON_UNSET = 1 << 22;
+
 static gboolean
 should_alert (void)
 {
@@ -117,10 +120,24 @@ static int
 incoming_message_cb (char *word[], gpointer userdata)
 {
 	int message;
+	int flags;
+	int alert = 0;
+
+	flags = hexchat_list_int(ph, NULL, "flags");
+
+	/* Let sure that can alert */
+	if (should_alert()) {
+		/* Follow the channel rules if set */
+		if (!(flags & CHANNEL_FLAG_BALLOON_UNSET)) {
+			alert = (flags & CHANNEL_FLAG_BALLOON);
+		} else {
+			/* Else follow global environment */
+			alert = (hexchat_get_prefs(ph, "input_balloon_chans", NULL, &message) == 3 && message);
+		}
+	}
 
-	if (hexchat_get_prefs (ph, "input_balloon_chans", NULL, &message) == 3 && message && should_alert ())
-	{
-		show_notificationf (word[2], _("Channel message from: %s (%s)"), word[1], hexchat_get_info (ph, "channel"));
+	if (alert) {
+		show_notificationf(word[2], _("Channel message from: %s (%s)"), word[1], hexchat_get_info(ph, "channel"));
 	}
 	return HEXCHAT_EAT_NONE;
 }
@@ -129,8 +146,23 @@ static int
 incoming_priv_cb (char *word[], gpointer userdata)
 {
 	int priv;
+	int flags;
+	int alert = 0;
+
+	flags = hexchat_list_int(ph, NULL, "flags");
+
+	/* Let sure that can alert */
+	if (should_alert()) {
+		/* Follow the private rules if set */
+		if (!(flags & CHANNEL_FLAG_BALLOON_UNSET)) {
+			alert = (flags & CHANNEL_FLAG_BALLOON);
+		} else {
+			/* Else follow global environment */
+			alert = (hexchat_get_prefs(ph, "input_balloon_priv", NULL, &priv) == 3 && priv);
+		}
+	}
 
-	if (hexchat_get_prefs (ph, "input_balloon_priv", NULL, &priv) == 3 && priv && should_alert ())
+	if (alert)
 	{
 		const char *network = hexchat_get_info (ph, "network");
 		if (!network)
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index fac0c4e6..418bb4da 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -283,8 +283,24 @@ backend_font_open (GtkXText *xtext, char *name)
 	metrics = pango_context_get_metrics (context, xtext->font->font, lang);
 	xtext->font->ascent = pango_font_metrics_get_ascent (metrics) / PANGO_SCALE;
 	xtext->font->descent = pango_font_metrics_get_descent (metrics) / PANGO_SCALE;
+
+	/*
+	 * In later versions of pango, a font's height should be calculated like
+	 * this to account for line gap; a typical symptom of not doing so is
+	 * cutting off the underscore on some fonts.
+	 */
+#if PANGO_VERSION_CHECK(1, 44, 0)
+	xtext->fontsize = pango_font_metrics_get_height (metrics) / PANGO_SCALE + 1;
+
+	if (xtext->fontsize == 0)
+		xtext->fontsize = xtext->font->ascent + xtext->font->descent;
+#else
+	xtext->fontsize = xtext->font->ascent + xtext->font->descent;
+#endif
+
 	pango_font_metrics_unref (metrics);
 }
+
 static int
 backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis)
 {
@@ -3479,8 +3495,6 @@ gtk_xtext_set_font (GtkXText *xtext, char *name)
 	if (xtext->font == NULL)
 		return FALSE;
 
-	xtext->fontsize = xtext->font->ascent + xtext->font->descent;
-
 	{
 		char *time_str;
 		int stamp_size = xtext_get_stamp_str (time(0), &time_str);
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index ac190325..1d411ddf 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -837,7 +837,7 @@ fe_ctrl_gui (session *sess, fe_gui_action action, int arg)
 	/* only one action type handled for now, but could add more */
 	switch (action)
 	{
-	/* gui focus is really the only case hexchat-text needs to wory about */
+	/* gui focus is really the only case hexchat-text needs to worry about */
 	case FE_GUI_FOCUS:
 		current_sess = sess;
 		current_tab = sess;
diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj
index 6c7c25a8..75b64a12 100644
--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.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>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

diff --git a/src/htm/Properties/Resources.Designer.cs b/src/htm/Properties/Resources.Designer.cs
index 7627ee06..8e2cd74a 100644
--- a/src/htm/Properties/Resources.Designer.cs
+++ b/src/htm/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace thememan.Properties {
     // class via a tool like ResGen or Visual Studio.

     // To add or remove a member, edit your .ResX file then rerun ResGen

     // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

     internal class Resources {

diff --git a/src/htm/Properties/Settings.Designer.cs b/src/htm/Properties/Settings.Designer.cs
index cf679280..c8c467e8 100644
--- a/src/htm/Properties/Settings.Designer.cs
+++ b/src/htm/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace thememan.Properties {
     

     

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]

     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {

         

         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

diff --git a/src/htm/app.config b/src/htm/app.config
index ad1957f6..b33a2051 100644
--- a/src/htm/app.config
+++ b/src/htm/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>

 <configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

diff --git a/src/htm/htm.csproj b/src/htm/htm.csproj
index eaf57a0f..7c96d274 100644
--- a/src/htm/htm.csproj
+++ b/src/htm/htm.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>thememan</AssemblyName>

     <FileAlignment>512</FileAlignment>

     <IsWebBootstrapper>false</IsWebBootstrapper>

-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

     <TargetFrameworkProfile>

     </TargetFrameworkProfile>

     <PublishUrl>publish\</PublishUrl>

diff --git a/src/libenchant_win8/libenchant_win8.vcxproj b/src/libenchant_win8/libenchant_win8.vcxproj
index 3496f978..a6cbdad6 100644
--- a/src/libenchant_win8/libenchant_win8.vcxproj
+++ b/src/libenchant_win8/libenchant_win8.vcxproj
@@ -19,7 +19,7 @@
   <PropertyGroup Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

-    <PlatformToolset>v140</PlatformToolset>

+    <PlatformToolset>v142</PlatformToolset>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <Import Project="..\..\win32\hexchat.props" />

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index c508a7f3..b26d7e28 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.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>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

@@ -64,6 +64,8 @@
     <LuaShare Include="$(DepsRoot)\share\lua\**\*.lua" />

     <LuaShare Include="$(DepsRoot)\share\lua\**\**\*.lua" />

     <Typelib Include="$(DepsRoot)\lib\girepository-1.0\*.typelib" />

+    <None Include="$(Python3Path)\Lib\site-packages\_cffi_backend.*.pyd" />

+    <None Include="$(Python2Path)\Lib\site-packages\_cffi_backend.pyd" />

 

     <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs14\engines\**\*" />

 

@@ -91,6 +93,9 @@
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(HexChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />

     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(HexChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />

     <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(HexChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />

+    <Copy SourceFiles="..\..\plugins\python\xchat.py" DestinationFolder="$(HexChatRel)\python" />

+    <Copy SourceFiles="..\..\plugins\python\hexchat.py" DestinationFolder="$(HexChatRel)\python" />

+    <Copy SourceFiles="..\..\plugins\python\_hexchat.py" DestinationFolder="$(HexChatRel)\python" />

 

     <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" />

 

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 831996e5..f40c794a 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -41,7 +41,7 @@
 		<HexChatLib>$(HexChatBuild)\$(PlatformName)\lib\</HexChatLib>

 		<HexChatPdb>$(HexChatBuild)\$(PlatformName)\pdb\</HexChatPdb>

 		<HexChatRel>$(HexChatBuild)\$(PlatformName)\rel\</HexChatRel>

-		<IsccPath>"$(MSBuildExtensionsPath32)\..\Inno Setup 5\iscc.exe"</IsccPath>

+		<IsccPath>"$(ProgramFiles)\Inno Setup 5\iscc.exe"</IsccPath>

 	</PropertyGroup>

 

 	<PropertyGroup>

diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index e242ee96..be985384 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -31,9 +31,9 @@ Compression=lzma2/ultra64
 SourceDir=..\rel
 OutputDir=..
 #if APPARCH == "x64"
-OutputBaseFilename={#APPNAM} {#APPVER} x64
+OutputBaseFilename={#APPNAM}-{#APPVER}_x64
 #else
-OutputBaseFilename={#APPNAM} {#APPVER} x86
+OutputBaseFilename={#APPNAM}-{#APPVER}_x86
 #endif
 FlatComponentsList=no
 PrivilegesRequired=none
@@ -164,6 +164,7 @@ Source: "lib\girepository-1.0\*.typelib"; DestDir: "{app}\lib\girepository-1.0";
 Source: "share\lua\*.lua"; DestDir: "{app}\share\lua"; Flags: ignoreversion; Components: langs\lua
 Source: "share\lua\lgi\*.lua"; DestDir: "{app}\share\lua\lgi"; Flags: ignoreversion; Components: langs\lua
 Source: "share\lua\lgi\override\*.lua"; DestDir: "{app}\share\lua\lgi\override"; Flags: ignoreversion; Components: langs\lua
+Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
 
 Source: "plugins\hcchecksum.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\checksum
 Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec
@@ -175,11 +176,15 @@ Source: "WinSparkle.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: pl
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp
 Source: "share\system.png"; DestDir: "{app}\share"; Flags: ignoreversion; Components: plugins\sysinfo
 Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo
+Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\perl
+
+Source: "python\*.py"; DestDir: "{app}\python"; Flags: ignoreversion; Components: langs\python
 
 Source: "plugins\hcpython2.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python\python2
+Source: "_cffi_backend.pyd"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\python\python2
+
 Source: "plugins\hcpython3.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python\python3
-Source: "plugins\hcperl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\perl
-Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua
+Source: "_cffi_backend.cp3*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\python\python3
 
 Source: "hexchat.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xctext
diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index 3458b658..3cc11e44 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.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>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index aa60abff..759ae14d 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.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>Application</ConfigurationType>

   </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">