Merge branch '1.8.x'

diff --cc modules/po/admindebug.bg_BG.po
index fca36ffca31985f634dd2090af005cdaab1d34c5,a127aff3dbe0cd2c4f6dc8bd46c30da20dfb71e5..5b98b270cc1561c32d65fa1271091a907fcab75a
--- 1/modules/po/admindebug.bg_BG.po
--- 2/modules/po/admindebug.bg_BG.po
+++ b/modules/po/admindebug.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/admindebug.es_ES.po
index e9ec1bf91756e5237d41979c8ba0697f126a20d4,155f3435523d1637560991c26e1cf2363b2de876..9e5959a1782751238b94ce5aae9094309f814e27
--- 1/modules/po/admindebug.es_ES.po
--- 2/modules/po/admindebug.es_ES.po
+++ b/modules/po/admindebug.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/admindebug.fr_FR.po
index e2fc8efdc084389c4a1f64ad9b0a2f0dc1124f88,c89f510227d1b2f6d96d933965ec0c6523a3f035..4be5f8fe8c27f1f7c67711c3a925a7fccee81911
--- 1/modules/po/admindebug.fr_FR.po
--- 2/modules/po/admindebug.fr_FR.po
+++ b/modules/po/admindebug.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/admindebug.id_ID.po
index dda9bdd77c0c80087d84b11e453148034933d194,b957f4ff288578f52092881f97cd7b14dc547424..8819da1a2a81b7a3c69fd79bc9adb23e49e65597
--- 1/modules/po/admindebug.id_ID.po
--- 2/modules/po/admindebug.id_ID.po
+++ b/modules/po/admindebug.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/admindebug.it_IT.po
index 2629751ba44551de3f179c9d4621a74e0f3bfced,1f496c5ae72c197d85d218b0b3e943423d27bc47..ecbc76a5105f9b7e12114dde51d5ea64791509d3
--- 1/modules/po/admindebug.it_IT.po
--- 2/modules/po/admindebug.it_IT.po
+++ b/modules/po/admindebug.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/admindebug.nl_NL.po
index 554b1ff913bf8ebb198d3ad976bcb8364d06b09a,75838a971613a56caacf72a361601f47f96a25f3..39505115606eaf0b0b8d12ba119105f3322fb9b1
--- 1/modules/po/admindebug.nl_NL.po
--- 2/modules/po/admindebug.nl_NL.po
+++ b/modules/po/admindebug.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/admindebug.pl_PL.po
index 893361a478a60d2012956cd3efaf1c92837f7431,5f1cd4eb42397a046f416e6193009c70bf8ca8cd..afbc43cc90d4be63aa0b49894d39cce551f4450b
--- 1/modules/po/admindebug.pl_PL.po
--- 2/modules/po/admindebug.pl_PL.po
+++ b/modules/po/admindebug.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/admindebug.pt_BR.po
index c6fbee1e5b39434d71aca29c0bd26e59a06ce531,d9b4ea26894415a6f54011de44cac6a06bd15601..c97df2e13f9f5494c258de5c492978699b6f6b0d
--- 1/modules/po/admindebug.pt_BR.po
--- 2/modules/po/admindebug.pt_BR.po
+++ b/modules/po/admindebug.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/admindebug.ru_RU.po
index 3156f093bcc96d6c786d197ec9290922f93ecf8e,232013d0f9a54463e02c606575d204caec6b0cac..8842acad440e92f4ab36c12a4e84afe4b1f1da42
--- 1/modules/po/admindebug.ru_RU.po
--- 2/modules/po/admindebug.ru_RU.po
+++ b/modules/po/admindebug.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/admindebug.pot\n"
 +"X-Crowdin-File-ID: 273\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n"
+ "X-Crowdin-File-ID: 290\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/adminlog.bg_BG.po
index 24ff5048ce82e7cf9c54fd0032ac6f21bc79252d,53ae7f2527226ad9c438a8f9da23ef7bdabbde63..aa55937f2799ab65ca3f7f3af9ef8455e863b0a3
--- 1/modules/po/adminlog.bg_BG.po
--- 2/modules/po/adminlog.bg_BG.po
+++ b/modules/po/adminlog.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/adminlog.es_ES.po
index 7732ddd4c3194cd4378450076e43603a4571e60b,839d572a8f15f8449302654d6853468311795281..9e46d4e14b6c279a0a73d5e8f3053c661739178b
--- 1/modules/po/adminlog.es_ES.po
--- 2/modules/po/adminlog.es_ES.po
+++ b/modules/po/adminlog.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/adminlog.fr_FR.po
index f899ab3670e9b173b9c203520524c69a951f3e1d,3dad8f5c78720a646151162268d8dbf434202ab9..855a94aa736c923fb611eb0836ee0898ef45aa51
--- 1/modules/po/adminlog.fr_FR.po
--- 2/modules/po/adminlog.fr_FR.po
+++ b/modules/po/adminlog.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/adminlog.id_ID.po
index f45e1e64b80871db3cfaffae8569f981968725c3,4dc278e0b6030edb300d7ac3b83de64ec67e3087..de0c77aafc77ed71afc3b8abe5c29d303af9a98d
--- 1/modules/po/adminlog.id_ID.po
--- 2/modules/po/adminlog.id_ID.po
+++ b/modules/po/adminlog.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/adminlog.it_IT.po
index aa2565aeb14ea84ae2db2c2a1b481aa019d8c500,b6edc576871249f7a4bcf316d2fb5bfc2bf261d2..1ee3c391385d967ef0fdab32ae8664344bf941dd
--- 1/modules/po/adminlog.it_IT.po
--- 2/modules/po/adminlog.it_IT.po
+++ b/modules/po/adminlog.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/adminlog.nl_NL.po
index c52d7d1ac243a554d07ab69f561306a05bbdee37,a47c380d1800dfeaf764285cba4d5aedee75b981..2cef6f7cfc6ba901fa7dac04fc90a142c54a3293
--- 1/modules/po/adminlog.nl_NL.po
--- 2/modules/po/adminlog.nl_NL.po
+++ b/modules/po/adminlog.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/adminlog.pl_PL.po
index 130edc304278c5da596b5b0fc53c88e9e3a1c3d2,dcc4324b29e2f286cc058a36caaeb7f8bc0dab9f..ff48120a5fcab76c34bb67d45fd35ce1b4c45efe
--- 1/modules/po/adminlog.pl_PL.po
--- 2/modules/po/adminlog.pl_PL.po
+++ b/modules/po/adminlog.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/adminlog.pt_BR.po
index ba85e916499c4c03ad0af13d6107c622ad80c97c,a33ed7e3a2c4d7479ce5bd49e1867011c04b411e..917d8b234f1db0287f13685ae03e89ed8d90a478
--- 1/modules/po/adminlog.pt_BR.po
--- 2/modules/po/adminlog.pt_BR.po
+++ b/modules/po/adminlog.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/adminlog.ru_RU.po
index 6b301b78d8cad4c3dfd52d4e2b82cb21bd6901ed,69a9a954fa64f8c1e125cca713f82777a1fada07..a7e01a8165db9902fec37646b340fcbd4e7426f6
--- 1/modules/po/adminlog.ru_RU.po
--- 2/modules/po/adminlog.ru_RU.po
+++ b/modules/po/adminlog.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/adminlog.pot\n"
 +"X-Crowdin-File-ID: 149\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n"
+ "X-Crowdin-File-ID: 294\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/alias.bg_BG.po
index 54e644be149a1d61f7c8c0e57dc1f0556a87b3f9,129e84e71b9a40da704a3c800eb1dd4470c496eb..8a3c5c4a74a21f064c564f93c5b16828d040300c
--- 1/modules/po/alias.bg_BG.po
--- 2/modules/po/alias.bg_BG.po
+++ b/modules/po/alias.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/alias.es_ES.po
index 3289e6e1c196d0f6f25634d949f0e1d8f57c31cd,0242697bbef878f1799c8f17fc2981280f7e7452..715322bf52e5c3d94fbc0e6032f4f8351a88a602
--- 1/modules/po/alias.es_ES.po
--- 2/modules/po/alias.es_ES.po
+++ b/modules/po/alias.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/alias.fr_FR.po
index e7046d06a71a97dabc67980fc093e8d8f2b5be74,aecbe335fa2f181ad2319e5bd1e3cbc024e30cad..88b252d1cc6d4dbe92e014e96b391789bee00546
--- 1/modules/po/alias.fr_FR.po
--- 2/modules/po/alias.fr_FR.po
+++ b/modules/po/alias.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/alias.id_ID.po
index 0dbcc95a98779a436a238f336804fd11e647de6a,a18d65f685d405445dee1f3308c7d34ef5d56fca..43c919d01ef164d4961f3a4da459d4bdf7eaeb28
--- 1/modules/po/alias.id_ID.po
--- 2/modules/po/alias.id_ID.po
+++ b/modules/po/alias.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/alias.it_IT.po
index 5c50f0096d8295493e05c232ddaaa9269a9162b9,86d7f056fdd46596b2ba692b8eb358f4e6aee2e2..1936def3f1b035e795538ed82fa67fb665aa6345
--- 1/modules/po/alias.it_IT.po
--- 2/modules/po/alias.it_IT.po
+++ b/modules/po/alias.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/alias.nl_NL.po
index 3bd207e1765521ca0592f9c005c67e1d56fb1819,5a300161b164467976c70215e4cfca98bf236f9c..1d1359d31894719eee0718c0d255e40b6130ce89
--- 1/modules/po/alias.nl_NL.po
--- 2/modules/po/alias.nl_NL.po
+++ b/modules/po/alias.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/alias.pl_PL.po
index 0e325c47e92844e0decc190f9467b08727576061,f552a73d779055c39f8910c814719e8cc40d7431..d7e2f5d12b79b8076b0b023ce95810fd114aa15b
--- 1/modules/po/alias.pl_PL.po
--- 2/modules/po/alias.pl_PL.po
+++ b/modules/po/alias.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/alias.pt_BR.po
index 8b7c74b7f2e281eaa723715ee3c2c18bbd213c8c,a569355e54032322311a40ca37ef845c9270ab68..30e2a1d001b8e5df1a028cd54df0d03f18f06e09
--- 1/modules/po/alias.pt_BR.po
--- 2/modules/po/alias.pt_BR.po
+++ b/modules/po/alias.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/alias.ru_RU.po
index 69e694cb4d4bf91e2a8c07f3687be2f170f635b0,820358ad62cf80dd61331804dc15e6416bc86f2f..34ebef5426b9b43d6ac9368a514541f876488967
--- 1/modules/po/alias.ru_RU.po
--- 2/modules/po/alias.ru_RU.po
+++ b/modules/po/alias.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/alias.pot\n"
 +"X-Crowdin-File-ID: 150\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/alias.pot\n"
+ "X-Crowdin-File-ID: 292\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/autoattach.bg_BG.po
index d71c656382ea652f35b534df616b7c1c4ba0de57,dac3f119a83c099ef3e419387232a4d90b935c64..762f715a2c4d6b4dc7706dfb1927436dd536bbac
--- 1/modules/po/autoattach.bg_BG.po
--- 2/modules/po/autoattach.bg_BG.po
+++ b/modules/po/autoattach.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/autoattach.es_ES.po
index 987e1cde5bc3fb366e30f8c1bbe6a6ca4b98524e,5916a76505a12c03415a56cccdd774800ecf52b3..0f6df8823bab690f836bcc7361027dc46497c93a
--- 1/modules/po/autoattach.es_ES.po
--- 2/modules/po/autoattach.es_ES.po
+++ b/modules/po/autoattach.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/autoattach.fr_FR.po
index 17c04de32fa4089bf9d0d7721c2cc79110915d7f,6b9f453242ba0387f6719388ca2bbf44c86b4734..e0c58b95f5c558bbbc7bf2c88ee93b81bbf24a6d
--- 1/modules/po/autoattach.fr_FR.po
--- 2/modules/po/autoattach.fr_FR.po
+++ b/modules/po/autoattach.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/autoattach.id_ID.po
index a452dc40934bda70c6e15fbc79bdf454936ddbf0,19d684961b1c49ee192538d60d2aa17a6f898d14..3b74158dac426203c1f868e9891c106d2d980f92
--- 1/modules/po/autoattach.id_ID.po
--- 2/modules/po/autoattach.id_ID.po
+++ b/modules/po/autoattach.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/autoattach.it_IT.po
index 3febe8c478e208addde639d5305bca25ffb1ff50,16aac83c1f7f3e98b88a65932d9784f511e45630..d577ab479d0771e419e375ccb0111a857bb7ebdc
--- 1/modules/po/autoattach.it_IT.po
--- 2/modules/po/autoattach.it_IT.po
+++ b/modules/po/autoattach.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/autoattach.nl_NL.po
index c4de774a9793eb5579a757fdbf44cd1b3dcb2254,d8eb629dd9a9bdb35ce53ab75e42f4eaba35b571..ff2e7605c852d7925c208411b7054dfdc6228d2c
--- 1/modules/po/autoattach.nl_NL.po
--- 2/modules/po/autoattach.nl_NL.po
+++ b/modules/po/autoattach.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/autoattach.pl_PL.po
index 8bf1e0f8b904cc103796c040e0d3d75d325459ee,d471d22adcd51b7ab321c8ea09b7a0e4d8ce039a..0ce4d64cfd1ab45c61ee67b33ff623ebab4c56a9
--- 1/modules/po/autoattach.pl_PL.po
--- 2/modules/po/autoattach.pl_PL.po
+++ b/modules/po/autoattach.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/autoattach.pt_BR.po
index 385ec4dc31fe0c3e137137c4f77b9413ecd52da2,43c73cfbb977ed4c724b39232278417a9c825f50..b8283bde6a52d7324df5a13acf688dbe085adb60
--- 1/modules/po/autoattach.pt_BR.po
--- 2/modules/po/autoattach.pt_BR.po
+++ b/modules/po/autoattach.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/autoattach.ru_RU.po
index b5378e4eab6133db9452aa1fefcaf581b5c6190b,5d6fb6d8c7f078954449629eef75c9dcdbf5b6c9..9d99534e06bd5db592c958cdace9fe6aa76c892a
--- 1/modules/po/autoattach.ru_RU.po
--- 2/modules/po/autoattach.ru_RU.po
+++ b/modules/po/autoattach.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoattach.pot\n"
 +"X-Crowdin-File-ID: 151\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n"
+ "X-Crowdin-File-ID: 298\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/autocycle.bg_BG.po
index 79165f6a427a4c41225b78cc10ec9c1500663985,c0ac6f439da0ba1d7aeaf0fb4d91c4e058951b67..4bd14111aa842e76946ce92677a09ee2125f938c
--- 1/modules/po/autocycle.bg_BG.po
--- 2/modules/po/autocycle.bg_BG.po
+++ b/modules/po/autocycle.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/autocycle.es_ES.po
index bbdd2e7f539264eb8d3d20d913b1ddad91464c59,bb1699d023dc63ca95f474d49c45ab6ad244c531..999b3e29d9f31fd967a28d72642973b5fdb4d6da
--- 1/modules/po/autocycle.es_ES.po
--- 2/modules/po/autocycle.es_ES.po
+++ b/modules/po/autocycle.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/autocycle.fr_FR.po
index b9b9c89daa39c40fa0c7daa7203ee05bcb539e15,b1a28a250d1b9597a73cab76397ed897c59a3aa8..3d25eaf88d6abd5fdf9498b0ebd2aafa014eb5fe
--- 1/modules/po/autocycle.fr_FR.po
--- 2/modules/po/autocycle.fr_FR.po
+++ b/modules/po/autocycle.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/autocycle.id_ID.po
index 2fbab50e133de483588a7d4251e9941e33634559,3147394563a80e6bdbe87852dca4561583b71947..cab8dbfefca7d3a3e614bb0f2b1db89cbf618ae3
--- 1/modules/po/autocycle.id_ID.po
--- 2/modules/po/autocycle.id_ID.po
+++ b/modules/po/autocycle.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/autocycle.it_IT.po
index 2113064d7781c41ad3e371bbac477b02f427fd87,37e5accb3bce5383bd4c72ae742618340f977ce7..881181ffb22255be05056f2f10eb0495a1e1a975
--- 1/modules/po/autocycle.it_IT.po
--- 2/modules/po/autocycle.it_IT.po
+++ b/modules/po/autocycle.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/autocycle.nl_NL.po
index e8f84126d0ca346a97087575995878d1e1409925,7d21e167d2a8313bd5642aa0bff1135ed37c416d..51c5964df22b7b67e8f896d46f42d2dcdfa63687
--- 1/modules/po/autocycle.nl_NL.po
--- 2/modules/po/autocycle.nl_NL.po
+++ b/modules/po/autocycle.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/autocycle.pl_PL.po
index 66c680c8ec998ab277718d8af90875be2bb16044,043103fac25cdf34fa4e5ffbf1a9bd0b8852faae..7f9c12f28240e1983aa2f6cc5ed512639f8c8609
--- 1/modules/po/autocycle.pl_PL.po
--- 2/modules/po/autocycle.pl_PL.po
+++ b/modules/po/autocycle.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/autocycle.pt_BR.po
index 3b6cc5ff85543f73c1fd3a270b6692963abcfa94,8cfe1b2ce521f5bbc4558053b85cb182f670fb39..6b53c6e229fbdedf89cac012e10ea3be54bbe48e
--- 1/modules/po/autocycle.pt_BR.po
--- 2/modules/po/autocycle.pt_BR.po
+++ b/modules/po/autocycle.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/autocycle.ru_RU.po
index 0fd7edb9b7f53b1ac37d829d3bf27e2bf01d0c32,8c3d2d859b0f62099be79933c064043de6512625..60866f8dbd2c288897f140ab443a0f2f2b4eebc6
--- 1/modules/po/autocycle.ru_RU.po
--- 2/modules/po/autocycle.ru_RU.po
+++ b/modules/po/autocycle.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autocycle.pot\n"
 +"X-Crowdin-File-ID: 207\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n"
+ "X-Crowdin-File-ID: 300\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/autoop.bg_BG.po
index 08c2b64ca3a92d23f437b1b3838bed00d108e32d,bf9c2a912f529d7b6dd76464b022efdb1a2f74a5..c122b0f1bb5f88ed290270b6e7e43eb3975b5e21
--- 1/modules/po/autoop.bg_BG.po
--- 2/modules/po/autoop.bg_BG.po
+++ b/modules/po/autoop.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/autoop.es_ES.po
index 2f5645f824d53e9c628c2dd2983fba07afe108f2,3027dd35e5932561f97db7b6e9ac517b37b4d3d8..e5444d69419cc8de7739315501b996df671f7a9f
--- 1/modules/po/autoop.es_ES.po
--- 2/modules/po/autoop.es_ES.po
+++ b/modules/po/autoop.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/autoop.fr_FR.po
index 314a8b9285e47c94fe0d290f8134c9a6f9810969,293b2202466fdb8b72c13876385599c5ac79bd18..e4fb1fbb2764f495c823f25c6da20b1ec6be0a81
--- 1/modules/po/autoop.fr_FR.po
--- 2/modules/po/autoop.fr_FR.po
+++ b/modules/po/autoop.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/autoop.id_ID.po
index e901a884b0bcd92cb7bc90e12ddbe706aadd7cf2,14c2e79aad868a7035d3ccf4f546df0c3e60bc51..25ea44248031e9393f5504b89d1eff9eab0020a1
--- 1/modules/po/autoop.id_ID.po
--- 2/modules/po/autoop.id_ID.po
+++ b/modules/po/autoop.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/autoop.it_IT.po
index 77be1652ac02260480aae3c29e1fb72fc7eda0c2,2de05256d23ae6aaa47b051a3129ae9b17cb25d1..839a343917d59c41f5ae20413677fbd3865adbd0
--- 1/modules/po/autoop.it_IT.po
--- 2/modules/po/autoop.it_IT.po
+++ b/modules/po/autoop.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/autoop.nl_NL.po
index 293a275916bea1b1c0c3e1cc12c3a0cc9aa5e611,748b7167d067d33f7d3a1fea7e039cdf6e2f37ce..b0d5988a96328d4ca0fedab8d42e3e100e203f54
--- 1/modules/po/autoop.nl_NL.po
--- 2/modules/po/autoop.nl_NL.po
+++ b/modules/po/autoop.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/autoop.pl_PL.po
index 8f9dbccdb8945bd86c5e8fd214d74fa7fd0d9f1b,84af36250784ebd890201e356bb1f297e7231955..ac06162b64a28ffe6690a7a6a056d3c8939d291d
--- 1/modules/po/autoop.pl_PL.po
--- 2/modules/po/autoop.pl_PL.po
+++ b/modules/po/autoop.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/autoop.pt_BR.po
index 96b47ad7be735cd2b56025c92b69921cc8edad03,1dbaa8ef6c954a53c5eafe39367351524336229f..415a3e4573ae818e676d27f2db7617a2f77698a5
--- 1/modules/po/autoop.pt_BR.po
--- 2/modules/po/autoop.pt_BR.po
+++ b/modules/po/autoop.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/autoop.ru_RU.po
index 246e7314e903b2ba2aee3a117018c49438041832,046eac02bd927cc36068c7806ea2fac1bbf865a7..9fa43c6376a97c398b14a1b228f9167e8c6380a1
--- 1/modules/po/autoop.ru_RU.po
--- 2/modules/po/autoop.ru_RU.po
+++ b/modules/po/autoop.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoop.pot\n"
 +"X-Crowdin-File-ID: 153\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n"
+ "X-Crowdin-File-ID: 296\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/autoreply.bg_BG.po
index c2ec21a7e66df5e6342a09f711ef5a17c04fea72,049b591d8b1faa2d84e5d95aaac1c366bf1f3a73..76206ea807b214f98c3c079804ff0e692f2e48c5
--- 1/modules/po/autoreply.bg_BG.po
--- 2/modules/po/autoreply.bg_BG.po
+++ b/modules/po/autoreply.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/autoreply.es_ES.po
index 36d2f98b0ce2b25baa869dd64d2dbcf3440e9821,8bab5413570f448ae0d6005ccbc6aa8f3927aeef..a1bcb1f52f1f6fea73228647ec8708575d63596a
--- 1/modules/po/autoreply.es_ES.po
--- 2/modules/po/autoreply.es_ES.po
+++ b/modules/po/autoreply.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/autoreply.fr_FR.po
index 01176d4da4b4c69cf3abbaa36ff4913d7813b5af,3098044768de22eda4780623a58ff6fc5e5c720f..9a453c8df5a0c21fc0e6cafb164179c375029de3
--- 1/modules/po/autoreply.fr_FR.po
--- 2/modules/po/autoreply.fr_FR.po
+++ b/modules/po/autoreply.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/autoreply.id_ID.po
index 399a9ff86cfc11a7a2e3c967937a78189a5c59e7,8d2f985a03b0bfccc929983333fe6cb750671ce0..6623a9c9b489976e5e9ea81631f369c2b3474f95
--- 1/modules/po/autoreply.id_ID.po
--- 2/modules/po/autoreply.id_ID.po
+++ b/modules/po/autoreply.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/autoreply.it_IT.po
index 21fc883b8a137050d99902e94951f063921bce74,4701df398aef234add2b2e872653ff8f072a2198..28328765b4f65d08cc43be5982d9f42665b66eef
--- 1/modules/po/autoreply.it_IT.po
--- 2/modules/po/autoreply.it_IT.po
+++ b/modules/po/autoreply.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/autoreply.nl_NL.po
index 44379340a11614d8a6e6420d48c632f05ae4125c,66322242d2a540fe11c37e83daed2e591505b3c6..0895a802883199a17d9a5bdeba5201cb53db8b9e
--- 1/modules/po/autoreply.nl_NL.po
--- 2/modules/po/autoreply.nl_NL.po
+++ b/modules/po/autoreply.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/autoreply.pl_PL.po
index e7e18c5cb729afd1e3b50411aece97fe2091c9e7,9182ba1aa2d53a9a02f4e830b4b8e27884f89c24..7da4a96885793c87a44b190fdb5b498666528c25
--- 1/modules/po/autoreply.pl_PL.po
--- 2/modules/po/autoreply.pl_PL.po
+++ b/modules/po/autoreply.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/autoreply.pt_BR.po
index fb705aff47c7168489f545129783e2e24b155330,278edba4bad4e8e076b1451dddedd9283f52d6d9..34faf52a6ed2dbdc9bb7f9137d6eac99a66623ba
--- 1/modules/po/autoreply.pt_BR.po
--- 2/modules/po/autoreply.pt_BR.po
+++ b/modules/po/autoreply.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/autoreply.ru_RU.po
index a9324923287044951a03487570a8ee8fc06cdcb0,cc266ebb62184e8900c1844d7857cddcecfa31eb..ba484b38d536039d3fcabfc38fd759f571b5a546
--- 1/modules/po/autoreply.ru_RU.po
--- 2/modules/po/autoreply.ru_RU.po
+++ b/modules/po/autoreply.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autoreply.pot\n"
 +"X-Crowdin-File-ID: 154\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n"
+ "X-Crowdin-File-ID: 302\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/autovoice.bg_BG.po
index 2dcf4b069ad6a1ce4d0c84ac7d4480fa5573ba43,774e535c3594e8076e17fbb9a33a8e7dd61862f9..210a856c8f299de44dea3e6105ebdd5a3b894362
--- 1/modules/po/autovoice.bg_BG.po
--- 2/modules/po/autovoice.bg_BG.po
+++ b/modules/po/autovoice.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/autovoice.es_ES.po
index db7dc8630c1b47e5458782faefa173e564377456,11d3d9ce0bc8698f175b47d64609213a82feaf14..66117b62d4f2a344d50b38d65e7e13721c41c7dd
--- 1/modules/po/autovoice.es_ES.po
--- 2/modules/po/autovoice.es_ES.po
+++ b/modules/po/autovoice.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/autovoice.fr_FR.po
index a94dc131848d2a372127cafc34579830d92aea8b,b01b42cf03d2d492160efef0fb629017b6418db5..f7a81765d44e62b35df4c71602004de01cffe2a9
--- 1/modules/po/autovoice.fr_FR.po
--- 2/modules/po/autovoice.fr_FR.po
+++ b/modules/po/autovoice.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/autovoice.id_ID.po
index 3bb5e6b94bfad39a5ab3c97274052a3e10483068,ad5e4da2e238f32feeb40d66ae75b50bc08f7343..75abf15c820a768f09b807e0d347b1b229e5db91
--- 1/modules/po/autovoice.id_ID.po
--- 2/modules/po/autovoice.id_ID.po
+++ b/modules/po/autovoice.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/autovoice.it_IT.po
index e9b72f5e2228e98b8989158d29659d1d2a583586,4ee4e0556a3985407f5ce27b3da46c39a6967bf0..97a618b73123756d2beb2427b442caed183ae910
--- 1/modules/po/autovoice.it_IT.po
--- 2/modules/po/autovoice.it_IT.po
+++ b/modules/po/autovoice.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/autovoice.nl_NL.po
index 0ae812b59e89af3530ba2191fdbd9034a164394d,5b88c8e305d40e1dc4f4004ab96f60d202ff30ae..7b8232b92c3f44e12b5e46796293d7828fe0fb69
--- 1/modules/po/autovoice.nl_NL.po
--- 2/modules/po/autovoice.nl_NL.po
+++ b/modules/po/autovoice.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/autovoice.pl_PL.po
index ba1a8b88ad08c8c4d7ef8da7d282971f88bd811b,080e7ba33fa723045da3956d81c93924ac7d00a4..79f1cee9d8b1db5e2f0d3c615f6c9d71ff24d3c9
--- 1/modules/po/autovoice.pl_PL.po
--- 2/modules/po/autovoice.pl_PL.po
+++ b/modules/po/autovoice.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/autovoice.pt_BR.po
index 2fa784bac6874eaf982055b4b274fe70f00748e9,70dc78c13a989bd289d5f4aac15a984a481eff40..f5ed48d8f7a2719dc8a1d9088e43f427004a2c44
--- 1/modules/po/autovoice.pt_BR.po
--- 2/modules/po/autovoice.pt_BR.po
+++ b/modules/po/autovoice.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/autovoice.ru_RU.po
index 86d8a49df87cb0deda61fa52feaa653ce25a2acc,1b66e3df2518761ff81b1eddbdf85a0d5547f809..0d7853b8ee033d6ab158e53efcedcb501c247784
--- 1/modules/po/autovoice.ru_RU.po
--- 2/modules/po/autovoice.ru_RU.po
+++ b/modules/po/autovoice.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/autovoice.pot\n"
 +"X-Crowdin-File-ID: 155\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n"
+ "X-Crowdin-File-ID: 304\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/awaystore.bg_BG.po
index 50fde29838be580ca8bb57cfb4e90f4dc5962ada,0a2e3255389211722da7353c9e83bb2ebd160587..97d107120021cda65af7d0533dbc0b91b0624722
--- 1/modules/po/awaystore.bg_BG.po
--- 2/modules/po/awaystore.bg_BG.po
+++ b/modules/po/awaystore.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/awaystore.es_ES.po
index 14e7ef9b72f458ba9630a73d50fe4968597818f0,f444fb1d0b33bc10d6526516c29b0398f4b3bb3e..5f75d294cc7339d7da59adef67e68a492bc78751
--- 1/modules/po/awaystore.es_ES.po
--- 2/modules/po/awaystore.es_ES.po
+++ b/modules/po/awaystore.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/awaystore.fr_FR.po
index 314c491612b3f3a7bd6ca1f1bb2cd0922087832f,9d96548b063bbd863618c50900e58a92f95878f5..985eeb9e20abd9ae297b89906333f7dbaa06506a
--- 1/modules/po/awaystore.fr_FR.po
--- 2/modules/po/awaystore.fr_FR.po
+++ b/modules/po/awaystore.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/awaystore.id_ID.po
index fe046126740a65b21acfd7f5e916abc89819499e,df1342c2b17b79fe22c3d05abca8826fc7879e0a..826d3b02cd993e8fc8299dcb3e537dfb8d07923e
--- 1/modules/po/awaystore.id_ID.po
--- 2/modules/po/awaystore.id_ID.po
+++ b/modules/po/awaystore.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/awaystore.it_IT.po
index 1d80b50b6f1687d1c4d20e5fc017c82c301a148b,09b9755fe8018b7c5981be73730060c35b92c2ae..2f0ea8ae3603e05450b0d43de56fd088265b3a4d
--- 1/modules/po/awaystore.it_IT.po
--- 2/modules/po/awaystore.it_IT.po
+++ b/modules/po/awaystore.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/awaystore.nl_NL.po
index a78007228f5efe6ed7c0a331e841a6749c75f575,cad5fa943ff14990afc16757a4467f34b09a9690..34cec6607f3eaa15565a87cd178a9a22def5bb35
--- 1/modules/po/awaystore.nl_NL.po
--- 2/modules/po/awaystore.nl_NL.po
+++ b/modules/po/awaystore.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/awaystore.pl_PL.po
index f954069c2e4673691ac500d8745d783773f30ff0,6c5a79f21b33fe2d0daca210bdae0d2cf255a6c7..b78ecee16c167a1363263bca0e860e0c83d37b59
--- 1/modules/po/awaystore.pl_PL.po
--- 2/modules/po/awaystore.pl_PL.po
+++ b/modules/po/awaystore.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/awaystore.pt_BR.po
index b474a7f8249819c0e8fad0fd5111849b9320a662,336d459a1b8ecf3c3e6c144265fd35a0160fe339..e7b435f6627f62e9a7f841b20de03ba88a006fb1
--- 1/modules/po/awaystore.pt_BR.po
--- 2/modules/po/awaystore.pt_BR.po
+++ b/modules/po/awaystore.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/awaystore.ru_RU.po
index 93e432ed5af174128044a0374ef36f1219dceaed,3405c60c1804e2936386efe1c7feaa57105494c5..9b21de7b5fcb5e96e8800888b7cdc2665615aeb0
--- 1/modules/po/awaystore.ru_RU.po
--- 2/modules/po/awaystore.ru_RU.po
+++ b/modules/po/awaystore.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/awaystore.pot\n"
 +"X-Crowdin-File-ID: 156\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n"
+ "X-Crowdin-File-ID: 306\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/block_motd.bg_BG.po
index 2ed99644d2a36a33a7c346a6de3f7c099a538b0f,9f843590307b9a98862e175b0c3c4e589ff788b5..26cad423e2136284a0f1c12002c48cd6f8b375d6
--- 1/modules/po/block_motd.bg_BG.po
--- 2/modules/po/block_motd.bg_BG.po
+++ b/modules/po/block_motd.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/block_motd.es_ES.po
index 374d4bab09b196ad2f12cfb4e876baa3d305044f,dc46dc885eb9c758584f6cdd09147fb69ee3e67e..787ab3e5ed3905dd40a0c3e6f0e9f83f76f7ab94
--- 1/modules/po/block_motd.es_ES.po
--- 2/modules/po/block_motd.es_ES.po
+++ b/modules/po/block_motd.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/block_motd.fr_FR.po
index c0098990430872efaffac68a40b5cdde42471bf4,4f10c8eecf0a5aa393147e6096e5e2b85556892f..934614691bfc147548ed7015d0578a5037989fc0
--- 1/modules/po/block_motd.fr_FR.po
--- 2/modules/po/block_motd.fr_FR.po
+++ b/modules/po/block_motd.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/block_motd.id_ID.po
index b21f401941e2fe9dc193554075cb164362250cfe,927f1494164050cea4834fd444c0675a9c97977d..bd57020f12f8b5ae6a38c2516e8411ee46e51ffe
--- 1/modules/po/block_motd.id_ID.po
--- 2/modules/po/block_motd.id_ID.po
+++ b/modules/po/block_motd.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/block_motd.it_IT.po
index 57dec5ba965ffb70c9d6d0108ab22529c7a82ade,c04715fecf5329251d22e1b50a7fab8eef354ac4..599464414d1bf6b51bc8806e40d5644d280961d0
--- 1/modules/po/block_motd.it_IT.po
--- 2/modules/po/block_motd.it_IT.po
+++ b/modules/po/block_motd.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/block_motd.nl_NL.po
index 38b828df317f2821f7eea135757587d7eeab0dc0,2e8b24d03081743d52a1c573957de4b77399bf63..36b40985c0a37085b630d818880e807f30049a18
--- 1/modules/po/block_motd.nl_NL.po
--- 2/modules/po/block_motd.nl_NL.po
+++ b/modules/po/block_motd.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/block_motd.pl_PL.po
index f7600db87a1fbdbfbfd1677dd52e23b946b8cae5,54e5017fd79267c45e5936e4a9ac56636613356b..22e65ebd15f7603a56756200b3b28355f89af78e
--- 1/modules/po/block_motd.pl_PL.po
--- 2/modules/po/block_motd.pl_PL.po
+++ b/modules/po/block_motd.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/block_motd.pt_BR.po
index 33d76df8be0a8037e7c5c883299df38c51edfff0,d01673c04df16a51451cab3562ecc94c9404aafc..2ab71658b57f819e8634059a0dba5def8b98f7fd
--- 1/modules/po/block_motd.pt_BR.po
--- 2/modules/po/block_motd.pt_BR.po
+++ b/modules/po/block_motd.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/block_motd.ru_RU.po
index 93071e872bb8c58b25efb313b74cde9511262bd5,d5aa319f1fd2b285c2486db59f08bbb71bd2bf78..340902993b9da98dcf89c7d77216d14b1d54d48b
--- 1/modules/po/block_motd.ru_RU.po
--- 2/modules/po/block_motd.ru_RU.po
+++ b/modules/po/block_motd.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/block_motd.pot\n"
 +"X-Crowdin-File-ID: 157\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n"
+ "X-Crowdin-File-ID: 310\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/blockuser.bg_BG.po
index c9342194bac3eed9c15c8f226a0cf5979a49b23a,710911aca437881c4022c4d524963e9c17cfc9b4..4e776ce1caa75234fda1bf5dc447f6770ea45483
--- 1/modules/po/blockuser.bg_BG.po
--- 2/modules/po/blockuser.bg_BG.po
+++ b/modules/po/blockuser.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/blockuser.es_ES.po
index 50bd0ed6c25c6d71e4dc4c175b23acf406c90abf,dbf2f38b44b70ea2d0d34a3eac00f3ea47183804..31fe262f164c2b2640faeca45594903748c95068
--- 1/modules/po/blockuser.es_ES.po
--- 2/modules/po/blockuser.es_ES.po
+++ b/modules/po/blockuser.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/blockuser.fr_FR.po
index c52cb906adc7c0a655c19f29e629eedb4fd818e2,922663eeb98e2906bf4a22054fe89149051a8f3b..8698faa89180b5957769b5868116dc5651c1c668
--- 1/modules/po/blockuser.fr_FR.po
--- 2/modules/po/blockuser.fr_FR.po
+++ b/modules/po/blockuser.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/blockuser.id_ID.po
index c95ed576255d098bb2880a37b9f88c8a62881205,7735612f4a8607446ef4b17c4d36c33b04c094e1..3248e37ab8f94dfd250032bd9be3d91857f04531
--- 1/modules/po/blockuser.id_ID.po
--- 2/modules/po/blockuser.id_ID.po
+++ b/modules/po/blockuser.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/blockuser.it_IT.po
index 9072ac5dc5a5c6719c2b265de378bd12f339e44b,fb95f7e04741d5e43c3ac2b7c18db7e56658f3c7..75a35860ecba45b264e0a756528d2ca162af3056
--- 1/modules/po/blockuser.it_IT.po
--- 2/modules/po/blockuser.it_IT.po
+++ b/modules/po/blockuser.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/blockuser.nl_NL.po
index 8c4c17c5ad0292cade9c49a26ecd4fd25939d4c2,38279acb6c1cfc37444764be4771d13c39338838..c636f06169d5c608685b5060ea5e0a8237d7da64
--- 1/modules/po/blockuser.nl_NL.po
--- 2/modules/po/blockuser.nl_NL.po
+++ b/modules/po/blockuser.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/blockuser.pl_PL.po
index b0fc0a3c4807b0b0382d8d6b91419fe3581ba749,212c02309d439a08a2957384cc3b7837bb7bd61e..ddf461e85daed571d9f97cefcbfbd270ed3e77db
--- 1/modules/po/blockuser.pl_PL.po
--- 2/modules/po/blockuser.pl_PL.po
+++ b/modules/po/blockuser.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/blockuser.pt_BR.po
index 12163fb37b5536e813ce48086269471e3ef4c7d2,7974c1ad3bd545b680b66a8a120a4d580be1026b..14f69b2635286640a95e9c4bada6bf129ea464b9
--- 1/modules/po/blockuser.pt_BR.po
--- 2/modules/po/blockuser.pt_BR.po
+++ b/modules/po/blockuser.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/blockuser.ru_RU.po
index c6ff156e21776a1e35231aab0b4fafb4fcbe87c7,eb9dc7f53a47df5404084c1bdc93fc41ffd6dbcc..9218f03dee30e6b06af9b4fd586cd97c5f54d576
--- 1/modules/po/blockuser.ru_RU.po
--- 2/modules/po/blockuser.ru_RU.po
+++ b/modules/po/blockuser.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/blockuser.pot\n"
 +"X-Crowdin-File-ID: 158\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n"
+ "X-Crowdin-File-ID: 312\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/bouncedcc.bg_BG.po
index bf17c4672afb1e3e65734f6f918401b12575ea98,de8cbece7f8ec9f12445ff12bd8bdfba909d47a1..eae32087d6910de7e4e6248062f545392c7166c0
--- 1/modules/po/bouncedcc.bg_BG.po
--- 2/modules/po/bouncedcc.bg_BG.po
+++ b/modules/po/bouncedcc.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/bouncedcc.es_ES.po
index 9f42aab68c9729972fefb11539cecddb3057cd7c,4291d2377a5302a4dced0d1007fd46f3a83c95d6..9e30219885065dac59eddc1275814cb339bae085
--- 1/modules/po/bouncedcc.es_ES.po
--- 2/modules/po/bouncedcc.es_ES.po
+++ b/modules/po/bouncedcc.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/bouncedcc.fr_FR.po
index fa4c8913deb1a3f00883e7cd809fa0b20c72c545,314496d295f384fa36fdfe045d4e9bb2000cb9fa..fd15799387de28fea1e9073b380f6d6a7f7ae615
--- 1/modules/po/bouncedcc.fr_FR.po
--- 2/modules/po/bouncedcc.fr_FR.po
+++ b/modules/po/bouncedcc.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/bouncedcc.id_ID.po
index 154af7135289c90967679a7ec939c797b436d075,8d3188ce597fbf80ee02ed5dcfe52db83ecc255a..1560da31dfddd8c4ae44c928149327442bff42ff
--- 1/modules/po/bouncedcc.id_ID.po
--- 2/modules/po/bouncedcc.id_ID.po
+++ b/modules/po/bouncedcc.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/bouncedcc.it_IT.po
index d98a5f1ffc04a5ea6f5649288908e97a9f87f21f,0369631b88127fdac9c5faef81c3ae2b7bbea3f8..49e0a98ebe05c0f62f27861f06de3f0b6e6fcef8
--- 1/modules/po/bouncedcc.it_IT.po
--- 2/modules/po/bouncedcc.it_IT.po
+++ b/modules/po/bouncedcc.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/bouncedcc.nl_NL.po
index 7469c72b4264932b22a290976ba3f2ab851d6f15,b178ba72dce800d61b0f64b75aac10fb3963ab3e..ef7e7aa88a09b53ba6fdf993e27c812be550d46d
--- 1/modules/po/bouncedcc.nl_NL.po
--- 2/modules/po/bouncedcc.nl_NL.po
+++ b/modules/po/bouncedcc.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/bouncedcc.pl_PL.po
index 3b974b2864b6c247edee73c0396237157312ff4d,c8bd496f38d521babce118540c5814b7a97e1914..c838f20258094e60b8af0a6551ab6e138c23fec5
--- 1/modules/po/bouncedcc.pl_PL.po
--- 2/modules/po/bouncedcc.pl_PL.po
+++ b/modules/po/bouncedcc.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/bouncedcc.pt_BR.po
index 1f949f8393951b49aa495335eedb96c38e601b3e,e4da41b60be18f2722cb06bf04ce98d2cfafcfd0..062eaaea7ab4adced1a9bcae6107976924e5546f
--- 1/modules/po/bouncedcc.pt_BR.po
--- 2/modules/po/bouncedcc.pt_BR.po
+++ b/modules/po/bouncedcc.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/bouncedcc.ru_RU.po
index cb4925901f1e72c9d6f055d57ff602feb50bea3c,e03783a79c78555e8ef36936ef48f617f6ed46fe..62189a550c60ee9a0beb5d07b83b06a2285e57bd
--- 1/modules/po/bouncedcc.ru_RU.po
--- 2/modules/po/bouncedcc.ru_RU.po
+++ b/modules/po/bouncedcc.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/bouncedcc.pot\n"
 +"X-Crowdin-File-ID: 159\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n"
+ "X-Crowdin-File-ID: 316\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/buffextras.bg_BG.po
index 9c8ee3d6bb89a787b51833bc4bdd703682b1dfaf,db74fe17be43d933940243e47f58553110288e07..854913ac1c8d3db01e839390c369e19c99156041
--- 1/modules/po/buffextras.bg_BG.po
--- 2/modules/po/buffextras.bg_BG.po
+++ b/modules/po/buffextras.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/buffextras.es_ES.po
index 5adae4b105a924d7a116cb088f42f24a0cdeaab4,0a25e0a11a6e9221e89a74251f15e82add715f91..4ff319f860b1505fe2d6aa73f185acd13a9a0681
--- 1/modules/po/buffextras.es_ES.po
--- 2/modules/po/buffextras.es_ES.po
+++ b/modules/po/buffextras.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/buffextras.fr_FR.po
index c62da85ddf83e3d19ae2617217da11809953b835,5dc096af0c0830ac034b571251ed02395199d6dc..608ae2b91b33f18e68f29354e1553d8f0b25e122
--- 1/modules/po/buffextras.fr_FR.po
--- 2/modules/po/buffextras.fr_FR.po
+++ b/modules/po/buffextras.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/buffextras.id_ID.po
index 01ee6ebba94d30aa30df4397f939a218e90e747e,5ee445114016fb2e664ee6083a10387ad254ad02..e7bac7e023ef2be4b95e8cc30fe4b0f22d366e0b
--- 1/modules/po/buffextras.id_ID.po
--- 2/modules/po/buffextras.id_ID.po
+++ b/modules/po/buffextras.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/buffextras.it_IT.po
index fb9d9654f0bb92de4a034b376f7332ec82dcd810,efb14c607579a3e6fd73a439ac36891f4d163127..8f7479a5005b02f1a9bbc2fe3683bc0ded1bb14a
--- 1/modules/po/buffextras.it_IT.po
--- 2/modules/po/buffextras.it_IT.po
+++ b/modules/po/buffextras.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/buffextras.nl_NL.po
index 2d040754d76ae0e8a7d2639fc8d2656edc4efbf8,68a5df0a8a0f9c67bb7bd072b92adf258b729122..2a46ad0eb44760be667990c34c39766ea3d78827
--- 1/modules/po/buffextras.nl_NL.po
--- 2/modules/po/buffextras.nl_NL.po
+++ b/modules/po/buffextras.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/buffextras.pl_PL.po
index 3dc029b9f0ea4cba8bd6ced19b6e858665845787,8f6dad13196cffe7f05527eeba6651dbeafd9270..5208d4c35c14d78c467af7487cbcdc9fff95d069
--- 1/modules/po/buffextras.pl_PL.po
--- 2/modules/po/buffextras.pl_PL.po
+++ b/modules/po/buffextras.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/buffextras.pt_BR.po
index 065a851407e637f45cf2c58b194903602bc32237,acdfa67d78e2816ce2ae1773795b49e384ff5a8d..cfccc9900c7ab9e1042d4660333f4a6d5a10e3c1
--- 1/modules/po/buffextras.pt_BR.po
--- 2/modules/po/buffextras.pt_BR.po
+++ b/modules/po/buffextras.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/buffextras.ru_RU.po
index 32ba4509fc6a6f628818041f1871ec3f08d0ceec,0c6ba21440d6676e630ccd975dbb151d101ee42b..ea00632a6644a8493da466a7139d1f25d088a8ea
--- 1/modules/po/buffextras.ru_RU.po
--- 2/modules/po/buffextras.ru_RU.po
+++ b/modules/po/buffextras.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/buffextras.pot\n"
 +"X-Crowdin-File-ID: 160\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n"
+ "X-Crowdin-File-ID: 318\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/cert.bg_BG.po
index b6abbc0928ac0625b490c61e6897110728b3a286,6d5663e77e16d8b49d428e6afb215f5f8fa38fe4..53d02c94a0918cd9f57af6f9babde0dc28820c2a
--- 1/modules/po/cert.bg_BG.po
--- 2/modules/po/cert.bg_BG.po
+++ b/modules/po/cert.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/cert.es_ES.po
index 39c4f3697fe1a88c222b30d8dc5dd8cf26961e70,2fee9acddf195f9ac07dfdf05f4a54d5d184b512..68e71c140dc4a6cc08512a4cd97571a9f1732479
--- 1/modules/po/cert.es_ES.po
--- 2/modules/po/cert.es_ES.po
+++ b/modules/po/cert.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/cert.fr_FR.po
index df0fc7bf877ceb0320c6b5b934736b72f69e1a11,0537ff831f2c7e34e30487f2549863844148f2b2..eedbc0ba5ddf3096b1148cc0c78e92c178baa417
--- 1/modules/po/cert.fr_FR.po
--- 2/modules/po/cert.fr_FR.po
+++ b/modules/po/cert.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/cert.id_ID.po
index b7df124ef6727ce4f1e0881ef70bcea62d7ce0ee,8cbc5b2c62c566db7c3d5a2fb011256385c353be..9848b2dce72eddb592aefa88768acbe4deb31f07
--- 1/modules/po/cert.id_ID.po
--- 2/modules/po/cert.id_ID.po
+++ b/modules/po/cert.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/cert.it_IT.po
index c03d685eeb0296975f3b9c32fcc2bb3dd8c245f1,a5efe9345582626690f137705e622a6a918db512..c16bc53f4cb07705751988cb6c0a6d91ef994af4
--- 1/modules/po/cert.it_IT.po
--- 2/modules/po/cert.it_IT.po
+++ b/modules/po/cert.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/cert.nl_NL.po
index b653dbca0e7bd6fe9f68721051d655e6a265cce0,9486690e80e3cd9960e2f21015b3fab96b8b471f..9a31788a9094ea1abd55473e72fca0f0d76e2100
--- 1/modules/po/cert.nl_NL.po
--- 2/modules/po/cert.nl_NL.po
+++ b/modules/po/cert.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/cert.pl_PL.po
index 329ecafa8c4ab88277ec010cc6a9420e1b226b69,b4525eb3824cba1cb51fcbf25f26c500c81f24be..83a235ebf9a37c92824e229e70d87b885ad714d7
--- 1/modules/po/cert.pl_PL.po
--- 2/modules/po/cert.pl_PL.po
+++ b/modules/po/cert.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/cert.pt_BR.po
index 0e933b4339d780c468168f1ef14b77c2ddd25838,c3de575883c50b517de73a8479cab4f69b197e94..9f8fd065ec30951ec770d9e5345c01c0ad21a2c2
--- 1/modules/po/cert.pt_BR.po
--- 2/modules/po/cert.pt_BR.po
+++ b/modules/po/cert.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/cert.ru_RU.po
index a0e02e38abeea4c9a4c05788c3865c156e046a0e,b3d30145f888f52ec9cb68c559db39aa13fc4d0e..ee3a5953f7c4b0b3fbefbebca2d9176b2d3346cd
--- 1/modules/po/cert.ru_RU.po
--- 2/modules/po/cert.ru_RU.po
+++ b/modules/po/cert.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cert.pot\n"
 +"X-Crowdin-File-ID: 161\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cert.pot\n"
+ "X-Crowdin-File-ID: 322\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/certauth.bg_BG.po
index 16a2316106a819b46b0960ee463324bf911552ea,17c5255b15738c2da1dcf752cea27755ccd26740..73510efde776b9a17966590da8e41f8c724f4143
--- 1/modules/po/certauth.bg_BG.po
--- 2/modules/po/certauth.bg_BG.po
+++ b/modules/po/certauth.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/certauth.es_ES.po
index 14a857b943ff6a52434296c9401777a72dc84d80,0554d7cd8858dcef451beeffeb4a7a5be918ce4a..cc489d3f148e8101ea31a2b4692f0a8c0e675ff8
--- 1/modules/po/certauth.es_ES.po
--- 2/modules/po/certauth.es_ES.po
+++ b/modules/po/certauth.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/certauth.fr_FR.po
index 26cafec5f0086d48cf298d06587e53560c269cca,c205bef821e8267ec4ce30936185066dcfb3afaf..9cccace244cef01d15f34ff46326dafd39fbf2fd
--- 1/modules/po/certauth.fr_FR.po
--- 2/modules/po/certauth.fr_FR.po
+++ b/modules/po/certauth.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/certauth.id_ID.po
index c4c2be0dedd0565144a7629a00ea6e3efe01a76a,5bbf9c751a002ac5d90fd81025f5a0aac39855ca..1f70ba40ae72848e24ddb8a549b24d2ede3d27f0
--- 1/modules/po/certauth.id_ID.po
--- 2/modules/po/certauth.id_ID.po
+++ b/modules/po/certauth.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/certauth.it_IT.po
index b124566c081f4afe5d61407588d6919ae9a036ca,ca61bc79510fe0dcbfca6275140d2bef6f94c241..2106caf84273b55374c5e120491a875c76694b62
--- 1/modules/po/certauth.it_IT.po
--- 2/modules/po/certauth.it_IT.po
+++ b/modules/po/certauth.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/certauth.nl_NL.po
index cb24a7aa07b1e495aa6fc861d35f2b07876754b8,64b63f34be121e5b6517a9a52f304c8c52e2cf24..4b60ec2e1e160ca8844f78dd3511844826b9f729
--- 1/modules/po/certauth.nl_NL.po
--- 2/modules/po/certauth.nl_NL.po
+++ b/modules/po/certauth.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/certauth.pl_PL.po
index 01fdc2d00cd9070eeec36daa44cf472940c64d8a,744393b37fa08d6701ff7d3f4da8b9fb266f1850..a4073ded395526caec8713ec4d2c3c2d72442ccc
--- 1/modules/po/certauth.pl_PL.po
--- 2/modules/po/certauth.pl_PL.po
+++ b/modules/po/certauth.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/certauth.pt_BR.po
index 44ba9e5f204cf546a7a1b16b36d7ba02758bc983,1239311c35925c08f92071c5047a453cfd882b35..5d66d5e4f4ededcef168fadda2fe56f1b619c0bc
--- 1/modules/po/certauth.pt_BR.po
--- 2/modules/po/certauth.pt_BR.po
+++ b/modules/po/certauth.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/certauth.ru_RU.po
index 2282ed766be6994f9e1c6a73d2353746bab205d2,b88eb6565798f7af944ca821adf0032a355c608a..eb3851e20e37b512f6cb559b2b18d45bb6b4ea80
--- 1/modules/po/certauth.ru_RU.po
--- 2/modules/po/certauth.ru_RU.po
+++ b/modules/po/certauth.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/certauth.pot\n"
 +"X-Crowdin-File-ID: 162\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n"
+ "X-Crowdin-File-ID: 324\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/chansaver.bg_BG.po
index fb9805b9361da59ee5b0494a1a6888e5732fd230,bb4cf83cf828ff633312e60af7fd79204d621e3d..52bb0e443f8171bc3629143efccea3a66d35589a
--- 1/modules/po/chansaver.bg_BG.po
--- 2/modules/po/chansaver.bg_BG.po
+++ b/modules/po/chansaver.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/chansaver.es_ES.po
index 644ce037269ad924610851fea112f5c65c7d197c,c700d3fefdc233766cf4229c93265171ca3ace81..b28e25cb1346d7a1f5a9679d74dc7c2e6ba94219
--- 1/modules/po/chansaver.es_ES.po
--- 2/modules/po/chansaver.es_ES.po
+++ b/modules/po/chansaver.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/chansaver.fr_FR.po
index a5e2b59a7791bd6d2a5ec0e60a5d736e2b397e5c,98abc78be10f645cf15fe1ff183561143bdbdf36..1b65df7cb55eeae9e94fcc692895720388215513
--- 1/modules/po/chansaver.fr_FR.po
--- 2/modules/po/chansaver.fr_FR.po
+++ b/modules/po/chansaver.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/chansaver.id_ID.po
index a6fb34425d3b43339fc4654ddc8e58d224e1529c,8a9f6c31f989e07e795f5f3360b9ceec00537197..2902c5cd132d7c8e6e7c1fc7132c01030431985c
--- 1/modules/po/chansaver.id_ID.po
--- 2/modules/po/chansaver.id_ID.po
+++ b/modules/po/chansaver.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/chansaver.it_IT.po
index 47a66e576b8ca12be8a1795ca951f85be4743b1c,48543e8a81818a5a3ee44b31e722cf003f7c657e..0c0730487626153fcaf7390c1556113998331b3b
--- 1/modules/po/chansaver.it_IT.po
--- 2/modules/po/chansaver.it_IT.po
+++ b/modules/po/chansaver.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/chansaver.nl_NL.po
index de3e290723be18e3fc150e5ce85b49808ff9068f,f9e6958324c2d95c26f356aa07e7bc53b604c0b1..22ac59c37fc3ab79c96467eafee0fa0fa0f203b3
--- 1/modules/po/chansaver.nl_NL.po
--- 2/modules/po/chansaver.nl_NL.po
+++ b/modules/po/chansaver.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/chansaver.pl_PL.po
index 2f5b0d4ad5589b82ba8d879dba513d1923bcb29d,c36f775414caca54207f1a3f6a2e4d5d219964ac..2c4f16d9fb8cc313ec518b6230c392ce4d023784
--- 1/modules/po/chansaver.pl_PL.po
--- 2/modules/po/chansaver.pl_PL.po
+++ b/modules/po/chansaver.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/chansaver.pt_BR.po
index 5096b4a589a7ea49c513fffb628508fc845e6646,80c112bf615d18c063fa9c94ed8a3046e42604fe..ac1593d0e8deeb664d6d7f54d332d87a4e4fc3c7
--- 1/modules/po/chansaver.pt_BR.po
--- 2/modules/po/chansaver.pt_BR.po
+++ b/modules/po/chansaver.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/chansaver.ru_RU.po
index 3d22d6630acab7262e50a0f1f2606462ce9f0c12,8f576a3cd8383e0df76dcdc38a272939e43f227e..36f8431acd3a0aeaa92f3686fdac494e1cf590e2
--- 1/modules/po/chansaver.ru_RU.po
--- 2/modules/po/chansaver.ru_RU.po
+++ b/modules/po/chansaver.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/chansaver.pot\n"
 +"X-Crowdin-File-ID: 163\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n"
+ "X-Crowdin-File-ID: 326\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/clearbufferonmsg.bg_BG.po
index 78a88749c9899bf588c51a6b7bd63d8a3c403880,a693fd8f6c5518752af5facf5a87b324213e60c4..c125ad553b504928ceecc6da1596f5c8ed6a525e
--- 1/modules/po/clearbufferonmsg.bg_BG.po
--- 2/modules/po/clearbufferonmsg.bg_BG.po
+++ b/modules/po/clearbufferonmsg.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/clearbufferonmsg.es_ES.po
index a47e2143bad1caf187ee5142e4c610a826ae6112,8f3352f028300e850607f14f7d37e831731b5587..80378d24e97f47c53f2df6bc1a6767dab180dac9
--- 1/modules/po/clearbufferonmsg.es_ES.po
--- 2/modules/po/clearbufferonmsg.es_ES.po
+++ b/modules/po/clearbufferonmsg.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/clearbufferonmsg.fr_FR.po
index f2373293221fe9de1f5147394bec6b77c2afd618,0a916d7b22760a7f01ba53e716b513766145eef2..675dc338a48bf2b681b339c183560a81f9546766
--- 1/modules/po/clearbufferonmsg.fr_FR.po
--- 2/modules/po/clearbufferonmsg.fr_FR.po
+++ b/modules/po/clearbufferonmsg.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/clearbufferonmsg.id_ID.po
index 7eba1c6093a46e850f00daad0f1d05970291eddf,a7dab9d6ebc3cf9c4d3e3fe4e08eb4754b37dbb6..bf43c00ab0aaa3d805aa75849105d65924092a16
--- 1/modules/po/clearbufferonmsg.id_ID.po
--- 2/modules/po/clearbufferonmsg.id_ID.po
+++ b/modules/po/clearbufferonmsg.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/clearbufferonmsg.it_IT.po
index 0feabb87511901d397b3246f65f3260f392a3f8b,faf65864c5ebbe9c6d6cb18f18d71f19d7bf7e32..def2d655b4e29178b2c1da302327bf48bcfaac77
--- 1/modules/po/clearbufferonmsg.it_IT.po
--- 2/modules/po/clearbufferonmsg.it_IT.po
+++ b/modules/po/clearbufferonmsg.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/clearbufferonmsg.nl_NL.po
index 427c8cc6549e39798991288f765251a222f5fc21,8a835ac405ad2005e9db97ecb6f2828fbaf920fd..25fc22eab065229d04a61153932c08d8e4e15d58
--- 1/modules/po/clearbufferonmsg.nl_NL.po
--- 2/modules/po/clearbufferonmsg.nl_NL.po
+++ b/modules/po/clearbufferonmsg.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/clearbufferonmsg.pl_PL.po
index 7eb3f67269dbc510fdbc5ae5f8cd76b3eadab365,339b71e2434db481d679cdd7f1d5ceac97103d96..b685d1e68c0091417edc9901a39d646cde2120e5
--- 1/modules/po/clearbufferonmsg.pl_PL.po
--- 2/modules/po/clearbufferonmsg.pl_PL.po
+++ b/modules/po/clearbufferonmsg.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/clearbufferonmsg.pt_BR.po
index f71a99623d091cdaf6476f1f57e12ecad9e4741d,3f87db11330f0f83084abefcd62da03f84630eec..2f50f7f080314f46c2ec338fd8ad4748cc7b18f4
--- 1/modules/po/clearbufferonmsg.pt_BR.po
--- 2/modules/po/clearbufferonmsg.pt_BR.po
+++ b/modules/po/clearbufferonmsg.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/clearbufferonmsg.ru_RU.po
index 1fa8d538d8935a3a1b348ecfe17ecf15ae058ce7,a60a9c4bdc551ec39b84793ca1361a5208644f79..d02f86b286f2fc2190698d93da27b248f9b4a0ab
--- 1/modules/po/clearbufferonmsg.ru_RU.po
--- 2/modules/po/clearbufferonmsg.ru_RU.po
+++ b/modules/po/clearbufferonmsg.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n"
 +"X-Crowdin-File-ID: 164\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n"
+ "X-Crowdin-File-ID: 330\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/clientnotify.bg_BG.po
index a495a928f6fa38848cfde6bcf0a299513da3e4e3,eca4893ffc03c8bef5261dfee8861fcfd6ab9f52..ab6130976163b27fb43722e2bc68aae23fa5371d
--- 1/modules/po/clientnotify.bg_BG.po
--- 2/modules/po/clientnotify.bg_BG.po
+++ b/modules/po/clientnotify.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/clientnotify.es_ES.po
index 86ed1b90b200d0b079ccf414fd0b78b922ef0e74,d74bd2caea5c652eeb67c3fe8053228bad9c7396..a777685f8008a7fa81f5f62859303cd3f9918965
--- 1/modules/po/clientnotify.es_ES.po
--- 2/modules/po/clientnotify.es_ES.po
+++ b/modules/po/clientnotify.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/clientnotify.fr_FR.po
index 6b202d799990dcefe5a3f610602f42746e924e54,6d62d866d47be491df4d7bd59550cd4aaca43274..90e855f6a704555c5e1eb426e308b24379a28503
--- 1/modules/po/clientnotify.fr_FR.po
--- 2/modules/po/clientnotify.fr_FR.po
+++ b/modules/po/clientnotify.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/clientnotify.id_ID.po
index e8bd757db6ce00acc3255d73ff7a213ba7755b3c,d3e9cd905f0232f5ece948356c0f8fcdcfee0e4f..ffbaa6bdc726724af3c7265c78f3d41617c16bff
--- 1/modules/po/clientnotify.id_ID.po
--- 2/modules/po/clientnotify.id_ID.po
+++ b/modules/po/clientnotify.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/clientnotify.it_IT.po
index 0ba5bcf95258f4bc1472ba068c892e12893e7435,c474bfbfd5b005da2ee4cda4d45de9f7499348f6..f128d530e59e6d5f60b51a2ff4ecadee4cb2ec70
--- 1/modules/po/clientnotify.it_IT.po
--- 2/modules/po/clientnotify.it_IT.po
+++ b/modules/po/clientnotify.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/clientnotify.nl_NL.po
index a787beeffff50ee63d5b596c7c2da74c20421aa1,7ff095c9298d9244c5e3ad145d82f4bf90f23d57..08556a925a19fbd1f1ff5b3c7a562f1b354c4451
--- 1/modules/po/clientnotify.nl_NL.po
--- 2/modules/po/clientnotify.nl_NL.po
+++ b/modules/po/clientnotify.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/clientnotify.pl_PL.po
index 55abcaaa58e900186509ac12bb885945c0483dd9,0bedb01876138739cd2409b34e9c002dd8f7034a..1fd41034252c326a58da841b9c7fba80636a1ecf
--- 1/modules/po/clientnotify.pl_PL.po
--- 2/modules/po/clientnotify.pl_PL.po
+++ b/modules/po/clientnotify.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/clientnotify.pt_BR.po
index 3acb83b26899922096563aa4aa3c7b68584c58f7,a135ad9456479660529c9be1d9e9044b0235e764..4fa925f3b3b2f0e82be69665d6d09b2154f875af
--- 1/modules/po/clientnotify.pt_BR.po
--- 2/modules/po/clientnotify.pt_BR.po
+++ b/modules/po/clientnotify.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/clientnotify.ru_RU.po
index 59b2474db90345f89d6dc760d2203e62c84af676,8364f554d3ca3370d150102f7a542dfaa059854c..95783061a2a0ced3124e2001074bfc63e4dc1729
--- 1/modules/po/clientnotify.ru_RU.po
--- 2/modules/po/clientnotify.ru_RU.po
+++ b/modules/po/clientnotify.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/clientnotify.pot\n"
 +"X-Crowdin-File-ID: 165\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n"
+ "X-Crowdin-File-ID: 328\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/controlpanel.bg_BG.po
index 9275294bfc7bb52313585e547e4babd317b9a3e9,a9fdc42da85a6b480eb6dfbd8ca6ae95fd90be4f..2dcf7991c510dc99d50fe57d6bc0467515fa6c03
--- 1/modules/po/controlpanel.bg_BG.po
--- 2/modules/po/controlpanel.bg_BG.po
+++ b/modules/po/controlpanel.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/controlpanel.es_ES.po
index 4e4e60c1572d7d1f8ca32daaca1ba6a9e562768a,5af9c95029a3d563a4134876efd15b3ea8ef47be..978b3a3d1605d806e5596876007108dc7a1e0b87
--- 1/modules/po/controlpanel.es_ES.po
--- 2/modules/po/controlpanel.es_ES.po
+++ b/modules/po/controlpanel.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/controlpanel.fr_FR.po
index a9813d98c650cadc9b0017a8a5a5778c96577946,e9d17e0385ec23fd394b5a58dd3eeb1da23b562a..ee8a4c9b1652892de56f86b31b6bc44b33d93397
--- 1/modules/po/controlpanel.fr_FR.po
--- 2/modules/po/controlpanel.fr_FR.po
+++ b/modules/po/controlpanel.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/controlpanel.id_ID.po
index 4d97edbb4cdfab2b9f57b672c6e8c2b905b6ca6f,b6eed055a65a101ea9991d909efc67fdf2c428d9..4ba2d44ddad000525ef74bc0c2f8785137ae307c
--- 1/modules/po/controlpanel.id_ID.po
--- 2/modules/po/controlpanel.id_ID.po
+++ b/modules/po/controlpanel.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/controlpanel.it_IT.po
index 0159df494836bcdb92370758123ed25d4a30c88b,d6ef8c2ab9c51b45969a188aaf9408315763a67d..b072df586e4e29df942c6754eea665e1a2bf2b32
--- 1/modules/po/controlpanel.it_IT.po
--- 2/modules/po/controlpanel.it_IT.po
+++ b/modules/po/controlpanel.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/controlpanel.nl_NL.po
index b0879332175922ccd0d23c3b3d7f24ef5c4f5ed6,f1b64325ae8c62c3b333ebf8730abd345cf295ab..9a968a9bc8753db0612aa433bb76646478495ca6
--- 1/modules/po/controlpanel.nl_NL.po
--- 2/modules/po/controlpanel.nl_NL.po
+++ b/modules/po/controlpanel.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/controlpanel.pl_PL.po
index 4806ff4d658b883af680d0d13de54e53f8db504e,8ea36d525112fa179efc3ffdf3fb9ceddb261114..15d0c2ff70329d04376bb5b659ab749dd2440388
--- 1/modules/po/controlpanel.pl_PL.po
--- 2/modules/po/controlpanel.pl_PL.po
+++ b/modules/po/controlpanel.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"
@@@ -181,10 -181,10 +186,17 @@@ msgstr "
  #: controlpanel.cpp:731
  msgid "Channel {1} is deleted from network {2} of user {3}"
  msgid_plural "Channels {1} are deleted from network {2} of user {3}"
++<<<<<<< HEAD
 +msgstr[0] "Kanał {1} został usunięty z sieci {2} użytkownika {3}"
 +msgstr[1] ""
 +msgstr[2] ""
 +msgstr[3] "Kanały {1} są usuwane z sieci {2} użytkownika {3}"
++=======
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ msgstr[3] ""
++>>>>>>> 1.8.x
  
  #: controlpanel.cpp:746
  msgid "Usage: GetChan <variable> <username> <network> <chan>"

diff --cc modules/po/controlpanel.pt_BR.po
index 76b925340d046af3a7cb6a1ce9c1134c45cd33a9,e1f35d0c28377ccf695c4b0852815ea763424a72..98e57cdead1915767932cdfd2af80f6f50497a70
--- 1/modules/po/controlpanel.pt_BR.po
--- 2/modules/po/controlpanel.pt_BR.po
+++ b/modules/po/controlpanel.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/controlpanel.ru_RU.po
index b0994e7dc5381589bd657127aacf6d66d612327e,e941ce9dadc280d76ed90fb20607cd6b077279a7..b7f58513dc5254c6c2cedc1ad1eb1e331650b051
--- 1/modules/po/controlpanel.ru_RU.po
--- 2/modules/po/controlpanel.ru_RU.po
+++ b/modules/po/controlpanel.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/controlpanel.pot\n"
 +"X-Crowdin-File-ID: 166\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n"
+ "X-Crowdin-File-ID: 332\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/crypt.bg_BG.po
index 009deeeff3b1c92789060555952f31792d3afb37,9c142315911b1a7544604d4ee0775816108a114c..a19236c6766b782f7298181b4bd9c36518007719
--- 1/modules/po/crypt.bg_BG.po
--- 2/modules/po/crypt.bg_BG.po
+++ b/modules/po/crypt.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/crypt.es_ES.po
index 05919095b511187ef1a30bf80c0a8fdc756a6a29,a1a4a659648b856c9af7d8cb96c560bb4172ce8d..724f49fd6966fe1dccc6547a68a53a0e4743bda6
--- 1/modules/po/crypt.es_ES.po
--- 2/modules/po/crypt.es_ES.po
+++ b/modules/po/crypt.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/crypt.fr_FR.po
index 5597ee1195104e98602fa310185e609900a48aa0,2830fdbf03bed1b8b2822a6c552cff2594a6fa37..2315fba387ae3892a8cc993e6ceb4044c7e9e1a9
--- 1/modules/po/crypt.fr_FR.po
--- 2/modules/po/crypt.fr_FR.po
+++ b/modules/po/crypt.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/crypt.id_ID.po
index a32dac1b278be870067510c92d16402d480660fa,eecb7f779807a6961cf43d5126ce3c3c49e36ade..3c828b76fd98e9f213a918db3fb9ec5a03fa534e
--- 1/modules/po/crypt.id_ID.po
--- 2/modules/po/crypt.id_ID.po
+++ b/modules/po/crypt.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/crypt.it_IT.po
index 0bf43bc22df6f752b5c3e074a5059bffd926a638,6a6588e0d034d922949e017af11856294790128b..a941483e319407941f308cd2fe96cc2a7f65495f
--- 1/modules/po/crypt.it_IT.po
--- 2/modules/po/crypt.it_IT.po
+++ b/modules/po/crypt.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/crypt.nl_NL.po
index 7e5fc1ea8c315c61b4d85ef6b3931600e0b74489,a017ca6b182373f8db2d0b2b4a77cdf9acaedd6c..588549d4c5b3c4d05b51c450b15b198b5807e0a0
--- 1/modules/po/crypt.nl_NL.po
--- 2/modules/po/crypt.nl_NL.po
+++ b/modules/po/crypt.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/crypt.pl_PL.po
index 38fa093e2120c3a7b1553289666623ff4baabe2c,6b9e97cfad82a4d667714d85803257da0ed691ae..bb92b4856b3fe425acdcc212a1914f76dadf6724
--- 1/modules/po/crypt.pl_PL.po
--- 2/modules/po/crypt.pl_PL.po
+++ b/modules/po/crypt.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/crypt.pt_BR.po
index 558757f5b093747f77cf6f0c69af4b6c86d176be,5ad8d33daafe160b4320ea24830987423c15f8ac..3ae8b29ae84c776b31ff5a48dca9e26e9e312588
--- 1/modules/po/crypt.pt_BR.po
--- 2/modules/po/crypt.pt_BR.po
+++ b/modules/po/crypt.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/crypt.ru_RU.po
index bebb506a822936da2fe17b14a0fa2f5501b1b72b,63d2c7ec012bea99259fd631087bf443f549eb19..f016893cb5656f0337f4d22f159ec253535cd8c2
--- 1/modules/po/crypt.ru_RU.po
--- 2/modules/po/crypt.ru_RU.po
+++ b/modules/po/crypt.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/crypt.pot\n"
 +"X-Crowdin-File-ID: 167\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n"
+ "X-Crowdin-File-ID: 334\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/ctcpflood.bg_BG.po
index 143f0174901bab24f3650025a8de69702ae32757,f783171aca0c8089583a2ece7af55538c733b5ea..65e53336d9e35b06811cd44faa02bc5d13e97fda
--- 1/modules/po/ctcpflood.bg_BG.po
--- 2/modules/po/ctcpflood.bg_BG.po
+++ b/modules/po/ctcpflood.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/ctcpflood.es_ES.po
index e6d6257db24854d0c79a64e067ccdf064946ecf1,36e8d2a2621a47d85c2430c7c1537f54f771884d..d970918094bfb65fef61119b5c989904fdb17077
--- 1/modules/po/ctcpflood.es_ES.po
--- 2/modules/po/ctcpflood.es_ES.po
+++ b/modules/po/ctcpflood.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/ctcpflood.fr_FR.po
index c394e84f1315cd50e7aef4fc7858880e4ada5e94,973fe06c7f14bcee0f3408f410afe076fce2d467..cbd4add4fbcf7aa10c958948198aca1a42ea2c2c
--- 1/modules/po/ctcpflood.fr_FR.po
--- 2/modules/po/ctcpflood.fr_FR.po
+++ b/modules/po/ctcpflood.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/ctcpflood.id_ID.po
index 40a9cdd0104dba81e474116c1e78a0de5eb805ae,15c38e1d2c1ed2c961de08d8e16f141be3970cc5..1b1cb32037bd52c7f2991dc8f07e19a1042cdafe
--- 1/modules/po/ctcpflood.id_ID.po
--- 2/modules/po/ctcpflood.id_ID.po
+++ b/modules/po/ctcpflood.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/ctcpflood.it_IT.po
index 6be5694ef9b23a634d10b2e4447abd434a45ae21,51dc30a6dfa3d86a4d7fd2487602e13598249462..4b5a43db844b1ab7eb2531617d39ac1e92f8fd12
--- 1/modules/po/ctcpflood.it_IT.po
--- 2/modules/po/ctcpflood.it_IT.po
+++ b/modules/po/ctcpflood.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/ctcpflood.nl_NL.po
index 18a72ee2a6f7632f41214bc7b81f77fe0f59efc2,39a724b7c17902987c86aad5ebc729a50682d1c5..695990fc0dba57f0d35cf1fc9485f95bf00e9ba6
--- 1/modules/po/ctcpflood.nl_NL.po
--- 2/modules/po/ctcpflood.nl_NL.po
+++ b/modules/po/ctcpflood.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/ctcpflood.pl_PL.po
index 187ac31546216a520a58a0fed454897e124b6037,ef8ca3024bdb08b1318e7b09c6ec90680b60007d..a2e9277dd52e111d7f07e01e4b736607e1d75e77
--- 1/modules/po/ctcpflood.pl_PL.po
--- 2/modules/po/ctcpflood.pl_PL.po
+++ b/modules/po/ctcpflood.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/ctcpflood.pt_BR.po
index aab58d6afae27a9fc845eaa6239bf4b4ec7c6804,024c4526cc14dcf05b39be472278693d4ae2bb1a..7ce54b385dc4f9b72cc46ea7c722d29dd874115e
--- 1/modules/po/ctcpflood.pt_BR.po
--- 2/modules/po/ctcpflood.pt_BR.po
+++ b/modules/po/ctcpflood.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/ctcpflood.ru_RU.po
index 7d614e0734558a49bca0dc70140a1ab74491e3e2,834dd4baff8a55c5f891570ebc1a075ae627aed3..5b99a4367079703b49d9f8df71ea7b2f68a8b2b8
--- 1/modules/po/ctcpflood.ru_RU.po
--- 2/modules/po/ctcpflood.ru_RU.po
+++ b/modules/po/ctcpflood.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/ctcpflood.pot\n"
 +"X-Crowdin-File-ID: 168\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n"
+ "X-Crowdin-File-ID: 336\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/cyrusauth.bg_BG.po
index 98402b853c86ff634c0ba41446b5f2a6bd04ac7e,7e5fca0168ef1aa88debe09a6e01bda29a0a34c7..6df3599af9d159d55369072b2f0c2f93259fbfbf
--- 1/modules/po/cyrusauth.bg_BG.po
--- 2/modules/po/cyrusauth.bg_BG.po
+++ b/modules/po/cyrusauth.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/cyrusauth.es_ES.po
index f345c4761216228ab499b570859e9cc936b6b813,5a7c39aca424ffb9634d5a1cd4d6e00001ba4801..a7a2d0579f23a88b5fa91354bb7e10086048ad3c
--- 1/modules/po/cyrusauth.es_ES.po
--- 2/modules/po/cyrusauth.es_ES.po
+++ b/modules/po/cyrusauth.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/cyrusauth.fr_FR.po
index 490af7c4bd951143ac6edf89e9f8890c5c48e1ec,ef6da16cad75a64170573180b6b78eb9df0c518e..db259bbd8565793e3f68fde4e58e244c3a6c5690
--- 1/modules/po/cyrusauth.fr_FR.po
--- 2/modules/po/cyrusauth.fr_FR.po
+++ b/modules/po/cyrusauth.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/cyrusauth.id_ID.po
index e6820030c49c89735842e472c32304eb98044973,962495e4d1943452763eb2a7f55eacd579c45d9e..495c3210ef1ff5bb562693841d8465f3af0cb36f
--- 1/modules/po/cyrusauth.id_ID.po
--- 2/modules/po/cyrusauth.id_ID.po
+++ b/modules/po/cyrusauth.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/cyrusauth.it_IT.po
index 409736385ab9fd8d76c2884a69c8843c67edc6e7,8802284f7f5b6d7041bb21392961e017bcc3b005..3a773f6fefb6c5d6d0bb2c9447c1650042247f76
--- 1/modules/po/cyrusauth.it_IT.po
--- 2/modules/po/cyrusauth.it_IT.po
+++ b/modules/po/cyrusauth.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/cyrusauth.nl_NL.po
index 6cb6b6aca2857e17d73d8acba39eebe78d3f8441,d25abe831cf30edb0d864a44571726d22b07f9ac..df2d4e89791e4c337be45ce78ba6aec6593908ad
--- 1/modules/po/cyrusauth.nl_NL.po
--- 2/modules/po/cyrusauth.nl_NL.po
+++ b/modules/po/cyrusauth.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/cyrusauth.pl_PL.po
index 508deb36f9d39e9da2dff8ef767a65f29d563472,de1a4bea53829b48b0aa27da04cd37a66cdc83ee..879cd00713e47107fb7c67eb9f17b1192d4358cc
--- 1/modules/po/cyrusauth.pl_PL.po
--- 2/modules/po/cyrusauth.pl_PL.po
+++ b/modules/po/cyrusauth.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/cyrusauth.pt_BR.po
index 3940022fdea01eafc5c1f8cdabb8de39328d0347,f5e647258bb8254c4202b0fee4c2f98a65b3609a..151e47f3f077fd70093511ea1668fd1c59a292fd
--- 1/modules/po/cyrusauth.pt_BR.po
--- 2/modules/po/cyrusauth.pt_BR.po
+++ b/modules/po/cyrusauth.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/cyrusauth.ru_RU.po
index 1eaffa7339bb058053ae612467b015025ea91be0,bb7315c08c4f2b8471b058e95a24b4b59a909106..018a20a3e186c33fccd14d826e7c58afa7c7a683
--- 1/modules/po/cyrusauth.ru_RU.po
--- 2/modules/po/cyrusauth.ru_RU.po
+++ b/modules/po/cyrusauth.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/cyrusauth.pot\n"
 +"X-Crowdin-File-ID: 169\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n"
+ "X-Crowdin-File-ID: 338\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/dcc.bg_BG.po
index 498349f1edaecaa826f8f0b62d68166dc1204c5e,9d6297bcd1b8f1317e36ebfb5a01f0c02a228f77..3f04252ddbcdcc60e23a9749cff1f78c59de5863
--- 1/modules/po/dcc.bg_BG.po
--- 2/modules/po/dcc.bg_BG.po
+++ b/modules/po/dcc.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/dcc.es_ES.po
index 3c8f4d6dd5d2862de2a77e8b4cf51ac601177440,d6e4c68d87ed3f6b30468041b47535e9c1444134..aa163b41fe23079c88cedc8b43655b42d4511328
--- 1/modules/po/dcc.es_ES.po
--- 2/modules/po/dcc.es_ES.po
+++ b/modules/po/dcc.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/dcc.fr_FR.po
index 225e82ca3f444a44985f4b4d79a86ca45b6a203f,7ccf348ac5ab5f7004a1e249f7cb829b6d4bd793..d0ade9eb3448422d03423fbca53eda30fb44cf79
--- 1/modules/po/dcc.fr_FR.po
--- 2/modules/po/dcc.fr_FR.po
+++ b/modules/po/dcc.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/dcc.id_ID.po
index f1af517b18fc0355bb0d603c29323b7f7b89c906,f0c7b7f1e0239502c0025cedfc54bb530ae15744..2f1b7fb384759ae2ce8f84224befff1468c104a5
--- 1/modules/po/dcc.id_ID.po
--- 2/modules/po/dcc.id_ID.po
+++ b/modules/po/dcc.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/dcc.it_IT.po
index b49e4771252333ace43ded0c2e60aa35b554c30d,5c623b4395b808dcd3fee085028d336d92a29590..ec926f33010fbca6c826435b83efd95c903c6ed6
--- 1/modules/po/dcc.it_IT.po
--- 2/modules/po/dcc.it_IT.po
+++ b/modules/po/dcc.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/dcc.nl_NL.po
index f85f87abb17405131d31a5b09158432b02901095,68f4339bf08785bbeba5bd15ddadf1129104d2f2..05c870192dc5b96787c48326f7affde046e20349
--- 1/modules/po/dcc.nl_NL.po
--- 2/modules/po/dcc.nl_NL.po
+++ b/modules/po/dcc.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/dcc.pl_PL.po
index 46a40278cb7e7339a0ca22bf0e9602b3e8cc9f65,d2e40190f96b13aa3fbc13a56831ef3fe7bb8803..73d9a24ba0d0fa442a1c20c7331c845ae2a79aba
--- 1/modules/po/dcc.pl_PL.po
--- 2/modules/po/dcc.pl_PL.po
+++ b/modules/po/dcc.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/dcc.pt_BR.po
index 797b8b8bf1e93771584e6c49a894f7301f6c0515,8bf6975bf3b0974ffd24f860048310c2dc102ecb..40d7cfd00502b752a6dcae9c2bd1b350f9163660
--- 1/modules/po/dcc.pt_BR.po
--- 2/modules/po/dcc.pt_BR.po
+++ b/modules/po/dcc.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/dcc.ru_RU.po
index 8107facf427aae2777aff28e2bfb214cddc2da3d,5b134dfc19a8688d158c16bd305eca053032c463..1a8cf34f3a1738d82f5256c7c850bb3bf8e17565
--- 1/modules/po/dcc.ru_RU.po
--- 2/modules/po/dcc.ru_RU.po
+++ b/modules/po/dcc.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/dcc.pot\n"
 +"X-Crowdin-File-ID: 170\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n"
+ "X-Crowdin-File-ID: 308\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/disconkick.bg_BG.po
index f2ee90eb2d3e45d8c9c3802f0a6cba443fe13829,8bb6875e2cc43e673adcbc6a176c76bf2cb71766..7daef00fc539aa6d35c302c88e0215ba1ced98cb
--- 1/modules/po/disconkick.bg_BG.po
--- 2/modules/po/disconkick.bg_BG.po
+++ b/modules/po/disconkick.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/disconkick.es_ES.po
index 04e87e09945e110deb5992278de0d7b482be4d2c,740c3fb8100dea5eac9a1165d2fde755fb9941e9..bf04f9db110f00e3c86e74682c4f238d50a6fd75
--- 1/modules/po/disconkick.es_ES.po
--- 2/modules/po/disconkick.es_ES.po
+++ b/modules/po/disconkick.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/disconkick.fr_FR.po
index 9e9f645f76a17a2e6306bcf6441db8da679bfe57,993ca4c5649325b9566fdab2bdca11c8bd060922..febc0097528725f1649f81179765d17eb0ec9eb9
--- 1/modules/po/disconkick.fr_FR.po
--- 2/modules/po/disconkick.fr_FR.po
+++ b/modules/po/disconkick.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/disconkick.id_ID.po
index 8d72561ae4ea6b38cc9cb8362ce215f3f57212e0,4b4ee5fa3974093e90d2beaa9886faabc8befc1b..0c4a6e789adc1e3766b01567cbd231069067c7e6
--- 1/modules/po/disconkick.id_ID.po
--- 2/modules/po/disconkick.id_ID.po
+++ b/modules/po/disconkick.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/disconkick.it_IT.po
index e5cb1efc64ab715bb64cdf5bbcf0b055de90eac3,503dc98350273ca25799202c01b27a26ec20de78..7d7687c53bb28b40a16f4d2902a6662938f4015a
--- 1/modules/po/disconkick.it_IT.po
--- 2/modules/po/disconkick.it_IT.po
+++ b/modules/po/disconkick.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/disconkick.nl_NL.po
index 87a9493e31c7090a324d50ac858f9a35cba82360,521ee1e37036ccde86a8bfa72476122a5bc55895..7c0d0620eab5dabca283a674ab9d78b818190086
--- 1/modules/po/disconkick.nl_NL.po
--- 2/modules/po/disconkick.nl_NL.po
+++ b/modules/po/disconkick.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/disconkick.pl_PL.po
index 0258fce2ebb0bbaf3f892f13943231d15e9e7237,23056a73b477f5bdd2cb7d44e7c4afbec19efd4e..eeff3005ff9f3180cb41c0ca212710aebff7ff4b
--- 1/modules/po/disconkick.pl_PL.po
--- 2/modules/po/disconkick.pl_PL.po
+++ b/modules/po/disconkick.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/disconkick.pt_BR.po
index 22f6cea86be7a5fb4ac7066b7637b1628fcdda27,0c373d29908766b5495caa1dd8b17232b6f76aef..0e9f595eed157bccc1b1c6cf91c8442fcd23679b
--- 1/modules/po/disconkick.pt_BR.po
--- 2/modules/po/disconkick.pt_BR.po
+++ b/modules/po/disconkick.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/disconkick.ru_RU.po
index 6338b623a31854c51f056c4a95d04a64b7f20368,2b94e5852a1d6439e9b56edc417c4e5e194e187f..28272ac0203b097b7f00ed17f53ea7d494d3ab39
--- 1/modules/po/disconkick.ru_RU.po
--- 2/modules/po/disconkick.ru_RU.po
+++ b/modules/po/disconkick.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/disconkick.pot\n"
 +"X-Crowdin-File-ID: 171\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n"
+ "X-Crowdin-File-ID: 342\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/fail2ban.bg_BG.po
index 9ce3b3ceac1815d78bccdc8ceb419b8a0993771c,b8d4b608306eb1dd3f5d0c38d8dedbfa36b62906..487f261076f7d431397f6ca3b34af49caa0692bc
--- 1/modules/po/fail2ban.bg_BG.po
--- 2/modules/po/fail2ban.bg_BG.po
+++ b/modules/po/fail2ban.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/fail2ban.es_ES.po
index 143356b4c76bcce0fc8438f000643f4b71337f9a,fed7c58a5204b402a00ef4616d3afc69b8d49f2c..732b48c5adca4db19a757573a82d46f6ee15e560
--- 1/modules/po/fail2ban.es_ES.po
--- 2/modules/po/fail2ban.es_ES.po
+++ b/modules/po/fail2ban.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/fail2ban.fr_FR.po
index 331e709efc13f7e28097a0d705a09501e3276089,664a5b6e82ef4c146eb647247f11123694aeef35..d1a507618b72f9ad01f1b173b316dac2ae7e4ac5
--- 1/modules/po/fail2ban.fr_FR.po
--- 2/modules/po/fail2ban.fr_FR.po
+++ b/modules/po/fail2ban.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/fail2ban.id_ID.po
index 3ab23216b35e3690ecb4dec4ec2358494fa239c3,b388e0f902efc5c3393a1a0f1ab0d3052a973750..50f8b0a586b6db89c4e713dc5119273e52d2afc6
--- 1/modules/po/fail2ban.id_ID.po
--- 2/modules/po/fail2ban.id_ID.po
+++ b/modules/po/fail2ban.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/fail2ban.it_IT.po
index bfd951228a10821473453b45d8e0f0339c0d873c,75bec101f6fa9b34cb30c6f8c99e3e0fe650698a..c75fe65d0c933bedb01fb5fa84f0efb6a4cb7823
--- 1/modules/po/fail2ban.it_IT.po
--- 2/modules/po/fail2ban.it_IT.po
+++ b/modules/po/fail2ban.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/fail2ban.nl_NL.po
index 07b39775ee9a701492cc9ce5938ad1cfa88d8edf,759a4cde8fd4fdd799d572b6a0fec48d236315f1..200d4b73a2f511e7bedab013d2c0b710d8f00fe5
--- 1/modules/po/fail2ban.nl_NL.po
--- 2/modules/po/fail2ban.nl_NL.po
+++ b/modules/po/fail2ban.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/fail2ban.pl_PL.po
index abd5fecc0836ea9f6ea32a1203848ebeddc60691,cff0aebd0d5612aac905a8239ff0e4f36685b3f6..12508d5170fd0f5ad6d2bdb1d595e36e7a605cde
--- 1/modules/po/fail2ban.pl_PL.po
--- 2/modules/po/fail2ban.pl_PL.po
+++ b/modules/po/fail2ban.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/fail2ban.pt_BR.po
index 9bb234f2ff8601a80f45a63020d855be7366223b,55a79e4b8b311dc62a89de8098a86aab225502e4..c9da9261df819b57f8c03e0eb9dadab4d5165e91
--- 1/modules/po/fail2ban.pt_BR.po
--- 2/modules/po/fail2ban.pt_BR.po
+++ b/modules/po/fail2ban.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/fail2ban.ru_RU.po
index 31a6011e95386f7d0c0b0097fa6334eb0d4530f0,76153d2b1717ff9e66889f18e2d071a7535abb9c..fc98975ea7d02a4d27e2adcb20d5d046d2309640
--- 1/modules/po/fail2ban.ru_RU.po
--- 2/modules/po/fail2ban.ru_RU.po
+++ b/modules/po/fail2ban.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/fail2ban.pot\n"
 +"X-Crowdin-File-ID: 172\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n"
+ "X-Crowdin-File-ID: 344\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/flooddetach.bg_BG.po
index 517337a6a763e5b2086ca13d448b8d75ca5f921a,52eb97cb2e9d36c519761d2d92dcc8f19751bebb..9e4ffef63965a024ac5fe71c284ae3b7da657d5f
--- 1/modules/po/flooddetach.bg_BG.po
--- 2/modules/po/flooddetach.bg_BG.po
+++ b/modules/po/flooddetach.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/flooddetach.es_ES.po
index 59b098ee964d0b805241fb8f9ca03af19509c900,ad89814446f39690ae42ab64a5a05f551e7d5bc7..56a30d74ebf63217c9ea276b69307b64a1d7fc3d
--- 1/modules/po/flooddetach.es_ES.po
--- 2/modules/po/flooddetach.es_ES.po
+++ b/modules/po/flooddetach.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/flooddetach.fr_FR.po
index db36dd3de30a6e4924c3e0e6a0b5043f6849f33a,137c8c742c75243611f4f07c33ccc32e233f08b9..25ed617833af035d9ebfcbdc88c74d4e00f9278f
--- 1/modules/po/flooddetach.fr_FR.po
--- 2/modules/po/flooddetach.fr_FR.po
+++ b/modules/po/flooddetach.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/flooddetach.id_ID.po
index bfdb04debca19151518bc163434422efc67a7984,08e11d142b5989853e1e13e30e5d7c2ea0329b26..72fb70fcc45b3cc2027f0f98ba3e3949f2765e1b
--- 1/modules/po/flooddetach.id_ID.po
--- 2/modules/po/flooddetach.id_ID.po
+++ b/modules/po/flooddetach.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/flooddetach.it_IT.po
index a04e3962083f3fe1da3699893513a74ef4b7bc89,4181a9c7c76959ebe45eec046035753d8342c4ee..c9b2715a045023841b6cf4949aedcbd0d53c9eda
--- 1/modules/po/flooddetach.it_IT.po
--- 2/modules/po/flooddetach.it_IT.po
+++ b/modules/po/flooddetach.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/flooddetach.nl_NL.po
index 3c164d0139a08e7a0d02ce089e9e192c5fe12b1c,d919bd75b023f8daf47feb235e52cc90511687b4..5ba12cb722591f8d45d6670b186a89f2f5f3a677
--- 1/modules/po/flooddetach.nl_NL.po
--- 2/modules/po/flooddetach.nl_NL.po
+++ b/modules/po/flooddetach.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/flooddetach.pl_PL.po
index 7db44c8236e8b4a44c8f0376ff8a7d50643015a2,8c2706eeedf7e37d5fc538fa8cb1ea9232722589..d69c022e54282d674901e4bef0863cbc2d75179a
--- 1/modules/po/flooddetach.pl_PL.po
--- 2/modules/po/flooddetach.pl_PL.po
+++ b/modules/po/flooddetach.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/flooddetach.pt_BR.po
index 19b9263079216e4f7a91fc2af81be07cf832ca4b,37be6bd2941f0fc78ce940f056eeb8bcc85ddc31..6008f32d24c2ef6f0f847049b5157e826cfb0bcd
--- 1/modules/po/flooddetach.pt_BR.po
--- 2/modules/po/flooddetach.pt_BR.po
+++ b/modules/po/flooddetach.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/flooddetach.ru_RU.po
index 050341e3c1fd323f30bd4dceaa44536d1ad90999,f3942d8e45cd03a465b8f48925641fcf1716c6bf..cadcd54001481861f086683ec3d06a874d7a1b30
--- 1/modules/po/flooddetach.ru_RU.po
--- 2/modules/po/flooddetach.ru_RU.po
+++ b/modules/po/flooddetach.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/flooddetach.pot\n"
 +"X-Crowdin-File-ID: 173\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n"
+ "X-Crowdin-File-ID: 346\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/identfile.bg_BG.po
index 654ff51f706bdca93f7799540368b7197ba769e8,8d45c56d1758daa630143052e7e7708663d791b7..6abb620899f207ecde0c8268dc8443aaa9da578a
--- 1/modules/po/identfile.bg_BG.po
--- 2/modules/po/identfile.bg_BG.po
+++ b/modules/po/identfile.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/identfile.es_ES.po
index 2159b16a5eb8d93347d7d02652632c167c1faf17,f41fdfd245bb0b9106576fb2eaf8aef3b9e79989..1fcff81f84a69d13b54ac97663e4e6db4e256d8e
--- 1/modules/po/identfile.es_ES.po
--- 2/modules/po/identfile.es_ES.po
+++ b/modules/po/identfile.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/identfile.fr_FR.po
index 4cb8744fd875174ac3322e85ff982236a93114e1,3fcabaa3a7ada2347f7787b7c3305a87fb34c1f5..8538006dd6fc913d49174a2faff59b277236625a
--- 1/modules/po/identfile.fr_FR.po
--- 2/modules/po/identfile.fr_FR.po
+++ b/modules/po/identfile.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/identfile.id_ID.po
index 31f09ade87d3debb320cd5c19c825ea3fac83381,ac6ec1274dfff0ca098b2df8f834fb7722949cb2..d043f845d13fae84f3747617970aaf9e77bc965d
--- 1/modules/po/identfile.id_ID.po
--- 2/modules/po/identfile.id_ID.po
+++ b/modules/po/identfile.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/identfile.it_IT.po
index bcef897847035317e8dfe85dc59d7d2f9fa2973a,92e9954f9d8bef18af42351e1162de5013871c34..97530dd2f05be7e5dd77c86c038f7013c7ef9d47
--- 1/modules/po/identfile.it_IT.po
--- 2/modules/po/identfile.it_IT.po
+++ b/modules/po/identfile.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/identfile.nl_NL.po
index 6b2a44f80525ea6fe50c349efc5b47bb1fcaff5e,7d25edddac427b4c28035e8001a87b6d6d7ffdf9..6f4b93a580bbd066752834e1110469d6a5ceb8fb
--- 1/modules/po/identfile.nl_NL.po
--- 2/modules/po/identfile.nl_NL.po
+++ b/modules/po/identfile.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/identfile.pl_PL.po
index 3f44e2a9ef3bf9199a9349b4fb714392ccd0846f,fc481d40057c51ed9c195735d605035308ab4a7e..b4b4eca2e7a904e7e95ee1fb23e6ae6bc7184493
--- 1/modules/po/identfile.pl_PL.po
--- 2/modules/po/identfile.pl_PL.po
+++ b/modules/po/identfile.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/identfile.pt_BR.po
index 4712a14110352e70d9ce13bdb86850438f5b96e0,855706bfde93fb4a9ef52490460561bacf3cc747..bd84212ab113e97c2f9cfff941ef56b9cf11ed0a
--- 1/modules/po/identfile.pt_BR.po
--- 2/modules/po/identfile.pt_BR.po
+++ b/modules/po/identfile.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/identfile.ru_RU.po
index d8e8cb0f9a085f7a5384e9585d1f4846e109ca16,8955ffe42d60740f5d2c30ad791e0fa226558267..c86df9764bbb849c6df22fe967c6ee7b4d5f6e05
--- 1/modules/po/identfile.ru_RU.po
--- 2/modules/po/identfile.ru_RU.po
+++ b/modules/po/identfile.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/identfile.pot\n"
 +"X-Crowdin-File-ID: 174\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n"
+ "X-Crowdin-File-ID: 348\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/imapauth.bg_BG.po
index 786c28c9fd6f5d3325131694de69dee0c5851431,1ba4b171611ad5f4a01788fd2c4e1d524f6185e4..4790d1b09e7049e2590d8ca5cab0e9c5ad1cf2ba
--- 1/modules/po/imapauth.bg_BG.po
--- 2/modules/po/imapauth.bg_BG.po
+++ b/modules/po/imapauth.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/imapauth.es_ES.po
index 21a52d6658ab307dc687b0c3a8af4cf178b5676b,30d0c8737bfd5719a64faad1c85e803b81790fd5..32be931413c1650ee68b32f8784089c954975376
--- 1/modules/po/imapauth.es_ES.po
--- 2/modules/po/imapauth.es_ES.po
+++ b/modules/po/imapauth.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/imapauth.fr_FR.po
index 0fdc64cad8ef2ac87e635a23cb15eb243d7026a1,93a8b9d19c11dc8a146743d4a224765109f59f80..724e16682013a39d5318a399f2cde0c8f14d9871
--- 1/modules/po/imapauth.fr_FR.po
--- 2/modules/po/imapauth.fr_FR.po
+++ b/modules/po/imapauth.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/imapauth.id_ID.po
index 8ecd94d2183bafceba8f2fc5483e87363d199183,f55c1316559c0d1dd44e2e0bbc47b2af7cf56091..6bb202434eedb3cde77de0b0a22c882f64a42fbd
--- 1/modules/po/imapauth.id_ID.po
--- 2/modules/po/imapauth.id_ID.po
+++ b/modules/po/imapauth.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/imapauth.it_IT.po
index f3a9cb7509c2a3560f3037ebfb47733fa928caad,afa42902f4d5de587bf5fcfb1af738fbcca034a2..a583e4e1b7b6f7ee2c3b5638805754a8147f2bc4
--- 1/modules/po/imapauth.it_IT.po
--- 2/modules/po/imapauth.it_IT.po
+++ b/modules/po/imapauth.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/imapauth.nl_NL.po
index e9e16dd7be794cd818c39ac36d35fa377d8e34d1,a0d3a48b93861c705509798537baa0fdea66c9c1..50972e0b3dd9afc2b07648b30bc29ed9d46a2a4c
--- 1/modules/po/imapauth.nl_NL.po
--- 2/modules/po/imapauth.nl_NL.po
+++ b/modules/po/imapauth.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/imapauth.pl_PL.po
index 2e1837f1e088f2aa7a0b0731ee4c02fb0140da7b,a5c997a8e909d8467e36371610a4f58c097d7e5c..bd8b8f3be2146fd51ece9a53c3983858db764f00
--- 1/modules/po/imapauth.pl_PL.po
--- 2/modules/po/imapauth.pl_PL.po
+++ b/modules/po/imapauth.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/imapauth.pt_BR.po
index e208f3e0b522fe71b779ee8548d8a884da78a3f9,40bc0faf69265e8763893ed5b063e6f5708b73c7..a5f26d289ec7ce68ef605492e64326ce0da32a55
--- 1/modules/po/imapauth.pt_BR.po
--- 2/modules/po/imapauth.pt_BR.po
+++ b/modules/po/imapauth.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/imapauth.ru_RU.po
index 3c81f444d6b72e2d030b4eb80005a941186dc0e9,2dbc78b8baa99b89d7da5053149b7d65dd4aba06..7b207722e47453eb96828001cfc04c37397f7389
--- 1/modules/po/imapauth.ru_RU.po
--- 2/modules/po/imapauth.ru_RU.po
+++ b/modules/po/imapauth.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/imapauth.pot\n"
 +"X-Crowdin-File-ID: 175\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n"
+ "X-Crowdin-File-ID: 352\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/keepnick.bg_BG.po
index 46ec51afded261e7f33bec7206d1f4d9328a8e93,1afbe0bdb795aee678ef3537907daea03aa25df2..16e336d05c3d6bac5e97413ff8ea6a3bcb604087
--- 1/modules/po/keepnick.bg_BG.po
--- 2/modules/po/keepnick.bg_BG.po
+++ b/modules/po/keepnick.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/keepnick.es_ES.po
index a50e58d552558a63a66149f3877216d9483d4f16,5e7d8c5714a9e98c10d5e6c6dd802e4cfbbb6024..22b39401088e7ea13bae1350c973af33f1d9c18f
--- 1/modules/po/keepnick.es_ES.po
--- 2/modules/po/keepnick.es_ES.po
+++ b/modules/po/keepnick.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/keepnick.fr_FR.po
index 7ec6f02e1afc696950207a67e86311323121eb60,edd411b9782c6c04665dafda8f1c66659b7f3064..7fe6707dc971f2f109c546d2fcb66ee4d02845fa
--- 1/modules/po/keepnick.fr_FR.po
--- 2/modules/po/keepnick.fr_FR.po
+++ b/modules/po/keepnick.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/keepnick.id_ID.po
index c0ae6d6023517421268c4e213f26bb6f166d10a1,6bb2fc842be7c96c660e2e4eb5f2422d0cd501ac..50366019b2140d6d34099827bd2275109229207e
--- 1/modules/po/keepnick.id_ID.po
--- 2/modules/po/keepnick.id_ID.po
+++ b/modules/po/keepnick.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/keepnick.it_IT.po
index 0a37eae31bf442a370ed306e40bd9898466211d1,9d6d304204d7d605f88bad8a92ae539acf43f351..49b2d949e3b48d6658bcc95d081a43233b08606d
--- 1/modules/po/keepnick.it_IT.po
--- 2/modules/po/keepnick.it_IT.po
+++ b/modules/po/keepnick.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/keepnick.nl_NL.po
index a36ab8ef742c79b272c1dccbb916a2dda1c18fe6,d81b082010496915ac74c2cef7b0dfac104c1588..bf0ebace99924d374327f4e8e08870a1e0d5818b
--- 1/modules/po/keepnick.nl_NL.po
--- 2/modules/po/keepnick.nl_NL.po
+++ b/modules/po/keepnick.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/keepnick.pl_PL.po
index fe90fab1e9563dc09ec3724d4937582ec8906a8d,e150afe3175fcb9fd21b86994c2218d2bc3b8fe1..086e037a64cf4d2e2adb1824aab788f529ccc389
--- 1/modules/po/keepnick.pl_PL.po
--- 2/modules/po/keepnick.pl_PL.po
+++ b/modules/po/keepnick.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/keepnick.pt_BR.po
index 65b9c19b6530b401502acad02ee88a92b1160f45,192cbb4f7e4f59fbdf942c11b644c3a906c534aa..bff957ac355ee01327a1deb8ecdbc94e94e84c11
--- 1/modules/po/keepnick.pt_BR.po
--- 2/modules/po/keepnick.pt_BR.po
+++ b/modules/po/keepnick.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/keepnick.ru_RU.po
index 0c67d8922dbb540bfe26c5a099b66e5d9d154226,48ba98f960d6cafb0a15cc9dc82ac2aafd4784ad..82e1f3089d2a089456e5bf546869d7cf46502d86
--- 1/modules/po/keepnick.ru_RU.po
--- 2/modules/po/keepnick.ru_RU.po
+++ b/modules/po/keepnick.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/keepnick.pot\n"
 +"X-Crowdin-File-ID: 176\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n"
+ "X-Crowdin-File-ID: 354\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/kickrejoin.bg_BG.po
index 09688601c717a2271419edd56a81597b7db953d2,64af16c052f6220707efa8f0ad4c0917404eb842..e067c2f91735b35431da3e42581351a32584603a
--- 1/modules/po/kickrejoin.bg_BG.po
--- 2/modules/po/kickrejoin.bg_BG.po
+++ b/modules/po/kickrejoin.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/kickrejoin.es_ES.po
index 4874e59ef39b75761f68563da9a1b83d96280969,4abcd9fb79bb498a90737e073f7337615f5790ab..b7464f8eb59465d20b53ece49a8937dd54ec73ee
--- 1/modules/po/kickrejoin.es_ES.po
--- 2/modules/po/kickrejoin.es_ES.po
+++ b/modules/po/kickrejoin.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/kickrejoin.fr_FR.po
index a3540a94a3698c280e345c7abadf4f02f8d11a62,305c6ae95b57306e05825bc2431820d0e5475b0a..11085402dafa0e7ecd595e2dda5a02006ed66ebc
--- 1/modules/po/kickrejoin.fr_FR.po
--- 2/modules/po/kickrejoin.fr_FR.po
+++ b/modules/po/kickrejoin.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/kickrejoin.id_ID.po
index 40d07ebb03f0ef485d8ba693105be58e5ba706e8,44aeda3e507454e21448e8193d260012d4f68bcb..c51dc91eb9362b96914b78d9c685d26b50139f58
--- 1/modules/po/kickrejoin.id_ID.po
--- 2/modules/po/kickrejoin.id_ID.po
+++ b/modules/po/kickrejoin.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/kickrejoin.it_IT.po
index c86161f790e20146517069601b9bbf6d3b139aed,778f3d81404221d092438cc7adfef24796c37575..0b2240892db139c52dcb76115d46803d5b28ac19
--- 1/modules/po/kickrejoin.it_IT.po
--- 2/modules/po/kickrejoin.it_IT.po
+++ b/modules/po/kickrejoin.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/kickrejoin.nl_NL.po
index 951105a4652de66f4080f79403b86bf801d70c02,ba0f493dc411791d6a8b410a098c3ee598c7aa7c..f7cecc2f9abf5c73f756e093cf82e5afee1aee91
--- 1/modules/po/kickrejoin.nl_NL.po
--- 2/modules/po/kickrejoin.nl_NL.po
+++ b/modules/po/kickrejoin.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/kickrejoin.pl_PL.po
index 401b9a9fcc46d4621c8535d8635c0df9e2c137f3,115018cecd2469807b8cbe628c78e2c59f865ca7..57a043d6818a02bdb5ca3b477b7f8923a07a525e
--- 1/modules/po/kickrejoin.pl_PL.po
--- 2/modules/po/kickrejoin.pl_PL.po
+++ b/modules/po/kickrejoin.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/kickrejoin.pt_BR.po
index 849d38769ce129dfde77967b8d29bc158a8379d6,8fe3aeedd37203020ce0d846d6a12aa06680b58d..a25eb3c08ed4c4adb775929a699fbf486da0c51d
--- 1/modules/po/kickrejoin.pt_BR.po
--- 2/modules/po/kickrejoin.pt_BR.po
+++ b/modules/po/kickrejoin.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/kickrejoin.ru_RU.po
index 07c39eade07b2a680cc51af75e6379889f46a308,6c0a8bc9e3d4db6df3d54c3f10ed33299814724b..5e0904b4e1986a5ee91be0e5f243b2d92f09daeb
--- 1/modules/po/kickrejoin.ru_RU.po
--- 2/modules/po/kickrejoin.ru_RU.po
+++ b/modules/po/kickrejoin.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/kickrejoin.pot\n"
 +"X-Crowdin-File-ID: 177\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n"
+ "X-Crowdin-File-ID: 356\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/lastseen.bg_BG.po
index 85d6f121d29159645f80343a4e5240c1abda05fd,7fc15a1067b0d67bc8eccc73e4b95aa94cca181c..c9d66efda620e75052d7388c9f074a082247553c
--- 1/modules/po/lastseen.bg_BG.po
--- 2/modules/po/lastseen.bg_BG.po
+++ b/modules/po/lastseen.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/lastseen.es_ES.po
index 65897cc452dcc7242cfa91d98b2c0c12fbafcc76,62d2556c907be732623bbabc34d40e2f41f6fce8..81523bb5dc737067f4f9ccf6641c2e05c5653899
--- 1/modules/po/lastseen.es_ES.po
--- 2/modules/po/lastseen.es_ES.po
+++ b/modules/po/lastseen.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/lastseen.fr_FR.po
index d4b89eb67742049c421161a5dd0792fd37533e74,a3d984c8c7eaab06f52b87ad3886ad57d0af8441..9b3fba11b7423c644e15ad9ecf256ff56e06c61d
--- 1/modules/po/lastseen.fr_FR.po
--- 2/modules/po/lastseen.fr_FR.po
+++ b/modules/po/lastseen.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/lastseen.id_ID.po
index 5a5c1e9e3231033365a74193db72af470dd79311,85f61a8bd9f042e531cb6a174c62fbb82038a67a..f5037d713d6559ff1593b2f3faae5789d07be2ce
--- 1/modules/po/lastseen.id_ID.po
--- 2/modules/po/lastseen.id_ID.po
+++ b/modules/po/lastseen.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/lastseen.it_IT.po
index 8c3fece5ba90a20c40f88f2e44a976eadb1c1528,7469cac72626b11dc2cfbeacb1f5ba4c7114be18..f0df1a91ae1754dc4ffabfd118bcd48e7dd38f2f
--- 1/modules/po/lastseen.it_IT.po
--- 2/modules/po/lastseen.it_IT.po
+++ b/modules/po/lastseen.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/lastseen.nl_NL.po
index d3d802544f3bf704e39e7ad4f6a748524b2fd147,509ecb6df24b60a9d3225892a07585b0ad5b2dc2..fa94c1eb130ac76dbc388350f3cec6cee9774b65
--- 1/modules/po/lastseen.nl_NL.po
--- 2/modules/po/lastseen.nl_NL.po
+++ b/modules/po/lastseen.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/lastseen.pl_PL.po
index 26f8365766263c822ef7a1d29f0f9dc5d7478ed8,8c549e806ac98f4fbdc524b0dd2931385f4eac36..7e77eea58dc638438e6455008028d43ff5a763d5
--- 1/modules/po/lastseen.pl_PL.po
--- 2/modules/po/lastseen.pl_PL.po
+++ b/modules/po/lastseen.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/lastseen.pt_BR.po
index 8cf276396cae0bd4ea4e3d203fc5b8fe373b1faa,bdb24907034252f1513a73cfa6997aacd0b9c502..b04579489e634c4b474974e95af4e0a33848cd80
--- 1/modules/po/lastseen.pt_BR.po
--- 2/modules/po/lastseen.pt_BR.po
+++ b/modules/po/lastseen.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/lastseen.ru_RU.po
index a1d2fae4180e9280064d04a82ea468c94d124e5a,b482391c144aad50f65023b334df4b1fa242e60c..b06a863d7f0468eb852cff4a69312ef70dd1184b
--- 1/modules/po/lastseen.ru_RU.po
--- 2/modules/po/lastseen.ru_RU.po
+++ b/modules/po/lastseen.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/lastseen.pot\n"
 +"X-Crowdin-File-ID: 178\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n"
+ "X-Crowdin-File-ID: 358\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/listsockets.bg_BG.po
index b3846967f2bd62218a4b57323b253acca88a5c39,706ec7ffe5cb1c431eef3cecc10254935c76e18b..55acd3cafd2d500980555bf1f4ed55e1d30996cc
--- 1/modules/po/listsockets.bg_BG.po
--- 2/modules/po/listsockets.bg_BG.po
+++ b/modules/po/listsockets.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/listsockets.es_ES.po
index 655842c9fdd518000263ad106448f7c49babd508,54cff5e486796d866e7571484c7f05526980d96d..ee06f50f5343beccc05558b4b003e82690eac2a6
--- 1/modules/po/listsockets.es_ES.po
--- 2/modules/po/listsockets.es_ES.po
+++ b/modules/po/listsockets.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/listsockets.fr_FR.po
index 501ae9fa3c9819ba08b0ab759c51eec16191562a,946b4bd93f68c30ec8b3cc237fdb9c921f4cb022..9ef7a9c2407fec0cc5916d83470a89120748e640
--- 1/modules/po/listsockets.fr_FR.po
--- 2/modules/po/listsockets.fr_FR.po
+++ b/modules/po/listsockets.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/listsockets.id_ID.po
index 993f9b3ddbacbd745cbcd0c8666e58e180649db4,fd1a919b50b9f223cc5f599534ef1cfc274e30df..eec24499568169fe2241a944e60eec14271edf0f
--- 1/modules/po/listsockets.id_ID.po
--- 2/modules/po/listsockets.id_ID.po
+++ b/modules/po/listsockets.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/listsockets.it_IT.po
index 12d60ede078bd7b7ca67a24e69ab3e089b102ce2,3a33b9aac889e8073841829783a636f600569601..cb027523a8349e890c37f218d4dc0e5ee0863833
--- 1/modules/po/listsockets.it_IT.po
--- 2/modules/po/listsockets.it_IT.po
+++ b/modules/po/listsockets.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/listsockets.nl_NL.po
index babc13947565f5794d541cfaae8ebfc00dde2feb,7d6dd034586f7e42178e773cc3c88dbda28a048f..2763e1e8d4d84d131e7daa59b941bd35e0cc1e78
--- 1/modules/po/listsockets.nl_NL.po
--- 2/modules/po/listsockets.nl_NL.po
+++ b/modules/po/listsockets.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/listsockets.pl_PL.po
index 691d1d2eaf5b3d57b9354e42f67b053f217bb252,bffbe1aa94f78d14acb6cf6a5261a7d94ea1d6a9..a9a634068197be2948742cea5c0a1ac0d7206828
--- 1/modules/po/listsockets.pl_PL.po
--- 2/modules/po/listsockets.pl_PL.po
+++ b/modules/po/listsockets.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/listsockets.pt_BR.po
index 08f7f844e79eafdfd239439f49357867f4a3de7c,a56f143bac9cc56c0ea351179b9e5be67875eec5..6d272bf3527880d87b74dc564ed54fdb82fd0864
--- 1/modules/po/listsockets.pt_BR.po
--- 2/modules/po/listsockets.pt_BR.po
+++ b/modules/po/listsockets.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/listsockets.ru_RU.po
index 4cdbc1dbbc5603a1279a6be3f5b4cb7413d13090,30eaae6a47cf0bcb76660c34806635b4e4f817a7..81a71f4e653dc70cf0ec8a09138014c443febe14
--- 1/modules/po/listsockets.ru_RU.po
--- 2/modules/po/listsockets.ru_RU.po
+++ b/modules/po/listsockets.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/listsockets.pot\n"
 +"X-Crowdin-File-ID: 179\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n"
+ "X-Crowdin-File-ID: 360\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/log.bg_BG.po
index 84f023202ad8754f7f31c0a5da587e72832bdd3e,5c326533ce6bc30b9fb181be8b5b75f28de1899a..827d26f47b7247db8d404f6d1962264ed29eab0b
--- 1/modules/po/log.bg_BG.po
--- 2/modules/po/log.bg_BG.po
+++ b/modules/po/log.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/log.es_ES.po
index 05afe9e5c956bd268a22118fcbf7ca365091f6f7,531411d490c48f3d5df4a5d7e7bfd3a22ac49658..280165bcdc45ac9f034eb3e82fbf3b9898f7b531
--- 1/modules/po/log.es_ES.po
--- 2/modules/po/log.es_ES.po
+++ b/modules/po/log.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/log.fr_FR.po
index 9370a8b5f96507120161e1a1cb419148aed60fa0,2d921819c8764aa00d20db7699325c72ee31bad7..b4f5ddcbddc8d644225fdef55156f492a21c7479
--- 1/modules/po/log.fr_FR.po
--- 2/modules/po/log.fr_FR.po
+++ b/modules/po/log.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/log.id_ID.po
index c1b54da385e4b904065a38754e0c5ed337f09ceb,38690f1cfe0aa2618282c2202b31750822a961aa..750c636d419b3935d89304c33a5b92e27ced985b
--- 1/modules/po/log.id_ID.po
--- 2/modules/po/log.id_ID.po
+++ b/modules/po/log.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/log.it_IT.po
index a638f457cd87f971f08bf4f158b68a63ff803d3d,778730650556824c0cc0d483d8bfe839354a9732..cbb64235bebb45fcb90b925cf3548dcc341054a2
--- 1/modules/po/log.it_IT.po
--- 2/modules/po/log.it_IT.po
+++ b/modules/po/log.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/log.nl_NL.po
index e6242e8aabfe739635c6eb7ca264e4bcbe7ffdde,2f9afe1c18a21230bf582fe8dae9e8b5260ae2e1..a133156bd595e6b1b26ec072992cba34ac255f8a
--- 1/modules/po/log.nl_NL.po
--- 2/modules/po/log.nl_NL.po
+++ b/modules/po/log.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/log.pl_PL.po
index f8d2e9bd439da628061f1d9460304c8194f639eb,1049cf39a8269ced90d306f0eccd2707e597c282..66c73b2c1bd3733171bf4fd59ef0ffbd8250c61e
--- 1/modules/po/log.pl_PL.po
--- 2/modules/po/log.pl_PL.po
+++ b/modules/po/log.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/log.pt_BR.po
index 75462ebe9f68693ae6ca5a89e13cea31b0d157af,394d08069e1e8fce8b5413796e6ba02470c5c98d..32a5b9f176da9faf1d13b3c8210a22e153a56290
--- 1/modules/po/log.pt_BR.po
--- 2/modules/po/log.pt_BR.po
+++ b/modules/po/log.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/log.ru_RU.po
index c6f157eb5fa39634dcb14d2e88d85e364e983bee,abc571e042f5bbfe8d5c03785ac8e02f5d76f7e2..e88a57eed721d8b7b87f6226056e1d911d570031
--- 1/modules/po/log.ru_RU.po
--- 2/modules/po/log.ru_RU.po
+++ b/modules/po/log.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/log.pot\n"
 +"X-Crowdin-File-ID: 180\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/log.pot\n"
+ "X-Crowdin-File-ID: 314\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/missingmotd.bg_BG.po
index 1500a219acd3cdcf13b6b56507b4c3ba8dc5684d,b86d719739c7a3636b1885b60325766766df86c2..cce764220b4015a537e03b126a03b606d847e513
--- 1/modules/po/missingmotd.bg_BG.po
--- 2/modules/po/missingmotd.bg_BG.po
+++ b/modules/po/missingmotd.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/missingmotd.es_ES.po
index f5235dd6d19439e2fa87a5c294ebfa2c60f1f1dd,a1f143bb2203244b61b2e0a05d1251ef1694241e..e84a0aeb2f81e8ca27a2fb676bae03b33c35e2db
--- 1/modules/po/missingmotd.es_ES.po
--- 2/modules/po/missingmotd.es_ES.po
+++ b/modules/po/missingmotd.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/missingmotd.fr_FR.po
index 8ab32de1b2244cb152fb6773ffa9730437f4da40,65f3ef1dc828dc50dde8001dcab24fb1e30d11eb..36ffb75b7f51f2342a5cabdf8b4df0ebe4c1233c
--- 1/modules/po/missingmotd.fr_FR.po
--- 2/modules/po/missingmotd.fr_FR.po
+++ b/modules/po/missingmotd.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/missingmotd.id_ID.po
index cd3bb1fe79c46996fa175f565348d7bc09cc6954,220e615eba73b1e8e896c7823e798a33f717d808..2f44583b7be0dcfdd006dd56338fe1e0886e5558
--- 1/modules/po/missingmotd.id_ID.po
--- 2/modules/po/missingmotd.id_ID.po
+++ b/modules/po/missingmotd.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/missingmotd.it_IT.po
index 550bdb873691be280cac529f4a5ee70b4e3e6f53,777fd846dbebc363236c98e9c2f7cfb519fc2239..c5ee24b4ef40d5a1f31bbaa7ce404348db732a9b
--- 1/modules/po/missingmotd.it_IT.po
--- 2/modules/po/missingmotd.it_IT.po
+++ b/modules/po/missingmotd.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/missingmotd.nl_NL.po
index fdf6f6106d143199e994a3711e22bb8ef95c344c,ae58fea4aa8262aff770ad12fba17f2d5b4bda35..32bf866d08031094854dd7b6689e76e38d875c99
--- 1/modules/po/missingmotd.nl_NL.po
--- 2/modules/po/missingmotd.nl_NL.po
+++ b/modules/po/missingmotd.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/missingmotd.pl_PL.po
index dcaf567c21143ed6d8ebc03a975fd81bf5f3675d,4a3f33f20adfd03609112992646ce644517de392..680defc820fe19a1b22ee449ebcf403cc3d8e3b7
--- 1/modules/po/missingmotd.pl_PL.po
--- 2/modules/po/missingmotd.pl_PL.po
+++ b/modules/po/missingmotd.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/missingmotd.pt_BR.po
index 8031140261d7f811631f6a738e72876f256c0fce,384a6759242671d7a346d661dcca3a1bbbd3cb1a..a0ab1b471cb8ae67a1df51609a9dda7452aecbb0
--- 1/modules/po/missingmotd.pt_BR.po
--- 2/modules/po/missingmotd.pt_BR.po
+++ b/modules/po/missingmotd.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/missingmotd.ru_RU.po
index 9010af6f2368227bd715f6f43b1916a89beef80d,382c43abbb490959df4256b020d23735fb9ed8e7..6b3df83abd218c8946833486e9377414a1a9d6cd
--- 1/modules/po/missingmotd.ru_RU.po
--- 2/modules/po/missingmotd.ru_RU.po
+++ b/modules/po/missingmotd.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/missingmotd.pot\n"
 +"X-Crowdin-File-ID: 181\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n"
+ "X-Crowdin-File-ID: 362\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/modperl.bg_BG.po
index 9f02207d7ba7679732a254b60bbb7be8a5703a73,609206f9ee5d762f3af2b859568ca5c6d98b3a6d..3fd897a770ba4c7897092fcfe37262da3aa0dc1e
--- 1/modules/po/modperl.bg_BG.po
--- 2/modules/po/modperl.bg_BG.po
+++ b/modules/po/modperl.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/modperl.es_ES.po
index d7ace707e2abb3a807a3937c6b4a76b54768da78,d3f8f08094a68ec2d85468d1210a4f7767aacdc5..e25c1ec77babb2e2bef966bada53027f4294bd32
--- 1/modules/po/modperl.es_ES.po
--- 2/modules/po/modperl.es_ES.po
+++ b/modules/po/modperl.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/modperl.fr_FR.po
index f6fbeac695b4d17def81656d2426c1a895341117,f0c815682a7f1adda93cefc9fd7e83600f59161f..01950da36e10e4f30ec313d60796a69d46b5dcd8
--- 1/modules/po/modperl.fr_FR.po
--- 2/modules/po/modperl.fr_FR.po
+++ b/modules/po/modperl.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/modperl.id_ID.po
index 28ef753241128335d49aa74360f6ca4fafc89ec8,92e8ebb118426897c115891dc1b99122f101345e..10890d7c3b5ec645830343ce650c69a9f673d71b
--- 1/modules/po/modperl.id_ID.po
--- 2/modules/po/modperl.id_ID.po
+++ b/modules/po/modperl.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/modperl.it_IT.po
index a03ea2c5346c65e49156382a737e9e87c130161c,c02b47597e11347857a5693af8e231c8d5ca9398..788935c455c37629a88d27960c23a3eaa2ae469e
--- 1/modules/po/modperl.it_IT.po
--- 2/modules/po/modperl.it_IT.po
+++ b/modules/po/modperl.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/modperl.nl_NL.po
index ed2d8953ba0bebe4520e0dfb53722523c2a5a06b,a6ee78bd38961effd0a9aadd127c60473bbed441..20522a8ec09d65c12fea6143cfad3a1ba1aa62ef
--- 1/modules/po/modperl.nl_NL.po
--- 2/modules/po/modperl.nl_NL.po
+++ b/modules/po/modperl.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/modperl.pl_PL.po
index 42c6196dc273f256e723f8bd3fba5f11b2b52434,fcfb446056afe8c92cee9e593986e5d310d05599..7c1de97ead04405b6e7986cda2dfc2b0aa8312f7
--- 1/modules/po/modperl.pl_PL.po
--- 2/modules/po/modperl.pl_PL.po
+++ b/modules/po/modperl.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/modperl.pt_BR.po
index 66308b5cb3e43284495481ba5b18e06d3b9abe66,ac33443b5c94c04fc50b63a2b4fff525aacc4607..328bce3c5264e2020b386a339a1109b02cabc83f
--- 1/modules/po/modperl.pt_BR.po
--- 2/modules/po/modperl.pt_BR.po
+++ b/modules/po/modperl.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/modperl.ru_RU.po
index 8ee3332565a428d2fe80e55a75cbd12ddfdbbb48,29b1e008a8d9e4a7a725706eeb105aac22024354..b5d5d7af299d75c8032e953624af9fa3baac428f
--- 1/modules/po/modperl.ru_RU.po
--- 2/modules/po/modperl.ru_RU.po
+++ b/modules/po/modperl.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modperl.pot\n"
 +"X-Crowdin-File-ID: 182\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n"
+ "X-Crowdin-File-ID: 340\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/modpython.bg_BG.po
index a202e145fcfbb9db3821417d2f90073325413fac,c5e71a76131f2d8c432dbc30dba3618a85a7c942..02f4457331402e8b6d68850ea82969207248e037
--- 1/modules/po/modpython.bg_BG.po
--- 2/modules/po/modpython.bg_BG.po
+++ b/modules/po/modpython.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/modpython.es_ES.po
index 1c6d865b7d51619ede53806fde976e6369dbd087,ae71e2897658ab5870a9dc6cf8558ee89fc7f97e..2417ffa6378fc6fa19c8f018b44f30a67eba6d27
--- 1/modules/po/modpython.es_ES.po
--- 2/modules/po/modpython.es_ES.po
+++ b/modules/po/modpython.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/modpython.fr_FR.po
index e7aeb582fb299f799418f63fccd1146a21d92614,c46c26ab4520e08a5f0adcd5dd94278ba8722555..d0f5c57d2246a0a5ec1725f1f04759f9d223a48f
--- 1/modules/po/modpython.fr_FR.po
--- 2/modules/po/modpython.fr_FR.po
+++ b/modules/po/modpython.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/modpython.id_ID.po
index 67ce0ab37edec1eefbad5e11f21690eb39619003,f174e79064ce89bbfa1bb71977d2daa43039f436..6af341adc98b5ece37101c4cfeb2412301daa8a3
--- 1/modules/po/modpython.id_ID.po
--- 2/modules/po/modpython.id_ID.po
+++ b/modules/po/modpython.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/modpython.it_IT.po
index ba31c2172ab0d14c176d476a14bfa952883da9ce,113190cfd1504ff5b80f1c13119c2317d84b2900..ca3f40d00edd85bcd85f899608f1167014819bd8
--- 1/modules/po/modpython.it_IT.po
--- 2/modules/po/modpython.it_IT.po
+++ b/modules/po/modpython.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/modpython.nl_NL.po
index 3fb019a6527fd3eb8aac62dce16f30a23a7ee7db,236de00ca4a018314b84bab4456e8cdf2ccaf6db..615bb0869943100d85d18540d7b599acb4beec91
--- 1/modules/po/modpython.nl_NL.po
--- 2/modules/po/modpython.nl_NL.po
+++ b/modules/po/modpython.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/modpython.pl_PL.po
index 13b315c4e8e4d020b7a6f8237fe810adec37c7ff,186875ebf49f13f08e7b05bcd19ceb78fc9f50e4..bdbdf7d7d362efff66201ceb3891ab6c8a9919aa
--- 1/modules/po/modpython.pl_PL.po
--- 2/modules/po/modpython.pl_PL.po
+++ b/modules/po/modpython.pl_PL.po
@@@ -8,12 -8,12 +8,21 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"
  
++<<<<<<< HEAD
 +#: modpython.cpp:513
++=======
+ #: modpython.cpp:512
++>>>>>>> 1.8.x
  msgid "Loads python scripts as ZNC modules"
  msgstr ""

diff --cc modules/po/modpython.pt_BR.po
index 8adafb0cc015248f95ba6ec7b7b9ad0937dc1e40,9c5f05231ecca018de120050816c3ec10df3a771..d1fe0311309eadd289b1784b9a0c8db1a8e1b219
--- 1/modules/po/modpython.pt_BR.po
--- 2/modules/po/modpython.pt_BR.po
+++ b/modules/po/modpython.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/modpython.ru_RU.po
index f3a2d5c0b0c68f477f918843a355c18ca162a100,8129820c92ebdc067981daed716c3c895bde7619..fc97e570109f6834cd7ba5ba01afcd14ba1728ad
--- 1/modules/po/modpython.ru_RU.po
--- 2/modules/po/modpython.ru_RU.po
+++ b/modules/po/modpython.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modpython.pot\n"
 +"X-Crowdin-File-ID: 183\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n"
+ "X-Crowdin-File-ID: 364\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/modules_online.bg_BG.po
index a9249329a8aa6133501d0ae1fc175c24195af3e5,7af5a381352e512daf2737d85865d51732f3532c..a0c0d64b85205d7c94968ce276b6129c4fe6d683
--- 1/modules/po/modules_online.bg_BG.po
--- 2/modules/po/modules_online.bg_BG.po
+++ b/modules/po/modules_online.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/modules_online.es_ES.po
index b53a8e6a5a9d9894cf1fc1657020733f459bdf0e,ee3728278ab46fe5e87abc02a09f3ca930d5a3e2..7a142ca4f6fd704ebcb8f0649cc7d53599547965
--- 1/modules/po/modules_online.es_ES.po
--- 2/modules/po/modules_online.es_ES.po
+++ b/modules/po/modules_online.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/modules_online.fr_FR.po
index fa095e279d99b0952863c124d49ac8f28a188e6d,9bdb9bde3d48e17b5c8fd631dc2d80ac8be797a5..205223a7c76a22a0b719d028a642a155f34cd738
--- 1/modules/po/modules_online.fr_FR.po
--- 2/modules/po/modules_online.fr_FR.po
+++ b/modules/po/modules_online.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/modules_online.id_ID.po
index 64457a020c4d3eb1440fe22c79da313399c5fd5a,56b8bbd9a74291ba9eb97593f6f1a99a8abb0935..28549df9d8a481f7bc23c7816d44cce96dbe5518
--- 1/modules/po/modules_online.id_ID.po
--- 2/modules/po/modules_online.id_ID.po
+++ b/modules/po/modules_online.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/modules_online.it_IT.po
index 484b8e5dd81b82c837a4c30230ae83c0d2bb0efe,6acb61bbd8ea2664d7f23bf2e6608c13da636043..40fdc200e019b71a4e4dcd43408d370def40d326
--- 1/modules/po/modules_online.it_IT.po
--- 2/modules/po/modules_online.it_IT.po
+++ b/modules/po/modules_online.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/modules_online.nl_NL.po
index aac2a9dcda84bc58bcea77d491ada512a252d0a3,0e74fd4f528d897dde76459beb9720523d7a89c1..2becdf58b6d6a6a43863f9548e0f866a62868c33
--- 1/modules/po/modules_online.nl_NL.po
--- 2/modules/po/modules_online.nl_NL.po
+++ b/modules/po/modules_online.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/modules_online.pl_PL.po
index 69ec9c93abf94e8430b09435eb6d7d5410a1ce13,7268a2c46d39fee4f5524d5662f35de3ea48ea1e..723d5b596d97af452e740e94a386c38f567c9801
--- 1/modules/po/modules_online.pl_PL.po
--- 2/modules/po/modules_online.pl_PL.po
+++ b/modules/po/modules_online.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/modules_online.pt_BR.po
index eb4692aa815a2032b2884252e216b99513df394c,7d3d4155eeb8ab1dea3691b60c0dc707a59942f6..ba113945b572c81e6d1994fd4e0303eae7eca07a
--- 1/modules/po/modules_online.pt_BR.po
--- 2/modules/po/modules_online.pt_BR.po
+++ b/modules/po/modules_online.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/modules_online.ru_RU.po
index 82312d2ac9420b76d9bf88f1f5901014410cc022,73e937112bef7ce4ae6bf6214065f6e2b1862f52..ffe5a268b07e70c6e2c18027e2d5da620b3c2f72
--- 1/modules/po/modules_online.ru_RU.po
--- 2/modules/po/modules_online.ru_RU.po
+++ b/modules/po/modules_online.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/modules_online.pot\n"
 +"X-Crowdin-File-ID: 184\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n"
+ "X-Crowdin-File-ID: 366\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/nickserv.bg_BG.po
index 902f69d2d46de30609ea42b7f0ef00dfb3889654,1ca4400cc7a3d96b25227942f9e5052fb9c4d9f4..336353cc000267ed0f2912c08e0b72aedf453111
--- 1/modules/po/nickserv.bg_BG.po
--- 2/modules/po/nickserv.bg_BG.po
+++ b/modules/po/nickserv.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/nickserv.es_ES.po
index c4a77fba8cb24f905ba544aa949e735d123e0773,c673af78f9c033a1b09c5a1099b7a2f572d3212b..263887f4cf7ea8ccc9c048044885b0e8d5f08b7e
--- 1/modules/po/nickserv.es_ES.po
--- 2/modules/po/nickserv.es_ES.po
+++ b/modules/po/nickserv.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/nickserv.fr_FR.po
index de74a88e9750753518ccc751d87da9f6abc5181a,bf07181354851d340531049d5f3e1751db7db865..bb05b2303161de1bcf90b850b6cecdb83d2a5592
--- 1/modules/po/nickserv.fr_FR.po
--- 2/modules/po/nickserv.fr_FR.po
+++ b/modules/po/nickserv.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/nickserv.id_ID.po
index 3cee07a4bb9c0bc71623337f1106f311bbfa225b,8d04e779fba73a5b7cdcd85c0c8c92787a390b32..747260b7650e893c1a6c849efb6e21969f3cb852
--- 1/modules/po/nickserv.id_ID.po
--- 2/modules/po/nickserv.id_ID.po
+++ b/modules/po/nickserv.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/nickserv.it_IT.po
index 31455733f1fe02a971f67424cc61753f9b5a7d71,165707a4d1161fa5bdc8a5c3424db08e7fec6987..959a87a0c7ece212bcd172ee6d8ac3b5fe31e720
--- 1/modules/po/nickserv.it_IT.po
--- 2/modules/po/nickserv.it_IT.po
+++ b/modules/po/nickserv.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/nickserv.nl_NL.po
index 723eb0175955f0ad3ecafd93df94b06892519421,b72f847a391f11eaea479a93fb47a747022b10e2..943bb47f8ffa1b9f28d58e811ce8f6ef9eccaa3b
--- 1/modules/po/nickserv.nl_NL.po
--- 2/modules/po/nickserv.nl_NL.po
+++ b/modules/po/nickserv.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/nickserv.pl_PL.po
index c864dbc1b10cd1c2aa5069f26aa1c58be4f4917a,fb42b6965b442065a0cebb3d85c8b675eee4cb44..b79f5b8fae2c1cee254b91b0aaf235a056fe16fb
--- 1/modules/po/nickserv.pl_PL.po
--- 2/modules/po/nickserv.pl_PL.po
+++ b/modules/po/nickserv.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/nickserv.pt_BR.po
index 62104726e9dab57d6613534568e17dcfd3959277,0da18a849f113235733a78ca0925143dc633b364..8ccca85f66f8d7b3095215405a13481dae13add2
--- 1/modules/po/nickserv.pt_BR.po
--- 2/modules/po/nickserv.pt_BR.po
+++ b/modules/po/nickserv.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/nickserv.ru_RU.po
index a6bee5a1874599be671b26d1bdb0420af8516ac6,246582b85e4f0f928d169c6ddf9f6a91f6ad61ea..0667e3112e6bca41b33709bd70eff378a4b9560b
--- 1/modules/po/nickserv.ru_RU.po
--- 2/modules/po/nickserv.ru_RU.po
+++ b/modules/po/nickserv.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/nickserv.pot\n"
 +"X-Crowdin-File-ID: 185\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n"
+ "X-Crowdin-File-ID: 368\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/notes.bg_BG.po
index 4785615095a4c1a32fdfa9077eb29aeef3a79475,e8440e81fe2061e7d44852b3225535a95ed62700..36973c34453e597c7cefc92f16c125c5595d8e02
--- 1/modules/po/notes.bg_BG.po
--- 2/modules/po/notes.bg_BG.po
+++ b/modules/po/notes.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/notes.es_ES.po
index 25f96361e8dc1c13557ae1ec89e2d2d7ddcc43e1,0d6b45190a00b7e1d8c8c1fe6bc53af343135971..451e1b5112f180a1ca80cc4c56b119cfef76b80f
--- 1/modules/po/notes.es_ES.po
--- 2/modules/po/notes.es_ES.po
+++ b/modules/po/notes.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/notes.fr_FR.po
index d18759e886d5b207bf8bb6906fe64a231cf03571,134c742fd46ec3259094f25bfdac96a13329562f..4057fc14068654c6a7864fa58268323a55eff60a
--- 1/modules/po/notes.fr_FR.po
--- 2/modules/po/notes.fr_FR.po
+++ b/modules/po/notes.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/notes.id_ID.po
index 988501542a35fa2c0c3be6fc7cd29856ef7ec307,0dac7b3a6fc5ff2be68d02e37d922ad01242edec..5ee29632c3b00381e18c092c93e5608341f9f999
--- 1/modules/po/notes.id_ID.po
--- 2/modules/po/notes.id_ID.po
+++ b/modules/po/notes.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/notes.it_IT.po
index 622574a152d525b58faab2dc028f6b911d89937b,32179ae3b0bb25e4244166af4ebaee99495cc37c..306cda82ee160a3dfe1395ae57e12588f3818fce
--- 1/modules/po/notes.it_IT.po
--- 2/modules/po/notes.it_IT.po
+++ b/modules/po/notes.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/notes.nl_NL.po
index 8aa0abf474dc46c115be10e7dab82f8a02c36d12,6e0bb98f4db8b7b4eb80708321ae18ffb94e77bb..3939b155ba91d9a15b711a86f022b5add3ef2944
--- 1/modules/po/notes.nl_NL.po
--- 2/modules/po/notes.nl_NL.po
+++ b/modules/po/notes.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/notes.pl_PL.po
index 1f32107bda6e226723f5bdeac0d2f3a9f9cf0729,7349fd40531a35bd27d13bf335f92b9a30720bb7..382e9ec455c57a94b10680a618d5ed05e60125dd
--- 1/modules/po/notes.pl_PL.po
--- 2/modules/po/notes.pl_PL.po
+++ b/modules/po/notes.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/notes.pt_BR.po
index cc11357e193e0a01794a1f9ca474cab66d696ff9,75cd1bb3f9bf054db7a608515c2a5a6bbe2d6919..7c456fcafef01f04c97b7288149acb8f9b890e15
--- 1/modules/po/notes.pt_BR.po
--- 2/modules/po/notes.pt_BR.po
+++ b/modules/po/notes.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/notes.ru_RU.po
index c94c8cbf4550356558783635676c39533146440e,d51ff36a4a10e816dd1b3ab9f8b56974d3fe496d..db4b5b74b1358e1a3818c3958bfe24e6eb688960
--- 1/modules/po/notes.ru_RU.po
--- 2/modules/po/notes.ru_RU.po
+++ b/modules/po/notes.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notes.pot\n"
 +"X-Crowdin-File-ID: 186\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notes.pot\n"
+ "X-Crowdin-File-ID: 350\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/notify_connect.bg_BG.po
index f590f639bac84c10048fa9999486f04777dd991e,b9ffeafd8af5b99361a22f4759a2e40f63449f43..2c2ee5fdcbc4c99bcefe411985d9ed588b9b2018
--- 1/modules/po/notify_connect.bg_BG.po
--- 2/modules/po/notify_connect.bg_BG.po
+++ b/modules/po/notify_connect.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/notify_connect.es_ES.po
index a83bce84b077f8080406f6b3eee76c9085896153,ef26cb8f628b0523f04492dbd9194dc5c8945451..bed2b105c8b30d574de918aa0adb22ee5246b611
--- 1/modules/po/notify_connect.es_ES.po
--- 2/modules/po/notify_connect.es_ES.po
+++ b/modules/po/notify_connect.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/notify_connect.fr_FR.po
index 881d67da5356d8367581b424fa6c7c1171f7a62e,8ce3a0feae4494b2ffbfa517fdb5dabba92dff17..9157e0d41132d09853fcda5b28975bae8a2ff32b
--- 1/modules/po/notify_connect.fr_FR.po
--- 2/modules/po/notify_connect.fr_FR.po
+++ b/modules/po/notify_connect.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/notify_connect.id_ID.po
index 2f970b02faba73e221bc78a62693875b5e3971f8,9ccaabcaafe3f66abac05b9f7c28d21a2928329d..24701947027f7f5a4eef78b21c7add1b08fdf9ed
--- 1/modules/po/notify_connect.id_ID.po
--- 2/modules/po/notify_connect.id_ID.po
+++ b/modules/po/notify_connect.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/notify_connect.it_IT.po
index 3976096f1a86f9a33227618a335a8d8b84b62c16,bdc567532bfc4be6f65b886c18dbbc8fdb8a6b6a..642a01d67ff4ea3bf27d57f916e288cba44135a7
--- 1/modules/po/notify_connect.it_IT.po
--- 2/modules/po/notify_connect.it_IT.po
+++ b/modules/po/notify_connect.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/notify_connect.nl_NL.po
index 9e3b9a7c5641510a7e6d5a1f38d4dd80816d2817,d341d8a42212d0a665b71aa3c7d157e415a557d2..6eb55c0106de70774e6bc8ca2445fd9b63e52e38
--- 1/modules/po/notify_connect.nl_NL.po
--- 2/modules/po/notify_connect.nl_NL.po
+++ b/modules/po/notify_connect.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/notify_connect.pl_PL.po
index 9155d40ac35b2b4c6544e3df7ce01e4db3070392,f3b83697b22199cbd9fc682946b7ca6c4fbe4fef..cc11e5c4a7a5052c89fe9d1317bc3e5f166ec71c
--- 1/modules/po/notify_connect.pl_PL.po
--- 2/modules/po/notify_connect.pl_PL.po
+++ b/modules/po/notify_connect.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/notify_connect.pt_BR.po
index 4d62416a470d9321b1c6c2b503b07625e498bf99,1b010398be459875a974c11cf9887ac7bd8c04ba..c107c0c6fe918643c8b3743bab5f54a186c115be
--- 1/modules/po/notify_connect.pt_BR.po
--- 2/modules/po/notify_connect.pt_BR.po
+++ b/modules/po/notify_connect.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/notify_connect.ru_RU.po
index f1c5b804b3d22c8c13a628bf1be4f5be4b5207e5,dce52863d49ae681660534b100f638bff1bf8150..13d46913c7a3c345388b2f513bb5ed6049b945ad
--- 1/modules/po/notify_connect.ru_RU.po
--- 2/modules/po/notify_connect.ru_RU.po
+++ b/modules/po/notify_connect.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/notify_connect.pot\n"
 +"X-Crowdin-File-ID: 187\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n"
+ "X-Crowdin-File-ID: 370\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/perform.bg_BG.po
index 55959c76a9f930861c4259e55e97a9b0ec57f5a1,07739478955832280d6d85d449f817860a0e3446..c6d95c2d614df09693e1d24ff1950e851407f120
--- 1/modules/po/perform.bg_BG.po
--- 2/modules/po/perform.bg_BG.po
+++ b/modules/po/perform.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/perform.es_ES.po
index f9f89e3ae2960b50c28a8019ceb584611aae3c09,d9baea94f9cb4c74de374c66b816a4bc9c5d8e8e..a9a7098e8f30922bb5a70c8cf7257a01fa24a91d
--- 1/modules/po/perform.es_ES.po
--- 2/modules/po/perform.es_ES.po
+++ b/modules/po/perform.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/perform.fr_FR.po
index 526399ba0ac642c90a17e18708f050f253760cbf,616bf5281ea75bd405633842448f545bf4aafdec..dc5cc8441e7e609060058eb0a6f8a652cc9305a6
--- 1/modules/po/perform.fr_FR.po
--- 2/modules/po/perform.fr_FR.po
+++ b/modules/po/perform.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/perform.id_ID.po
index 87f32225f53139eab88b053a07d19870cdf6703e,83b7c630d500a435ff93ba6932f2e9d055ca3dc2..c316cf808c5fb5794d7ef8a823332034f9faf239
--- 1/modules/po/perform.id_ID.po
--- 2/modules/po/perform.id_ID.po
+++ b/modules/po/perform.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/perform.it_IT.po
index c9bf6d9b20bc96d243306c6d715a105cf0bbd29f,4ba93d464cb04dae91cfdca9715d4902731d5e90..6536b7c673112587f2602c29f6c1033f2d958d64
--- 1/modules/po/perform.it_IT.po
--- 2/modules/po/perform.it_IT.po
+++ b/modules/po/perform.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/perform.nl_NL.po
index d8c08746f9ad931d0d8514b99e00953896f948a9,00c14edbc34ef3a7cebb9a99cc7b1168bc9dae6b..dd0769a57b5982c9af844660999c338a57c5c14d
--- 1/modules/po/perform.nl_NL.po
--- 2/modules/po/perform.nl_NL.po
+++ b/modules/po/perform.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/perform.pl_PL.po
index 86fb98b4019afefcdbf87ff183d5812725420e66,46348b56392c331e5e32aec0b7d7128a496e4624..dcb446d1f32d683bc06c508794a23c0f7e4f7270
--- 1/modules/po/perform.pl_PL.po
--- 2/modules/po/perform.pl_PL.po
+++ b/modules/po/perform.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/perform.pt_BR.po
index 246d93215ef653484866d6885d2d2f6ad4bf1a88,c27c898ae13a9cb1f68c3c8d6bea7f1dd06f0779..50cf86559ad5dc7841d8ce68d6afedcca877f39a
--- 1/modules/po/perform.pt_BR.po
--- 2/modules/po/perform.pt_BR.po
+++ b/modules/po/perform.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/perform.ru_RU.po
index b4bab31c2a5100aae2fcbaacea00d6414663edf9,e1c39d9d98f02c0b6bc7029e175daa39fee72d12..c46e81417af2e8e479e3b8730a75ff0592e46e22
--- 1/modules/po/perform.ru_RU.po
--- 2/modules/po/perform.ru_RU.po
+++ b/modules/po/perform.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perform.pot\n"
 +"X-Crowdin-File-ID: 189\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perform.pot\n"
+ "X-Crowdin-File-ID: 372\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/perleval.bg_BG.po
index e9c58232492eb94e6a8604a8b4aa92b2ab5f3ecd,38ff14ca7314781f40892c59aed1a1362c522543..af19a85d124604f2ad300dcdce28f4845058467d
--- 1/modules/po/perleval.bg_BG.po
--- 2/modules/po/perleval.bg_BG.po
+++ b/modules/po/perleval.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/perleval.es_ES.po
index 9f65a7300dae8bf66d0d1547fb30f7175c78736d,2c243c5cb9288250919844b0be4f1fb02a50dd46..3113321f802cc8e0adba6a88e2089d252e7fb739
--- 1/modules/po/perleval.es_ES.po
--- 2/modules/po/perleval.es_ES.po
+++ b/modules/po/perleval.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/perleval.fr_FR.po
index bc02e552cc845ee9245f9c19b47d3ab25156f333,2c1b3e26233945dd722ad89494114091857caf9b..6595468f8632888f7fac36137bf963cfa5d69701
--- 1/modules/po/perleval.fr_FR.po
--- 2/modules/po/perleval.fr_FR.po
+++ b/modules/po/perleval.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/perleval.id_ID.po
index 358a8a9acfb76bfe8aca82f18c3e4afa5bcdc4b6,94e72fb0075026ca27e154d935b804a8fedd1451..88581e8407e0607650df03715d3a2d1a188c75bd
--- 1/modules/po/perleval.id_ID.po
--- 2/modules/po/perleval.id_ID.po
+++ b/modules/po/perleval.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/perleval.it_IT.po
index 9abef01d1e10c65594c38db14b5c95f7c1cccc78,3221c72e66866a12ec734a29aa3f66d6572e1206..28f58480cfcc972a32fb86a8e15bdbb8b37e5e87
--- 1/modules/po/perleval.it_IT.po
--- 2/modules/po/perleval.it_IT.po
+++ b/modules/po/perleval.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/perleval.nl_NL.po
index 2497c70a09d22e7ebb183063cbdb0d68355f37e9,d435b38f119142e52782c0f100ef1b503e841ae2..a082748bc4bd2f18aefbb0545071ee9bec4ee54a
--- 1/modules/po/perleval.nl_NL.po
--- 2/modules/po/perleval.nl_NL.po
+++ b/modules/po/perleval.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/perleval.pl_PL.po
index 4cfff577b8734a4c20c3752cb2adaea08a2a6b2e,2601ed3affdae1e70e214edd8c3231641cf75795..b1ca932c53d18907a37c5a4c0841e4af0f8ce3f6
--- 1/modules/po/perleval.pl_PL.po
--- 2/modules/po/perleval.pl_PL.po
+++ b/modules/po/perleval.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/perleval.pt_BR.po
index 480232220f2e142d4b8e7449370f73f8774f6902,69f2303158deb61a0d5b359d9668211220a73ccc..389eb47abfe72f107b39775024c51ae506f2bde5
--- 1/modules/po/perleval.pt_BR.po
--- 2/modules/po/perleval.pt_BR.po
+++ b/modules/po/perleval.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/perleval.ru_RU.po
index 8355feed5628a9c0d4f1948a63592c517a83de49,a8f0753f0aa9431dc2528620a79fa9539799afe4..72e6eca046bb2aba549ecbf2b3d68350f398744f
--- 1/modules/po/perleval.ru_RU.po
--- 2/modules/po/perleval.ru_RU.po
+++ b/modules/po/perleval.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/perleval.pot\n"
 +"X-Crowdin-File-ID: 190\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n"
+ "X-Crowdin-File-ID: 374\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/pyeval.bg_BG.po
index 848f374d285a727123f4d4497aad6af1096517cb,733c541f9568bbd2457db1c228c183bc8b4e268e..1294396eb83dd08f91a761148ba07d4dddfe9481
--- 1/modules/po/pyeval.bg_BG.po
--- 2/modules/po/pyeval.bg_BG.po
+++ b/modules/po/pyeval.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/pyeval.es_ES.po
index 12a76213397b62936b26e6135fdd45e2e57b142f,18f9be71994b5ed973f8d32e12d3868b912400c2..475c5b15a93ed2f9eebe3f895f3fbe7a3313a635
--- 1/modules/po/pyeval.es_ES.po
--- 2/modules/po/pyeval.es_ES.po
+++ b/modules/po/pyeval.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/pyeval.fr_FR.po
index 7b9776db47d621ae99400fda28aca187f312121d,2daa117e7e4b3919bc4358ee3e389836d17fc386..c8d60231efe64bf074a466077a9f321c6b756abb
--- 1/modules/po/pyeval.fr_FR.po
--- 2/modules/po/pyeval.fr_FR.po
+++ b/modules/po/pyeval.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/pyeval.id_ID.po
index 6ff56b0bdae867c2725f2177ed2b451fb185cac1,64002a890a17f9fadad726f798e429bef6f091d7..fcd3096b9bde58f678231c1daa6643418b8fc3c2
--- 1/modules/po/pyeval.id_ID.po
--- 2/modules/po/pyeval.id_ID.po
+++ b/modules/po/pyeval.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/pyeval.it_IT.po
index 3dc13005cf1fed7c092cc91235c8bbfef55f01d9,b877617f9c138e703f3f8f11e3cf6325bf16ba3c..043e68568a156dfd24234031f734f4b4bfe550cb
--- 1/modules/po/pyeval.it_IT.po
--- 2/modules/po/pyeval.it_IT.po
+++ b/modules/po/pyeval.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/pyeval.nl_NL.po
index 543e9d0e8a57f8e876cdbaaa7ea5cc683182400b,000b655fc88d35311f2164054d2908fccdf42bac..f7fabfbd2f961ab2c23e28046c42d8a7e72a7280
--- 1/modules/po/pyeval.nl_NL.po
--- 2/modules/po/pyeval.nl_NL.po
+++ b/modules/po/pyeval.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/pyeval.pl_PL.po
index f3961f05f2918cbd6d32844ed01e91d3466d5efb,7babdb9545511f35bb4d5ffce3f50833b725e351..638b0c81fa6a4d3f8642f13ca966c159e48a25f9
--- 1/modules/po/pyeval.pl_PL.po
--- 2/modules/po/pyeval.pl_PL.po
+++ b/modules/po/pyeval.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/pyeval.pt_BR.po
index ef36873daedc3fc73eaa7dc6e84faac8ed4ca525,c73ac52a234302c5914292535be3be2eb706d14e..acaa797693a528e4ebfa2f97a186cf3991f27995
--- 1/modules/po/pyeval.pt_BR.po
--- 2/modules/po/pyeval.pt_BR.po
+++ b/modules/po/pyeval.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/pyeval.ru_RU.po
index 13f5502523f0582fb8379eb69a99fe8be866d1ba,904b74b57a43421105830cd84392951c264f0789..27a9bc1f8f37781fb61c4cba8253e1ba579253c6
--- 1/modules/po/pyeval.ru_RU.po
--- 2/modules/po/pyeval.ru_RU.po
+++ b/modules/po/pyeval.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/pyeval.pot\n"
 +"X-Crowdin-File-ID: 191\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n"
+ "X-Crowdin-File-ID: 376\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/raw.bg_BG.po
index 759f6bd74c346b726009511e0a0db7cae2e3720e,f7e7cf771c934761ffd6a320e390cd92fbee29d9..72cf1f9a3d5e6d7a2365aa81fc8d023b1c60869e
--- 1/modules/po/raw.bg_BG.po
--- 2/modules/po/raw.bg_BG.po
+++ b/modules/po/raw.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/raw.es_ES.po
index 24badec398a84790a57b352dcec67b0091364fa8,c67eaf8ce00474318fdfee9081a4ea166d491d25..a65a4e6d4c3c79c0add63d719045136a7a5bc982
--- 1/modules/po/raw.es_ES.po
--- 2/modules/po/raw.es_ES.po
+++ b/modules/po/raw.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/raw.fr_FR.po
index 586438423bcc4dbf0808d6ad9586d123d98577f3,d111f909db9d737d3987a17e5091abcc420210f3..1e95e5afda54f690132e638a1224677ac7b00b32
--- 1/modules/po/raw.fr_FR.po
--- 2/modules/po/raw.fr_FR.po
+++ b/modules/po/raw.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/raw.id_ID.po
index 9ac7ab78e33169fd67c4775ba64af3e4454e7821,fafbb2c28ed9e419e5686eb28f34c7bc15277539..779ddd065379f24999d6a5891e4e3188a9fb9014
--- 1/modules/po/raw.id_ID.po
--- 2/modules/po/raw.id_ID.po
+++ b/modules/po/raw.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/raw.it_IT.po
index 46844540ac41903e5c2ea1381d8045c42126dcfd,4ce5f880db0d3cf25952b2635e0799782e8365d2..1f7d1d4c08c7001eb46758b964ce7fc081dc45a5
--- 1/modules/po/raw.it_IT.po
--- 2/modules/po/raw.it_IT.po
+++ b/modules/po/raw.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/raw.nl_NL.po
index 8d33c0adee1ad812c5f31bccc44b3a1a14e1cc69,53900e794e3f11e2f5ec1c2eae699451eb6f0c15..cf3c62caf073331fc17c6bcb40c57847b219a8e6
--- 1/modules/po/raw.nl_NL.po
--- 2/modules/po/raw.nl_NL.po
+++ b/modules/po/raw.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/raw.pl_PL.po
index f63b7c9ce927b9844b6c0d9599b8a6c2a3e02554,8dc651dd3f327e3ced1e018d8b672eb06d75291b..7b1e3a317d5ef65b66cade4d51163f17d50edfd2
--- 1/modules/po/raw.pl_PL.po
--- 2/modules/po/raw.pl_PL.po
+++ b/modules/po/raw.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/raw.pt_BR.po
index 4275586ebbd9e225acb03b82f3e240fce6d236ae,9d165ad71689f057928ae037aac1df3be87f5b44..a478141d18f3fbadeed80c4d4ad1d175507f05a7
--- 1/modules/po/raw.pt_BR.po
--- 2/modules/po/raw.pt_BR.po
+++ b/modules/po/raw.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/raw.ru_RU.po
index da8b7d2752e58bc7bcce4448fff3817d41a9da6b,2de435ebe5754a5723aafcbc002f75c3275bf65d..3ae0828501de3c0d975f6e22cda5628c7586152b
--- 1/modules/po/raw.ru_RU.po
--- 2/modules/po/raw.ru_RU.po
+++ b/modules/po/raw.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/raw.pot\n"
 +"X-Crowdin-File-ID: 193\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/raw.pot\n"
+ "X-Crowdin-File-ID: 320\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/route_replies.bg_BG.po
index bb407e7f40a18a616f8769371583cee5076bfb1f,51d72b197ad5dbbb076fdbcf9ab4e161d4470d0c..8efc088742b5d9196cbbe837941544e515a11704
--- 1/modules/po/route_replies.bg_BG.po
--- 2/modules/po/route_replies.bg_BG.po
+++ b/modules/po/route_replies.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/route_replies.es_ES.po
index 3b93339147c074e759b4f6bd319fdabac470f424,65ae4b5995ab31cb488085f5c2c6238748f69de7..74404270e3a242306e99024bf398d268f6083be0
--- 1/modules/po/route_replies.es_ES.po
--- 2/modules/po/route_replies.es_ES.po
+++ b/modules/po/route_replies.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/route_replies.fr_FR.po
index c6058712179b9a2eedac2d7265712c199b64c25c,e02c16b93862d3aafe5c33bf0e97cd30ffcc905b..7b01c630beab910c345fc7d1f1481822e59bc6e8
--- 1/modules/po/route_replies.fr_FR.po
--- 2/modules/po/route_replies.fr_FR.po
+++ b/modules/po/route_replies.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/route_replies.id_ID.po
index e34033fa597db1d378f9235bbb8f815bf996a70f,269c6e05c6083bd58e7b2bdbffcccd62013c0be2..56d4930f0f899b788e2c4f1bcf20cc037661f4ec
--- 1/modules/po/route_replies.id_ID.po
--- 2/modules/po/route_replies.id_ID.po
+++ b/modules/po/route_replies.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/route_replies.it_IT.po
index ebb8511211e671415e7aff1522a4feae78b54198,c278f84e4f8576b7fd1dd8541f92567e789d38db..33ad5dca2bca4bfa071789c313d9cb47d1ae3edc
--- 1/modules/po/route_replies.it_IT.po
--- 2/modules/po/route_replies.it_IT.po
+++ b/modules/po/route_replies.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/route_replies.nl_NL.po
index 83070b1c584dd847137784e5610a34e1d8d8c660,fd27358b8739893acf118a55dfeab5a4c0f9f7ec..d059229c11e5b4d022825b90a03538122ce47896
--- 1/modules/po/route_replies.nl_NL.po
--- 2/modules/po/route_replies.nl_NL.po
+++ b/modules/po/route_replies.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/route_replies.pl_PL.po
index 57c76f5cd8684cec6e9fcd577df7a6f6234d91cb,7a6d47acc4214858278fa3ad1e01c25b6d005f4e..ff6b0894f60df0dfaf89483bbf4cfcb18642994b
--- 1/modules/po/route_replies.pl_PL.po
--- 2/modules/po/route_replies.pl_PL.po
+++ b/modules/po/route_replies.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/route_replies.pt_BR.po
index 63e50f22f66453eb9b988a89198cd23e818f7c19,205fa1cf50e8b690885a7948867923cc4d2c2274..ce14be74cfa01d7cb15993b68003ea7441fc285b
--- 1/modules/po/route_replies.pt_BR.po
--- 2/modules/po/route_replies.pt_BR.po
+++ b/modules/po/route_replies.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/route_replies.ru_RU.po
index dbfcc444696fd93ba47b2cb6900ccbd95e53fe57,79e201e8f01189f42c17907f679f24a550487dd8..1d0bac12c850eb3b910c4808526d67fe32967392
--- 1/modules/po/route_replies.ru_RU.po
--- 2/modules/po/route_replies.ru_RU.po
+++ b/modules/po/route_replies.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/route_replies.pot\n"
 +"X-Crowdin-File-ID: 194\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n"
+ "X-Crowdin-File-ID: 378\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/sample.bg_BG.po
index e4c7c047129dad48583e45a98a65e28bd33d4aab,46ce0799acf48cc282af8e7282762a884a0ccc42..eaf530ba5e56dd8d5aaae064e8f7649bf888c03f
--- 1/modules/po/sample.bg_BG.po
--- 2/modules/po/sample.bg_BG.po
+++ b/modules/po/sample.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/sample.es_ES.po
index 1c0c4fbd6c53c32cef96bed264904dfda21477b9,14fe213b9572c3c9e926ea8cf9b658d160e7ad0a..cc7a6e111d664493517ce69f8213439eb36230c5
--- 1/modules/po/sample.es_ES.po
--- 2/modules/po/sample.es_ES.po
+++ b/modules/po/sample.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/sample.fr_FR.po
index a93358b0d0590ac217911b43121eb26eeaaaf68b,878fa0a8dbf5943e21fb354378509216a9dbaacf..c13f4ec3946dc342277ebdbbbb6ab790990b4870
--- 1/modules/po/sample.fr_FR.po
--- 2/modules/po/sample.fr_FR.po
+++ b/modules/po/sample.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/sample.id_ID.po
index 17032ef6b978a1044ef8b1af2ee90085a1bd9869,96458e62f7df853c250545794952059e8ac4c895..f96e83ec4e7f60458df966f658378bed73d63850
--- 1/modules/po/sample.id_ID.po
--- 2/modules/po/sample.id_ID.po
+++ b/modules/po/sample.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/sample.it_IT.po
index 3c50c8ba1148571eda70da8708fd0a6368d34f4a,5b3fb54c9eefd8ab9ee80e09f6784f04028a0b57..f09fe260a1b610962171e953f3e16170f52a53c8
--- 1/modules/po/sample.it_IT.po
--- 2/modules/po/sample.it_IT.po
+++ b/modules/po/sample.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/sample.nl_NL.po
index f6f0384efa461ff121d2613d8b1e809218b53cd4,bf5bb15723763b2e1a9d1fe2ef81a2485965ff8f..f789bfd1381a2360c56800937ca58eb47d51f12e
--- 1/modules/po/sample.nl_NL.po
--- 2/modules/po/sample.nl_NL.po
+++ b/modules/po/sample.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/sample.pl_PL.po
index 670061320eab6e17202eb86d189b16f39454534b,35b852c280c650966b4951dbdd6b69fefe2ed1a2..4d0bcc1567c34065adfad3a7258bab5aa69c77ec
--- 1/modules/po/sample.pl_PL.po
--- 2/modules/po/sample.pl_PL.po
+++ b/modules/po/sample.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/sample.pt_BR.po
index 011d0094923f5870227ee5dc70d528ac46d7de70,ac7747f5aa2c82f044a044d47126e080d60ed9be..4b9c4e86218b389c210689387aa753d4bd5f90ac
--- 1/modules/po/sample.pt_BR.po
--- 2/modules/po/sample.pt_BR.po
+++ b/modules/po/sample.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/sample.ru_RU.po
index b2fc8e3dd3a26e5d2baf813962ee48be44e62a03,fe31442c1a10485d6fe91534c46cf8643202f634..7b7698ef057de8a586b5ba56f6aaba09699e0dd9
--- 1/modules/po/sample.ru_RU.po
--- 2/modules/po/sample.ru_RU.po
+++ b/modules/po/sample.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sample.pot\n"
 +"X-Crowdin-File-ID: 195\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sample.pot\n"
+ "X-Crowdin-File-ID: 380\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/samplewebapi.bg_BG.po
index 361b138d23f4452ec8c7afdf7c87f5d08c7b7a4e,b616199b700bcc03fd2ab4ea310b968453c38f3f..b6502d1c249c31f0dec3f31bb5d2756d9aaa8f34
--- 1/modules/po/samplewebapi.bg_BG.po
--- 2/modules/po/samplewebapi.bg_BG.po
+++ b/modules/po/samplewebapi.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/samplewebapi.es_ES.po
index b1f8ab7e31bdb049e63450882d344fa8063542bb,9b14ed66659de152a104857001bc9d608042d8ca..138fe0aa0009ed4d526dd9c01fd64f23a58128ca
--- 1/modules/po/samplewebapi.es_ES.po
--- 2/modules/po/samplewebapi.es_ES.po
+++ b/modules/po/samplewebapi.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/samplewebapi.fr_FR.po
index 147abe932e06554bc28984f406fcdcb7c6c0fe34,98d01e8c7edd08b5e6c180f19c075a65b6874640..b3c874ba7f33fa978eed8b502e214ca62908b87b
--- 1/modules/po/samplewebapi.fr_FR.po
--- 2/modules/po/samplewebapi.fr_FR.po
+++ b/modules/po/samplewebapi.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/samplewebapi.id_ID.po
index 449e0f48c7fc241f9e4cede9b75b7e77a58fc965,c8005891660dfad616c80f424c3c81457e41c509..a12613e11fea04eaef603bbf3d88990b6635910e
--- 1/modules/po/samplewebapi.id_ID.po
--- 2/modules/po/samplewebapi.id_ID.po
+++ b/modules/po/samplewebapi.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/samplewebapi.it_IT.po
index 163b48581afbeacf26ef59f98e8acc99851072d2,82423a5fa5ab20b6b4ea262b05540ad7123ef405..a827477590506697f3b4048db422f3caf168cea8
--- 1/modules/po/samplewebapi.it_IT.po
--- 2/modules/po/samplewebapi.it_IT.po
+++ b/modules/po/samplewebapi.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/samplewebapi.nl_NL.po
index 0103896d9d1d8d48368ac536bab59b9730ea6f46,3c5975062389751b99ff54fa3bd9f411b4d5e739..aebc82f4aa6bbf6e489b10c80abd09d281c88c6b
--- 1/modules/po/samplewebapi.nl_NL.po
--- 2/modules/po/samplewebapi.nl_NL.po
+++ b/modules/po/samplewebapi.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/samplewebapi.pl_PL.po
index 731afa8721735d746e5d0494b8f76f5edb6a068e,14519b6c0f5211066774dd2c249f3ad87f8be2fc..0acc413d5ea3acf082451b9745d673aed4598c20
--- 1/modules/po/samplewebapi.pl_PL.po
--- 2/modules/po/samplewebapi.pl_PL.po
+++ b/modules/po/samplewebapi.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/samplewebapi.pt_BR.po
index b6f0d4820236a68daf0a6b1d9fb97187743f5731,4347d4e04a9c5a195895999c218b5422a672d7a6..0dd819107d1a9280708352678420281374553d97
--- 1/modules/po/samplewebapi.pt_BR.po
--- 2/modules/po/samplewebapi.pt_BR.po
+++ b/modules/po/samplewebapi.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/samplewebapi.ru_RU.po
index 04467ac99037bd9d8c3753bd85d6009336cb2607,608cd7a1295c47e05cadb223789c7310e108a7b9..d883a1e04ea643c143244ff47f7ea351f85284c6
--- 1/modules/po/samplewebapi.ru_RU.po
--- 2/modules/po/samplewebapi.ru_RU.po
+++ b/modules/po/samplewebapi.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/samplewebapi.pot\n"
 +"X-Crowdin-File-ID: 196\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n"
+ "X-Crowdin-File-ID: 382\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/sasl.bg_BG.po
index d898b9a2ec6e2d7e2cbd1accb0575784b2171730,2a30db98016667714758d4d600c287a3b46cae37..87c1767ad9a250115fc23297b148a78fc60e1baa
--- 1/modules/po/sasl.bg_BG.po
--- 2/modules/po/sasl.bg_BG.po
+++ b/modules/po/sasl.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/sasl.es_ES.po
index ac778e0d0469f61a050c8353972a4b885d103686,ddc6ea5750dedf8f8a0a8251102b7239e1664145..4a470962c84b47d3299046c5c6fbf695e85915eb
--- 1/modules/po/sasl.es_ES.po
--- 2/modules/po/sasl.es_ES.po
+++ b/modules/po/sasl.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/sasl.fr_FR.po
index 14db9a8eac1b99413e7159cac90fca40a170d78f,dd686cddc6dab9713221c2a51131fb9c8d3baf63..c2e63e37286527c04d65f5b1a298fe510d82f015
--- 1/modules/po/sasl.fr_FR.po
--- 2/modules/po/sasl.fr_FR.po
+++ b/modules/po/sasl.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/sasl.id_ID.po
index cf7fffdc746bb66aee693eaa843f206381aa4684,bb162cbb38ae2b2f1125013a4941f4ab60ecc1ed..3f4eb6c0fd217994e825f16932d1f3f603fc1521
--- 1/modules/po/sasl.id_ID.po
--- 2/modules/po/sasl.id_ID.po
+++ b/modules/po/sasl.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/sasl.it_IT.po
index b6aba7be5f3bb0e6664592aea5301d9499774cef,1c1244287444e023a00309721f133761f21c8ee1..ae0e9399b11b223623d912d5c5649846db62ab40
--- 1/modules/po/sasl.it_IT.po
--- 2/modules/po/sasl.it_IT.po
+++ b/modules/po/sasl.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/sasl.nl_NL.po
index 714d1753f83ae8d46bec72d7d3cb74833c22f34c,fd54dc8ab5ac668106baf680c49394fcce269a24..0210d926f1f56245042205cf87b91dbd83a9f99a
--- 1/modules/po/sasl.nl_NL.po
--- 2/modules/po/sasl.nl_NL.po
+++ b/modules/po/sasl.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/sasl.pl_PL.po
index 9606c50a3faa2c3a666684ffcec28066642f9e09,a1ae675c943eef92826f9ffa3e7f5bae94f51b71..35fc6d07a55fa8223e94c0b44122fa53cbe6602f
--- 1/modules/po/sasl.pl_PL.po
--- 2/modules/po/sasl.pl_PL.po
+++ b/modules/po/sasl.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/sasl.pt_BR.po
index 9197a66b8814d7873856bf3a6a8e48423ac8ddb5,1e6f544b579bbc8271e9a0354b2412e62724502e..f8eb8242bf25785a2825dc35077b351ed2b41007
--- 1/modules/po/sasl.pt_BR.po
--- 2/modules/po/sasl.pt_BR.po
+++ b/modules/po/sasl.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/sasl.ru_RU.po
index b8e9d533766e103002ef7973f2ffba390218a265,32aad40438271cd563659ba30eff9b20f209d24f..33b3414891401057804673cd912d40f42a752a83
--- 1/modules/po/sasl.ru_RU.po
--- 2/modules/po/sasl.ru_RU.po
+++ b/modules/po/sasl.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/sasl.pot\n"
 +"X-Crowdin-File-ID: 197\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n"
+ "X-Crowdin-File-ID: 384\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/savebuff.bg_BG.po
index 33bed6096fd95ebb0732a6685e9c73462b529536,61bfacbc9de1df61c8c82b0d85f985d41f504cc9..f880aa55f7b15bc487fb24f9aa402e945cdcce27
--- 1/modules/po/savebuff.bg_BG.po
--- 2/modules/po/savebuff.bg_BG.po
+++ b/modules/po/savebuff.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/savebuff.es_ES.po
index 90a2b5d3d3e6efc36603f5acccad36940a332455,7fcf79d0ed5d2e6506e0c066e90798d60cc8acab..5fb7d759dd5d9b926471f2113fedfa26bcb3122e
--- 1/modules/po/savebuff.es_ES.po
--- 2/modules/po/savebuff.es_ES.po
+++ b/modules/po/savebuff.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/savebuff.fr_FR.po
index 8e51acbc047e3247fd581bf8bda28bc36a89b765,b1c3c98775c3ff7782d61bab911ceb07223a33e4..cf4c2ece8087cf4cee2a2dd3b8d4f5dd45fd3eee
--- 1/modules/po/savebuff.fr_FR.po
--- 2/modules/po/savebuff.fr_FR.po
+++ b/modules/po/savebuff.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/savebuff.id_ID.po
index d3e8b522f8bec12ae04c21a0a281f2232b0d7df8,f6bfdc865525e3c3462ed02898237b6356de9950..33135a0d08f1fd56f388fe56d3e1ccefb428d9be
--- 1/modules/po/savebuff.id_ID.po
--- 2/modules/po/savebuff.id_ID.po
+++ b/modules/po/savebuff.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/savebuff.it_IT.po
index 0bb0641dc19a843a8a365cf68c5275d67fa898ea,85a6cccff22a85a444be0a3636b232b974f32fe1..324c992afbf2a99538a26fe30e89a99e97004634
--- 1/modules/po/savebuff.it_IT.po
--- 2/modules/po/savebuff.it_IT.po
+++ b/modules/po/savebuff.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/savebuff.nl_NL.po
index 759b2e9ed13c9b2692514019deec1443aa6c0fc3,685e358974ae81d6b4681558f25b731dffb3c903..6faf6b4eb87173da36ee51803b797a33ce3b302c
--- 1/modules/po/savebuff.nl_NL.po
--- 2/modules/po/savebuff.nl_NL.po
+++ b/modules/po/savebuff.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/savebuff.pl_PL.po
index 157ecd2fbf387aac90ca4c44902bccc1b36f82d0,912217c9b243bf7376ece10a47c4e9bca190b43e..5fa8e12d9145c65e1111f6ba129451df64125daf
--- 1/modules/po/savebuff.pl_PL.po
--- 2/modules/po/savebuff.pl_PL.po
+++ b/modules/po/savebuff.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/savebuff.pt_BR.po
index dc756ffc7683feff0dd8592fce5bcd9cd8eacf9e,a0ce944280a0593638143ead1789f206c857951f..4ef8fc5c3a265290517dfef362e39f6ed91b6781
--- 1/modules/po/savebuff.pt_BR.po
--- 2/modules/po/savebuff.pt_BR.po
+++ b/modules/po/savebuff.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/savebuff.ru_RU.po
index 4236d64c9306e37194d65e13afdc01a568c74202,8a9409e5d56a639feaa03aa54737166e0b0bcd89..85d6235f32642fbe08d4919928f68c9c4b7fadbe
--- 1/modules/po/savebuff.ru_RU.po
--- 2/modules/po/savebuff.ru_RU.po
+++ b/modules/po/savebuff.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/savebuff.pot\n"
 +"X-Crowdin-File-ID: 198\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n"
+ "X-Crowdin-File-ID: 386\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/send_raw.bg_BG.po
index c99b5a133136082ae2c5b734a72d5216add52afe,632f1283468246b77ae12715f25ac6b7bd429b32..c39867554f6a32ce71d9fa3433295cdad5f9adaa
--- 1/modules/po/send_raw.bg_BG.po
--- 2/modules/po/send_raw.bg_BG.po
+++ b/modules/po/send_raw.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/send_raw.es_ES.po
index e771ee77b63f316d5eaf2ef519ef3c71bfb45d44,1cc52be429822414e29c14c16c9d7a77ccb33b96..4a1fae36fadf7cbfc746e23118f9f3bb8b4011e0
--- 1/modules/po/send_raw.es_ES.po
--- 2/modules/po/send_raw.es_ES.po
+++ b/modules/po/send_raw.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/send_raw.fr_FR.po
index f8ec58875360586e740c0c31ae12f277a245ac62,57f8392a12cc013745346cad5159915e9515a6c4..85aa7773d62a475b3ac5e0e1f3c669b824aa9197
--- 1/modules/po/send_raw.fr_FR.po
--- 2/modules/po/send_raw.fr_FR.po
+++ b/modules/po/send_raw.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/send_raw.id_ID.po
index aa609e5abb28338cad51be0844f9464bfc022b0f,4e59a5265033942f6f5b3d1129efc56bbef56640..0340552ca8bf197b6422369580b5f304a2908c6c
--- 1/modules/po/send_raw.id_ID.po
--- 2/modules/po/send_raw.id_ID.po
+++ b/modules/po/send_raw.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/send_raw.it_IT.po
index b2c3a7e4087c9533288220180dfe7d76ab8f712d,b6b904d3086fa6929835c43463cdb02c35cd392c..709fc06964f634e0122a25a9ed57a42cf5499c4b
--- 1/modules/po/send_raw.it_IT.po
--- 2/modules/po/send_raw.it_IT.po
+++ b/modules/po/send_raw.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/send_raw.nl_NL.po
index f7d435cccfe05ec9c47fa35f8e721af8d98c4551,7e40f794f5d2e3d0c56186b652eaf59e114e1330..43abcf3f5a53b3163e0c33836e6f2f39d71f7d82
--- 1/modules/po/send_raw.nl_NL.po
--- 2/modules/po/send_raw.nl_NL.po
+++ b/modules/po/send_raw.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/send_raw.pl_PL.po
index ebca335f0d955e59a63885c4b5b2c10b807e1aec,0d60402564680a3c2cbed881436a54dad56c55f7..ea2aeaacfafe964d775bd5539903196aa3dad770
--- 1/modules/po/send_raw.pl_PL.po
--- 2/modules/po/send_raw.pl_PL.po
+++ b/modules/po/send_raw.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/send_raw.pt_BR.po
index 778b9e78f2c6de3d7529e4d5274ca27ebe348a38,1dbc09a0a1304603d70753b9844a7880827ee5e6..2448a16cdbb330a12ec095e112f4428a77c7a66a
--- 1/modules/po/send_raw.pt_BR.po
--- 2/modules/po/send_raw.pt_BR.po
+++ b/modules/po/send_raw.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/send_raw.ru_RU.po
index 62b4b66fe110d3bfe982cc1d7b727aaf6609f3a7,093514090f4b0ef304812271028acea4a09099b2..bc88712a65698160ad4728c56668b133ae82a22f
--- 1/modules/po/send_raw.ru_RU.po
--- 2/modules/po/send_raw.ru_RU.po
+++ b/modules/po/send_raw.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/send_raw.pot\n"
 +"X-Crowdin-File-ID: 199\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n"
+ "X-Crowdin-File-ID: 388\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/shell.bg_BG.po
index 76c66891b0f825ac1bf7cddd31bb0f54af6ba278,ddc6193452a17dc747a6300fb14f6e7aa4b9b130..56e72b6971165bd271c92b6cb3513eaf56a4aff0
--- 1/modules/po/shell.bg_BG.po
--- 2/modules/po/shell.bg_BG.po
+++ b/modules/po/shell.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/shell.es_ES.po
index 8e344a101fba291b7b2dd649d191fcf9eab4dc89,0eab4a878da8177388f76daf56e82389dc2ddf48..c3e6638506c1432ce9a9b2465566423d4196a416
--- 1/modules/po/shell.es_ES.po
--- 2/modules/po/shell.es_ES.po
+++ b/modules/po/shell.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/shell.fr_FR.po
index c946f9e033f57a4059bb575163bde9d3f7fefb9b,3c9214703ae5423f4cdc7c3eea89f14d354e1e57..539430bd855342795b1819034d9e19bc42c50a1a
--- 1/modules/po/shell.fr_FR.po
--- 2/modules/po/shell.fr_FR.po
+++ b/modules/po/shell.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/shell.id_ID.po
index 93518d043d94426a33527c15de81a0d36f442803,87c1807a08edf22119313e06fd28a7e3a2038ace..34ee5b1bfbed820bfae452944c8392d22699994e
--- 1/modules/po/shell.id_ID.po
--- 2/modules/po/shell.id_ID.po
+++ b/modules/po/shell.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/shell.it_IT.po
index b825cb515228734f7b6992b9c063c930b6ee358e,143b1ae76733a14cf00b45fcb7b25bcf9f6a6d02..3bd0bba4ffc20afe5f28932dc6d6945b0e69bfa3
--- 1/modules/po/shell.it_IT.po
--- 2/modules/po/shell.it_IT.po
+++ b/modules/po/shell.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/shell.nl_NL.po
index acbce2e013832d93f46a6260b18b2d6f795170a0,27d11bc6e77e87c7d03fdb3f4e61692895b6c57c..a745612bf8705ad3d7266d915b29d1ab3fb58fcf
--- 1/modules/po/shell.nl_NL.po
--- 2/modules/po/shell.nl_NL.po
+++ b/modules/po/shell.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/shell.pl_PL.po
index dd63d3c4fb9aaec607f614bc63101af7bcacb747,a0eac1ec63987fce1e588b1ce4e93a865ca7dbb0..fb7abdf1d2a6a640f51c1e200f6e8c8b509871eb
--- 1/modules/po/shell.pl_PL.po
--- 2/modules/po/shell.pl_PL.po
+++ b/modules/po/shell.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/shell.pt_BR.po
index f320da16ee3764430220c467ec8e95066f0e169f,c73accef48ab1c33c29ea26fe0188896aed59770..41e540d6eadd0eb79c8eda20c9ada1e038b01853
--- 1/modules/po/shell.pt_BR.po
--- 2/modules/po/shell.pt_BR.po
+++ b/modules/po/shell.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/shell.ru_RU.po
index 17101efb1d3936dae1300458674efb6d67da2fa6,40d3cb92d437f5cf5a23fe0aede71068695222fc..a087c46de2dba689353f22b2de5ae67490ab91c9
--- 1/modules/po/shell.ru_RU.po
--- 2/modules/po/shell.ru_RU.po
+++ b/modules/po/shell.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/shell.pot\n"
 +"X-Crowdin-File-ID: 200\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/shell.pot\n"
+ "X-Crowdin-File-ID: 390\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/simple_away.bg_BG.po
index f7c00101673f45a3ecc8dffc77236d78a7e7fd1b,cb019662b771863e9733eba212d2c000af4b17a8..ede2533a07cef448d243ebc314bcc046b3469d77
--- 1/modules/po/simple_away.bg_BG.po
--- 2/modules/po/simple_away.bg_BG.po
+++ b/modules/po/simple_away.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/simple_away.es_ES.po
index 70f491d40a112878c09590f80de26de1086568e3,334db9ecfa6300800f5a649386bf6e01e7c3b29c..518943761f7a32a39e2a1f18efcd7b877854ce1c
--- 1/modules/po/simple_away.es_ES.po
--- 2/modules/po/simple_away.es_ES.po
+++ b/modules/po/simple_away.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/simple_away.fr_FR.po
index 2785a515006aef07a81cf45af69f62d936825f61,d87d61df1394d3cba329142416e714d314b3041b..3993f12e9a6fc58b6c4a4dba2cc940a852f91e69
--- 1/modules/po/simple_away.fr_FR.po
--- 2/modules/po/simple_away.fr_FR.po
+++ b/modules/po/simple_away.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/simple_away.id_ID.po
index 3aee727db5f094133132c76a020b4690f70736a2,3e4dbde814742a7df43fc3a267e60a4d67b90c20..003abf5b5ace94051b2e21eb7c830d8f79c18ca7
--- 1/modules/po/simple_away.id_ID.po
--- 2/modules/po/simple_away.id_ID.po
+++ b/modules/po/simple_away.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/simple_away.it_IT.po
index 4b21a22446bee22d033260fbda25de957fa5a02c,870f646de05da12ed034f5e7a14f4f906a5de4c6..3b37673d6a90f1da79e72acea2ce46357c44f673
--- 1/modules/po/simple_away.it_IT.po
--- 2/modules/po/simple_away.it_IT.po
+++ b/modules/po/simple_away.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/simple_away.nl_NL.po
index cf568bc855c95472b1c43fe97a383d1c92c8a730,210990758d885ee380fc6c9106d54d52a9c1cd5d..c8d2f650349fc326875f465cce71c89f637e3328
--- 1/modules/po/simple_away.nl_NL.po
--- 2/modules/po/simple_away.nl_NL.po
+++ b/modules/po/simple_away.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/simple_away.pl_PL.po
index 71dce0e50617e59b9331418d79eb96749102370a,ef65712c5b99b04cc40b80ce081cca151557c5c2..23d33c2e7b391b745e7c585cba0e6a09cea562c1
--- 1/modules/po/simple_away.pl_PL.po
--- 2/modules/po/simple_away.pl_PL.po
+++ b/modules/po/simple_away.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/simple_away.pt_BR.po
index da28dabb589668a6e4f4868f534a5fce8ed59e7f,525c332fb7ac6af5d91cf571e49561b326918a30..2c814d47d517691049618905aa90db1b3aa9ceed
--- 1/modules/po/simple_away.pt_BR.po
--- 2/modules/po/simple_away.pt_BR.po
+++ b/modules/po/simple_away.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/simple_away.ru_RU.po
index 896cbda78093f28d491ba453b6cc2a199124c508,432432d4e3f7c2062b85f32eb0dd469aec565869..0f7cf14d8882e7a9f3f63b735cca172d2b1e476b
--- 1/modules/po/simple_away.ru_RU.po
--- 2/modules/po/simple_away.ru_RU.po
+++ b/modules/po/simple_away.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/simple_away.pot\n"
 +"X-Crowdin-File-ID: 201\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n"
+ "X-Crowdin-File-ID: 392\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/stickychan.bg_BG.po
index 375ef818a17d4371f668860498fc59e4de585212,bdcbbaccc524d45ba78174317ea911d8f6103100..d4da716c24a5818cd797ae9a28a0c19743e70aa1
--- 1/modules/po/stickychan.bg_BG.po
--- 2/modules/po/stickychan.bg_BG.po
+++ b/modules/po/stickychan.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/stickychan.es_ES.po
index 29c5a608f4f97ba8c404bf339a202a6acf2b36d4,91a65eceeb0c29ea474ae755d74bb958e5295557..3785bbe609e57b77f666c307535f320d134827e6
--- 1/modules/po/stickychan.es_ES.po
--- 2/modules/po/stickychan.es_ES.po
+++ b/modules/po/stickychan.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/stickychan.fr_FR.po
index 8d4b7975c9d702b27058309f507babe4e68b5086,b0105679f45d42cde6a59253756aecd47b544e02..78b83792c33dd8953c7f708420675ea25f1bc088
--- 1/modules/po/stickychan.fr_FR.po
--- 2/modules/po/stickychan.fr_FR.po
+++ b/modules/po/stickychan.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/stickychan.id_ID.po
index 689bd71eedbc82d71e067523eb5c37abfea7d6d2,5042bca06807cd4c9aeff3900d50a6437c7e2224..54a65e768a325ace19e3357fc38313878c4363e6
--- 1/modules/po/stickychan.id_ID.po
--- 2/modules/po/stickychan.id_ID.po
+++ b/modules/po/stickychan.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/stickychan.it_IT.po
index ea47bf9f553cb7a7ff4aa4c2fa03f3dd6e4ccb79,9ed8814ffcb2cbfa6d9aeab75f10822cd2db3fcb..be5310721af68f8832f8a964eae3c9c79b35fe84
--- 1/modules/po/stickychan.it_IT.po
--- 2/modules/po/stickychan.it_IT.po
+++ b/modules/po/stickychan.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/stickychan.nl_NL.po
index 664aaa7d7956c1fd5277acbf7c0ad84a954ee44e,6ff2f539a356427713f888927ccd3e7f5bfcde92..7acf5c860e815b14210c2410f5d47e7fc292b7a2
--- 1/modules/po/stickychan.nl_NL.po
--- 2/modules/po/stickychan.nl_NL.po
+++ b/modules/po/stickychan.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/stickychan.pl_PL.po
index a03b766da4335327752cff25b0506c7711567024,27566585953f50b2718d1568575eaacf32facfe5..d34dd46ba718022ec5276a26fb229721761d4a9d
--- 1/modules/po/stickychan.pl_PL.po
--- 2/modules/po/stickychan.pl_PL.po
+++ b/modules/po/stickychan.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/stickychan.pt_BR.po
index f443e8ab0f4f793f7ee9089be79ad9a7cf230aab,42f99221a2d520b0917d79a89df69eee6c00ec68..7594d7e24be51f9171b1f5ce797ac54f1c30e055
--- 1/modules/po/stickychan.pt_BR.po
--- 2/modules/po/stickychan.pt_BR.po
+++ b/modules/po/stickychan.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/stickychan.ru_RU.po
index b387623ea77db6bcba0d72aac73413cc15af4823,27f984b94a8fa6d85ae3bfdacf5783a62a448569..d5a11deaa057e18df9ce7739b52a0a423453ea72
--- 1/modules/po/stickychan.ru_RU.po
--- 2/modules/po/stickychan.ru_RU.po
+++ b/modules/po/stickychan.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stickychan.pot\n"
 +"X-Crowdin-File-ID: 202\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n"
+ "X-Crowdin-File-ID: 394\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/stripcontrols.bg_BG.po
index d711a6e5a723e4c21a226293377e5eeca5a388c0,7a0faf312d17c36d23f65a3b794de2fd1bf49e93..b262d062f53008f4cc5b93a6ed4c2c5b5711ea16
--- 1/modules/po/stripcontrols.bg_BG.po
--- 2/modules/po/stripcontrols.bg_BG.po
+++ b/modules/po/stripcontrols.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/stripcontrols.es_ES.po
index a934a5ee32ca3e42052ee43fca75430339eae499,15d345b2ec4fd26d792a91ae8f80508dc22a25cb..63827d3c56a6f3e5ea11e6b5fd7342d96d72dcd5
--- 1/modules/po/stripcontrols.es_ES.po
--- 2/modules/po/stripcontrols.es_ES.po
+++ b/modules/po/stripcontrols.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/stripcontrols.fr_FR.po
index 1b5ba780ed9498a36e7173aa5bdc2955f62fa648,d84662ee72b50f06961ee87a3ef4a09f14ed0a0e..f121f0e28c8a8d199ffd2017f5ea69c08caf86b6
--- 1/modules/po/stripcontrols.fr_FR.po
--- 2/modules/po/stripcontrols.fr_FR.po
+++ b/modules/po/stripcontrols.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/stripcontrols.id_ID.po
index 8904b06cee377d3c5f9f0b0df9b3dd9c8a0e65c3,7835da505c39534a15403e985b25f0a8b83641ce..9be07e7a1e2e0e29dbb2652c6dff1249c424b59e
--- 1/modules/po/stripcontrols.id_ID.po
--- 2/modules/po/stripcontrols.id_ID.po
+++ b/modules/po/stripcontrols.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/stripcontrols.it_IT.po
index 50c10aa225e63bf09783b9f52f015bee42a5c784,dd45e6afe0f1f82cdb1ee6afeb16dba8239c07d4..6bf29fee175a300a11fe071b17cc9af1a68953bc
--- 1/modules/po/stripcontrols.it_IT.po
--- 2/modules/po/stripcontrols.it_IT.po
+++ b/modules/po/stripcontrols.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/stripcontrols.nl_NL.po
index 54d3d17c3724b99009b19538d1b3a8b4c6d7ec5e,80b4743c73155b2ec90a9bc00a0f5408e5ed14b4..0576373b25ec19de0070ee2327b9b6ad6ca9c742
--- 1/modules/po/stripcontrols.nl_NL.po
--- 2/modules/po/stripcontrols.nl_NL.po
+++ b/modules/po/stripcontrols.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/stripcontrols.pl_PL.po
index 81001f835db0e282320654df8b8a8a421bae40fb,e3dea064c3b9d6b1b1a765c92bc19bb047eda005..edab96f0f49c924dd8aa33ad8665065253d165f3
--- 1/modules/po/stripcontrols.pl_PL.po
--- 2/modules/po/stripcontrols.pl_PL.po
+++ b/modules/po/stripcontrols.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/stripcontrols.pt_BR.po
index cb8a91c1539f9334afc5fd6e2e69574fbe2b215a,1117a92d3b07e6558fe4693bc8d7c4e0f9081fcd..09674abf50dd244e8dee69b6387a5e63829b340d
--- 1/modules/po/stripcontrols.pt_BR.po
--- 2/modules/po/stripcontrols.pt_BR.po
+++ b/modules/po/stripcontrols.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/stripcontrols.ru_RU.po
index 70020166b551a17a205c799a9aa201d9f8918e7c,3ae21f625e49e791468533b35a785e46dfdc255f..b54ba59a01d52939ad4bc91fbd8571aea256cdb7
--- 1/modules/po/stripcontrols.ru_RU.po
--- 2/modules/po/stripcontrols.ru_RU.po
+++ b/modules/po/stripcontrols.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/stripcontrols.pot\n"
 +"X-Crowdin-File-ID: 203\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n"
+ "X-Crowdin-File-ID: 398\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/watch.bg_BG.po
index e6f9a61fe78467626fe9a33501d2d4b032836a9f,eeb14ebb3ac9ab76061bd8b3585a10a35e377fc9..c73ef11245dabc5cc1cde478234bb744d954ff93
--- 1/modules/po/watch.bg_BG.po
--- 2/modules/po/watch.bg_BG.po
+++ b/modules/po/watch.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/watch.es_ES.po
index 73effeadeea2dfc33db1ee4c6c2bdcdbdde79334,5126ab04b45e4aa47e81d71a59d24f8e094e93ce..4af10a9ea1bc8ac10d33bf7b5e42be19096e3b29
--- 1/modules/po/watch.es_ES.po
--- 2/modules/po/watch.es_ES.po
+++ b/modules/po/watch.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/watch.fr_FR.po
index ce7af1b98a30d039d27fa8f2f4e3f8782265243b,bca6ffa1df28b04e57f3694010a29d3b6a421fd7..f9708148a6d9c78d65ac68c259c5b3b0cae351f1
--- 1/modules/po/watch.fr_FR.po
--- 2/modules/po/watch.fr_FR.po
+++ b/modules/po/watch.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/watch.id_ID.po
index 95e188dde35a236cb4688fb2c988442e21b9a1fa,d974a1c09b5e325f2fb758a3b2e1aa309d799ce4..4ca9a1b10558f9b2e8fb4e9d38ee339bc1ab1e33
--- 1/modules/po/watch.id_ID.po
--- 2/modules/po/watch.id_ID.po
+++ b/modules/po/watch.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/watch.it_IT.po
index 3d3e4cf60a5110b1f83e9264127f4c584a8e9f68,29659d8d7a1188301f4834299cdbe6383885f4a5..c37098ab3f23422bdbff26ffb7147b436a349bd3
--- 1/modules/po/watch.it_IT.po
--- 2/modules/po/watch.it_IT.po
+++ b/modules/po/watch.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/watch.nl_NL.po
index 872c2086e34bbe6f6428c235fee3adf847868823,9ea115d2e8830ce054f7abcbac58d9fc317a4e78..4665aeaa7da6ca006e039ab2cedfef1178c9cba0
--- 1/modules/po/watch.nl_NL.po
--- 2/modules/po/watch.nl_NL.po
+++ b/modules/po/watch.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/watch.pl_PL.po
index 7bd3ba79f9bbe6d185cde71350f22c705301bd3e,ee6c3fdfb76b0fed2e9cdbd547993d3454de7f5d..4010910997d2afbaafbeb481f5ffbdb01b380239
--- 1/modules/po/watch.pl_PL.po
--- 2/modules/po/watch.pl_PL.po
+++ b/modules/po/watch.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/watch.pt_BR.po
index b39abe5030a060357f8d971afd3d7ed71dc274af,8e6956b98783e3a1b8fe98e0bd213f9cfe3ec9da..3477fe0d2b3f4ed34c6cf27a560e1010f4377e2c
--- 1/modules/po/watch.pt_BR.po
--- 2/modules/po/watch.pt_BR.po
+++ b/modules/po/watch.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/watch.ru_RU.po
index 1f8a4777d3b3644d4d260c41dca3b7c6a3849bc6,42ed67394360a9323a6c14629706568ffec55b02..cede33c7ed857f81fa8cf3767aea3e4a7e810d8c
--- 1/modules/po/watch.ru_RU.po
--- 2/modules/po/watch.ru_RU.po
+++ b/modules/po/watch.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/watch.pot\n"
 +"X-Crowdin-File-ID: 204\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/watch.pot\n"
+ "X-Crowdin-File-ID: 396\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc modules/po/webadmin.bg_BG.po
index 340030854788d490eda9c9e1dd4d0aaae403c706,d0d43f15e4172d232696ae7e6bc909a3dc215551..4734e77607ddd497dfb7aef8c321f1978cdd2894
--- 1/modules/po/webadmin.bg_BG.po
--- 2/modules/po/webadmin.bg_BG.po
+++ b/modules/po/webadmin.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc modules/po/webadmin.es_ES.po
index 6b048b25b751c3c6f296ad34d064849d377ddd77,262af12479380ae1e5a0feefa84ef2763572c38a..8243206195f55c96310597a3403ddcdfbfe8440f
--- 1/modules/po/webadmin.es_ES.po
--- 2/modules/po/webadmin.es_ES.po
+++ b/modules/po/webadmin.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc modules/po/webadmin.fr_FR.po
index 506c0b66865b1aeb27d5ec932e6c6690d28b9992,0d94fbc4b056d1cbea41c8a11b00dbcce46bdc85..6094628d00adb969baaef8b22a3fa143d466493b
--- 1/modules/po/webadmin.fr_FR.po
--- 2/modules/po/webadmin.fr_FR.po
+++ b/modules/po/webadmin.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc modules/po/webadmin.id_ID.po
index 3ca4da6e12809934acfeafb029f456d54587245e,cbf6735abdde33246fc6712596da8dd87368ad02..4c25854270f8b73dda8f6e32f13f057b35fb44c8
--- 1/modules/po/webadmin.id_ID.po
--- 2/modules/po/webadmin.id_ID.po
+++ b/modules/po/webadmin.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc modules/po/webadmin.it_IT.po
index 552ec00669c5ec9d54df78e5b7afdfaa7e00cc99,53e4fe4751e329cb1bbfa43e798d45b77d845a9a..6c71480018dfd3d1547663b72902683156f9c4f3
--- 1/modules/po/webadmin.it_IT.po
--- 2/modules/po/webadmin.it_IT.po
+++ b/modules/po/webadmin.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc modules/po/webadmin.nl_NL.po
index 60b1cd68521388f6295936baf6557b811afe848c,37a67860e7d15edeb3e6362eeb4bad52e0ce153d..585b9ad7039e4d376e7bb582b7dde5ac08b8bae7
--- 1/modules/po/webadmin.nl_NL.po
--- 2/modules/po/webadmin.nl_NL.po
+++ b/modules/po/webadmin.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc modules/po/webadmin.pl_PL.po
index e658d179e46aa101c90bfad027b8afc54d92f2fe,d6b85c43501f9a7d2c13a47030f033c0bb869c6d..ac334c3a4313f06c8d3b0ddc4c88d84473f1c4b4
--- 1/modules/po/webadmin.pl_PL.po
--- 2/modules/po/webadmin.pl_PL.po
+++ b/modules/po/webadmin.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"

diff --cc modules/po/webadmin.pt_BR.po
index 30420399686760bfd4e5ad1d1493bb79410bee04,46e325ed367cd3beb0494b921af79d8b93e9bee8..d511fc7562e2ee2879716f37b2a613524e9c58ad
--- 1/modules/po/webadmin.pt_BR.po
--- 2/modules/po/webadmin.pt_BR.po
+++ b/modules/po/webadmin.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc modules/po/webadmin.ru_RU.po
index 384165294c358d0e998502bccad6549b5803f757,223a2386b2f48518e1297050b7b86738f65bd951..cee5a0eee24ce1dfd06e99f46cb62823beb5843a
--- 1/modules/po/webadmin.ru_RU.po
--- 2/modules/po/webadmin.ru_RU.po
+++ b/modules/po/webadmin.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/modules/po/webadmin.pot\n"
 +"X-Crowdin-File-ID: 205\n"
++=======
+ "X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n"
+ "X-Crowdin-File-ID: 400\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"

diff --cc src/po/znc.bg_BG.po
index 8d95a11a7d6de83334899771b559cc1d57000fe1,e1379baa9f6f90e5ad02b0eb794bd15f414606ca..1d4016a4f4890af276925877dbd3e7adc861d9c5
--- 1/src/po/znc.bg_BG.po
--- 2/src/po/znc.bg_BG.po
+++ b/src/po/znc.bg_BG.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: bg\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Bulgarian\n"
  "Language: bg_BG\n"

diff --cc src/po/znc.es_ES.po
index de68195fb3a22e5c324fc5a99109f5c6e30c9026,9952f3871338bd402f2c3cfc1baf8745a1274c9d..df2c51d4e4295f0d856d530e8a21c47015a9ae3e
--- 1/src/po/znc.es_ES.po
--- 2/src/po/znc.es_ES.po
+++ b/src/po/znc.es_ES.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: es-ES\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Spanish\n"
  "Language: es_ES\n"

diff --cc src/po/znc.fr_FR.po
index 73fae054ee921075356b338165379d6a0e7072c6,0186b2a62b45b8a4f87af6a2f5045407dd39f23f..5d330ec702f05943b2f512e21c46d4912974b377
--- 1/src/po/znc.fr_FR.po
--- 2/src/po/znc.fr_FR.po
+++ b/src/po/znc.fr_FR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: fr\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: French\n"
  "Language: fr_FR\n"

diff --cc src/po/znc.id_ID.po
index 65e037545cfcaed55ddbeb240d697ff7141d49f4,614f07eb42572c7aab47b503f9f0728ab749b9ca..a0a006218dd6687697ed41fe4327cc9dcb00c768
--- 1/src/po/znc.id_ID.po
--- 2/src/po/znc.id_ID.po
+++ b/src/po/znc.id_ID.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: id\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Indonesian\n"
  "Language: id_ID\n"

diff --cc src/po/znc.it_IT.po
index fbbca59a0fa16e6587f8409409b0f87f76fa2f94,137da3306b8090aa82997d6bd3a49ca0d6fdd454..4bab2f404149a03e626b8c523a3d5dc31a87bf00
--- 1/src/po/znc.it_IT.po
--- 2/src/po/znc.it_IT.po
+++ b/src/po/znc.it_IT.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: it\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Italian\n"
  "Language: it_IT\n"

diff --cc src/po/znc.nl_NL.po
index 4125b603e34bad9670f89f1a1cf55b19b04d88d6,b39c6caf0af91ed71f43a96af286ec93620a8fec..f5e38c40f732534a1d904595cc32cc44e8f316ac
--- 1/src/po/znc.nl_NL.po
--- 2/src/po/znc.nl_NL.po
+++ b/src/po/znc.nl_NL.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: nl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Dutch\n"
  "Language: nl_NL\n"

diff --cc src/po/znc.pl_PL.po
index 915d3d26ce7f63dc7d87cad7489c3c63f82408d6,0c725ff19cf80f08b45ff438d1f7df0dafa97a2e..8a9a452a5457197656358bddd91135a6d86b5fde
--- 1/src/po/znc.pl_PL.po
--- 2/src/po/znc.pl_PL.po
+++ b/src/po/znc.pl_PL.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pl\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Polish\n"
  "Language: pl_PL\n"
@@@ -56,27 -56,27 +61,51 @@@ msgstr "
  "*status help</code>” i “<code>/msg *status loadmod &lt;moduł&gt;</code>”). "
  "Po załadowaniu niektórych modułów WWW menu się rozwinie."
  
++<<<<<<< HEAD
 +#: znc.cpp:1554
 +msgid "User already exists"
 +msgstr "Użytkownik już istnieje"
 +
 +#: znc.cpp:1662
 +msgid "IPv6 is not enabled"
 +msgstr "IPv6 nie jest włączone"
 +
 +#: znc.cpp:1670
 +msgid "SSL is not enabled"
 +msgstr "SSL nie jest włączone"
 +
 +#: znc.cpp:1678
 +msgid "Unable to locate pem file: {1}"
 +msgstr "Nie udało się odnaleźć pliku pem: {1}"
 +
 +#: znc.cpp:1697
 +msgid "Invalid port"
 +msgstr "Nieprawidłowy port"
 +
 +#: znc.cpp:1813 ClientCommand.cpp:1637
++=======
+ #: znc.cpp:1562
+ msgid "User already exists"
+ msgstr "Użytkownik już istnieje"
+ 
+ #: znc.cpp:1670
+ msgid "IPv6 is not enabled"
+ msgstr "IPv6 nie jest włączone"
+ 
+ #: znc.cpp:1678
+ msgid "SSL is not enabled"
+ msgstr "SSL nie jest włączone"
+ 
+ #: znc.cpp:1686
+ msgid "Unable to locate pem file: {1}"
+ msgstr "Nie udało się odnaleźć pliku pem: {1}"
+ 
+ #: znc.cpp:1705
+ msgid "Invalid port"
+ msgstr "Nieprawidłowy port"
+ 
+ #: znc.cpp:1821 ClientCommand.cpp:1637
++>>>>>>> 1.8.x
  msgid "Unable to bind: {1}"
  msgstr "Nie udało się przypiąć: {1}"
  
@@@ -284,10 -284,10 +313,17 @@@ msgstr "Użycie: /detach <#kanały>
  #: Client.cpp:1369 ClientCommand.cpp:154
  msgid "Detached {1} channel"
  msgid_plural "Detached {1} channels"
++<<<<<<< HEAD
 +msgstr[0] "Odpięto kanał {1}"
 +msgstr[1] ""
 +msgstr[2] ""
 +msgstr[3] "Odpięto {1} kanały"
++=======
+ msgstr[0] ""
+ msgstr[1] ""
+ msgstr[2] ""
+ msgstr[3] ""
++>>>>>>> 1.8.x
  
  #: Chan.cpp:678
  msgid "Buffer Playback..."

diff --cc src/po/znc.pt_BR.po
index 84cbffced465b7c6215c3f9f9d60b8dc62fd6751,ae6a65ca668eb3fb0f8843e4eaaa5cb1700cccc5..b440bd6c989597106504c5fdfe332804c234e930
--- 1/src/po/znc.pt_BR.po
--- 2/src/po/znc.pt_BR.po
+++ b/src/po/znc.pt_BR.po
@@@ -6,8 -6,8 +6,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: pt-BR\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Portuguese, Brazilian\n"
  "Language: pt_BR\n"

diff --cc src/po/znc.ru_RU.po
index f2f250b78268e8efdba1de44f0736c68b21c2431,971df773b060b5f3e31767db6fd9102b2e63409e..cc9c701d9e205ac3b5d6d56f4bde99b93534357f
--- 1/src/po/znc.ru_RU.po
--- 2/src/po/znc.ru_RU.po
+++ b/src/po/znc.ru_RU.po
@@@ -8,8 -8,8 +8,13 @@@ msgstr "
  "X-Crowdin-Project: znc-bouncer\n"
  "X-Crowdin-Project-ID: 289533\n"
  "X-Crowdin-Language: ru\n"
++<<<<<<< HEAD
 +"X-Crowdin-File: /master/src/po/znc.pot\n"
 +"X-Crowdin-File-ID: 146\n"
++=======
+ "X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
+ "X-Crowdin-File-ID: 284\n"
++>>>>>>> 1.8.x
  "Project-Id-Version: znc-bouncer\n"
  "Language-Team: Russian\n"
  "Language: ru_RU\n"