diff --git a/modules/po/admindebug.bg_BG.po b/modules/po/admindebug.bg_BG.po index 5b98b270..fca36ffc 100644 --- a/modules/po/admindebug.bg_BG.po +++ b/modules/po/admindebug.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.es_ES.po b/modules/po/admindebug.es_ES.po index 9e5959a1..e9ec1bf9 100644 --- a/modules/po/admindebug.es_ES.po +++ b/modules/po/admindebug.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.fr_FR.po b/modules/po/admindebug.fr_FR.po index 4be5f8fe..e2fc8efd 100644 --- a/modules/po/admindebug.fr_FR.po +++ b/modules/po/admindebug.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.id_ID.po b/modules/po/admindebug.id_ID.po index 8819da1a..dda9bdd7 100644 --- a/modules/po/admindebug.id_ID.po +++ b/modules/po/admindebug.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.it_IT.po b/modules/po/admindebug.it_IT.po index ecbc76a5..2629751b 100644 --- a/modules/po/admindebug.it_IT.po +++ b/modules/po/admindebug.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.nl_NL.po b/modules/po/admindebug.nl_NL.po index 39505115..554b1ff9 100644 --- a/modules/po/admindebug.nl_NL.po +++ b/modules/po/admindebug.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.pl_PL.po b/modules/po/admindebug.pl_PL.po index afbc43cc..893361a4 100644 --- a/modules/po/admindebug.pl_PL.po +++ b/modules/po/admindebug.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/admindebug.pt_BR.po b/modules/po/admindebug.pt_BR.po index c97df2e1..c6fbee1e 100644 --- a/modules/po/admindebug.pt_BR.po +++ b/modules/po/admindebug.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/admindebug.ru_RU.po b/modules/po/admindebug.ru_RU.po index 8842acad..3156f093 100644 --- a/modules/po/admindebug.ru_RU.po +++ b/modules/po/admindebug.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/adminlog.bg_BG.po b/modules/po/adminlog.bg_BG.po index aa55937f..24ff5048 100644 --- a/modules/po/adminlog.bg_BG.po +++ b/modules/po/adminlog.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.es_ES.po b/modules/po/adminlog.es_ES.po index 9e46d4e1..7732ddd4 100644 --- a/modules/po/adminlog.es_ES.po +++ b/modules/po/adminlog.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.fr_FR.po b/modules/po/adminlog.fr_FR.po index 855a94aa..f899ab36 100644 --- a/modules/po/adminlog.fr_FR.po +++ b/modules/po/adminlog.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.id_ID.po b/modules/po/adminlog.id_ID.po index de0c77aa..f45e1e64 100644 --- a/modules/po/adminlog.id_ID.po +++ b/modules/po/adminlog.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.it_IT.po b/modules/po/adminlog.it_IT.po index 1ee3c391..aa2565ae 100644 --- a/modules/po/adminlog.it_IT.po +++ b/modules/po/adminlog.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.nl_NL.po b/modules/po/adminlog.nl_NL.po index 2cef6f7c..c52d7d1a 100644 --- a/modules/po/adminlog.nl_NL.po +++ b/modules/po/adminlog.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.pl_PL.po b/modules/po/adminlog.pl_PL.po index ff48120a..130edc30 100644 --- a/modules/po/adminlog.pl_PL.po +++ b/modules/po/adminlog.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/adminlog.pt_BR.po b/modules/po/adminlog.pt_BR.po index 917d8b23..ba85e916 100644 --- a/modules/po/adminlog.pt_BR.po +++ b/modules/po/adminlog.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/adminlog.ru_RU.po b/modules/po/adminlog.ru_RU.po index a7e01a81..6b301b78 100644 --- a/modules/po/adminlog.ru_RU.po +++ b/modules/po/adminlog.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/alias.bg_BG.po b/modules/po/alias.bg_BG.po index 8a3c5c4a..54e644be 100644 --- a/modules/po/alias.bg_BG.po +++ b/modules/po/alias.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.es_ES.po b/modules/po/alias.es_ES.po index 715322bf..3289e6e1 100644 --- a/modules/po/alias.es_ES.po +++ b/modules/po/alias.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.fr_FR.po b/modules/po/alias.fr_FR.po index 88b252d1..e7046d06 100644 --- a/modules/po/alias.fr_FR.po +++ b/modules/po/alias.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.id_ID.po b/modules/po/alias.id_ID.po index 43c919d0..0dbcc95a 100644 --- a/modules/po/alias.id_ID.po +++ b/modules/po/alias.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.it_IT.po b/modules/po/alias.it_IT.po index 1936def3..5c50f009 100644 --- a/modules/po/alias.it_IT.po +++ b/modules/po/alias.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.nl_NL.po b/modules/po/alias.nl_NL.po index 1d1359d3..3bd207e1 100644 --- a/modules/po/alias.nl_NL.po +++ b/modules/po/alias.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.pl_PL.po b/modules/po/alias.pl_PL.po index d7e2f5d1..0e325c47 100644 --- a/modules/po/alias.pl_PL.po +++ b/modules/po/alias.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/alias.pt_BR.po b/modules/po/alias.pt_BR.po index 30e2a1d0..8b7c74b7 100644 --- a/modules/po/alias.pt_BR.po +++ b/modules/po/alias.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/alias.ru_RU.po b/modules/po/alias.ru_RU.po index 34ebef54..69e694cb 100644 --- a/modules/po/alias.ru_RU.po +++ b/modules/po/alias.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoattach.bg_BG.po b/modules/po/autoattach.bg_BG.po index 762f715a..d71c6563 100644 --- a/modules/po/autoattach.bg_BG.po +++ b/modules/po/autoattach.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.es_ES.po b/modules/po/autoattach.es_ES.po index 0f6df882..987e1cde 100644 --- a/modules/po/autoattach.es_ES.po +++ b/modules/po/autoattach.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.fr_FR.po b/modules/po/autoattach.fr_FR.po index e0c58b95..17c04de3 100644 --- a/modules/po/autoattach.fr_FR.po +++ b/modules/po/autoattach.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.id_ID.po b/modules/po/autoattach.id_ID.po index 3b74158d..a452dc40 100644 --- a/modules/po/autoattach.id_ID.po +++ b/modules/po/autoattach.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.it_IT.po b/modules/po/autoattach.it_IT.po index d577ab47..3febe8c4 100644 --- a/modules/po/autoattach.it_IT.po +++ b/modules/po/autoattach.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.nl_NL.po b/modules/po/autoattach.nl_NL.po index ff2e7605..c4de774a 100644 --- a/modules/po/autoattach.nl_NL.po +++ b/modules/po/autoattach.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.pl_PL.po b/modules/po/autoattach.pl_PL.po index 0ce4d64c..8bf1e0f8 100644 --- a/modules/po/autoattach.pl_PL.po +++ b/modules/po/autoattach.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoattach.pt_BR.po b/modules/po/autoattach.pt_BR.po index b8283bde..385ec4dc 100644 --- a/modules/po/autoattach.pt_BR.po +++ b/modules/po/autoattach.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoattach.ru_RU.po b/modules/po/autoattach.ru_RU.po index 9d99534e..b5378e4e 100644 --- a/modules/po/autoattach.ru_RU.po +++ b/modules/po/autoattach.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autocycle.bg_BG.po b/modules/po/autocycle.bg_BG.po index 4bd14111..79165f6a 100644 --- a/modules/po/autocycle.bg_BG.po +++ b/modules/po/autocycle.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.es_ES.po b/modules/po/autocycle.es_ES.po index 999b3e29..bbdd2e7f 100644 --- a/modules/po/autocycle.es_ES.po +++ b/modules/po/autocycle.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.fr_FR.po b/modules/po/autocycle.fr_FR.po index 3d25eaf8..b9b9c89d 100644 --- a/modules/po/autocycle.fr_FR.po +++ b/modules/po/autocycle.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.id_ID.po b/modules/po/autocycle.id_ID.po index cab8dbfe..2fbab50e 100644 --- a/modules/po/autocycle.id_ID.po +++ b/modules/po/autocycle.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.it_IT.po b/modules/po/autocycle.it_IT.po index 881181ff..2113064d 100644 --- a/modules/po/autocycle.it_IT.po +++ b/modules/po/autocycle.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.nl_NL.po b/modules/po/autocycle.nl_NL.po index 51c5964d..e8f84126 100644 --- a/modules/po/autocycle.nl_NL.po +++ b/modules/po/autocycle.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.pl_PL.po b/modules/po/autocycle.pl_PL.po index 7f9c12f2..66c680c8 100644 --- a/modules/po/autocycle.pl_PL.po +++ b/modules/po/autocycle.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autocycle.pt_BR.po b/modules/po/autocycle.pt_BR.po index 6b53c6e2..3b6cc5ff 100644 --- a/modules/po/autocycle.pt_BR.po +++ b/modules/po/autocycle.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autocycle.ru_RU.po b/modules/po/autocycle.ru_RU.po index 60866f8d..0fd7edb9 100644 --- a/modules/po/autocycle.ru_RU.po +++ b/modules/po/autocycle.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoop.bg_BG.po b/modules/po/autoop.bg_BG.po index c122b0f1..08c2b64c 100644 --- a/modules/po/autoop.bg_BG.po +++ b/modules/po/autoop.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.es_ES.po b/modules/po/autoop.es_ES.po index e5444d69..2f5645f8 100644 --- a/modules/po/autoop.es_ES.po +++ b/modules/po/autoop.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.fr_FR.po b/modules/po/autoop.fr_FR.po index e4fb1fbb..314a8b92 100644 --- a/modules/po/autoop.fr_FR.po +++ b/modules/po/autoop.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.id_ID.po b/modules/po/autoop.id_ID.po index 25ea4424..e901a884 100644 --- a/modules/po/autoop.id_ID.po +++ b/modules/po/autoop.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.it_IT.po b/modules/po/autoop.it_IT.po index 839a3439..77be1652 100644 --- a/modules/po/autoop.it_IT.po +++ b/modules/po/autoop.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.nl_NL.po b/modules/po/autoop.nl_NL.po index b0d5988a..293a2759 100644 --- a/modules/po/autoop.nl_NL.po +++ b/modules/po/autoop.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.pl_PL.po b/modules/po/autoop.pl_PL.po index ac06162b..8f9dbccd 100644 --- a/modules/po/autoop.pl_PL.po +++ b/modules/po/autoop.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoop.pt_BR.po b/modules/po/autoop.pt_BR.po index 415a3e45..96b47ad7 100644 --- a/modules/po/autoop.pt_BR.po +++ b/modules/po/autoop.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoop.ru_RU.po b/modules/po/autoop.ru_RU.po index 9fa43c63..246e7314 100644 --- a/modules/po/autoop.ru_RU.po +++ b/modules/po/autoop.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoreply.bg_BG.po b/modules/po/autoreply.bg_BG.po index 76206ea8..c2ec21a7 100644 --- a/modules/po/autoreply.bg_BG.po +++ b/modules/po/autoreply.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.es_ES.po b/modules/po/autoreply.es_ES.po index a1bcb1f5..36d2f98b 100644 --- a/modules/po/autoreply.es_ES.po +++ b/modules/po/autoreply.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.fr_FR.po b/modules/po/autoreply.fr_FR.po index 9a453c8d..01176d4d 100644 --- a/modules/po/autoreply.fr_FR.po +++ b/modules/po/autoreply.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.id_ID.po b/modules/po/autoreply.id_ID.po index 6623a9c9..399a9ff8 100644 --- a/modules/po/autoreply.id_ID.po +++ b/modules/po/autoreply.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.it_IT.po b/modules/po/autoreply.it_IT.po index 28328765..21fc883b 100644 --- a/modules/po/autoreply.it_IT.po +++ b/modules/po/autoreply.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.nl_NL.po b/modules/po/autoreply.nl_NL.po index 0895a802..44379340 100644 --- a/modules/po/autoreply.nl_NL.po +++ b/modules/po/autoreply.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.pl_PL.po b/modules/po/autoreply.pl_PL.po index 7da4a968..e7e18c5c 100644 --- a/modules/po/autoreply.pl_PL.po +++ b/modules/po/autoreply.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autoreply.pt_BR.po b/modules/po/autoreply.pt_BR.po index 34faf52a..fb705aff 100644 --- a/modules/po/autoreply.pt_BR.po +++ b/modules/po/autoreply.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autoreply.ru_RU.po b/modules/po/autoreply.ru_RU.po index ba484b38..a9324923 100644 --- a/modules/po/autoreply.ru_RU.po +++ b/modules/po/autoreply.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autovoice.bg_BG.po b/modules/po/autovoice.bg_BG.po index 210a856c..2dcf4b06 100644 --- a/modules/po/autovoice.bg_BG.po +++ b/modules/po/autovoice.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.es_ES.po b/modules/po/autovoice.es_ES.po index 66117b62..db7dc863 100644 --- a/modules/po/autovoice.es_ES.po +++ b/modules/po/autovoice.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.fr_FR.po b/modules/po/autovoice.fr_FR.po index f7a81765..a94dc131 100644 --- a/modules/po/autovoice.fr_FR.po +++ b/modules/po/autovoice.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.id_ID.po b/modules/po/autovoice.id_ID.po index 75abf15c..3bb5e6b9 100644 --- a/modules/po/autovoice.id_ID.po +++ b/modules/po/autovoice.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.it_IT.po b/modules/po/autovoice.it_IT.po index 97a618b7..e9b72f5e 100644 --- a/modules/po/autovoice.it_IT.po +++ b/modules/po/autovoice.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.nl_NL.po b/modules/po/autovoice.nl_NL.po index 7b8232b9..0ae812b5 100644 --- a/modules/po/autovoice.nl_NL.po +++ b/modules/po/autovoice.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.pl_PL.po b/modules/po/autovoice.pl_PL.po index 79f1cee9..ba1a8b88 100644 --- a/modules/po/autovoice.pl_PL.po +++ b/modules/po/autovoice.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/autovoice.pt_BR.po b/modules/po/autovoice.pt_BR.po index f5ed48d8..2fa784ba 100644 --- a/modules/po/autovoice.pt_BR.po +++ b/modules/po/autovoice.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/autovoice.ru_RU.po b/modules/po/autovoice.ru_RU.po index 0d7853b8..86d8a49d 100644 --- a/modules/po/autovoice.ru_RU.po +++ b/modules/po/autovoice.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/awaystore.bg_BG.po b/modules/po/awaystore.bg_BG.po index 97d10712..50fde298 100644 --- a/modules/po/awaystore.bg_BG.po +++ b/modules/po/awaystore.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.es_ES.po b/modules/po/awaystore.es_ES.po index 5f75d294..14e7ef9b 100644 --- a/modules/po/awaystore.es_ES.po +++ b/modules/po/awaystore.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.fr_FR.po b/modules/po/awaystore.fr_FR.po index 985eeb9e..314c4916 100644 --- a/modules/po/awaystore.fr_FR.po +++ b/modules/po/awaystore.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.id_ID.po b/modules/po/awaystore.id_ID.po index 826d3b02..fe046126 100644 --- a/modules/po/awaystore.id_ID.po +++ b/modules/po/awaystore.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.it_IT.po b/modules/po/awaystore.it_IT.po index 2f0ea8ae..1d80b50b 100644 --- a/modules/po/awaystore.it_IT.po +++ b/modules/po/awaystore.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.nl_NL.po b/modules/po/awaystore.nl_NL.po index 34cec660..a7800722 100644 --- a/modules/po/awaystore.nl_NL.po +++ b/modules/po/awaystore.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.pl_PL.po b/modules/po/awaystore.pl_PL.po index b78ecee1..f954069c 100644 --- a/modules/po/awaystore.pl_PL.po +++ b/modules/po/awaystore.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/awaystore.pt_BR.po b/modules/po/awaystore.pt_BR.po index e7b435f6..b474a7f8 100644 --- a/modules/po/awaystore.pt_BR.po +++ b/modules/po/awaystore.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/awaystore.ru_RU.po b/modules/po/awaystore.ru_RU.po index 9b21de7b..93e432ed 100644 --- a/modules/po/awaystore.ru_RU.po +++ b/modules/po/awaystore.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/block_motd.bg_BG.po b/modules/po/block_motd.bg_BG.po index 26cad423..2ed99644 100644 --- a/modules/po/block_motd.bg_BG.po +++ b/modules/po/block_motd.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.es_ES.po b/modules/po/block_motd.es_ES.po index 787ab3e5..374d4bab 100644 --- a/modules/po/block_motd.es_ES.po +++ b/modules/po/block_motd.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.fr_FR.po b/modules/po/block_motd.fr_FR.po index 93461469..c0098990 100644 --- a/modules/po/block_motd.fr_FR.po +++ b/modules/po/block_motd.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.id_ID.po b/modules/po/block_motd.id_ID.po index bd57020f..b21f4019 100644 --- a/modules/po/block_motd.id_ID.po +++ b/modules/po/block_motd.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.it_IT.po b/modules/po/block_motd.it_IT.po index 59946441..57dec5ba 100644 --- a/modules/po/block_motd.it_IT.po +++ b/modules/po/block_motd.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.nl_NL.po b/modules/po/block_motd.nl_NL.po index 36b40985..38b828df 100644 --- a/modules/po/block_motd.nl_NL.po +++ b/modules/po/block_motd.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.pl_PL.po b/modules/po/block_motd.pl_PL.po index 22e65ebd..f7600db8 100644 --- a/modules/po/block_motd.pl_PL.po +++ b/modules/po/block_motd.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/block_motd.pt_BR.po b/modules/po/block_motd.pt_BR.po index 2ab71658..33d76df8 100644 --- a/modules/po/block_motd.pt_BR.po +++ b/modules/po/block_motd.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/block_motd.ru_RU.po b/modules/po/block_motd.ru_RU.po index 34090299..93071e87 100644 --- a/modules/po/block_motd.ru_RU.po +++ b/modules/po/block_motd.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/blockuser.bg_BG.po b/modules/po/blockuser.bg_BG.po index 4e776ce1..c9342194 100644 --- a/modules/po/blockuser.bg_BG.po +++ b/modules/po/blockuser.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.es_ES.po b/modules/po/blockuser.es_ES.po index 31fe262f..50bd0ed6 100644 --- a/modules/po/blockuser.es_ES.po +++ b/modules/po/blockuser.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.fr_FR.po b/modules/po/blockuser.fr_FR.po index 8698faa8..c52cb906 100644 --- a/modules/po/blockuser.fr_FR.po +++ b/modules/po/blockuser.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.id_ID.po b/modules/po/blockuser.id_ID.po index 3248e37a..c95ed576 100644 --- a/modules/po/blockuser.id_ID.po +++ b/modules/po/blockuser.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.it_IT.po b/modules/po/blockuser.it_IT.po index 75a35860..9072ac5d 100644 --- a/modules/po/blockuser.it_IT.po +++ b/modules/po/blockuser.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.nl_NL.po b/modules/po/blockuser.nl_NL.po index c636f061..8c4c17c5 100644 --- a/modules/po/blockuser.nl_NL.po +++ b/modules/po/blockuser.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.pl_PL.po b/modules/po/blockuser.pl_PL.po index ddf461e8..b0fc0a3c 100644 --- a/modules/po/blockuser.pl_PL.po +++ b/modules/po/blockuser.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/blockuser.pt_BR.po b/modules/po/blockuser.pt_BR.po index 14f69b26..12163fb3 100644 --- a/modules/po/blockuser.pt_BR.po +++ b/modules/po/blockuser.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/blockuser.ru_RU.po b/modules/po/blockuser.ru_RU.po index 9218f03d..c6ff156e 100644 --- a/modules/po/blockuser.ru_RU.po +++ b/modules/po/blockuser.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/bouncedcc.bg_BG.po b/modules/po/bouncedcc.bg_BG.po index eae32087..bf17c467 100644 --- a/modules/po/bouncedcc.bg_BG.po +++ b/modules/po/bouncedcc.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.es_ES.po b/modules/po/bouncedcc.es_ES.po index 9e302198..9f42aab6 100644 --- a/modules/po/bouncedcc.es_ES.po +++ b/modules/po/bouncedcc.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.fr_FR.po b/modules/po/bouncedcc.fr_FR.po index fd157993..fa4c8913 100644 --- a/modules/po/bouncedcc.fr_FR.po +++ b/modules/po/bouncedcc.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.id_ID.po b/modules/po/bouncedcc.id_ID.po index 1560da31..154af713 100644 --- a/modules/po/bouncedcc.id_ID.po +++ b/modules/po/bouncedcc.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.it_IT.po b/modules/po/bouncedcc.it_IT.po index 49e0a98e..d98a5f1f 100644 --- a/modules/po/bouncedcc.it_IT.po +++ b/modules/po/bouncedcc.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.nl_NL.po b/modules/po/bouncedcc.nl_NL.po index ef7e7aa8..7469c72b 100644 --- a/modules/po/bouncedcc.nl_NL.po +++ b/modules/po/bouncedcc.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.pl_PL.po b/modules/po/bouncedcc.pl_PL.po index c838f202..3b974b28 100644 --- a/modules/po/bouncedcc.pl_PL.po +++ b/modules/po/bouncedcc.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/bouncedcc.pt_BR.po b/modules/po/bouncedcc.pt_BR.po index 062eaaea..1f949f83 100644 --- a/modules/po/bouncedcc.pt_BR.po +++ b/modules/po/bouncedcc.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/bouncedcc.ru_RU.po b/modules/po/bouncedcc.ru_RU.po index 62189a55..cb492590 100644 --- a/modules/po/bouncedcc.ru_RU.po +++ b/modules/po/bouncedcc.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/buffextras.bg_BG.po b/modules/po/buffextras.bg_BG.po index 854913ac..9c8ee3d6 100644 --- a/modules/po/buffextras.bg_BG.po +++ b/modules/po/buffextras.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.es_ES.po b/modules/po/buffextras.es_ES.po index 4ff319f8..5adae4b1 100644 --- a/modules/po/buffextras.es_ES.po +++ b/modules/po/buffextras.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.fr_FR.po b/modules/po/buffextras.fr_FR.po index 608ae2b9..c62da85d 100644 --- a/modules/po/buffextras.fr_FR.po +++ b/modules/po/buffextras.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.id_ID.po b/modules/po/buffextras.id_ID.po index e7bac7e0..01ee6ebb 100644 --- a/modules/po/buffextras.id_ID.po +++ b/modules/po/buffextras.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.it_IT.po b/modules/po/buffextras.it_IT.po index 8f7479a5..fb9d9654 100644 --- a/modules/po/buffextras.it_IT.po +++ b/modules/po/buffextras.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.nl_NL.po b/modules/po/buffextras.nl_NL.po index 2a46ad0e..2d040754 100644 --- a/modules/po/buffextras.nl_NL.po +++ b/modules/po/buffextras.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.pl_PL.po b/modules/po/buffextras.pl_PL.po index 5208d4c3..3dc029b9 100644 --- a/modules/po/buffextras.pl_PL.po +++ b/modules/po/buffextras.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/buffextras.pt_BR.po b/modules/po/buffextras.pt_BR.po index cfccc990..065a8514 100644 --- a/modules/po/buffextras.pt_BR.po +++ b/modules/po/buffextras.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/buffextras.ru_RU.po b/modules/po/buffextras.ru_RU.po index ea00632a..32ba4509 100644 --- a/modules/po/buffextras.ru_RU.po +++ b/modules/po/buffextras.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/cert.bg_BG.po b/modules/po/cert.bg_BG.po index 53d02c94..b6abbc09 100644 --- a/modules/po/cert.bg_BG.po +++ b/modules/po/cert.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.es_ES.po b/modules/po/cert.es_ES.po index 68e71c14..39c4f369 100644 --- a/modules/po/cert.es_ES.po +++ b/modules/po/cert.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.fr_FR.po b/modules/po/cert.fr_FR.po index eedbc0ba..df0fc7bf 100644 --- a/modules/po/cert.fr_FR.po +++ b/modules/po/cert.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.id_ID.po b/modules/po/cert.id_ID.po index 9848b2dc..b7df124e 100644 --- a/modules/po/cert.id_ID.po +++ b/modules/po/cert.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.it_IT.po b/modules/po/cert.it_IT.po index c16bc53f..c03d685e 100644 --- a/modules/po/cert.it_IT.po +++ b/modules/po/cert.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.nl_NL.po b/modules/po/cert.nl_NL.po index 9a31788a..b653dbca 100644 --- a/modules/po/cert.nl_NL.po +++ b/modules/po/cert.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.pl_PL.po b/modules/po/cert.pl_PL.po index 83a235eb..329ecafa 100644 --- a/modules/po/cert.pl_PL.po +++ b/modules/po/cert.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/cert.pt_BR.po b/modules/po/cert.pt_BR.po index 9f8fd065..0e933b43 100644 --- a/modules/po/cert.pt_BR.po +++ b/modules/po/cert.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cert.ru_RU.po b/modules/po/cert.ru_RU.po index ee3a5953..a0e02e38 100644 --- a/modules/po/cert.ru_RU.po +++ b/modules/po/cert.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/certauth.bg_BG.po b/modules/po/certauth.bg_BG.po index 73510efd..16a23161 100644 --- a/modules/po/certauth.bg_BG.po +++ b/modules/po/certauth.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.es_ES.po b/modules/po/certauth.es_ES.po index cc489d3f..14a857b9 100644 --- a/modules/po/certauth.es_ES.po +++ b/modules/po/certauth.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.fr_FR.po b/modules/po/certauth.fr_FR.po index 9cccace2..26cafec5 100644 --- a/modules/po/certauth.fr_FR.po +++ b/modules/po/certauth.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.id_ID.po b/modules/po/certauth.id_ID.po index 1f70ba40..c4c2be0d 100644 --- a/modules/po/certauth.id_ID.po +++ b/modules/po/certauth.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.it_IT.po b/modules/po/certauth.it_IT.po index 2106caf8..b124566c 100644 --- a/modules/po/certauth.it_IT.po +++ b/modules/po/certauth.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.nl_NL.po b/modules/po/certauth.nl_NL.po index 4b60ec2e..cb24a7aa 100644 --- a/modules/po/certauth.nl_NL.po +++ b/modules/po/certauth.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.pl_PL.po b/modules/po/certauth.pl_PL.po index a4073ded..01fdc2d0 100644 --- a/modules/po/certauth.pl_PL.po +++ b/modules/po/certauth.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/certauth.pt_BR.po b/modules/po/certauth.pt_BR.po index 5d66d5e4..44ba9e5f 100644 --- a/modules/po/certauth.pt_BR.po +++ b/modules/po/certauth.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/certauth.ru_RU.po b/modules/po/certauth.ru_RU.po index eb3851e2..2282ed76 100644 --- a/modules/po/certauth.ru_RU.po +++ b/modules/po/certauth.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/chansaver.bg_BG.po b/modules/po/chansaver.bg_BG.po index 52bb0e44..fb9805b9 100644 --- a/modules/po/chansaver.bg_BG.po +++ b/modules/po/chansaver.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.es_ES.po b/modules/po/chansaver.es_ES.po index b28e25cb..644ce037 100644 --- a/modules/po/chansaver.es_ES.po +++ b/modules/po/chansaver.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.fr_FR.po b/modules/po/chansaver.fr_FR.po index 1b65df7c..a5e2b59a 100644 --- a/modules/po/chansaver.fr_FR.po +++ b/modules/po/chansaver.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.id_ID.po b/modules/po/chansaver.id_ID.po index 2902c5cd..a6fb3442 100644 --- a/modules/po/chansaver.id_ID.po +++ b/modules/po/chansaver.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.it_IT.po b/modules/po/chansaver.it_IT.po index 0c073048..47a66e57 100644 --- a/modules/po/chansaver.it_IT.po +++ b/modules/po/chansaver.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.nl_NL.po b/modules/po/chansaver.nl_NL.po index 22ac59c3..de3e2907 100644 --- a/modules/po/chansaver.nl_NL.po +++ b/modules/po/chansaver.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.pl_PL.po b/modules/po/chansaver.pl_PL.po index 2c4f16d9..2f5b0d4a 100644 --- a/modules/po/chansaver.pl_PL.po +++ b/modules/po/chansaver.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/chansaver.pt_BR.po b/modules/po/chansaver.pt_BR.po index ac1593d0..5096b4a5 100644 --- a/modules/po/chansaver.pt_BR.po +++ b/modules/po/chansaver.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/chansaver.ru_RU.po b/modules/po/chansaver.ru_RU.po index 36f8431a..3d22d663 100644 --- a/modules/po/chansaver.ru_RU.po +++ b/modules/po/chansaver.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/clearbufferonmsg.bg_BG.po b/modules/po/clearbufferonmsg.bg_BG.po index c125ad55..78a88749 100644 --- a/modules/po/clearbufferonmsg.bg_BG.po +++ b/modules/po/clearbufferonmsg.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.es_ES.po b/modules/po/clearbufferonmsg.es_ES.po index 80378d24..a47e2143 100644 --- a/modules/po/clearbufferonmsg.es_ES.po +++ b/modules/po/clearbufferonmsg.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.fr_FR.po b/modules/po/clearbufferonmsg.fr_FR.po index 675dc338..f2373293 100644 --- a/modules/po/clearbufferonmsg.fr_FR.po +++ b/modules/po/clearbufferonmsg.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.id_ID.po b/modules/po/clearbufferonmsg.id_ID.po index bf43c00a..7eba1c60 100644 --- a/modules/po/clearbufferonmsg.id_ID.po +++ b/modules/po/clearbufferonmsg.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.it_IT.po b/modules/po/clearbufferonmsg.it_IT.po index def2d655..0feabb87 100644 --- a/modules/po/clearbufferonmsg.it_IT.po +++ b/modules/po/clearbufferonmsg.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.nl_NL.po b/modules/po/clearbufferonmsg.nl_NL.po index 25fc22ea..427c8cc6 100644 --- a/modules/po/clearbufferonmsg.nl_NL.po +++ b/modules/po/clearbufferonmsg.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.pl_PL.po b/modules/po/clearbufferonmsg.pl_PL.po index b685d1e6..7eb3f672 100644 --- a/modules/po/clearbufferonmsg.pl_PL.po +++ b/modules/po/clearbufferonmsg.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/clearbufferonmsg.pt_BR.po b/modules/po/clearbufferonmsg.pt_BR.po index 2f50f7f0..f71a9962 100644 --- a/modules/po/clearbufferonmsg.pt_BR.po +++ b/modules/po/clearbufferonmsg.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clearbufferonmsg.ru_RU.po b/modules/po/clearbufferonmsg.ru_RU.po index d02f86b2..1fa8d538 100644 --- a/modules/po/clearbufferonmsg.ru_RU.po +++ b/modules/po/clearbufferonmsg.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/clientnotify.bg_BG.po b/modules/po/clientnotify.bg_BG.po index ab613097..a495a928 100644 --- a/modules/po/clientnotify.bg_BG.po +++ b/modules/po/clientnotify.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.es_ES.po b/modules/po/clientnotify.es_ES.po index a777685f..86ed1b90 100644 --- a/modules/po/clientnotify.es_ES.po +++ b/modules/po/clientnotify.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.fr_FR.po b/modules/po/clientnotify.fr_FR.po index 90e855f6..6b202d79 100644 --- a/modules/po/clientnotify.fr_FR.po +++ b/modules/po/clientnotify.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.id_ID.po b/modules/po/clientnotify.id_ID.po index ffbaa6bd..e8bd757d 100644 --- a/modules/po/clientnotify.id_ID.po +++ b/modules/po/clientnotify.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.it_IT.po b/modules/po/clientnotify.it_IT.po index f128d530..0ba5bcf9 100644 --- a/modules/po/clientnotify.it_IT.po +++ b/modules/po/clientnotify.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.nl_NL.po b/modules/po/clientnotify.nl_NL.po index 08556a92..a787beef 100644 --- a/modules/po/clientnotify.nl_NL.po +++ b/modules/po/clientnotify.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.pl_PL.po b/modules/po/clientnotify.pl_PL.po index 1fd41034..55abcaaa 100644 --- a/modules/po/clientnotify.pl_PL.po +++ b/modules/po/clientnotify.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/clientnotify.pt_BR.po b/modules/po/clientnotify.pt_BR.po index 4fa925f3..3acb83b2 100644 --- a/modules/po/clientnotify.pt_BR.po +++ b/modules/po/clientnotify.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/clientnotify.ru_RU.po b/modules/po/clientnotify.ru_RU.po index 95783061..59b2474d 100644 --- a/modules/po/clientnotify.ru_RU.po +++ b/modules/po/clientnotify.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/controlpanel.bg_BG.po b/modules/po/controlpanel.bg_BG.po index 2dcf7991..9275294b 100644 --- a/modules/po/controlpanel.bg_BG.po +++ b/modules/po/controlpanel.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.es_ES.po b/modules/po/controlpanel.es_ES.po index 978b3a3d..4e4e60c1 100644 --- a/modules/po/controlpanel.es_ES.po +++ b/modules/po/controlpanel.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.fr_FR.po b/modules/po/controlpanel.fr_FR.po index ee8a4c9b..a9813d98 100644 --- a/modules/po/controlpanel.fr_FR.po +++ b/modules/po/controlpanel.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.id_ID.po b/modules/po/controlpanel.id_ID.po index 4ba2d44d..4d97edbb 100644 --- a/modules/po/controlpanel.id_ID.po +++ b/modules/po/controlpanel.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.it_IT.po b/modules/po/controlpanel.it_IT.po index b072df58..0159df49 100644 --- a/modules/po/controlpanel.it_IT.po +++ b/modules/po/controlpanel.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.nl_NL.po b/modules/po/controlpanel.nl_NL.po index 9a968a9b..b0879332 100644 --- a/modules/po/controlpanel.nl_NL.po +++ b/modules/po/controlpanel.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.pl_PL.po b/modules/po/controlpanel.pl_PL.po index 15d0c2ff..4806ff4d 100644 --- a/modules/po/controlpanel.pl_PL.po +++ b/modules/po/controlpanel.pl_PL.po @@ -8,13 +8,8 @@ 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" @@ -186,17 +181,10 @@ 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 " diff --git a/modules/po/controlpanel.pt_BR.po b/modules/po/controlpanel.pt_BR.po index 98e57cde..76b92534 100644 --- a/modules/po/controlpanel.pt_BR.po +++ b/modules/po/controlpanel.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/controlpanel.ru_RU.po b/modules/po/controlpanel.ru_RU.po index b7f58513..b0994e7d 100644 --- a/modules/po/controlpanel.ru_RU.po +++ b/modules/po/controlpanel.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/crypt.bg_BG.po b/modules/po/crypt.bg_BG.po index a19236c6..009deeef 100644 --- a/modules/po/crypt.bg_BG.po +++ b/modules/po/crypt.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.es_ES.po b/modules/po/crypt.es_ES.po index 724f49fd..05919095 100644 --- a/modules/po/crypt.es_ES.po +++ b/modules/po/crypt.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.fr_FR.po b/modules/po/crypt.fr_FR.po index 2315fba3..5597ee11 100644 --- a/modules/po/crypt.fr_FR.po +++ b/modules/po/crypt.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.id_ID.po b/modules/po/crypt.id_ID.po index 3c828b76..a32dac1b 100644 --- a/modules/po/crypt.id_ID.po +++ b/modules/po/crypt.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.it_IT.po b/modules/po/crypt.it_IT.po index a941483e..0bf43bc2 100644 --- a/modules/po/crypt.it_IT.po +++ b/modules/po/crypt.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.nl_NL.po b/modules/po/crypt.nl_NL.po index 588549d4..7e5fc1ea 100644 --- a/modules/po/crypt.nl_NL.po +++ b/modules/po/crypt.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.pl_PL.po b/modules/po/crypt.pl_PL.po index bb92b485..38fa093e 100644 --- a/modules/po/crypt.pl_PL.po +++ b/modules/po/crypt.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/crypt.pt_BR.po b/modules/po/crypt.pt_BR.po index 3ae8b29a..558757f5 100644 --- a/modules/po/crypt.pt_BR.po +++ b/modules/po/crypt.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/crypt.ru_RU.po b/modules/po/crypt.ru_RU.po index f016893c..bebb506a 100644 --- a/modules/po/crypt.ru_RU.po +++ b/modules/po/crypt.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/ctcpflood.bg_BG.po b/modules/po/ctcpflood.bg_BG.po index 65e53336..143f0174 100644 --- a/modules/po/ctcpflood.bg_BG.po +++ b/modules/po/ctcpflood.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.es_ES.po b/modules/po/ctcpflood.es_ES.po index d9709180..e6d6257d 100644 --- a/modules/po/ctcpflood.es_ES.po +++ b/modules/po/ctcpflood.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.fr_FR.po b/modules/po/ctcpflood.fr_FR.po index cbd4add4..c394e84f 100644 --- a/modules/po/ctcpflood.fr_FR.po +++ b/modules/po/ctcpflood.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.id_ID.po b/modules/po/ctcpflood.id_ID.po index 1b1cb320..40a9cdd0 100644 --- a/modules/po/ctcpflood.id_ID.po +++ b/modules/po/ctcpflood.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.it_IT.po b/modules/po/ctcpflood.it_IT.po index 4b5a43db..6be5694e 100644 --- a/modules/po/ctcpflood.it_IT.po +++ b/modules/po/ctcpflood.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.nl_NL.po b/modules/po/ctcpflood.nl_NL.po index 695990fc..18a72ee2 100644 --- a/modules/po/ctcpflood.nl_NL.po +++ b/modules/po/ctcpflood.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.pl_PL.po b/modules/po/ctcpflood.pl_PL.po index a2e9277d..187ac315 100644 --- a/modules/po/ctcpflood.pl_PL.po +++ b/modules/po/ctcpflood.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/ctcpflood.pt_BR.po b/modules/po/ctcpflood.pt_BR.po index 7ce54b38..aab58d6a 100644 --- a/modules/po/ctcpflood.pt_BR.po +++ b/modules/po/ctcpflood.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/ctcpflood.ru_RU.po b/modules/po/ctcpflood.ru_RU.po index 5b99a436..7d614e07 100644 --- a/modules/po/ctcpflood.ru_RU.po +++ b/modules/po/ctcpflood.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/cyrusauth.bg_BG.po b/modules/po/cyrusauth.bg_BG.po index 6df3599a..98402b85 100644 --- a/modules/po/cyrusauth.bg_BG.po +++ b/modules/po/cyrusauth.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.es_ES.po b/modules/po/cyrusauth.es_ES.po index a7a2d057..f345c476 100644 --- a/modules/po/cyrusauth.es_ES.po +++ b/modules/po/cyrusauth.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.fr_FR.po b/modules/po/cyrusauth.fr_FR.po index db259bbd..490af7c4 100644 --- a/modules/po/cyrusauth.fr_FR.po +++ b/modules/po/cyrusauth.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.id_ID.po b/modules/po/cyrusauth.id_ID.po index 495c3210..e6820030 100644 --- a/modules/po/cyrusauth.id_ID.po +++ b/modules/po/cyrusauth.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.it_IT.po b/modules/po/cyrusauth.it_IT.po index 3a773f6f..40973638 100644 --- a/modules/po/cyrusauth.it_IT.po +++ b/modules/po/cyrusauth.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.nl_NL.po b/modules/po/cyrusauth.nl_NL.po index df2d4e89..6cb6b6ac 100644 --- a/modules/po/cyrusauth.nl_NL.po +++ b/modules/po/cyrusauth.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.pl_PL.po b/modules/po/cyrusauth.pl_PL.po index 879cd007..508deb36 100644 --- a/modules/po/cyrusauth.pl_PL.po +++ b/modules/po/cyrusauth.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/cyrusauth.pt_BR.po b/modules/po/cyrusauth.pt_BR.po index 151e47f3..3940022f 100644 --- a/modules/po/cyrusauth.pt_BR.po +++ b/modules/po/cyrusauth.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/cyrusauth.ru_RU.po b/modules/po/cyrusauth.ru_RU.po index 018a20a3..1eaffa73 100644 --- a/modules/po/cyrusauth.ru_RU.po +++ b/modules/po/cyrusauth.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/dcc.bg_BG.po b/modules/po/dcc.bg_BG.po index 3f04252d..498349f1 100644 --- a/modules/po/dcc.bg_BG.po +++ b/modules/po/dcc.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.es_ES.po b/modules/po/dcc.es_ES.po index aa163b41..3c8f4d6d 100644 --- a/modules/po/dcc.es_ES.po +++ b/modules/po/dcc.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.fr_FR.po b/modules/po/dcc.fr_FR.po index d0ade9eb..225e82ca 100644 --- a/modules/po/dcc.fr_FR.po +++ b/modules/po/dcc.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.id_ID.po b/modules/po/dcc.id_ID.po index 2f1b7fb3..f1af517b 100644 --- a/modules/po/dcc.id_ID.po +++ b/modules/po/dcc.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.it_IT.po b/modules/po/dcc.it_IT.po index ec926f33..b49e4771 100644 --- a/modules/po/dcc.it_IT.po +++ b/modules/po/dcc.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.nl_NL.po b/modules/po/dcc.nl_NL.po index 05c87019..f85f87ab 100644 --- a/modules/po/dcc.nl_NL.po +++ b/modules/po/dcc.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.pl_PL.po b/modules/po/dcc.pl_PL.po index 73d9a24b..46a40278 100644 --- a/modules/po/dcc.pl_PL.po +++ b/modules/po/dcc.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/dcc.pt_BR.po b/modules/po/dcc.pt_BR.po index 40d7cfd0..797b8b8b 100644 --- a/modules/po/dcc.pt_BR.po +++ b/modules/po/dcc.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/dcc.ru_RU.po b/modules/po/dcc.ru_RU.po index 1a8cf34f..8107facf 100644 --- a/modules/po/dcc.ru_RU.po +++ b/modules/po/dcc.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/disconkick.bg_BG.po b/modules/po/disconkick.bg_BG.po index 7daef00f..f2ee90eb 100644 --- a/modules/po/disconkick.bg_BG.po +++ b/modules/po/disconkick.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.es_ES.po b/modules/po/disconkick.es_ES.po index bf04f9db..04e87e09 100644 --- a/modules/po/disconkick.es_ES.po +++ b/modules/po/disconkick.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.fr_FR.po b/modules/po/disconkick.fr_FR.po index febc0097..9e9f645f 100644 --- a/modules/po/disconkick.fr_FR.po +++ b/modules/po/disconkick.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.id_ID.po b/modules/po/disconkick.id_ID.po index 0c4a6e78..8d72561a 100644 --- a/modules/po/disconkick.id_ID.po +++ b/modules/po/disconkick.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.it_IT.po b/modules/po/disconkick.it_IT.po index 7d7687c5..e5cb1efc 100644 --- a/modules/po/disconkick.it_IT.po +++ b/modules/po/disconkick.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.nl_NL.po b/modules/po/disconkick.nl_NL.po index 7c0d0620..87a9493e 100644 --- a/modules/po/disconkick.nl_NL.po +++ b/modules/po/disconkick.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.pl_PL.po b/modules/po/disconkick.pl_PL.po index eeff3005..0258fce2 100644 --- a/modules/po/disconkick.pl_PL.po +++ b/modules/po/disconkick.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/disconkick.pt_BR.po b/modules/po/disconkick.pt_BR.po index 0e9f595e..22f6cea8 100644 --- a/modules/po/disconkick.pt_BR.po +++ b/modules/po/disconkick.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/disconkick.ru_RU.po b/modules/po/disconkick.ru_RU.po index 28272ac0..6338b623 100644 --- a/modules/po/disconkick.ru_RU.po +++ b/modules/po/disconkick.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/fail2ban.bg_BG.po b/modules/po/fail2ban.bg_BG.po index 487f2610..9ce3b3ce 100644 --- a/modules/po/fail2ban.bg_BG.po +++ b/modules/po/fail2ban.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.es_ES.po b/modules/po/fail2ban.es_ES.po index 732b48c5..143356b4 100644 --- a/modules/po/fail2ban.es_ES.po +++ b/modules/po/fail2ban.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.fr_FR.po b/modules/po/fail2ban.fr_FR.po index d1a50761..331e709e 100644 --- a/modules/po/fail2ban.fr_FR.po +++ b/modules/po/fail2ban.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.id_ID.po b/modules/po/fail2ban.id_ID.po index 50f8b0a5..3ab23216 100644 --- a/modules/po/fail2ban.id_ID.po +++ b/modules/po/fail2ban.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.it_IT.po b/modules/po/fail2ban.it_IT.po index c75fe65d..bfd95122 100644 --- a/modules/po/fail2ban.it_IT.po +++ b/modules/po/fail2ban.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.nl_NL.po b/modules/po/fail2ban.nl_NL.po index 200d4b73..07b39775 100644 --- a/modules/po/fail2ban.nl_NL.po +++ b/modules/po/fail2ban.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.pl_PL.po b/modules/po/fail2ban.pl_PL.po index 12508d51..abd5fecc 100644 --- a/modules/po/fail2ban.pl_PL.po +++ b/modules/po/fail2ban.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/fail2ban.pt_BR.po b/modules/po/fail2ban.pt_BR.po index c9da9261..9bb234f2 100644 --- a/modules/po/fail2ban.pt_BR.po +++ b/modules/po/fail2ban.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/fail2ban.ru_RU.po b/modules/po/fail2ban.ru_RU.po index fc98975e..31a6011e 100644 --- a/modules/po/fail2ban.ru_RU.po +++ b/modules/po/fail2ban.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/flooddetach.bg_BG.po b/modules/po/flooddetach.bg_BG.po index 9e4ffef6..517337a6 100644 --- a/modules/po/flooddetach.bg_BG.po +++ b/modules/po/flooddetach.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.es_ES.po b/modules/po/flooddetach.es_ES.po index 56a30d74..59b098ee 100644 --- a/modules/po/flooddetach.es_ES.po +++ b/modules/po/flooddetach.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.fr_FR.po b/modules/po/flooddetach.fr_FR.po index 25ed6178..db36dd3d 100644 --- a/modules/po/flooddetach.fr_FR.po +++ b/modules/po/flooddetach.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.id_ID.po b/modules/po/flooddetach.id_ID.po index 72fb70fc..bfdb04de 100644 --- a/modules/po/flooddetach.id_ID.po +++ b/modules/po/flooddetach.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.it_IT.po b/modules/po/flooddetach.it_IT.po index c9b2715a..a04e3962 100644 --- a/modules/po/flooddetach.it_IT.po +++ b/modules/po/flooddetach.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.nl_NL.po b/modules/po/flooddetach.nl_NL.po index 5ba12cb7..3c164d01 100644 --- a/modules/po/flooddetach.nl_NL.po +++ b/modules/po/flooddetach.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.pl_PL.po b/modules/po/flooddetach.pl_PL.po index d69c022e..7db44c82 100644 --- a/modules/po/flooddetach.pl_PL.po +++ b/modules/po/flooddetach.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/flooddetach.pt_BR.po b/modules/po/flooddetach.pt_BR.po index 6008f32d..19b92630 100644 --- a/modules/po/flooddetach.pt_BR.po +++ b/modules/po/flooddetach.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/flooddetach.ru_RU.po b/modules/po/flooddetach.ru_RU.po index cadcd540..050341e3 100644 --- a/modules/po/flooddetach.ru_RU.po +++ b/modules/po/flooddetach.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/identfile.bg_BG.po b/modules/po/identfile.bg_BG.po index 6abb6208..654ff51f 100644 --- a/modules/po/identfile.bg_BG.po +++ b/modules/po/identfile.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.es_ES.po b/modules/po/identfile.es_ES.po index 1fcff81f..2159b16a 100644 --- a/modules/po/identfile.es_ES.po +++ b/modules/po/identfile.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.fr_FR.po b/modules/po/identfile.fr_FR.po index 8538006d..4cb8744f 100644 --- a/modules/po/identfile.fr_FR.po +++ b/modules/po/identfile.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.id_ID.po b/modules/po/identfile.id_ID.po index d043f845..31f09ade 100644 --- a/modules/po/identfile.id_ID.po +++ b/modules/po/identfile.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.it_IT.po b/modules/po/identfile.it_IT.po index 97530dd2..bcef8978 100644 --- a/modules/po/identfile.it_IT.po +++ b/modules/po/identfile.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.nl_NL.po b/modules/po/identfile.nl_NL.po index 6f4b93a5..6b2a44f8 100644 --- a/modules/po/identfile.nl_NL.po +++ b/modules/po/identfile.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.pl_PL.po b/modules/po/identfile.pl_PL.po index b4b4eca2..3f44e2a9 100644 --- a/modules/po/identfile.pl_PL.po +++ b/modules/po/identfile.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/identfile.pt_BR.po b/modules/po/identfile.pt_BR.po index bd84212a..4712a141 100644 --- a/modules/po/identfile.pt_BR.po +++ b/modules/po/identfile.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/identfile.ru_RU.po b/modules/po/identfile.ru_RU.po index c86df976..d8e8cb0f 100644 --- a/modules/po/identfile.ru_RU.po +++ b/modules/po/identfile.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/imapauth.bg_BG.po b/modules/po/imapauth.bg_BG.po index 4790d1b0..786c28c9 100644 --- a/modules/po/imapauth.bg_BG.po +++ b/modules/po/imapauth.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.es_ES.po b/modules/po/imapauth.es_ES.po index 32be9314..21a52d66 100644 --- a/modules/po/imapauth.es_ES.po +++ b/modules/po/imapauth.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.fr_FR.po b/modules/po/imapauth.fr_FR.po index 724e1668..0fdc64ca 100644 --- a/modules/po/imapauth.fr_FR.po +++ b/modules/po/imapauth.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.id_ID.po b/modules/po/imapauth.id_ID.po index 6bb20243..8ecd94d2 100644 --- a/modules/po/imapauth.id_ID.po +++ b/modules/po/imapauth.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.it_IT.po b/modules/po/imapauth.it_IT.po index a583e4e1..f3a9cb75 100644 --- a/modules/po/imapauth.it_IT.po +++ b/modules/po/imapauth.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.nl_NL.po b/modules/po/imapauth.nl_NL.po index 50972e0b..e9e16dd7 100644 --- a/modules/po/imapauth.nl_NL.po +++ b/modules/po/imapauth.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.pl_PL.po b/modules/po/imapauth.pl_PL.po index bd8b8f3b..2e1837f1 100644 --- a/modules/po/imapauth.pl_PL.po +++ b/modules/po/imapauth.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/imapauth.pt_BR.po b/modules/po/imapauth.pt_BR.po index a5f26d28..e208f3e0 100644 --- a/modules/po/imapauth.pt_BR.po +++ b/modules/po/imapauth.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/imapauth.ru_RU.po b/modules/po/imapauth.ru_RU.po index 7b207722..3c81f444 100644 --- a/modules/po/imapauth.ru_RU.po +++ b/modules/po/imapauth.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/keepnick.bg_BG.po b/modules/po/keepnick.bg_BG.po index 16e336d0..46ec51af 100644 --- a/modules/po/keepnick.bg_BG.po +++ b/modules/po/keepnick.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.es_ES.po b/modules/po/keepnick.es_ES.po index 22b39401..a50e58d5 100644 --- a/modules/po/keepnick.es_ES.po +++ b/modules/po/keepnick.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.fr_FR.po b/modules/po/keepnick.fr_FR.po index 7fe6707d..7ec6f02e 100644 --- a/modules/po/keepnick.fr_FR.po +++ b/modules/po/keepnick.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.id_ID.po b/modules/po/keepnick.id_ID.po index 50366019..c0ae6d60 100644 --- a/modules/po/keepnick.id_ID.po +++ b/modules/po/keepnick.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.it_IT.po b/modules/po/keepnick.it_IT.po index 49b2d949..0a37eae3 100644 --- a/modules/po/keepnick.it_IT.po +++ b/modules/po/keepnick.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.nl_NL.po b/modules/po/keepnick.nl_NL.po index bf0ebace..a36ab8ef 100644 --- a/modules/po/keepnick.nl_NL.po +++ b/modules/po/keepnick.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.pl_PL.po b/modules/po/keepnick.pl_PL.po index 086e037a..fe90fab1 100644 --- a/modules/po/keepnick.pl_PL.po +++ b/modules/po/keepnick.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/keepnick.pt_BR.po b/modules/po/keepnick.pt_BR.po index bff957ac..65b9c19b 100644 --- a/modules/po/keepnick.pt_BR.po +++ b/modules/po/keepnick.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/keepnick.ru_RU.po b/modules/po/keepnick.ru_RU.po index 82e1f308..0c67d892 100644 --- a/modules/po/keepnick.ru_RU.po +++ b/modules/po/keepnick.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/kickrejoin.bg_BG.po b/modules/po/kickrejoin.bg_BG.po index e067c2f9..09688601 100644 --- a/modules/po/kickrejoin.bg_BG.po +++ b/modules/po/kickrejoin.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.es_ES.po b/modules/po/kickrejoin.es_ES.po index b7464f8e..4874e59e 100644 --- a/modules/po/kickrejoin.es_ES.po +++ b/modules/po/kickrejoin.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.fr_FR.po b/modules/po/kickrejoin.fr_FR.po index 11085402..a3540a94 100644 --- a/modules/po/kickrejoin.fr_FR.po +++ b/modules/po/kickrejoin.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.id_ID.po b/modules/po/kickrejoin.id_ID.po index c51dc91e..40d07ebb 100644 --- a/modules/po/kickrejoin.id_ID.po +++ b/modules/po/kickrejoin.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.it_IT.po b/modules/po/kickrejoin.it_IT.po index 0b224089..c86161f7 100644 --- a/modules/po/kickrejoin.it_IT.po +++ b/modules/po/kickrejoin.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.nl_NL.po b/modules/po/kickrejoin.nl_NL.po index f7cecc2f..951105a4 100644 --- a/modules/po/kickrejoin.nl_NL.po +++ b/modules/po/kickrejoin.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.pl_PL.po b/modules/po/kickrejoin.pl_PL.po index 57a043d6..401b9a9f 100644 --- a/modules/po/kickrejoin.pl_PL.po +++ b/modules/po/kickrejoin.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/kickrejoin.pt_BR.po b/modules/po/kickrejoin.pt_BR.po index a25eb3c0..849d3876 100644 --- a/modules/po/kickrejoin.pt_BR.po +++ b/modules/po/kickrejoin.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/kickrejoin.ru_RU.po b/modules/po/kickrejoin.ru_RU.po index 5e0904b4..07c39ead 100644 --- a/modules/po/kickrejoin.ru_RU.po +++ b/modules/po/kickrejoin.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/lastseen.bg_BG.po b/modules/po/lastseen.bg_BG.po index c9d66efd..85d6f121 100644 --- a/modules/po/lastseen.bg_BG.po +++ b/modules/po/lastseen.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.es_ES.po b/modules/po/lastseen.es_ES.po index 81523bb5..65897cc4 100644 --- a/modules/po/lastseen.es_ES.po +++ b/modules/po/lastseen.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.fr_FR.po b/modules/po/lastseen.fr_FR.po index 9b3fba11..d4b89eb6 100644 --- a/modules/po/lastseen.fr_FR.po +++ b/modules/po/lastseen.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.id_ID.po b/modules/po/lastseen.id_ID.po index f5037d71..5a5c1e9e 100644 --- a/modules/po/lastseen.id_ID.po +++ b/modules/po/lastseen.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.it_IT.po b/modules/po/lastseen.it_IT.po index f0df1a91..8c3fece5 100644 --- a/modules/po/lastseen.it_IT.po +++ b/modules/po/lastseen.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.nl_NL.po b/modules/po/lastseen.nl_NL.po index fa94c1eb..d3d80254 100644 --- a/modules/po/lastseen.nl_NL.po +++ b/modules/po/lastseen.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.pl_PL.po b/modules/po/lastseen.pl_PL.po index 7e77eea5..26f83657 100644 --- a/modules/po/lastseen.pl_PL.po +++ b/modules/po/lastseen.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/lastseen.pt_BR.po b/modules/po/lastseen.pt_BR.po index b0457948..8cf27639 100644 --- a/modules/po/lastseen.pt_BR.po +++ b/modules/po/lastseen.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/lastseen.ru_RU.po b/modules/po/lastseen.ru_RU.po index b06a863d..a1d2fae4 100644 --- a/modules/po/lastseen.ru_RU.po +++ b/modules/po/lastseen.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/listsockets.bg_BG.po b/modules/po/listsockets.bg_BG.po index 55acd3ca..b3846967 100644 --- a/modules/po/listsockets.bg_BG.po +++ b/modules/po/listsockets.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.es_ES.po b/modules/po/listsockets.es_ES.po index ee06f50f..655842c9 100644 --- a/modules/po/listsockets.es_ES.po +++ b/modules/po/listsockets.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.fr_FR.po b/modules/po/listsockets.fr_FR.po index 9ef7a9c2..501ae9fa 100644 --- a/modules/po/listsockets.fr_FR.po +++ b/modules/po/listsockets.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.id_ID.po b/modules/po/listsockets.id_ID.po index eec24499..993f9b3d 100644 --- a/modules/po/listsockets.id_ID.po +++ b/modules/po/listsockets.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.it_IT.po b/modules/po/listsockets.it_IT.po index cb027523..12d60ede 100644 --- a/modules/po/listsockets.it_IT.po +++ b/modules/po/listsockets.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.nl_NL.po b/modules/po/listsockets.nl_NL.po index 2763e1e8..babc1394 100644 --- a/modules/po/listsockets.nl_NL.po +++ b/modules/po/listsockets.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.pl_PL.po b/modules/po/listsockets.pl_PL.po index a9a63406..691d1d2e 100644 --- a/modules/po/listsockets.pl_PL.po +++ b/modules/po/listsockets.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/listsockets.pt_BR.po b/modules/po/listsockets.pt_BR.po index 6d272bf3..08f7f844 100644 --- a/modules/po/listsockets.pt_BR.po +++ b/modules/po/listsockets.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/listsockets.ru_RU.po b/modules/po/listsockets.ru_RU.po index 81a71f4e..4cdbc1db 100644 --- a/modules/po/listsockets.ru_RU.po +++ b/modules/po/listsockets.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/log.bg_BG.po b/modules/po/log.bg_BG.po index 827d26f4..84f02320 100644 --- a/modules/po/log.bg_BG.po +++ b/modules/po/log.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.es_ES.po b/modules/po/log.es_ES.po index 280165bc..05afe9e5 100644 --- a/modules/po/log.es_ES.po +++ b/modules/po/log.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.fr_FR.po b/modules/po/log.fr_FR.po index b4f5ddcb..9370a8b5 100644 --- a/modules/po/log.fr_FR.po +++ b/modules/po/log.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.id_ID.po b/modules/po/log.id_ID.po index 750c636d..c1b54da3 100644 --- a/modules/po/log.id_ID.po +++ b/modules/po/log.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.it_IT.po b/modules/po/log.it_IT.po index cbb64235..a638f457 100644 --- a/modules/po/log.it_IT.po +++ b/modules/po/log.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.nl_NL.po b/modules/po/log.nl_NL.po index a133156b..e6242e8a 100644 --- a/modules/po/log.nl_NL.po +++ b/modules/po/log.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.pl_PL.po b/modules/po/log.pl_PL.po index 66c73b2c..f8d2e9bd 100644 --- a/modules/po/log.pl_PL.po +++ b/modules/po/log.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/log.pt_BR.po b/modules/po/log.pt_BR.po index 32a5b9f1..75462ebe 100644 --- a/modules/po/log.pt_BR.po +++ b/modules/po/log.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/log.ru_RU.po b/modules/po/log.ru_RU.po index e88a57ee..c6f157eb 100644 --- a/modules/po/log.ru_RU.po +++ b/modules/po/log.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/missingmotd.bg_BG.po b/modules/po/missingmotd.bg_BG.po index cce76422..1500a219 100644 --- a/modules/po/missingmotd.bg_BG.po +++ b/modules/po/missingmotd.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.es_ES.po b/modules/po/missingmotd.es_ES.po index e84a0aeb..f5235dd6 100644 --- a/modules/po/missingmotd.es_ES.po +++ b/modules/po/missingmotd.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.fr_FR.po b/modules/po/missingmotd.fr_FR.po index 36ffb75b..8ab32de1 100644 --- a/modules/po/missingmotd.fr_FR.po +++ b/modules/po/missingmotd.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.id_ID.po b/modules/po/missingmotd.id_ID.po index 2f44583b..cd3bb1fe 100644 --- a/modules/po/missingmotd.id_ID.po +++ b/modules/po/missingmotd.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.it_IT.po b/modules/po/missingmotd.it_IT.po index c5ee24b4..550bdb87 100644 --- a/modules/po/missingmotd.it_IT.po +++ b/modules/po/missingmotd.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.nl_NL.po b/modules/po/missingmotd.nl_NL.po index 32bf866d..fdf6f610 100644 --- a/modules/po/missingmotd.nl_NL.po +++ b/modules/po/missingmotd.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.pl_PL.po b/modules/po/missingmotd.pl_PL.po index 680defc8..dcaf567c 100644 --- a/modules/po/missingmotd.pl_PL.po +++ b/modules/po/missingmotd.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/missingmotd.pt_BR.po b/modules/po/missingmotd.pt_BR.po index a0ab1b47..80311402 100644 --- a/modules/po/missingmotd.pt_BR.po +++ b/modules/po/missingmotd.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/missingmotd.ru_RU.po b/modules/po/missingmotd.ru_RU.po index 6b3df83a..9010af6f 100644 --- a/modules/po/missingmotd.ru_RU.po +++ b/modules/po/missingmotd.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/modperl.bg_BG.po b/modules/po/modperl.bg_BG.po index 3fd897a7..9f02207d 100644 --- a/modules/po/modperl.bg_BG.po +++ b/modules/po/modperl.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.es_ES.po b/modules/po/modperl.es_ES.po index e25c1ec7..d7ace707 100644 --- a/modules/po/modperl.es_ES.po +++ b/modules/po/modperl.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.fr_FR.po b/modules/po/modperl.fr_FR.po index 01950da3..f6fbeac6 100644 --- a/modules/po/modperl.fr_FR.po +++ b/modules/po/modperl.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.id_ID.po b/modules/po/modperl.id_ID.po index 10890d7c..28ef7532 100644 --- a/modules/po/modperl.id_ID.po +++ b/modules/po/modperl.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.it_IT.po b/modules/po/modperl.it_IT.po index 788935c4..a03ea2c5 100644 --- a/modules/po/modperl.it_IT.po +++ b/modules/po/modperl.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.nl_NL.po b/modules/po/modperl.nl_NL.po index 20522a8e..ed2d8953 100644 --- a/modules/po/modperl.nl_NL.po +++ b/modules/po/modperl.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.pl_PL.po b/modules/po/modperl.pl_PL.po index 7c1de97e..42c6196d 100644 --- a/modules/po/modperl.pl_PL.po +++ b/modules/po/modperl.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/modperl.pt_BR.po b/modules/po/modperl.pt_BR.po index 328bce3c..66308b5c 100644 --- a/modules/po/modperl.pt_BR.po +++ b/modules/po/modperl.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modperl.ru_RU.po b/modules/po/modperl.ru_RU.po index b5d5d7af..8ee33325 100644 --- a/modules/po/modperl.ru_RU.po +++ b/modules/po/modperl.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/modpython.bg_BG.po b/modules/po/modpython.bg_BG.po index 02f44573..a202e145 100644 --- a/modules/po/modpython.bg_BG.po +++ b/modules/po/modpython.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.es_ES.po b/modules/po/modpython.es_ES.po index 2417ffa6..1c6d865b 100644 --- a/modules/po/modpython.es_ES.po +++ b/modules/po/modpython.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.fr_FR.po b/modules/po/modpython.fr_FR.po index d0f5c57d..e7aeb582 100644 --- a/modules/po/modpython.fr_FR.po +++ b/modules/po/modpython.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.id_ID.po b/modules/po/modpython.id_ID.po index 6af341ad..67ce0ab3 100644 --- a/modules/po/modpython.id_ID.po +++ b/modules/po/modpython.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.it_IT.po b/modules/po/modpython.it_IT.po index ca3f40d0..ba31c217 100644 --- a/modules/po/modpython.it_IT.po +++ b/modules/po/modpython.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.nl_NL.po b/modules/po/modpython.nl_NL.po index 615bb086..3fb019a6 100644 --- a/modules/po/modpython.nl_NL.po +++ b/modules/po/modpython.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.pl_PL.po b/modules/po/modpython.pl_PL.po index bdbdf7d7..13b315c4 100644 --- a/modules/po/modpython.pl_PL.po +++ b/modules/po/modpython.pl_PL.po @@ -8,21 +8,12 @@ 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 --git a/modules/po/modpython.pt_BR.po b/modules/po/modpython.pt_BR.po index d1fe0311..8adafb0c 100644 --- a/modules/po/modpython.pt_BR.po +++ b/modules/po/modpython.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modpython.ru_RU.po b/modules/po/modpython.ru_RU.po index fc97e570..f3a2d5c0 100644 --- a/modules/po/modpython.ru_RU.po +++ b/modules/po/modpython.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/modules_online.bg_BG.po b/modules/po/modules_online.bg_BG.po index a0c0d64b..a9249329 100644 --- a/modules/po/modules_online.bg_BG.po +++ b/modules/po/modules_online.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.es_ES.po b/modules/po/modules_online.es_ES.po index 7a142ca4..b53a8e6a 100644 --- a/modules/po/modules_online.es_ES.po +++ b/modules/po/modules_online.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.fr_FR.po b/modules/po/modules_online.fr_FR.po index 205223a7..fa095e27 100644 --- a/modules/po/modules_online.fr_FR.po +++ b/modules/po/modules_online.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.id_ID.po b/modules/po/modules_online.id_ID.po index 28549df9..64457a02 100644 --- a/modules/po/modules_online.id_ID.po +++ b/modules/po/modules_online.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.it_IT.po b/modules/po/modules_online.it_IT.po index 40fdc200..484b8e5d 100644 --- a/modules/po/modules_online.it_IT.po +++ b/modules/po/modules_online.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.nl_NL.po b/modules/po/modules_online.nl_NL.po index 2becdf58..aac2a9dc 100644 --- a/modules/po/modules_online.nl_NL.po +++ b/modules/po/modules_online.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.pl_PL.po b/modules/po/modules_online.pl_PL.po index 723d5b59..69ec9c93 100644 --- a/modules/po/modules_online.pl_PL.po +++ b/modules/po/modules_online.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/modules_online.pt_BR.po b/modules/po/modules_online.pt_BR.po index ba113945..eb4692aa 100644 --- a/modules/po/modules_online.pt_BR.po +++ b/modules/po/modules_online.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/modules_online.ru_RU.po b/modules/po/modules_online.ru_RU.po index ffe5a268..82312d2a 100644 --- a/modules/po/modules_online.ru_RU.po +++ b/modules/po/modules_online.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/nickserv.bg_BG.po b/modules/po/nickserv.bg_BG.po index 336353cc..902f69d2 100644 --- a/modules/po/nickserv.bg_BG.po +++ b/modules/po/nickserv.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.es_ES.po b/modules/po/nickserv.es_ES.po index 263887f4..c4a77fba 100644 --- a/modules/po/nickserv.es_ES.po +++ b/modules/po/nickserv.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.fr_FR.po b/modules/po/nickserv.fr_FR.po index bb05b230..de74a88e 100644 --- a/modules/po/nickserv.fr_FR.po +++ b/modules/po/nickserv.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.id_ID.po b/modules/po/nickserv.id_ID.po index 747260b7..3cee07a4 100644 --- a/modules/po/nickserv.id_ID.po +++ b/modules/po/nickserv.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.it_IT.po b/modules/po/nickserv.it_IT.po index 959a87a0..31455733 100644 --- a/modules/po/nickserv.it_IT.po +++ b/modules/po/nickserv.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.nl_NL.po b/modules/po/nickserv.nl_NL.po index 943bb47f..723eb017 100644 --- a/modules/po/nickserv.nl_NL.po +++ b/modules/po/nickserv.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.pl_PL.po b/modules/po/nickserv.pl_PL.po index b79f5b8f..c864dbc1 100644 --- a/modules/po/nickserv.pl_PL.po +++ b/modules/po/nickserv.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/nickserv.pt_BR.po b/modules/po/nickserv.pt_BR.po index 8ccca85f..62104726 100644 --- a/modules/po/nickserv.pt_BR.po +++ b/modules/po/nickserv.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/nickserv.ru_RU.po b/modules/po/nickserv.ru_RU.po index 0667e311..a6bee5a1 100644 --- a/modules/po/nickserv.ru_RU.po +++ b/modules/po/nickserv.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/notes.bg_BG.po b/modules/po/notes.bg_BG.po index 36973c34..47856150 100644 --- a/modules/po/notes.bg_BG.po +++ b/modules/po/notes.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.es_ES.po b/modules/po/notes.es_ES.po index 451e1b51..25f96361 100644 --- a/modules/po/notes.es_ES.po +++ b/modules/po/notes.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.fr_FR.po b/modules/po/notes.fr_FR.po index 4057fc14..d18759e8 100644 --- a/modules/po/notes.fr_FR.po +++ b/modules/po/notes.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.id_ID.po b/modules/po/notes.id_ID.po index 5ee29632..98850154 100644 --- a/modules/po/notes.id_ID.po +++ b/modules/po/notes.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.it_IT.po b/modules/po/notes.it_IT.po index 306cda82..622574a1 100644 --- a/modules/po/notes.it_IT.po +++ b/modules/po/notes.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.nl_NL.po b/modules/po/notes.nl_NL.po index 3939b155..8aa0abf4 100644 --- a/modules/po/notes.nl_NL.po +++ b/modules/po/notes.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.pl_PL.po b/modules/po/notes.pl_PL.po index 382e9ec4..1f32107b 100644 --- a/modules/po/notes.pl_PL.po +++ b/modules/po/notes.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/notes.pt_BR.po b/modules/po/notes.pt_BR.po index 7c456fca..cc11357e 100644 --- a/modules/po/notes.pt_BR.po +++ b/modules/po/notes.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notes.ru_RU.po b/modules/po/notes.ru_RU.po index db4b5b74..c94c8cbf 100644 --- a/modules/po/notes.ru_RU.po +++ b/modules/po/notes.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/notify_connect.bg_BG.po b/modules/po/notify_connect.bg_BG.po index 2c2ee5fd..f590f639 100644 --- a/modules/po/notify_connect.bg_BG.po +++ b/modules/po/notify_connect.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.es_ES.po b/modules/po/notify_connect.es_ES.po index bed2b105..a83bce84 100644 --- a/modules/po/notify_connect.es_ES.po +++ b/modules/po/notify_connect.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.fr_FR.po b/modules/po/notify_connect.fr_FR.po index 9157e0d4..881d67da 100644 --- a/modules/po/notify_connect.fr_FR.po +++ b/modules/po/notify_connect.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.id_ID.po b/modules/po/notify_connect.id_ID.po index 24701947..2f970b02 100644 --- a/modules/po/notify_connect.id_ID.po +++ b/modules/po/notify_connect.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.it_IT.po b/modules/po/notify_connect.it_IT.po index 642a01d6..3976096f 100644 --- a/modules/po/notify_connect.it_IT.po +++ b/modules/po/notify_connect.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.nl_NL.po b/modules/po/notify_connect.nl_NL.po index 6eb55c01..9e3b9a7c 100644 --- a/modules/po/notify_connect.nl_NL.po +++ b/modules/po/notify_connect.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.pl_PL.po b/modules/po/notify_connect.pl_PL.po index cc11e5c4..9155d40a 100644 --- a/modules/po/notify_connect.pl_PL.po +++ b/modules/po/notify_connect.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/notify_connect.pt_BR.po b/modules/po/notify_connect.pt_BR.po index c107c0c6..4d62416a 100644 --- a/modules/po/notify_connect.pt_BR.po +++ b/modules/po/notify_connect.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/notify_connect.ru_RU.po b/modules/po/notify_connect.ru_RU.po index 13d46913..f1c5b804 100644 --- a/modules/po/notify_connect.ru_RU.po +++ b/modules/po/notify_connect.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/perform.bg_BG.po b/modules/po/perform.bg_BG.po index c6d95c2d..55959c76 100644 --- a/modules/po/perform.bg_BG.po +++ b/modules/po/perform.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.es_ES.po b/modules/po/perform.es_ES.po index a9a7098e..f9f89e3a 100644 --- a/modules/po/perform.es_ES.po +++ b/modules/po/perform.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.fr_FR.po b/modules/po/perform.fr_FR.po index dc5cc844..526399ba 100644 --- a/modules/po/perform.fr_FR.po +++ b/modules/po/perform.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.id_ID.po b/modules/po/perform.id_ID.po index c316cf80..87f32225 100644 --- a/modules/po/perform.id_ID.po +++ b/modules/po/perform.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.it_IT.po b/modules/po/perform.it_IT.po index 6536b7c6..c9bf6d9b 100644 --- a/modules/po/perform.it_IT.po +++ b/modules/po/perform.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.nl_NL.po b/modules/po/perform.nl_NL.po index dd0769a5..d8c08746 100644 --- a/modules/po/perform.nl_NL.po +++ b/modules/po/perform.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.pl_PL.po b/modules/po/perform.pl_PL.po index dcb446d1..86fb98b4 100644 --- a/modules/po/perform.pl_PL.po +++ b/modules/po/perform.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/perform.pt_BR.po b/modules/po/perform.pt_BR.po index 50cf8655..246d9321 100644 --- a/modules/po/perform.pt_BR.po +++ b/modules/po/perform.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perform.ru_RU.po b/modules/po/perform.ru_RU.po index c46e8141..b4bab31c 100644 --- a/modules/po/perform.ru_RU.po +++ b/modules/po/perform.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/perleval.bg_BG.po b/modules/po/perleval.bg_BG.po index af19a85d..e9c58232 100644 --- a/modules/po/perleval.bg_BG.po +++ b/modules/po/perleval.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.es_ES.po b/modules/po/perleval.es_ES.po index 3113321f..9f65a730 100644 --- a/modules/po/perleval.es_ES.po +++ b/modules/po/perleval.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.fr_FR.po b/modules/po/perleval.fr_FR.po index 6595468f..bc02e552 100644 --- a/modules/po/perleval.fr_FR.po +++ b/modules/po/perleval.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.id_ID.po b/modules/po/perleval.id_ID.po index 88581e84..358a8a9a 100644 --- a/modules/po/perleval.id_ID.po +++ b/modules/po/perleval.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.it_IT.po b/modules/po/perleval.it_IT.po index 28f58480..9abef01d 100644 --- a/modules/po/perleval.it_IT.po +++ b/modules/po/perleval.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.nl_NL.po b/modules/po/perleval.nl_NL.po index a082748b..2497c70a 100644 --- a/modules/po/perleval.nl_NL.po +++ b/modules/po/perleval.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.pl_PL.po b/modules/po/perleval.pl_PL.po index b1ca932c..4cfff577 100644 --- a/modules/po/perleval.pl_PL.po +++ b/modules/po/perleval.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/perleval.pt_BR.po b/modules/po/perleval.pt_BR.po index 389eb47a..48023222 100644 --- a/modules/po/perleval.pt_BR.po +++ b/modules/po/perleval.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/perleval.ru_RU.po b/modules/po/perleval.ru_RU.po index 72e6eca0..8355feed 100644 --- a/modules/po/perleval.ru_RU.po +++ b/modules/po/perleval.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/pyeval.bg_BG.po b/modules/po/pyeval.bg_BG.po index 1294396e..848f374d 100644 --- a/modules/po/pyeval.bg_BG.po +++ b/modules/po/pyeval.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.es_ES.po b/modules/po/pyeval.es_ES.po index 475c5b15..12a76213 100644 --- a/modules/po/pyeval.es_ES.po +++ b/modules/po/pyeval.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.fr_FR.po b/modules/po/pyeval.fr_FR.po index c8d60231..7b9776db 100644 --- a/modules/po/pyeval.fr_FR.po +++ b/modules/po/pyeval.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.id_ID.po b/modules/po/pyeval.id_ID.po index fcd3096b..6ff56b0b 100644 --- a/modules/po/pyeval.id_ID.po +++ b/modules/po/pyeval.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.it_IT.po b/modules/po/pyeval.it_IT.po index 043e6856..3dc13005 100644 --- a/modules/po/pyeval.it_IT.po +++ b/modules/po/pyeval.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.nl_NL.po b/modules/po/pyeval.nl_NL.po index f7fabfbd..543e9d0e 100644 --- a/modules/po/pyeval.nl_NL.po +++ b/modules/po/pyeval.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.pl_PL.po b/modules/po/pyeval.pl_PL.po index 638b0c81..f3961f05 100644 --- a/modules/po/pyeval.pl_PL.po +++ b/modules/po/pyeval.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/pyeval.pt_BR.po b/modules/po/pyeval.pt_BR.po index acaa7976..ef36873d 100644 --- a/modules/po/pyeval.pt_BR.po +++ b/modules/po/pyeval.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/pyeval.ru_RU.po b/modules/po/pyeval.ru_RU.po index 27a9bc1f..13f55025 100644 --- a/modules/po/pyeval.ru_RU.po +++ b/modules/po/pyeval.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/raw.bg_BG.po b/modules/po/raw.bg_BG.po index 72cf1f9a..759f6bd7 100644 --- a/modules/po/raw.bg_BG.po +++ b/modules/po/raw.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.es_ES.po b/modules/po/raw.es_ES.po index a65a4e6d..24badec3 100644 --- a/modules/po/raw.es_ES.po +++ b/modules/po/raw.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.fr_FR.po b/modules/po/raw.fr_FR.po index 1e95e5af..58643842 100644 --- a/modules/po/raw.fr_FR.po +++ b/modules/po/raw.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.id_ID.po b/modules/po/raw.id_ID.po index 779ddd06..9ac7ab78 100644 --- a/modules/po/raw.id_ID.po +++ b/modules/po/raw.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.it_IT.po b/modules/po/raw.it_IT.po index 1f7d1d4c..46844540 100644 --- a/modules/po/raw.it_IT.po +++ b/modules/po/raw.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.nl_NL.po b/modules/po/raw.nl_NL.po index cf3c62ca..8d33c0ad 100644 --- a/modules/po/raw.nl_NL.po +++ b/modules/po/raw.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.pl_PL.po b/modules/po/raw.pl_PL.po index 7b1e3a31..f63b7c9c 100644 --- a/modules/po/raw.pl_PL.po +++ b/modules/po/raw.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/raw.pt_BR.po b/modules/po/raw.pt_BR.po index a478141d..4275586e 100644 --- a/modules/po/raw.pt_BR.po +++ b/modules/po/raw.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/raw.ru_RU.po b/modules/po/raw.ru_RU.po index 3ae08285..da8b7d27 100644 --- a/modules/po/raw.ru_RU.po +++ b/modules/po/raw.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/route_replies.bg_BG.po b/modules/po/route_replies.bg_BG.po index 8efc0887..bb407e7f 100644 --- a/modules/po/route_replies.bg_BG.po +++ b/modules/po/route_replies.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.es_ES.po b/modules/po/route_replies.es_ES.po index 74404270..3b933391 100644 --- a/modules/po/route_replies.es_ES.po +++ b/modules/po/route_replies.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.fr_FR.po b/modules/po/route_replies.fr_FR.po index 7b01c630..c6058712 100644 --- a/modules/po/route_replies.fr_FR.po +++ b/modules/po/route_replies.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.id_ID.po b/modules/po/route_replies.id_ID.po index 56d4930f..e34033fa 100644 --- a/modules/po/route_replies.id_ID.po +++ b/modules/po/route_replies.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.it_IT.po b/modules/po/route_replies.it_IT.po index 33ad5dca..ebb85112 100644 --- a/modules/po/route_replies.it_IT.po +++ b/modules/po/route_replies.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.nl_NL.po b/modules/po/route_replies.nl_NL.po index d059229c..83070b1c 100644 --- a/modules/po/route_replies.nl_NL.po +++ b/modules/po/route_replies.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.pl_PL.po b/modules/po/route_replies.pl_PL.po index ff6b0894..57c76f5c 100644 --- a/modules/po/route_replies.pl_PL.po +++ b/modules/po/route_replies.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/route_replies.pt_BR.po b/modules/po/route_replies.pt_BR.po index ce14be74..63e50f22 100644 --- a/modules/po/route_replies.pt_BR.po +++ b/modules/po/route_replies.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/route_replies.ru_RU.po b/modules/po/route_replies.ru_RU.po index 1d0bac12..dbfcc444 100644 --- a/modules/po/route_replies.ru_RU.po +++ b/modules/po/route_replies.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/sample.bg_BG.po b/modules/po/sample.bg_BG.po index eaf530ba..e4c7c047 100644 --- a/modules/po/sample.bg_BG.po +++ b/modules/po/sample.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.es_ES.po b/modules/po/sample.es_ES.po index cc7a6e11..1c0c4fbd 100644 --- a/modules/po/sample.es_ES.po +++ b/modules/po/sample.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.fr_FR.po b/modules/po/sample.fr_FR.po index c13f4ec3..a93358b0 100644 --- a/modules/po/sample.fr_FR.po +++ b/modules/po/sample.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.id_ID.po b/modules/po/sample.id_ID.po index f96e83ec..17032ef6 100644 --- a/modules/po/sample.id_ID.po +++ b/modules/po/sample.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.it_IT.po b/modules/po/sample.it_IT.po index f09fe260..3c50c8ba 100644 --- a/modules/po/sample.it_IT.po +++ b/modules/po/sample.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.nl_NL.po b/modules/po/sample.nl_NL.po index f789bfd1..f6f0384e 100644 --- a/modules/po/sample.nl_NL.po +++ b/modules/po/sample.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.pl_PL.po b/modules/po/sample.pl_PL.po index 4d0bcc15..67006132 100644 --- a/modules/po/sample.pl_PL.po +++ b/modules/po/sample.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/sample.pt_BR.po b/modules/po/sample.pt_BR.po index 4b9c4e86..011d0094 100644 --- a/modules/po/sample.pt_BR.po +++ b/modules/po/sample.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sample.ru_RU.po b/modules/po/sample.ru_RU.po index 7b7698ef..b2fc8e3d 100644 --- a/modules/po/sample.ru_RU.po +++ b/modules/po/sample.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/samplewebapi.bg_BG.po b/modules/po/samplewebapi.bg_BG.po index b6502d1c..361b138d 100644 --- a/modules/po/samplewebapi.bg_BG.po +++ b/modules/po/samplewebapi.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.es_ES.po b/modules/po/samplewebapi.es_ES.po index 138fe0aa..b1f8ab7e 100644 --- a/modules/po/samplewebapi.es_ES.po +++ b/modules/po/samplewebapi.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.fr_FR.po b/modules/po/samplewebapi.fr_FR.po index b3c874ba..147abe93 100644 --- a/modules/po/samplewebapi.fr_FR.po +++ b/modules/po/samplewebapi.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.id_ID.po b/modules/po/samplewebapi.id_ID.po index a12613e1..449e0f48 100644 --- a/modules/po/samplewebapi.id_ID.po +++ b/modules/po/samplewebapi.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.it_IT.po b/modules/po/samplewebapi.it_IT.po index a8274775..163b4858 100644 --- a/modules/po/samplewebapi.it_IT.po +++ b/modules/po/samplewebapi.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.nl_NL.po b/modules/po/samplewebapi.nl_NL.po index aebc82f4..0103896d 100644 --- a/modules/po/samplewebapi.nl_NL.po +++ b/modules/po/samplewebapi.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.pl_PL.po b/modules/po/samplewebapi.pl_PL.po index 0acc413d..731afa87 100644 --- a/modules/po/samplewebapi.pl_PL.po +++ b/modules/po/samplewebapi.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/samplewebapi.pt_BR.po b/modules/po/samplewebapi.pt_BR.po index 0dd81910..b6f0d482 100644 --- a/modules/po/samplewebapi.pt_BR.po +++ b/modules/po/samplewebapi.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/samplewebapi.ru_RU.po b/modules/po/samplewebapi.ru_RU.po index d883a1e0..04467ac9 100644 --- a/modules/po/samplewebapi.ru_RU.po +++ b/modules/po/samplewebapi.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/sasl.bg_BG.po b/modules/po/sasl.bg_BG.po index 87c1767a..d898b9a2 100644 --- a/modules/po/sasl.bg_BG.po +++ b/modules/po/sasl.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.es_ES.po b/modules/po/sasl.es_ES.po index 4a470962..ac778e0d 100644 --- a/modules/po/sasl.es_ES.po +++ b/modules/po/sasl.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.fr_FR.po b/modules/po/sasl.fr_FR.po index c2e63e37..14db9a8e 100644 --- a/modules/po/sasl.fr_FR.po +++ b/modules/po/sasl.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.id_ID.po b/modules/po/sasl.id_ID.po index 3f4eb6c0..cf7fffdc 100644 --- a/modules/po/sasl.id_ID.po +++ b/modules/po/sasl.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.it_IT.po b/modules/po/sasl.it_IT.po index ae0e9399..b6aba7be 100644 --- a/modules/po/sasl.it_IT.po +++ b/modules/po/sasl.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.nl_NL.po b/modules/po/sasl.nl_NL.po index 0210d926..714d1753 100644 --- a/modules/po/sasl.nl_NL.po +++ b/modules/po/sasl.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.pl_PL.po b/modules/po/sasl.pl_PL.po index 35fc6d07..9606c50a 100644 --- a/modules/po/sasl.pl_PL.po +++ b/modules/po/sasl.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/sasl.pt_BR.po b/modules/po/sasl.pt_BR.po index f8eb8242..9197a66b 100644 --- a/modules/po/sasl.pt_BR.po +++ b/modules/po/sasl.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/sasl.ru_RU.po b/modules/po/sasl.ru_RU.po index 33b34148..b8e9d533 100644 --- a/modules/po/sasl.ru_RU.po +++ b/modules/po/sasl.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/savebuff.bg_BG.po b/modules/po/savebuff.bg_BG.po index f880aa55..33bed609 100644 --- a/modules/po/savebuff.bg_BG.po +++ b/modules/po/savebuff.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.es_ES.po b/modules/po/savebuff.es_ES.po index 5fb7d759..90a2b5d3 100644 --- a/modules/po/savebuff.es_ES.po +++ b/modules/po/savebuff.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.fr_FR.po b/modules/po/savebuff.fr_FR.po index cf4c2ece..8e51acbc 100644 --- a/modules/po/savebuff.fr_FR.po +++ b/modules/po/savebuff.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.id_ID.po b/modules/po/savebuff.id_ID.po index 33135a0d..d3e8b522 100644 --- a/modules/po/savebuff.id_ID.po +++ b/modules/po/savebuff.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.it_IT.po b/modules/po/savebuff.it_IT.po index 324c992a..0bb0641d 100644 --- a/modules/po/savebuff.it_IT.po +++ b/modules/po/savebuff.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.nl_NL.po b/modules/po/savebuff.nl_NL.po index 6faf6b4e..759b2e9e 100644 --- a/modules/po/savebuff.nl_NL.po +++ b/modules/po/savebuff.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.pl_PL.po b/modules/po/savebuff.pl_PL.po index 5fa8e12d..157ecd2f 100644 --- a/modules/po/savebuff.pl_PL.po +++ b/modules/po/savebuff.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/savebuff.pt_BR.po b/modules/po/savebuff.pt_BR.po index 4ef8fc5c..dc756ffc 100644 --- a/modules/po/savebuff.pt_BR.po +++ b/modules/po/savebuff.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/savebuff.ru_RU.po b/modules/po/savebuff.ru_RU.po index 85d6235f..4236d64c 100644 --- a/modules/po/savebuff.ru_RU.po +++ b/modules/po/savebuff.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/send_raw.bg_BG.po b/modules/po/send_raw.bg_BG.po index c3986755..c99b5a13 100644 --- a/modules/po/send_raw.bg_BG.po +++ b/modules/po/send_raw.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.es_ES.po b/modules/po/send_raw.es_ES.po index 4a1fae36..e771ee77 100644 --- a/modules/po/send_raw.es_ES.po +++ b/modules/po/send_raw.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.fr_FR.po b/modules/po/send_raw.fr_FR.po index 85aa7773..f8ec5887 100644 --- a/modules/po/send_raw.fr_FR.po +++ b/modules/po/send_raw.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.id_ID.po b/modules/po/send_raw.id_ID.po index 0340552c..aa609e5a 100644 --- a/modules/po/send_raw.id_ID.po +++ b/modules/po/send_raw.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.it_IT.po b/modules/po/send_raw.it_IT.po index 709fc069..b2c3a7e4 100644 --- a/modules/po/send_raw.it_IT.po +++ b/modules/po/send_raw.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.nl_NL.po b/modules/po/send_raw.nl_NL.po index 43abcf3f..f7d435cc 100644 --- a/modules/po/send_raw.nl_NL.po +++ b/modules/po/send_raw.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.pl_PL.po b/modules/po/send_raw.pl_PL.po index ea2aeaac..ebca335f 100644 --- a/modules/po/send_raw.pl_PL.po +++ b/modules/po/send_raw.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/send_raw.pt_BR.po b/modules/po/send_raw.pt_BR.po index 2448a16c..778b9e78 100644 --- a/modules/po/send_raw.pt_BR.po +++ b/modules/po/send_raw.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/send_raw.ru_RU.po b/modules/po/send_raw.ru_RU.po index bc88712a..62b4b66f 100644 --- a/modules/po/send_raw.ru_RU.po +++ b/modules/po/send_raw.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/shell.bg_BG.po b/modules/po/shell.bg_BG.po index 56e72b69..76c66891 100644 --- a/modules/po/shell.bg_BG.po +++ b/modules/po/shell.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.es_ES.po b/modules/po/shell.es_ES.po index c3e66385..8e344a10 100644 --- a/modules/po/shell.es_ES.po +++ b/modules/po/shell.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.fr_FR.po b/modules/po/shell.fr_FR.po index 539430bd..c946f9e0 100644 --- a/modules/po/shell.fr_FR.po +++ b/modules/po/shell.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.id_ID.po b/modules/po/shell.id_ID.po index 34ee5b1b..93518d04 100644 --- a/modules/po/shell.id_ID.po +++ b/modules/po/shell.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.it_IT.po b/modules/po/shell.it_IT.po index 3bd0bba4..b825cb51 100644 --- a/modules/po/shell.it_IT.po +++ b/modules/po/shell.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.nl_NL.po b/modules/po/shell.nl_NL.po index a745612b..acbce2e0 100644 --- a/modules/po/shell.nl_NL.po +++ b/modules/po/shell.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.pl_PL.po b/modules/po/shell.pl_PL.po index fb7abdf1..dd63d3c4 100644 --- a/modules/po/shell.pl_PL.po +++ b/modules/po/shell.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/shell.pt_BR.po b/modules/po/shell.pt_BR.po index 41e540d6..f320da16 100644 --- a/modules/po/shell.pt_BR.po +++ b/modules/po/shell.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/shell.ru_RU.po b/modules/po/shell.ru_RU.po index a087c46d..17101efb 100644 --- a/modules/po/shell.ru_RU.po +++ b/modules/po/shell.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/simple_away.bg_BG.po b/modules/po/simple_away.bg_BG.po index ede2533a..f7c00101 100644 --- a/modules/po/simple_away.bg_BG.po +++ b/modules/po/simple_away.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.es_ES.po b/modules/po/simple_away.es_ES.po index 51894376..70f491d4 100644 --- a/modules/po/simple_away.es_ES.po +++ b/modules/po/simple_away.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.fr_FR.po b/modules/po/simple_away.fr_FR.po index 3993f12e..2785a515 100644 --- a/modules/po/simple_away.fr_FR.po +++ b/modules/po/simple_away.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.id_ID.po b/modules/po/simple_away.id_ID.po index 003abf5b..3aee727d 100644 --- a/modules/po/simple_away.id_ID.po +++ b/modules/po/simple_away.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.it_IT.po b/modules/po/simple_away.it_IT.po index 3b37673d..4b21a224 100644 --- a/modules/po/simple_away.it_IT.po +++ b/modules/po/simple_away.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.nl_NL.po b/modules/po/simple_away.nl_NL.po index c8d2f650..cf568bc8 100644 --- a/modules/po/simple_away.nl_NL.po +++ b/modules/po/simple_away.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.pl_PL.po b/modules/po/simple_away.pl_PL.po index 23d33c2e..71dce0e5 100644 --- a/modules/po/simple_away.pl_PL.po +++ b/modules/po/simple_away.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/simple_away.pt_BR.po b/modules/po/simple_away.pt_BR.po index 2c814d47..da28dabb 100644 --- a/modules/po/simple_away.pt_BR.po +++ b/modules/po/simple_away.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/simple_away.ru_RU.po b/modules/po/simple_away.ru_RU.po index 0f7cf14d..896cbda7 100644 --- a/modules/po/simple_away.ru_RU.po +++ b/modules/po/simple_away.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/stickychan.bg_BG.po b/modules/po/stickychan.bg_BG.po index d4da716c..375ef818 100644 --- a/modules/po/stickychan.bg_BG.po +++ b/modules/po/stickychan.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.es_ES.po b/modules/po/stickychan.es_ES.po index 3785bbe6..29c5a608 100644 --- a/modules/po/stickychan.es_ES.po +++ b/modules/po/stickychan.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.fr_FR.po b/modules/po/stickychan.fr_FR.po index 78b83792..8d4b7975 100644 --- a/modules/po/stickychan.fr_FR.po +++ b/modules/po/stickychan.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.id_ID.po b/modules/po/stickychan.id_ID.po index 54a65e76..689bd71e 100644 --- a/modules/po/stickychan.id_ID.po +++ b/modules/po/stickychan.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.it_IT.po b/modules/po/stickychan.it_IT.po index be531072..ea47bf9f 100644 --- a/modules/po/stickychan.it_IT.po +++ b/modules/po/stickychan.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.nl_NL.po b/modules/po/stickychan.nl_NL.po index 7acf5c86..664aaa7d 100644 --- a/modules/po/stickychan.nl_NL.po +++ b/modules/po/stickychan.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.pl_PL.po b/modules/po/stickychan.pl_PL.po index d34dd46b..a03b766d 100644 --- a/modules/po/stickychan.pl_PL.po +++ b/modules/po/stickychan.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/stickychan.pt_BR.po b/modules/po/stickychan.pt_BR.po index 7594d7e2..f443e8ab 100644 --- a/modules/po/stickychan.pt_BR.po +++ b/modules/po/stickychan.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stickychan.ru_RU.po b/modules/po/stickychan.ru_RU.po index d5a11dea..b387623e 100644 --- a/modules/po/stickychan.ru_RU.po +++ b/modules/po/stickychan.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/stripcontrols.bg_BG.po b/modules/po/stripcontrols.bg_BG.po index b262d062..d711a6e5 100644 --- a/modules/po/stripcontrols.bg_BG.po +++ b/modules/po/stripcontrols.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.es_ES.po b/modules/po/stripcontrols.es_ES.po index 63827d3c..a934a5ee 100644 --- a/modules/po/stripcontrols.es_ES.po +++ b/modules/po/stripcontrols.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.fr_FR.po b/modules/po/stripcontrols.fr_FR.po index f121f0e2..1b5ba780 100644 --- a/modules/po/stripcontrols.fr_FR.po +++ b/modules/po/stripcontrols.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.id_ID.po b/modules/po/stripcontrols.id_ID.po index 9be07e7a..8904b06c 100644 --- a/modules/po/stripcontrols.id_ID.po +++ b/modules/po/stripcontrols.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.it_IT.po b/modules/po/stripcontrols.it_IT.po index 6bf29fee..50c10aa2 100644 --- a/modules/po/stripcontrols.it_IT.po +++ b/modules/po/stripcontrols.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.nl_NL.po b/modules/po/stripcontrols.nl_NL.po index 0576373b..54d3d17c 100644 --- a/modules/po/stripcontrols.nl_NL.po +++ b/modules/po/stripcontrols.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.pl_PL.po b/modules/po/stripcontrols.pl_PL.po index edab96f0..81001f83 100644 --- a/modules/po/stripcontrols.pl_PL.po +++ b/modules/po/stripcontrols.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/stripcontrols.pt_BR.po b/modules/po/stripcontrols.pt_BR.po index 09674abf..cb8a91c1 100644 --- a/modules/po/stripcontrols.pt_BR.po +++ b/modules/po/stripcontrols.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/stripcontrols.ru_RU.po b/modules/po/stripcontrols.ru_RU.po index b54ba59a..70020166 100644 --- a/modules/po/stripcontrols.ru_RU.po +++ b/modules/po/stripcontrols.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/watch.bg_BG.po b/modules/po/watch.bg_BG.po index c73ef112..e6f9a61f 100644 --- a/modules/po/watch.bg_BG.po +++ b/modules/po/watch.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.es_ES.po b/modules/po/watch.es_ES.po index 4af10a9e..73effead 100644 --- a/modules/po/watch.es_ES.po +++ b/modules/po/watch.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.fr_FR.po b/modules/po/watch.fr_FR.po index f9708148..ce7af1b9 100644 --- a/modules/po/watch.fr_FR.po +++ b/modules/po/watch.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.id_ID.po b/modules/po/watch.id_ID.po index 4ca9a1b1..95e188dd 100644 --- a/modules/po/watch.id_ID.po +++ b/modules/po/watch.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.it_IT.po b/modules/po/watch.it_IT.po index c37098ab..3d3e4cf6 100644 --- a/modules/po/watch.it_IT.po +++ b/modules/po/watch.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.nl_NL.po b/modules/po/watch.nl_NL.po index 4665aeaa..872c2086 100644 --- a/modules/po/watch.nl_NL.po +++ b/modules/po/watch.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.pl_PL.po b/modules/po/watch.pl_PL.po index 40109109..7bd3ba79 100644 --- a/modules/po/watch.pl_PL.po +++ b/modules/po/watch.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/watch.pt_BR.po b/modules/po/watch.pt_BR.po index 3477fe0d..b39abe50 100644 --- a/modules/po/watch.pt_BR.po +++ b/modules/po/watch.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/watch.ru_RU.po b/modules/po/watch.ru_RU.po index cede33c7..1f8a4777 100644 --- a/modules/po/watch.ru_RU.po +++ b/modules/po/watch.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/webadmin.bg_BG.po b/modules/po/webadmin.bg_BG.po index 4734e776..34003085 100644 --- a/modules/po/webadmin.bg_BG.po +++ b/modules/po/webadmin.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.es_ES.po b/modules/po/webadmin.es_ES.po index 82432061..6b048b25 100644 --- a/modules/po/webadmin.es_ES.po +++ b/modules/po/webadmin.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.fr_FR.po b/modules/po/webadmin.fr_FR.po index 6094628d..506c0b66 100644 --- a/modules/po/webadmin.fr_FR.po +++ b/modules/po/webadmin.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.id_ID.po b/modules/po/webadmin.id_ID.po index 4c258542..3ca4da6e 100644 --- a/modules/po/webadmin.id_ID.po +++ b/modules/po/webadmin.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.it_IT.po b/modules/po/webadmin.it_IT.po index 6c714800..552ec006 100644 --- a/modules/po/webadmin.it_IT.po +++ b/modules/po/webadmin.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.nl_NL.po b/modules/po/webadmin.nl_NL.po index 585b9ad7..60b1cd68 100644 --- a/modules/po/webadmin.nl_NL.po +++ b/modules/po/webadmin.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.pl_PL.po b/modules/po/webadmin.pl_PL.po index ac334c3a..e658d179 100644 --- a/modules/po/webadmin.pl_PL.po +++ b/modules/po/webadmin.pl_PL.po @@ -8,13 +8,8 @@ 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 --git a/modules/po/webadmin.pt_BR.po b/modules/po/webadmin.pt_BR.po index d511fc75..30420399 100644 --- a/modules/po/webadmin.pt_BR.po +++ b/modules/po/webadmin.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/modules/po/webadmin.ru_RU.po b/modules/po/webadmin.ru_RU.po index cee5a0ee..38416529 100644 --- a/modules/po/webadmin.ru_RU.po +++ b/modules/po/webadmin.ru_RU.po @@ -8,13 +8,8 @@ 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 --git a/src/po/znc.bg_BG.po b/src/po/znc.bg_BG.po index 1d4016a4..8d95a11a 100644 --- a/src/po/znc.bg_BG.po +++ b/src/po/znc.bg_BG.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.es_ES.po b/src/po/znc.es_ES.po index df2c51d4..de68195f 100644 --- a/src/po/znc.es_ES.po +++ b/src/po/znc.es_ES.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.fr_FR.po b/src/po/znc.fr_FR.po index 5d330ec7..73fae054 100644 --- a/src/po/znc.fr_FR.po +++ b/src/po/znc.fr_FR.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.id_ID.po b/src/po/znc.id_ID.po index a0a00621..65e03754 100644 --- a/src/po/znc.id_ID.po +++ b/src/po/znc.id_ID.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.it_IT.po b/src/po/znc.it_IT.po index 4bab2f40..fbbca59a 100644 --- a/src/po/znc.it_IT.po +++ b/src/po/znc.it_IT.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.nl_NL.po b/src/po/znc.nl_NL.po index f5e38c40..4125b603 100644 --- a/src/po/znc.nl_NL.po +++ b/src/po/znc.nl_NL.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.pl_PL.po b/src/po/znc.pl_PL.po index 8a9a452a..915d3d26 100644 --- a/src/po/znc.pl_PL.po +++ b/src/po/znc.pl_PL.po @@ -8,13 +8,8 @@ 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" @@ -61,7 +56,6 @@ msgstr "" "*status help” i “/msg *status loadmod <moduł>”). " "Po załadowaniu niektórych modułów WWW menu się rozwinie." -<<<<<<< HEAD #: znc.cpp:1554 msgid "User already exists" msgstr "Użytkownik już istnieje" @@ -83,29 +77,6 @@ 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}" @@ -313,17 +284,10 @@ 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 --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po index b440bd6c..84cbffce 100644 --- a/src/po/znc.pt_BR.po +++ b/src/po/znc.pt_BR.po @@ -6,13 +6,8 @@ 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 --git a/src/po/znc.ru_RU.po b/src/po/znc.ru_RU.po index cc9c701d..f2f250b7 100644 --- a/src/po/znc.ru_RU.po +++ b/src/po/znc.ru_RU.po @@ -8,13 +8,8 @@ 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"