diff --git a/modules/po/admindebug.bg_BG.po b/modules/po/admindebug.bg_BG.po index fca36ffc..5b98b270 100644 --- a/modules/po/admindebug.bg_BG.po +++ b/modules/po/admindebug.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/admindebug.es_ES.po b/modules/po/admindebug.es_ES.po index e9ec1bf9..9e5959a1 100644 --- a/modules/po/admindebug.es_ES.po +++ b/modules/po/admindebug.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/admindebug.fr_FR.po b/modules/po/admindebug.fr_FR.po index e2fc8efd..4be5f8fe 100644 --- a/modules/po/admindebug.fr_FR.po +++ b/modules/po/admindebug.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/admindebug.id_ID.po b/modules/po/admindebug.id_ID.po index dda9bdd7..8819da1a 100644 --- a/modules/po/admindebug.id_ID.po +++ b/modules/po/admindebug.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/admindebug.it_IT.po b/modules/po/admindebug.it_IT.po index 2629751b..ecbc76a5 100644 --- a/modules/po/admindebug.it_IT.po +++ b/modules/po/admindebug.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/admindebug.nl_NL.po b/modules/po/admindebug.nl_NL.po index 554b1ff9..39505115 100644 --- a/modules/po/admindebug.nl_NL.po +++ b/modules/po/admindebug.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/admindebug.pl_PL.po b/modules/po/admindebug.pl_PL.po index 893361a4..afbc43cc 100644 --- a/modules/po/admindebug.pl_PL.po +++ b/modules/po/admindebug.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/admindebug.pt_BR.po b/modules/po/admindebug.pt_BR.po index c6fbee1e..c97df2e1 100644 --- a/modules/po/admindebug.pt_BR.po +++ b/modules/po/admindebug.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/admindebug.ru_RU.po b/modules/po/admindebug.ru_RU.po index 3156f093..8842acad 100644 --- a/modules/po/admindebug.ru_RU.po +++ b/modules/po/admindebug.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "X-Crowdin-File-ID: 273\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/admindebug.pot\n" +"X-Crowdin-File-ID: 290\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/adminlog.bg_BG.po b/modules/po/adminlog.bg_BG.po index 24ff5048..aa55937f 100644 --- a/modules/po/adminlog.bg_BG.po +++ b/modules/po/adminlog.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/adminlog.es_ES.po b/modules/po/adminlog.es_ES.po index 7732ddd4..9e46d4e1 100644 --- a/modules/po/adminlog.es_ES.po +++ b/modules/po/adminlog.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/adminlog.fr_FR.po b/modules/po/adminlog.fr_FR.po index f899ab36..855a94aa 100644 --- a/modules/po/adminlog.fr_FR.po +++ b/modules/po/adminlog.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/adminlog.id_ID.po b/modules/po/adminlog.id_ID.po index f45e1e64..de0c77aa 100644 --- a/modules/po/adminlog.id_ID.po +++ b/modules/po/adminlog.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/adminlog.it_IT.po b/modules/po/adminlog.it_IT.po index aa2565ae..1ee3c391 100644 --- a/modules/po/adminlog.it_IT.po +++ b/modules/po/adminlog.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/adminlog.nl_NL.po b/modules/po/adminlog.nl_NL.po index c52d7d1a..2cef6f7c 100644 --- a/modules/po/adminlog.nl_NL.po +++ b/modules/po/adminlog.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/adminlog.pl_PL.po b/modules/po/adminlog.pl_PL.po index 130edc30..ff48120a 100644 --- a/modules/po/adminlog.pl_PL.po +++ b/modules/po/adminlog.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/adminlog.pt_BR.po b/modules/po/adminlog.pt_BR.po index ba85e916..917d8b23 100644 --- a/modules/po/adminlog.pt_BR.po +++ b/modules/po/adminlog.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/adminlog.ru_RU.po b/modules/po/adminlog.ru_RU.po index 6b301b78..a7e01a81 100644 --- a/modules/po/adminlog.ru_RU.po +++ b/modules/po/adminlog.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "X-Crowdin-File-ID: 149\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/adminlog.pot\n" +"X-Crowdin-File-ID: 294\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/alias.bg_BG.po b/modules/po/alias.bg_BG.po index 54e644be..8a3c5c4a 100644 --- a/modules/po/alias.bg_BG.po +++ b/modules/po/alias.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/alias.es_ES.po b/modules/po/alias.es_ES.po index 3289e6e1..715322bf 100644 --- a/modules/po/alias.es_ES.po +++ b/modules/po/alias.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/alias.fr_FR.po b/modules/po/alias.fr_FR.po index e7046d06..88b252d1 100644 --- a/modules/po/alias.fr_FR.po +++ b/modules/po/alias.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/alias.id_ID.po b/modules/po/alias.id_ID.po index 0dbcc95a..43c919d0 100644 --- a/modules/po/alias.id_ID.po +++ b/modules/po/alias.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/alias.it_IT.po b/modules/po/alias.it_IT.po index 5c50f009..1936def3 100644 --- a/modules/po/alias.it_IT.po +++ b/modules/po/alias.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/alias.nl_NL.po b/modules/po/alias.nl_NL.po index 3bd207e1..1d1359d3 100644 --- a/modules/po/alias.nl_NL.po +++ b/modules/po/alias.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/alias.pl_PL.po b/modules/po/alias.pl_PL.po index 0e325c47..d7e2f5d1 100644 --- a/modules/po/alias.pl_PL.po +++ b/modules/po/alias.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/alias.pt_BR.po b/modules/po/alias.pt_BR.po index 8b7c74b7..30e2a1d0 100644 --- a/modules/po/alias.pt_BR.po +++ b/modules/po/alias.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/alias.ru_RU.po b/modules/po/alias.ru_RU.po index 69e694cb..34ebef54 100644 --- a/modules/po/alias.ru_RU.po +++ b/modules/po/alias.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "X-Crowdin-File-ID: 150\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/alias.pot\n" +"X-Crowdin-File-ID: 292\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/autoattach.bg_BG.po b/modules/po/autoattach.bg_BG.po index d71c6563..762f715a 100644 --- a/modules/po/autoattach.bg_BG.po +++ b/modules/po/autoattach.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoattach.es_ES.po b/modules/po/autoattach.es_ES.po index 987e1cde..0f6df882 100644 --- a/modules/po/autoattach.es_ES.po +++ b/modules/po/autoattach.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/autoattach.fr_FR.po b/modules/po/autoattach.fr_FR.po index 17c04de3..e0c58b95 100644 --- a/modules/po/autoattach.fr_FR.po +++ b/modules/po/autoattach.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/autoattach.id_ID.po b/modules/po/autoattach.id_ID.po index a452dc40..3b74158d 100644 --- a/modules/po/autoattach.id_ID.po +++ b/modules/po/autoattach.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/autoattach.it_IT.po b/modules/po/autoattach.it_IT.po index 3febe8c4..d577ab47 100644 --- a/modules/po/autoattach.it_IT.po +++ b/modules/po/autoattach.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/autoattach.nl_NL.po b/modules/po/autoattach.nl_NL.po index c4de774a..ff2e7605 100644 --- a/modules/po/autoattach.nl_NL.po +++ b/modules/po/autoattach.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoattach.pl_PL.po b/modules/po/autoattach.pl_PL.po index 8bf1e0f8..0ce4d64c 100644 --- a/modules/po/autoattach.pl_PL.po +++ b/modules/po/autoattach.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/autoattach.pt_BR.po b/modules/po/autoattach.pt_BR.po index 385ec4dc..b8283bde 100644 --- a/modules/po/autoattach.pt_BR.po +++ b/modules/po/autoattach.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/autoattach.ru_RU.po b/modules/po/autoattach.ru_RU.po index b5378e4e..9d99534e 100644 --- a/modules/po/autoattach.ru_RU.po +++ b/modules/po/autoattach.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "X-Crowdin-File-ID: 151\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoattach.pot\n" +"X-Crowdin-File-ID: 298\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/autocycle.bg_BG.po b/modules/po/autocycle.bg_BG.po index 79165f6a..4bd14111 100644 --- a/modules/po/autocycle.bg_BG.po +++ b/modules/po/autocycle.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autocycle.es_ES.po b/modules/po/autocycle.es_ES.po index bbdd2e7f..999b3e29 100644 --- a/modules/po/autocycle.es_ES.po +++ b/modules/po/autocycle.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/autocycle.fr_FR.po b/modules/po/autocycle.fr_FR.po index b9b9c89d..3d25eaf8 100644 --- a/modules/po/autocycle.fr_FR.po +++ b/modules/po/autocycle.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/autocycle.id_ID.po b/modules/po/autocycle.id_ID.po index 2fbab50e..cab8dbfe 100644 --- a/modules/po/autocycle.id_ID.po +++ b/modules/po/autocycle.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/autocycle.it_IT.po b/modules/po/autocycle.it_IT.po index 2113064d..881181ff 100644 --- a/modules/po/autocycle.it_IT.po +++ b/modules/po/autocycle.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/autocycle.nl_NL.po b/modules/po/autocycle.nl_NL.po index e8f84126..51c5964d 100644 --- a/modules/po/autocycle.nl_NL.po +++ b/modules/po/autocycle.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autocycle.pl_PL.po b/modules/po/autocycle.pl_PL.po index 66c680c8..7f9c12f2 100644 --- a/modules/po/autocycle.pl_PL.po +++ b/modules/po/autocycle.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/autocycle.pt_BR.po b/modules/po/autocycle.pt_BR.po index 3b6cc5ff..6b53c6e2 100644 --- a/modules/po/autocycle.pt_BR.po +++ b/modules/po/autocycle.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/autocycle.ru_RU.po b/modules/po/autocycle.ru_RU.po index 0fd7edb9..60866f8d 100644 --- a/modules/po/autocycle.ru_RU.po +++ b/modules/po/autocycle.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "X-Crowdin-File-ID: 207\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autocycle.pot\n" +"X-Crowdin-File-ID: 300\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/autoop.bg_BG.po b/modules/po/autoop.bg_BG.po index 08c2b64c..c122b0f1 100644 --- a/modules/po/autoop.bg_BG.po +++ b/modules/po/autoop.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoop.es_ES.po b/modules/po/autoop.es_ES.po index 2f5645f8..e5444d69 100644 --- a/modules/po/autoop.es_ES.po +++ b/modules/po/autoop.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/autoop.fr_FR.po b/modules/po/autoop.fr_FR.po index 314a8b92..e4fb1fbb 100644 --- a/modules/po/autoop.fr_FR.po +++ b/modules/po/autoop.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/autoop.id_ID.po b/modules/po/autoop.id_ID.po index e901a884..25ea4424 100644 --- a/modules/po/autoop.id_ID.po +++ b/modules/po/autoop.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/autoop.it_IT.po b/modules/po/autoop.it_IT.po index 77be1652..839a3439 100644 --- a/modules/po/autoop.it_IT.po +++ b/modules/po/autoop.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/autoop.nl_NL.po b/modules/po/autoop.nl_NL.po index 293a2759..b0d5988a 100644 --- a/modules/po/autoop.nl_NL.po +++ b/modules/po/autoop.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoop.pl_PL.po b/modules/po/autoop.pl_PL.po index 8f9dbccd..ac06162b 100644 --- a/modules/po/autoop.pl_PL.po +++ b/modules/po/autoop.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/autoop.pt_BR.po b/modules/po/autoop.pt_BR.po index 96b47ad7..415a3e45 100644 --- a/modules/po/autoop.pt_BR.po +++ b/modules/po/autoop.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/autoop.ru_RU.po b/modules/po/autoop.ru_RU.po index 246e7314..9fa43c63 100644 --- a/modules/po/autoop.ru_RU.po +++ b/modules/po/autoop.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "X-Crowdin-File-ID: 153\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoop.pot\n" +"X-Crowdin-File-ID: 296\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/autoreply.bg_BG.po b/modules/po/autoreply.bg_BG.po index c2ec21a7..76206ea8 100644 --- a/modules/po/autoreply.bg_BG.po +++ b/modules/po/autoreply.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoreply.es_ES.po b/modules/po/autoreply.es_ES.po index 36d2f98b..a1bcb1f5 100644 --- a/modules/po/autoreply.es_ES.po +++ b/modules/po/autoreply.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/autoreply.fr_FR.po b/modules/po/autoreply.fr_FR.po index 01176d4d..9a453c8d 100644 --- a/modules/po/autoreply.fr_FR.po +++ b/modules/po/autoreply.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/autoreply.id_ID.po b/modules/po/autoreply.id_ID.po index 399a9ff8..6623a9c9 100644 --- a/modules/po/autoreply.id_ID.po +++ b/modules/po/autoreply.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/autoreply.it_IT.po b/modules/po/autoreply.it_IT.po index 21fc883b..28328765 100644 --- a/modules/po/autoreply.it_IT.po +++ b/modules/po/autoreply.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/autoreply.nl_NL.po b/modules/po/autoreply.nl_NL.po index 44379340..0895a802 100644 --- a/modules/po/autoreply.nl_NL.po +++ b/modules/po/autoreply.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoreply.pl_PL.po b/modules/po/autoreply.pl_PL.po index e7e18c5c..7da4a968 100644 --- a/modules/po/autoreply.pl_PL.po +++ b/modules/po/autoreply.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/autoreply.pt_BR.po b/modules/po/autoreply.pt_BR.po index fb705aff..34faf52a 100644 --- a/modules/po/autoreply.pt_BR.po +++ b/modules/po/autoreply.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/autoreply.ru_RU.po b/modules/po/autoreply.ru_RU.po index a9324923..ba484b38 100644 --- a/modules/po/autoreply.ru_RU.po +++ b/modules/po/autoreply.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "X-Crowdin-File-ID: 154\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autoreply.pot\n" +"X-Crowdin-File-ID: 302\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/autovoice.bg_BG.po b/modules/po/autovoice.bg_BG.po index 2dcf4b06..210a856c 100644 --- a/modules/po/autovoice.bg_BG.po +++ b/modules/po/autovoice.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autovoice.es_ES.po b/modules/po/autovoice.es_ES.po index db7dc863..66117b62 100644 --- a/modules/po/autovoice.es_ES.po +++ b/modules/po/autovoice.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/autovoice.fr_FR.po b/modules/po/autovoice.fr_FR.po index a94dc131..f7a81765 100644 --- a/modules/po/autovoice.fr_FR.po +++ b/modules/po/autovoice.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/autovoice.id_ID.po b/modules/po/autovoice.id_ID.po index 3bb5e6b9..75abf15c 100644 --- a/modules/po/autovoice.id_ID.po +++ b/modules/po/autovoice.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/autovoice.it_IT.po b/modules/po/autovoice.it_IT.po index e9b72f5e..97a618b7 100644 --- a/modules/po/autovoice.it_IT.po +++ b/modules/po/autovoice.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/autovoice.nl_NL.po b/modules/po/autovoice.nl_NL.po index 0ae812b5..7b8232b9 100644 --- a/modules/po/autovoice.nl_NL.po +++ b/modules/po/autovoice.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autovoice.pl_PL.po b/modules/po/autovoice.pl_PL.po index ba1a8b88..79f1cee9 100644 --- a/modules/po/autovoice.pl_PL.po +++ b/modules/po/autovoice.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/autovoice.pt_BR.po b/modules/po/autovoice.pt_BR.po index 2fa784ba..f5ed48d8 100644 --- a/modules/po/autovoice.pt_BR.po +++ b/modules/po/autovoice.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/autovoice.ru_RU.po b/modules/po/autovoice.ru_RU.po index 86d8a49d..0d7853b8 100644 --- a/modules/po/autovoice.ru_RU.po +++ b/modules/po/autovoice.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "X-Crowdin-File-ID: 155\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/autovoice.pot\n" +"X-Crowdin-File-ID: 304\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/awaystore.bg_BG.po b/modules/po/awaystore.bg_BG.po index 50fde298..97d10712 100644 --- a/modules/po/awaystore.bg_BG.po +++ b/modules/po/awaystore.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/awaystore.es_ES.po b/modules/po/awaystore.es_ES.po index 14e7ef9b..5f75d294 100644 --- a/modules/po/awaystore.es_ES.po +++ b/modules/po/awaystore.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/awaystore.fr_FR.po b/modules/po/awaystore.fr_FR.po index 314c4916..985eeb9e 100644 --- a/modules/po/awaystore.fr_FR.po +++ b/modules/po/awaystore.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/awaystore.id_ID.po b/modules/po/awaystore.id_ID.po index fe046126..826d3b02 100644 --- a/modules/po/awaystore.id_ID.po +++ b/modules/po/awaystore.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/awaystore.it_IT.po b/modules/po/awaystore.it_IT.po index 1d80b50b..2f0ea8ae 100644 --- a/modules/po/awaystore.it_IT.po +++ b/modules/po/awaystore.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/awaystore.nl_NL.po b/modules/po/awaystore.nl_NL.po index a7800722..34cec660 100644 --- a/modules/po/awaystore.nl_NL.po +++ b/modules/po/awaystore.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/awaystore.pl_PL.po b/modules/po/awaystore.pl_PL.po index f954069c..b78ecee1 100644 --- a/modules/po/awaystore.pl_PL.po +++ b/modules/po/awaystore.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/awaystore.pt_BR.po b/modules/po/awaystore.pt_BR.po index b474a7f8..e7b435f6 100644 --- a/modules/po/awaystore.pt_BR.po +++ b/modules/po/awaystore.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/awaystore.ru_RU.po b/modules/po/awaystore.ru_RU.po index 93e432ed..9b21de7b 100644 --- a/modules/po/awaystore.ru_RU.po +++ b/modules/po/awaystore.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "X-Crowdin-File-ID: 156\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/awaystore.pot\n" +"X-Crowdin-File-ID: 306\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/block_motd.bg_BG.po b/modules/po/block_motd.bg_BG.po index 2ed99644..26cad423 100644 --- a/modules/po/block_motd.bg_BG.po +++ b/modules/po/block_motd.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/block_motd.es_ES.po b/modules/po/block_motd.es_ES.po index 374d4bab..787ab3e5 100644 --- a/modules/po/block_motd.es_ES.po +++ b/modules/po/block_motd.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/block_motd.fr_FR.po b/modules/po/block_motd.fr_FR.po index c0098990..93461469 100644 --- a/modules/po/block_motd.fr_FR.po +++ b/modules/po/block_motd.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/block_motd.id_ID.po b/modules/po/block_motd.id_ID.po index b21f4019..bd57020f 100644 --- a/modules/po/block_motd.id_ID.po +++ b/modules/po/block_motd.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/block_motd.it_IT.po b/modules/po/block_motd.it_IT.po index 57dec5ba..59946441 100644 --- a/modules/po/block_motd.it_IT.po +++ b/modules/po/block_motd.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/block_motd.nl_NL.po b/modules/po/block_motd.nl_NL.po index 38b828df..36b40985 100644 --- a/modules/po/block_motd.nl_NL.po +++ b/modules/po/block_motd.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/block_motd.pl_PL.po b/modules/po/block_motd.pl_PL.po index f7600db8..22e65ebd 100644 --- a/modules/po/block_motd.pl_PL.po +++ b/modules/po/block_motd.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/block_motd.pt_BR.po b/modules/po/block_motd.pt_BR.po index 33d76df8..2ab71658 100644 --- a/modules/po/block_motd.pt_BR.po +++ b/modules/po/block_motd.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/block_motd.ru_RU.po b/modules/po/block_motd.ru_RU.po index 93071e87..34090299 100644 --- a/modules/po/block_motd.ru_RU.po +++ b/modules/po/block_motd.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "X-Crowdin-File-ID: 157\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/block_motd.pot\n" +"X-Crowdin-File-ID: 310\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/blockuser.bg_BG.po b/modules/po/blockuser.bg_BG.po index c9342194..4e776ce1 100644 --- a/modules/po/blockuser.bg_BG.po +++ b/modules/po/blockuser.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/blockuser.es_ES.po b/modules/po/blockuser.es_ES.po index 50bd0ed6..31fe262f 100644 --- a/modules/po/blockuser.es_ES.po +++ b/modules/po/blockuser.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/blockuser.fr_FR.po b/modules/po/blockuser.fr_FR.po index c52cb906..8698faa8 100644 --- a/modules/po/blockuser.fr_FR.po +++ b/modules/po/blockuser.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/blockuser.id_ID.po b/modules/po/blockuser.id_ID.po index c95ed576..3248e37a 100644 --- a/modules/po/blockuser.id_ID.po +++ b/modules/po/blockuser.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/blockuser.it_IT.po b/modules/po/blockuser.it_IT.po index 9072ac5d..75a35860 100644 --- a/modules/po/blockuser.it_IT.po +++ b/modules/po/blockuser.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/blockuser.nl_NL.po b/modules/po/blockuser.nl_NL.po index 8c4c17c5..c636f061 100644 --- a/modules/po/blockuser.nl_NL.po +++ b/modules/po/blockuser.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/blockuser.pl_PL.po b/modules/po/blockuser.pl_PL.po index b0fc0a3c..ddf461e8 100644 --- a/modules/po/blockuser.pl_PL.po +++ b/modules/po/blockuser.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/blockuser.pt_BR.po b/modules/po/blockuser.pt_BR.po index 12163fb3..14f69b26 100644 --- a/modules/po/blockuser.pt_BR.po +++ b/modules/po/blockuser.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/blockuser.ru_RU.po b/modules/po/blockuser.ru_RU.po index c6ff156e..9218f03d 100644 --- a/modules/po/blockuser.ru_RU.po +++ b/modules/po/blockuser.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "X-Crowdin-File-ID: 158\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/blockuser.pot\n" +"X-Crowdin-File-ID: 312\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/bouncedcc.bg_BG.po b/modules/po/bouncedcc.bg_BG.po index bf17c467..eae32087 100644 --- a/modules/po/bouncedcc.bg_BG.po +++ b/modules/po/bouncedcc.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/bouncedcc.es_ES.po b/modules/po/bouncedcc.es_ES.po index 9f42aab6..9e302198 100644 --- a/modules/po/bouncedcc.es_ES.po +++ b/modules/po/bouncedcc.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/bouncedcc.fr_FR.po b/modules/po/bouncedcc.fr_FR.po index fa4c8913..fd157993 100644 --- a/modules/po/bouncedcc.fr_FR.po +++ b/modules/po/bouncedcc.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/bouncedcc.id_ID.po b/modules/po/bouncedcc.id_ID.po index 154af713..1560da31 100644 --- a/modules/po/bouncedcc.id_ID.po +++ b/modules/po/bouncedcc.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/bouncedcc.it_IT.po b/modules/po/bouncedcc.it_IT.po index d98a5f1f..49e0a98e 100644 --- a/modules/po/bouncedcc.it_IT.po +++ b/modules/po/bouncedcc.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/bouncedcc.nl_NL.po b/modules/po/bouncedcc.nl_NL.po index 7469c72b..ef7e7aa8 100644 --- a/modules/po/bouncedcc.nl_NL.po +++ b/modules/po/bouncedcc.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/bouncedcc.pl_PL.po b/modules/po/bouncedcc.pl_PL.po index 3b974b28..c838f202 100644 --- a/modules/po/bouncedcc.pl_PL.po +++ b/modules/po/bouncedcc.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/bouncedcc.pt_BR.po b/modules/po/bouncedcc.pt_BR.po index 1f949f83..062eaaea 100644 --- a/modules/po/bouncedcc.pt_BR.po +++ b/modules/po/bouncedcc.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/bouncedcc.ru_RU.po b/modules/po/bouncedcc.ru_RU.po index cb492590..62189a55 100644 --- a/modules/po/bouncedcc.ru_RU.po +++ b/modules/po/bouncedcc.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "X-Crowdin-File-ID: 159\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/bouncedcc.pot\n" +"X-Crowdin-File-ID: 316\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/buffextras.bg_BG.po b/modules/po/buffextras.bg_BG.po index 9c8ee3d6..854913ac 100644 --- a/modules/po/buffextras.bg_BG.po +++ b/modules/po/buffextras.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/buffextras.es_ES.po b/modules/po/buffextras.es_ES.po index 5adae4b1..4ff319f8 100644 --- a/modules/po/buffextras.es_ES.po +++ b/modules/po/buffextras.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/buffextras.fr_FR.po b/modules/po/buffextras.fr_FR.po index c62da85d..608ae2b9 100644 --- a/modules/po/buffextras.fr_FR.po +++ b/modules/po/buffextras.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/buffextras.id_ID.po b/modules/po/buffextras.id_ID.po index 01ee6ebb..e7bac7e0 100644 --- a/modules/po/buffextras.id_ID.po +++ b/modules/po/buffextras.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/buffextras.it_IT.po b/modules/po/buffextras.it_IT.po index fb9d9654..8f7479a5 100644 --- a/modules/po/buffextras.it_IT.po +++ b/modules/po/buffextras.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/buffextras.nl_NL.po b/modules/po/buffextras.nl_NL.po index 2d040754..2a46ad0e 100644 --- a/modules/po/buffextras.nl_NL.po +++ b/modules/po/buffextras.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/buffextras.pl_PL.po b/modules/po/buffextras.pl_PL.po index 3dc029b9..5208d4c3 100644 --- a/modules/po/buffextras.pl_PL.po +++ b/modules/po/buffextras.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/buffextras.pt_BR.po b/modules/po/buffextras.pt_BR.po index 065a8514..cfccc990 100644 --- a/modules/po/buffextras.pt_BR.po +++ b/modules/po/buffextras.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/buffextras.ru_RU.po b/modules/po/buffextras.ru_RU.po index 32ba4509..ea00632a 100644 --- a/modules/po/buffextras.ru_RU.po +++ b/modules/po/buffextras.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "X-Crowdin-File-ID: 160\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/buffextras.pot\n" +"X-Crowdin-File-ID: 318\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/cert.bg_BG.po b/modules/po/cert.bg_BG.po index b6abbc09..53d02c94 100644 --- a/modules/po/cert.bg_BG.po +++ b/modules/po/cert.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/cert.es_ES.po b/modules/po/cert.es_ES.po index 39c4f369..68e71c14 100644 --- a/modules/po/cert.es_ES.po +++ b/modules/po/cert.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/cert.fr_FR.po b/modules/po/cert.fr_FR.po index df0fc7bf..eedbc0ba 100644 --- a/modules/po/cert.fr_FR.po +++ b/modules/po/cert.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/cert.id_ID.po b/modules/po/cert.id_ID.po index b7df124e..9848b2dc 100644 --- a/modules/po/cert.id_ID.po +++ b/modules/po/cert.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/cert.it_IT.po b/modules/po/cert.it_IT.po index c03d685e..c16bc53f 100644 --- a/modules/po/cert.it_IT.po +++ b/modules/po/cert.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/cert.nl_NL.po b/modules/po/cert.nl_NL.po index b653dbca..9a31788a 100644 --- a/modules/po/cert.nl_NL.po +++ b/modules/po/cert.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/cert.pl_PL.po b/modules/po/cert.pl_PL.po index 329ecafa..83a235eb 100644 --- a/modules/po/cert.pl_PL.po +++ b/modules/po/cert.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/cert.pt_BR.po b/modules/po/cert.pt_BR.po index 0e933b43..9f8fd065 100644 --- a/modules/po/cert.pt_BR.po +++ b/modules/po/cert.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/cert.ru_RU.po b/modules/po/cert.ru_RU.po index a0e02e38..ee3a5953 100644 --- a/modules/po/cert.ru_RU.po +++ b/modules/po/cert.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "X-Crowdin-File-ID: 161\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cert.pot\n" +"X-Crowdin-File-ID: 322\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/certauth.bg_BG.po b/modules/po/certauth.bg_BG.po index 16a23161..73510efd 100644 --- a/modules/po/certauth.bg_BG.po +++ b/modules/po/certauth.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/certauth.es_ES.po b/modules/po/certauth.es_ES.po index 14a857b9..cc489d3f 100644 --- a/modules/po/certauth.es_ES.po +++ b/modules/po/certauth.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/certauth.fr_FR.po b/modules/po/certauth.fr_FR.po index 26cafec5..9cccace2 100644 --- a/modules/po/certauth.fr_FR.po +++ b/modules/po/certauth.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/certauth.id_ID.po b/modules/po/certauth.id_ID.po index c4c2be0d..1f70ba40 100644 --- a/modules/po/certauth.id_ID.po +++ b/modules/po/certauth.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/certauth.it_IT.po b/modules/po/certauth.it_IT.po index b124566c..2106caf8 100644 --- a/modules/po/certauth.it_IT.po +++ b/modules/po/certauth.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/certauth.nl_NL.po b/modules/po/certauth.nl_NL.po index cb24a7aa..4b60ec2e 100644 --- a/modules/po/certauth.nl_NL.po +++ b/modules/po/certauth.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/certauth.pl_PL.po b/modules/po/certauth.pl_PL.po index 01fdc2d0..a4073ded 100644 --- a/modules/po/certauth.pl_PL.po +++ b/modules/po/certauth.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/certauth.pt_BR.po b/modules/po/certauth.pt_BR.po index 44ba9e5f..5d66d5e4 100644 --- a/modules/po/certauth.pt_BR.po +++ b/modules/po/certauth.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/certauth.ru_RU.po b/modules/po/certauth.ru_RU.po index 2282ed76..eb3851e2 100644 --- a/modules/po/certauth.ru_RU.po +++ b/modules/po/certauth.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "X-Crowdin-File-ID: 162\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/certauth.pot\n" +"X-Crowdin-File-ID: 324\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/chansaver.bg_BG.po b/modules/po/chansaver.bg_BG.po index fb9805b9..52bb0e44 100644 --- a/modules/po/chansaver.bg_BG.po +++ b/modules/po/chansaver.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/chansaver.es_ES.po b/modules/po/chansaver.es_ES.po index 644ce037..b28e25cb 100644 --- a/modules/po/chansaver.es_ES.po +++ b/modules/po/chansaver.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/chansaver.fr_FR.po b/modules/po/chansaver.fr_FR.po index a5e2b59a..1b65df7c 100644 --- a/modules/po/chansaver.fr_FR.po +++ b/modules/po/chansaver.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/chansaver.id_ID.po b/modules/po/chansaver.id_ID.po index a6fb3442..2902c5cd 100644 --- a/modules/po/chansaver.id_ID.po +++ b/modules/po/chansaver.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/chansaver.it_IT.po b/modules/po/chansaver.it_IT.po index 47a66e57..0c073048 100644 --- a/modules/po/chansaver.it_IT.po +++ b/modules/po/chansaver.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/chansaver.nl_NL.po b/modules/po/chansaver.nl_NL.po index de3e2907..22ac59c3 100644 --- a/modules/po/chansaver.nl_NL.po +++ b/modules/po/chansaver.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/chansaver.pl_PL.po b/modules/po/chansaver.pl_PL.po index 2f5b0d4a..2c4f16d9 100644 --- a/modules/po/chansaver.pl_PL.po +++ b/modules/po/chansaver.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/chansaver.pt_BR.po b/modules/po/chansaver.pt_BR.po index 5096b4a5..ac1593d0 100644 --- a/modules/po/chansaver.pt_BR.po +++ b/modules/po/chansaver.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/chansaver.ru_RU.po b/modules/po/chansaver.ru_RU.po index 3d22d663..36f8431a 100644 --- a/modules/po/chansaver.ru_RU.po +++ b/modules/po/chansaver.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "X-Crowdin-File-ID: 163\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/chansaver.pot\n" +"X-Crowdin-File-ID: 326\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/clearbufferonmsg.bg_BG.po b/modules/po/clearbufferonmsg.bg_BG.po index 78a88749..c125ad55 100644 --- a/modules/po/clearbufferonmsg.bg_BG.po +++ b/modules/po/clearbufferonmsg.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/clearbufferonmsg.es_ES.po b/modules/po/clearbufferonmsg.es_ES.po index a47e2143..80378d24 100644 --- a/modules/po/clearbufferonmsg.es_ES.po +++ b/modules/po/clearbufferonmsg.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/clearbufferonmsg.fr_FR.po b/modules/po/clearbufferonmsg.fr_FR.po index f2373293..675dc338 100644 --- a/modules/po/clearbufferonmsg.fr_FR.po +++ b/modules/po/clearbufferonmsg.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/clearbufferonmsg.id_ID.po b/modules/po/clearbufferonmsg.id_ID.po index 7eba1c60..bf43c00a 100644 --- a/modules/po/clearbufferonmsg.id_ID.po +++ b/modules/po/clearbufferonmsg.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/clearbufferonmsg.it_IT.po b/modules/po/clearbufferonmsg.it_IT.po index 0feabb87..def2d655 100644 --- a/modules/po/clearbufferonmsg.it_IT.po +++ b/modules/po/clearbufferonmsg.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/clearbufferonmsg.nl_NL.po b/modules/po/clearbufferonmsg.nl_NL.po index 427c8cc6..25fc22ea 100644 --- a/modules/po/clearbufferonmsg.nl_NL.po +++ b/modules/po/clearbufferonmsg.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/clearbufferonmsg.pl_PL.po b/modules/po/clearbufferonmsg.pl_PL.po index 7eb3f672..b685d1e6 100644 --- a/modules/po/clearbufferonmsg.pl_PL.po +++ b/modules/po/clearbufferonmsg.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/clearbufferonmsg.pt_BR.po b/modules/po/clearbufferonmsg.pt_BR.po index f71a9962..2f50f7f0 100644 --- a/modules/po/clearbufferonmsg.pt_BR.po +++ b/modules/po/clearbufferonmsg.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/clearbufferonmsg.ru_RU.po b/modules/po/clearbufferonmsg.ru_RU.po index 1fa8d538..d02f86b2 100644 --- a/modules/po/clearbufferonmsg.ru_RU.po +++ b/modules/po/clearbufferonmsg.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "X-Crowdin-File-ID: 164\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clearbufferonmsg.pot\n" +"X-Crowdin-File-ID: 330\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/clientnotify.bg_BG.po b/modules/po/clientnotify.bg_BG.po index a495a928..ab613097 100644 --- a/modules/po/clientnotify.bg_BG.po +++ b/modules/po/clientnotify.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/clientnotify.es_ES.po b/modules/po/clientnotify.es_ES.po index 86ed1b90..a777685f 100644 --- a/modules/po/clientnotify.es_ES.po +++ b/modules/po/clientnotify.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/clientnotify.fr_FR.po b/modules/po/clientnotify.fr_FR.po index 6b202d79..90e855f6 100644 --- a/modules/po/clientnotify.fr_FR.po +++ b/modules/po/clientnotify.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/clientnotify.id_ID.po b/modules/po/clientnotify.id_ID.po index e8bd757d..ffbaa6bd 100644 --- a/modules/po/clientnotify.id_ID.po +++ b/modules/po/clientnotify.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/clientnotify.it_IT.po b/modules/po/clientnotify.it_IT.po index 0ba5bcf9..f128d530 100644 --- a/modules/po/clientnotify.it_IT.po +++ b/modules/po/clientnotify.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/clientnotify.nl_NL.po b/modules/po/clientnotify.nl_NL.po index a787beef..08556a92 100644 --- a/modules/po/clientnotify.nl_NL.po +++ b/modules/po/clientnotify.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/clientnotify.pl_PL.po b/modules/po/clientnotify.pl_PL.po index 55abcaaa..1fd41034 100644 --- a/modules/po/clientnotify.pl_PL.po +++ b/modules/po/clientnotify.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/clientnotify.pt_BR.po b/modules/po/clientnotify.pt_BR.po index 3acb83b2..4fa925f3 100644 --- a/modules/po/clientnotify.pt_BR.po +++ b/modules/po/clientnotify.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/clientnotify.ru_RU.po b/modules/po/clientnotify.ru_RU.po index 59b2474d..95783061 100644 --- a/modules/po/clientnotify.ru_RU.po +++ b/modules/po/clientnotify.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "X-Crowdin-File-ID: 165\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/clientnotify.pot\n" +"X-Crowdin-File-ID: 328\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/controlpanel.bg_BG.po b/modules/po/controlpanel.bg_BG.po index 9275294b..2dcf7991 100644 --- a/modules/po/controlpanel.bg_BG.po +++ b/modules/po/controlpanel.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/controlpanel.es_ES.po b/modules/po/controlpanel.es_ES.po index 4e4e60c1..978b3a3d 100644 --- a/modules/po/controlpanel.es_ES.po +++ b/modules/po/controlpanel.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/controlpanel.fr_FR.po b/modules/po/controlpanel.fr_FR.po index a9813d98..ee8a4c9b 100644 --- a/modules/po/controlpanel.fr_FR.po +++ b/modules/po/controlpanel.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/controlpanel.id_ID.po b/modules/po/controlpanel.id_ID.po index 4d97edbb..4ba2d44d 100644 --- a/modules/po/controlpanel.id_ID.po +++ b/modules/po/controlpanel.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/controlpanel.it_IT.po b/modules/po/controlpanel.it_IT.po index 0159df49..b072df58 100644 --- a/modules/po/controlpanel.it_IT.po +++ b/modules/po/controlpanel.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/controlpanel.nl_NL.po b/modules/po/controlpanel.nl_NL.po index b0879332..9a968a9b 100644 --- a/modules/po/controlpanel.nl_NL.po +++ b/modules/po/controlpanel.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/controlpanel.pl_PL.po b/modules/po/controlpanel.pl_PL.po index 4806ff4d..15d0c2ff 100644 --- a/modules/po/controlpanel.pl_PL.po +++ b/modules/po/controlpanel.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -181,10 +186,17 @@ msgstr "" #: controlpanel.cpp:731 msgid "Channel {1} is deleted from network {2} of user {3}" msgid_plural "Channels {1} are deleted from network {2} of user {3}" +<<<<<<< HEAD msgstr[0] "Kanał {1} został usunięty z sieci {2} użytkownika {3}" msgstr[1] "" msgstr[2] "" msgstr[3] "Kanały {1} są usuwane z sieci {2} użytkownika {3}" +======= +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +>>>>>>> 1.8.x #: controlpanel.cpp:746 msgid "Usage: GetChan " diff --git a/modules/po/controlpanel.pt_BR.po b/modules/po/controlpanel.pt_BR.po index 76b92534..98e57cde 100644 --- a/modules/po/controlpanel.pt_BR.po +++ b/modules/po/controlpanel.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/controlpanel.ru_RU.po b/modules/po/controlpanel.ru_RU.po index b0994e7d..b7f58513 100644 --- a/modules/po/controlpanel.ru_RU.po +++ b/modules/po/controlpanel.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "X-Crowdin-File-ID: 166\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/controlpanel.pot\n" +"X-Crowdin-File-ID: 332\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/crypt.bg_BG.po b/modules/po/crypt.bg_BG.po index 009deeef..a19236c6 100644 --- a/modules/po/crypt.bg_BG.po +++ b/modules/po/crypt.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/crypt.es_ES.po b/modules/po/crypt.es_ES.po index 05919095..724f49fd 100644 --- a/modules/po/crypt.es_ES.po +++ b/modules/po/crypt.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/crypt.fr_FR.po b/modules/po/crypt.fr_FR.po index 5597ee11..2315fba3 100644 --- a/modules/po/crypt.fr_FR.po +++ b/modules/po/crypt.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/crypt.id_ID.po b/modules/po/crypt.id_ID.po index a32dac1b..3c828b76 100644 --- a/modules/po/crypt.id_ID.po +++ b/modules/po/crypt.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/crypt.it_IT.po b/modules/po/crypt.it_IT.po index 0bf43bc2..a941483e 100644 --- a/modules/po/crypt.it_IT.po +++ b/modules/po/crypt.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/crypt.nl_NL.po b/modules/po/crypt.nl_NL.po index 7e5fc1ea..588549d4 100644 --- a/modules/po/crypt.nl_NL.po +++ b/modules/po/crypt.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/crypt.pl_PL.po b/modules/po/crypt.pl_PL.po index 38fa093e..bb92b485 100644 --- a/modules/po/crypt.pl_PL.po +++ b/modules/po/crypt.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/crypt.pt_BR.po b/modules/po/crypt.pt_BR.po index 558757f5..3ae8b29a 100644 --- a/modules/po/crypt.pt_BR.po +++ b/modules/po/crypt.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/crypt.ru_RU.po b/modules/po/crypt.ru_RU.po index bebb506a..f016893c 100644 --- a/modules/po/crypt.ru_RU.po +++ b/modules/po/crypt.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "X-Crowdin-File-ID: 167\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/crypt.pot\n" +"X-Crowdin-File-ID: 334\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/ctcpflood.bg_BG.po b/modules/po/ctcpflood.bg_BG.po index 143f0174..65e53336 100644 --- a/modules/po/ctcpflood.bg_BG.po +++ b/modules/po/ctcpflood.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/ctcpflood.es_ES.po b/modules/po/ctcpflood.es_ES.po index e6d6257d..d9709180 100644 --- a/modules/po/ctcpflood.es_ES.po +++ b/modules/po/ctcpflood.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/ctcpflood.fr_FR.po b/modules/po/ctcpflood.fr_FR.po index c394e84f..cbd4add4 100644 --- a/modules/po/ctcpflood.fr_FR.po +++ b/modules/po/ctcpflood.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/ctcpflood.id_ID.po b/modules/po/ctcpflood.id_ID.po index 40a9cdd0..1b1cb320 100644 --- a/modules/po/ctcpflood.id_ID.po +++ b/modules/po/ctcpflood.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/ctcpflood.it_IT.po b/modules/po/ctcpflood.it_IT.po index 6be5694e..4b5a43db 100644 --- a/modules/po/ctcpflood.it_IT.po +++ b/modules/po/ctcpflood.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/ctcpflood.nl_NL.po b/modules/po/ctcpflood.nl_NL.po index 18a72ee2..695990fc 100644 --- a/modules/po/ctcpflood.nl_NL.po +++ b/modules/po/ctcpflood.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/ctcpflood.pl_PL.po b/modules/po/ctcpflood.pl_PL.po index 187ac315..a2e9277d 100644 --- a/modules/po/ctcpflood.pl_PL.po +++ b/modules/po/ctcpflood.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/ctcpflood.pt_BR.po b/modules/po/ctcpflood.pt_BR.po index aab58d6a..7ce54b38 100644 --- a/modules/po/ctcpflood.pt_BR.po +++ b/modules/po/ctcpflood.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/ctcpflood.ru_RU.po b/modules/po/ctcpflood.ru_RU.po index 7d614e07..5b99a436 100644 --- a/modules/po/ctcpflood.ru_RU.po +++ b/modules/po/ctcpflood.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "X-Crowdin-File-ID: 168\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/ctcpflood.pot\n" +"X-Crowdin-File-ID: 336\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/cyrusauth.bg_BG.po b/modules/po/cyrusauth.bg_BG.po index 98402b85..6df3599a 100644 --- a/modules/po/cyrusauth.bg_BG.po +++ b/modules/po/cyrusauth.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/cyrusauth.es_ES.po b/modules/po/cyrusauth.es_ES.po index f345c476..a7a2d057 100644 --- a/modules/po/cyrusauth.es_ES.po +++ b/modules/po/cyrusauth.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/cyrusauth.fr_FR.po b/modules/po/cyrusauth.fr_FR.po index 490af7c4..db259bbd 100644 --- a/modules/po/cyrusauth.fr_FR.po +++ b/modules/po/cyrusauth.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/cyrusauth.id_ID.po b/modules/po/cyrusauth.id_ID.po index e6820030..495c3210 100644 --- a/modules/po/cyrusauth.id_ID.po +++ b/modules/po/cyrusauth.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/cyrusauth.it_IT.po b/modules/po/cyrusauth.it_IT.po index 40973638..3a773f6f 100644 --- a/modules/po/cyrusauth.it_IT.po +++ b/modules/po/cyrusauth.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/cyrusauth.nl_NL.po b/modules/po/cyrusauth.nl_NL.po index 6cb6b6ac..df2d4e89 100644 --- a/modules/po/cyrusauth.nl_NL.po +++ b/modules/po/cyrusauth.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/cyrusauth.pl_PL.po b/modules/po/cyrusauth.pl_PL.po index 508deb36..879cd007 100644 --- a/modules/po/cyrusauth.pl_PL.po +++ b/modules/po/cyrusauth.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/cyrusauth.pt_BR.po b/modules/po/cyrusauth.pt_BR.po index 3940022f..151e47f3 100644 --- a/modules/po/cyrusauth.pt_BR.po +++ b/modules/po/cyrusauth.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/cyrusauth.ru_RU.po b/modules/po/cyrusauth.ru_RU.po index 1eaffa73..018a20a3 100644 --- a/modules/po/cyrusauth.ru_RU.po +++ b/modules/po/cyrusauth.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "X-Crowdin-File-ID: 169\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/cyrusauth.pot\n" +"X-Crowdin-File-ID: 338\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/dcc.bg_BG.po b/modules/po/dcc.bg_BG.po index 498349f1..3f04252d 100644 --- a/modules/po/dcc.bg_BG.po +++ b/modules/po/dcc.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/dcc.es_ES.po b/modules/po/dcc.es_ES.po index 3c8f4d6d..aa163b41 100644 --- a/modules/po/dcc.es_ES.po +++ b/modules/po/dcc.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/dcc.fr_FR.po b/modules/po/dcc.fr_FR.po index 225e82ca..d0ade9eb 100644 --- a/modules/po/dcc.fr_FR.po +++ b/modules/po/dcc.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/dcc.id_ID.po b/modules/po/dcc.id_ID.po index f1af517b..2f1b7fb3 100644 --- a/modules/po/dcc.id_ID.po +++ b/modules/po/dcc.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/dcc.it_IT.po b/modules/po/dcc.it_IT.po index b49e4771..ec926f33 100644 --- a/modules/po/dcc.it_IT.po +++ b/modules/po/dcc.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/dcc.nl_NL.po b/modules/po/dcc.nl_NL.po index f85f87ab..05c87019 100644 --- a/modules/po/dcc.nl_NL.po +++ b/modules/po/dcc.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/dcc.pl_PL.po b/modules/po/dcc.pl_PL.po index 46a40278..73d9a24b 100644 --- a/modules/po/dcc.pl_PL.po +++ b/modules/po/dcc.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/dcc.pt_BR.po b/modules/po/dcc.pt_BR.po index 797b8b8b..40d7cfd0 100644 --- a/modules/po/dcc.pt_BR.po +++ b/modules/po/dcc.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/dcc.ru_RU.po b/modules/po/dcc.ru_RU.po index 8107facf..1a8cf34f 100644 --- a/modules/po/dcc.ru_RU.po +++ b/modules/po/dcc.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "X-Crowdin-File-ID: 170\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/dcc.pot\n" +"X-Crowdin-File-ID: 308\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/disconkick.bg_BG.po b/modules/po/disconkick.bg_BG.po index f2ee90eb..7daef00f 100644 --- a/modules/po/disconkick.bg_BG.po +++ b/modules/po/disconkick.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/disconkick.es_ES.po b/modules/po/disconkick.es_ES.po index 04e87e09..bf04f9db 100644 --- a/modules/po/disconkick.es_ES.po +++ b/modules/po/disconkick.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/disconkick.fr_FR.po b/modules/po/disconkick.fr_FR.po index 9e9f645f..febc0097 100644 --- a/modules/po/disconkick.fr_FR.po +++ b/modules/po/disconkick.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/disconkick.id_ID.po b/modules/po/disconkick.id_ID.po index 8d72561a..0c4a6e78 100644 --- a/modules/po/disconkick.id_ID.po +++ b/modules/po/disconkick.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/disconkick.it_IT.po b/modules/po/disconkick.it_IT.po index e5cb1efc..7d7687c5 100644 --- a/modules/po/disconkick.it_IT.po +++ b/modules/po/disconkick.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/disconkick.nl_NL.po b/modules/po/disconkick.nl_NL.po index 87a9493e..7c0d0620 100644 --- a/modules/po/disconkick.nl_NL.po +++ b/modules/po/disconkick.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/disconkick.pl_PL.po b/modules/po/disconkick.pl_PL.po index 0258fce2..eeff3005 100644 --- a/modules/po/disconkick.pl_PL.po +++ b/modules/po/disconkick.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/disconkick.pt_BR.po b/modules/po/disconkick.pt_BR.po index 22f6cea8..0e9f595e 100644 --- a/modules/po/disconkick.pt_BR.po +++ b/modules/po/disconkick.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/disconkick.ru_RU.po b/modules/po/disconkick.ru_RU.po index 6338b623..28272ac0 100644 --- a/modules/po/disconkick.ru_RU.po +++ b/modules/po/disconkick.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "X-Crowdin-File-ID: 171\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/disconkick.pot\n" +"X-Crowdin-File-ID: 342\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/fail2ban.bg_BG.po b/modules/po/fail2ban.bg_BG.po index 9ce3b3ce..487f2610 100644 --- a/modules/po/fail2ban.bg_BG.po +++ b/modules/po/fail2ban.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/fail2ban.es_ES.po b/modules/po/fail2ban.es_ES.po index 143356b4..732b48c5 100644 --- a/modules/po/fail2ban.es_ES.po +++ b/modules/po/fail2ban.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/fail2ban.fr_FR.po b/modules/po/fail2ban.fr_FR.po index 331e709e..d1a50761 100644 --- a/modules/po/fail2ban.fr_FR.po +++ b/modules/po/fail2ban.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/fail2ban.id_ID.po b/modules/po/fail2ban.id_ID.po index 3ab23216..50f8b0a5 100644 --- a/modules/po/fail2ban.id_ID.po +++ b/modules/po/fail2ban.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/fail2ban.it_IT.po b/modules/po/fail2ban.it_IT.po index bfd95122..c75fe65d 100644 --- a/modules/po/fail2ban.it_IT.po +++ b/modules/po/fail2ban.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/fail2ban.nl_NL.po b/modules/po/fail2ban.nl_NL.po index 07b39775..200d4b73 100644 --- a/modules/po/fail2ban.nl_NL.po +++ b/modules/po/fail2ban.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/fail2ban.pl_PL.po b/modules/po/fail2ban.pl_PL.po index abd5fecc..12508d51 100644 --- a/modules/po/fail2ban.pl_PL.po +++ b/modules/po/fail2ban.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/fail2ban.pt_BR.po b/modules/po/fail2ban.pt_BR.po index 9bb234f2..c9da9261 100644 --- a/modules/po/fail2ban.pt_BR.po +++ b/modules/po/fail2ban.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/fail2ban.ru_RU.po b/modules/po/fail2ban.ru_RU.po index 31a6011e..fc98975e 100644 --- a/modules/po/fail2ban.ru_RU.po +++ b/modules/po/fail2ban.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "X-Crowdin-File-ID: 172\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/fail2ban.pot\n" +"X-Crowdin-File-ID: 344\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/flooddetach.bg_BG.po b/modules/po/flooddetach.bg_BG.po index 517337a6..9e4ffef6 100644 --- a/modules/po/flooddetach.bg_BG.po +++ b/modules/po/flooddetach.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/flooddetach.es_ES.po b/modules/po/flooddetach.es_ES.po index 59b098ee..56a30d74 100644 --- a/modules/po/flooddetach.es_ES.po +++ b/modules/po/flooddetach.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/flooddetach.fr_FR.po b/modules/po/flooddetach.fr_FR.po index db36dd3d..25ed6178 100644 --- a/modules/po/flooddetach.fr_FR.po +++ b/modules/po/flooddetach.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/flooddetach.id_ID.po b/modules/po/flooddetach.id_ID.po index bfdb04de..72fb70fc 100644 --- a/modules/po/flooddetach.id_ID.po +++ b/modules/po/flooddetach.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/flooddetach.it_IT.po b/modules/po/flooddetach.it_IT.po index a04e3962..c9b2715a 100644 --- a/modules/po/flooddetach.it_IT.po +++ b/modules/po/flooddetach.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/flooddetach.nl_NL.po b/modules/po/flooddetach.nl_NL.po index 3c164d01..5ba12cb7 100644 --- a/modules/po/flooddetach.nl_NL.po +++ b/modules/po/flooddetach.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/flooddetach.pl_PL.po b/modules/po/flooddetach.pl_PL.po index 7db44c82..d69c022e 100644 --- a/modules/po/flooddetach.pl_PL.po +++ b/modules/po/flooddetach.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/flooddetach.pt_BR.po b/modules/po/flooddetach.pt_BR.po index 19b92630..6008f32d 100644 --- a/modules/po/flooddetach.pt_BR.po +++ b/modules/po/flooddetach.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/flooddetach.ru_RU.po b/modules/po/flooddetach.ru_RU.po index 050341e3..cadcd540 100644 --- a/modules/po/flooddetach.ru_RU.po +++ b/modules/po/flooddetach.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "X-Crowdin-File-ID: 173\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/flooddetach.pot\n" +"X-Crowdin-File-ID: 346\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/identfile.bg_BG.po b/modules/po/identfile.bg_BG.po index 654ff51f..6abb6208 100644 --- a/modules/po/identfile.bg_BG.po +++ b/modules/po/identfile.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/identfile.es_ES.po b/modules/po/identfile.es_ES.po index 2159b16a..1fcff81f 100644 --- a/modules/po/identfile.es_ES.po +++ b/modules/po/identfile.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/identfile.fr_FR.po b/modules/po/identfile.fr_FR.po index 4cb8744f..8538006d 100644 --- a/modules/po/identfile.fr_FR.po +++ b/modules/po/identfile.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/identfile.id_ID.po b/modules/po/identfile.id_ID.po index 31f09ade..d043f845 100644 --- a/modules/po/identfile.id_ID.po +++ b/modules/po/identfile.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/identfile.it_IT.po b/modules/po/identfile.it_IT.po index bcef8978..97530dd2 100644 --- a/modules/po/identfile.it_IT.po +++ b/modules/po/identfile.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/identfile.nl_NL.po b/modules/po/identfile.nl_NL.po index 6b2a44f8..6f4b93a5 100644 --- a/modules/po/identfile.nl_NL.po +++ b/modules/po/identfile.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/identfile.pl_PL.po b/modules/po/identfile.pl_PL.po index 3f44e2a9..b4b4eca2 100644 --- a/modules/po/identfile.pl_PL.po +++ b/modules/po/identfile.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/identfile.pt_BR.po b/modules/po/identfile.pt_BR.po index 4712a141..bd84212a 100644 --- a/modules/po/identfile.pt_BR.po +++ b/modules/po/identfile.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/identfile.ru_RU.po b/modules/po/identfile.ru_RU.po index d8e8cb0f..c86df976 100644 --- a/modules/po/identfile.ru_RU.po +++ b/modules/po/identfile.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "X-Crowdin-File-ID: 174\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/identfile.pot\n" +"X-Crowdin-File-ID: 348\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/imapauth.bg_BG.po b/modules/po/imapauth.bg_BG.po index 786c28c9..4790d1b0 100644 --- a/modules/po/imapauth.bg_BG.po +++ b/modules/po/imapauth.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/imapauth.es_ES.po b/modules/po/imapauth.es_ES.po index 21a52d66..32be9314 100644 --- a/modules/po/imapauth.es_ES.po +++ b/modules/po/imapauth.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/imapauth.fr_FR.po b/modules/po/imapauth.fr_FR.po index 0fdc64ca..724e1668 100644 --- a/modules/po/imapauth.fr_FR.po +++ b/modules/po/imapauth.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/imapauth.id_ID.po b/modules/po/imapauth.id_ID.po index 8ecd94d2..6bb20243 100644 --- a/modules/po/imapauth.id_ID.po +++ b/modules/po/imapauth.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/imapauth.it_IT.po b/modules/po/imapauth.it_IT.po index f3a9cb75..a583e4e1 100644 --- a/modules/po/imapauth.it_IT.po +++ b/modules/po/imapauth.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/imapauth.nl_NL.po b/modules/po/imapauth.nl_NL.po index e9e16dd7..50972e0b 100644 --- a/modules/po/imapauth.nl_NL.po +++ b/modules/po/imapauth.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/imapauth.pl_PL.po b/modules/po/imapauth.pl_PL.po index 2e1837f1..bd8b8f3b 100644 --- a/modules/po/imapauth.pl_PL.po +++ b/modules/po/imapauth.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/imapauth.pt_BR.po b/modules/po/imapauth.pt_BR.po index e208f3e0..a5f26d28 100644 --- a/modules/po/imapauth.pt_BR.po +++ b/modules/po/imapauth.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/imapauth.ru_RU.po b/modules/po/imapauth.ru_RU.po index 3c81f444..7b207722 100644 --- a/modules/po/imapauth.ru_RU.po +++ b/modules/po/imapauth.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "X-Crowdin-File-ID: 175\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/imapauth.pot\n" +"X-Crowdin-File-ID: 352\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/keepnick.bg_BG.po b/modules/po/keepnick.bg_BG.po index 46ec51af..16e336d0 100644 --- a/modules/po/keepnick.bg_BG.po +++ b/modules/po/keepnick.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/keepnick.es_ES.po b/modules/po/keepnick.es_ES.po index a50e58d5..22b39401 100644 --- a/modules/po/keepnick.es_ES.po +++ b/modules/po/keepnick.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/keepnick.fr_FR.po b/modules/po/keepnick.fr_FR.po index 7ec6f02e..7fe6707d 100644 --- a/modules/po/keepnick.fr_FR.po +++ b/modules/po/keepnick.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/keepnick.id_ID.po b/modules/po/keepnick.id_ID.po index c0ae6d60..50366019 100644 --- a/modules/po/keepnick.id_ID.po +++ b/modules/po/keepnick.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/keepnick.it_IT.po b/modules/po/keepnick.it_IT.po index 0a37eae3..49b2d949 100644 --- a/modules/po/keepnick.it_IT.po +++ b/modules/po/keepnick.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/keepnick.nl_NL.po b/modules/po/keepnick.nl_NL.po index a36ab8ef..bf0ebace 100644 --- a/modules/po/keepnick.nl_NL.po +++ b/modules/po/keepnick.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/keepnick.pl_PL.po b/modules/po/keepnick.pl_PL.po index fe90fab1..086e037a 100644 --- a/modules/po/keepnick.pl_PL.po +++ b/modules/po/keepnick.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/keepnick.pt_BR.po b/modules/po/keepnick.pt_BR.po index 65b9c19b..bff957ac 100644 --- a/modules/po/keepnick.pt_BR.po +++ b/modules/po/keepnick.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/keepnick.ru_RU.po b/modules/po/keepnick.ru_RU.po index 0c67d892..82e1f308 100644 --- a/modules/po/keepnick.ru_RU.po +++ b/modules/po/keepnick.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "X-Crowdin-File-ID: 176\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/keepnick.pot\n" +"X-Crowdin-File-ID: 354\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/kickrejoin.bg_BG.po b/modules/po/kickrejoin.bg_BG.po index 09688601..e067c2f9 100644 --- a/modules/po/kickrejoin.bg_BG.po +++ b/modules/po/kickrejoin.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/kickrejoin.es_ES.po b/modules/po/kickrejoin.es_ES.po index 4874e59e..b7464f8e 100644 --- a/modules/po/kickrejoin.es_ES.po +++ b/modules/po/kickrejoin.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/kickrejoin.fr_FR.po b/modules/po/kickrejoin.fr_FR.po index a3540a94..11085402 100644 --- a/modules/po/kickrejoin.fr_FR.po +++ b/modules/po/kickrejoin.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/kickrejoin.id_ID.po b/modules/po/kickrejoin.id_ID.po index 40d07ebb..c51dc91e 100644 --- a/modules/po/kickrejoin.id_ID.po +++ b/modules/po/kickrejoin.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/kickrejoin.it_IT.po b/modules/po/kickrejoin.it_IT.po index c86161f7..0b224089 100644 --- a/modules/po/kickrejoin.it_IT.po +++ b/modules/po/kickrejoin.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/kickrejoin.nl_NL.po b/modules/po/kickrejoin.nl_NL.po index 951105a4..f7cecc2f 100644 --- a/modules/po/kickrejoin.nl_NL.po +++ b/modules/po/kickrejoin.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/kickrejoin.pl_PL.po b/modules/po/kickrejoin.pl_PL.po index 401b9a9f..57a043d6 100644 --- a/modules/po/kickrejoin.pl_PL.po +++ b/modules/po/kickrejoin.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/kickrejoin.pt_BR.po b/modules/po/kickrejoin.pt_BR.po index 849d3876..a25eb3c0 100644 --- a/modules/po/kickrejoin.pt_BR.po +++ b/modules/po/kickrejoin.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/kickrejoin.ru_RU.po b/modules/po/kickrejoin.ru_RU.po index 07c39ead..5e0904b4 100644 --- a/modules/po/kickrejoin.ru_RU.po +++ b/modules/po/kickrejoin.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "X-Crowdin-File-ID: 177\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/kickrejoin.pot\n" +"X-Crowdin-File-ID: 356\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/lastseen.bg_BG.po b/modules/po/lastseen.bg_BG.po index 85d6f121..c9d66efd 100644 --- a/modules/po/lastseen.bg_BG.po +++ b/modules/po/lastseen.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/lastseen.es_ES.po b/modules/po/lastseen.es_ES.po index 65897cc4..81523bb5 100644 --- a/modules/po/lastseen.es_ES.po +++ b/modules/po/lastseen.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/lastseen.fr_FR.po b/modules/po/lastseen.fr_FR.po index d4b89eb6..9b3fba11 100644 --- a/modules/po/lastseen.fr_FR.po +++ b/modules/po/lastseen.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/lastseen.id_ID.po b/modules/po/lastseen.id_ID.po index 5a5c1e9e..f5037d71 100644 --- a/modules/po/lastseen.id_ID.po +++ b/modules/po/lastseen.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/lastseen.it_IT.po b/modules/po/lastseen.it_IT.po index 8c3fece5..f0df1a91 100644 --- a/modules/po/lastseen.it_IT.po +++ b/modules/po/lastseen.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/lastseen.nl_NL.po b/modules/po/lastseen.nl_NL.po index d3d80254..fa94c1eb 100644 --- a/modules/po/lastseen.nl_NL.po +++ b/modules/po/lastseen.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/lastseen.pl_PL.po b/modules/po/lastseen.pl_PL.po index 26f83657..7e77eea5 100644 --- a/modules/po/lastseen.pl_PL.po +++ b/modules/po/lastseen.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/lastseen.pt_BR.po b/modules/po/lastseen.pt_BR.po index 8cf27639..b0457948 100644 --- a/modules/po/lastseen.pt_BR.po +++ b/modules/po/lastseen.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/lastseen.ru_RU.po b/modules/po/lastseen.ru_RU.po index a1d2fae4..b06a863d 100644 --- a/modules/po/lastseen.ru_RU.po +++ b/modules/po/lastseen.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "X-Crowdin-File-ID: 178\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/lastseen.pot\n" +"X-Crowdin-File-ID: 358\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/listsockets.bg_BG.po b/modules/po/listsockets.bg_BG.po index b3846967..55acd3ca 100644 --- a/modules/po/listsockets.bg_BG.po +++ b/modules/po/listsockets.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/listsockets.es_ES.po b/modules/po/listsockets.es_ES.po index 655842c9..ee06f50f 100644 --- a/modules/po/listsockets.es_ES.po +++ b/modules/po/listsockets.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/listsockets.fr_FR.po b/modules/po/listsockets.fr_FR.po index 501ae9fa..9ef7a9c2 100644 --- a/modules/po/listsockets.fr_FR.po +++ b/modules/po/listsockets.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/listsockets.id_ID.po b/modules/po/listsockets.id_ID.po index 993f9b3d..eec24499 100644 --- a/modules/po/listsockets.id_ID.po +++ b/modules/po/listsockets.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/listsockets.it_IT.po b/modules/po/listsockets.it_IT.po index 12d60ede..cb027523 100644 --- a/modules/po/listsockets.it_IT.po +++ b/modules/po/listsockets.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/listsockets.nl_NL.po b/modules/po/listsockets.nl_NL.po index babc1394..2763e1e8 100644 --- a/modules/po/listsockets.nl_NL.po +++ b/modules/po/listsockets.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/listsockets.pl_PL.po b/modules/po/listsockets.pl_PL.po index 691d1d2e..a9a63406 100644 --- a/modules/po/listsockets.pl_PL.po +++ b/modules/po/listsockets.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/listsockets.pt_BR.po b/modules/po/listsockets.pt_BR.po index 08f7f844..6d272bf3 100644 --- a/modules/po/listsockets.pt_BR.po +++ b/modules/po/listsockets.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/listsockets.ru_RU.po b/modules/po/listsockets.ru_RU.po index 4cdbc1db..81a71f4e 100644 --- a/modules/po/listsockets.ru_RU.po +++ b/modules/po/listsockets.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "X-Crowdin-File-ID: 179\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/listsockets.pot\n" +"X-Crowdin-File-ID: 360\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/log.bg_BG.po b/modules/po/log.bg_BG.po index 84f02320..827d26f4 100644 --- a/modules/po/log.bg_BG.po +++ b/modules/po/log.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/log.es_ES.po b/modules/po/log.es_ES.po index 05afe9e5..280165bc 100644 --- a/modules/po/log.es_ES.po +++ b/modules/po/log.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/log.fr_FR.po b/modules/po/log.fr_FR.po index 9370a8b5..b4f5ddcb 100644 --- a/modules/po/log.fr_FR.po +++ b/modules/po/log.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/log.id_ID.po b/modules/po/log.id_ID.po index c1b54da3..750c636d 100644 --- a/modules/po/log.id_ID.po +++ b/modules/po/log.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/log.it_IT.po b/modules/po/log.it_IT.po index a638f457..cbb64235 100644 --- a/modules/po/log.it_IT.po +++ b/modules/po/log.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/log.nl_NL.po b/modules/po/log.nl_NL.po index e6242e8a..a133156b 100644 --- a/modules/po/log.nl_NL.po +++ b/modules/po/log.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/log.pl_PL.po b/modules/po/log.pl_PL.po index f8d2e9bd..66c73b2c 100644 --- a/modules/po/log.pl_PL.po +++ b/modules/po/log.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/log.pt_BR.po b/modules/po/log.pt_BR.po index 75462ebe..32a5b9f1 100644 --- a/modules/po/log.pt_BR.po +++ b/modules/po/log.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/log.ru_RU.po b/modules/po/log.ru_RU.po index c6f157eb..e88a57ee 100644 --- a/modules/po/log.ru_RU.po +++ b/modules/po/log.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "X-Crowdin-File-ID: 180\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/log.pot\n" +"X-Crowdin-File-ID: 314\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/missingmotd.bg_BG.po b/modules/po/missingmotd.bg_BG.po index 1500a219..cce76422 100644 --- a/modules/po/missingmotd.bg_BG.po +++ b/modules/po/missingmotd.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/missingmotd.es_ES.po b/modules/po/missingmotd.es_ES.po index f5235dd6..e84a0aeb 100644 --- a/modules/po/missingmotd.es_ES.po +++ b/modules/po/missingmotd.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/missingmotd.fr_FR.po b/modules/po/missingmotd.fr_FR.po index 8ab32de1..36ffb75b 100644 --- a/modules/po/missingmotd.fr_FR.po +++ b/modules/po/missingmotd.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/missingmotd.id_ID.po b/modules/po/missingmotd.id_ID.po index cd3bb1fe..2f44583b 100644 --- a/modules/po/missingmotd.id_ID.po +++ b/modules/po/missingmotd.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/missingmotd.it_IT.po b/modules/po/missingmotd.it_IT.po index 550bdb87..c5ee24b4 100644 --- a/modules/po/missingmotd.it_IT.po +++ b/modules/po/missingmotd.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/missingmotd.nl_NL.po b/modules/po/missingmotd.nl_NL.po index fdf6f610..32bf866d 100644 --- a/modules/po/missingmotd.nl_NL.po +++ b/modules/po/missingmotd.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/missingmotd.pl_PL.po b/modules/po/missingmotd.pl_PL.po index dcaf567c..680defc8 100644 --- a/modules/po/missingmotd.pl_PL.po +++ b/modules/po/missingmotd.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/missingmotd.pt_BR.po b/modules/po/missingmotd.pt_BR.po index 80311402..a0ab1b47 100644 --- a/modules/po/missingmotd.pt_BR.po +++ b/modules/po/missingmotd.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/missingmotd.ru_RU.po b/modules/po/missingmotd.ru_RU.po index 9010af6f..6b3df83a 100644 --- a/modules/po/missingmotd.ru_RU.po +++ b/modules/po/missingmotd.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "X-Crowdin-File-ID: 181\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/missingmotd.pot\n" +"X-Crowdin-File-ID: 362\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/modperl.bg_BG.po b/modules/po/modperl.bg_BG.po index 9f02207d..3fd897a7 100644 --- a/modules/po/modperl.bg_BG.po +++ b/modules/po/modperl.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modperl.es_ES.po b/modules/po/modperl.es_ES.po index d7ace707..e25c1ec7 100644 --- a/modules/po/modperl.es_ES.po +++ b/modules/po/modperl.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/modperl.fr_FR.po b/modules/po/modperl.fr_FR.po index f6fbeac6..01950da3 100644 --- a/modules/po/modperl.fr_FR.po +++ b/modules/po/modperl.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/modperl.id_ID.po b/modules/po/modperl.id_ID.po index 28ef7532..10890d7c 100644 --- a/modules/po/modperl.id_ID.po +++ b/modules/po/modperl.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/modperl.it_IT.po b/modules/po/modperl.it_IT.po index a03ea2c5..788935c4 100644 --- a/modules/po/modperl.it_IT.po +++ b/modules/po/modperl.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/modperl.nl_NL.po b/modules/po/modperl.nl_NL.po index ed2d8953..20522a8e 100644 --- a/modules/po/modperl.nl_NL.po +++ b/modules/po/modperl.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modperl.pl_PL.po b/modules/po/modperl.pl_PL.po index 42c6196d..7c1de97e 100644 --- a/modules/po/modperl.pl_PL.po +++ b/modules/po/modperl.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/modperl.pt_BR.po b/modules/po/modperl.pt_BR.po index 66308b5c..328bce3c 100644 --- a/modules/po/modperl.pt_BR.po +++ b/modules/po/modperl.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/modperl.ru_RU.po b/modules/po/modperl.ru_RU.po index 8ee33325..b5d5d7af 100644 --- a/modules/po/modperl.ru_RU.po +++ b/modules/po/modperl.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "X-Crowdin-File-ID: 182\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modperl.pot\n" +"X-Crowdin-File-ID: 340\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/modpython.bg_BG.po b/modules/po/modpython.bg_BG.po index a202e145..02f44573 100644 --- a/modules/po/modpython.bg_BG.po +++ b/modules/po/modpython.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modpython.es_ES.po b/modules/po/modpython.es_ES.po index 1c6d865b..2417ffa6 100644 --- a/modules/po/modpython.es_ES.po +++ b/modules/po/modpython.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/modpython.fr_FR.po b/modules/po/modpython.fr_FR.po index e7aeb582..d0f5c57d 100644 --- a/modules/po/modpython.fr_FR.po +++ b/modules/po/modpython.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/modpython.id_ID.po b/modules/po/modpython.id_ID.po index 67ce0ab3..6af341ad 100644 --- a/modules/po/modpython.id_ID.po +++ b/modules/po/modpython.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/modpython.it_IT.po b/modules/po/modpython.it_IT.po index ba31c217..ca3f40d0 100644 --- a/modules/po/modpython.it_IT.po +++ b/modules/po/modpython.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/modpython.nl_NL.po b/modules/po/modpython.nl_NL.po index 3fb019a6..615bb086 100644 --- a/modules/po/modpython.nl_NL.po +++ b/modules/po/modpython.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modpython.pl_PL.po b/modules/po/modpython.pl_PL.po index 13b315c4..bdbdf7d7 100644 --- a/modules/po/modpython.pl_PL.po +++ b/modules/po/modpython.pl_PL.po @@ -8,12 +8,21 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" +<<<<<<< HEAD #: modpython.cpp:513 +======= +#: modpython.cpp:512 +>>>>>>> 1.8.x msgid "Loads python scripts as ZNC modules" msgstr "" diff --git a/modules/po/modpython.pt_BR.po b/modules/po/modpython.pt_BR.po index 8adafb0c..d1fe0311 100644 --- a/modules/po/modpython.pt_BR.po +++ b/modules/po/modpython.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/modpython.ru_RU.po b/modules/po/modpython.ru_RU.po index f3a2d5c0..fc97e570 100644 --- a/modules/po/modpython.ru_RU.po +++ b/modules/po/modpython.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "X-Crowdin-File-ID: 183\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modpython.pot\n" +"X-Crowdin-File-ID: 364\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/modules_online.bg_BG.po b/modules/po/modules_online.bg_BG.po index a9249329..a0c0d64b 100644 --- a/modules/po/modules_online.bg_BG.po +++ b/modules/po/modules_online.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modules_online.es_ES.po b/modules/po/modules_online.es_ES.po index b53a8e6a..7a142ca4 100644 --- a/modules/po/modules_online.es_ES.po +++ b/modules/po/modules_online.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/modules_online.fr_FR.po b/modules/po/modules_online.fr_FR.po index fa095e27..205223a7 100644 --- a/modules/po/modules_online.fr_FR.po +++ b/modules/po/modules_online.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/modules_online.id_ID.po b/modules/po/modules_online.id_ID.po index 64457a02..28549df9 100644 --- a/modules/po/modules_online.id_ID.po +++ b/modules/po/modules_online.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/modules_online.it_IT.po b/modules/po/modules_online.it_IT.po index 484b8e5d..40fdc200 100644 --- a/modules/po/modules_online.it_IT.po +++ b/modules/po/modules_online.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/modules_online.nl_NL.po b/modules/po/modules_online.nl_NL.po index aac2a9dc..2becdf58 100644 --- a/modules/po/modules_online.nl_NL.po +++ b/modules/po/modules_online.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modules_online.pl_PL.po b/modules/po/modules_online.pl_PL.po index 69ec9c93..723d5b59 100644 --- a/modules/po/modules_online.pl_PL.po +++ b/modules/po/modules_online.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/modules_online.pt_BR.po b/modules/po/modules_online.pt_BR.po index eb4692aa..ba113945 100644 --- a/modules/po/modules_online.pt_BR.po +++ b/modules/po/modules_online.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/modules_online.ru_RU.po b/modules/po/modules_online.ru_RU.po index 82312d2a..ffe5a268 100644 --- a/modules/po/modules_online.ru_RU.po +++ b/modules/po/modules_online.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "X-Crowdin-File-ID: 184\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/modules_online.pot\n" +"X-Crowdin-File-ID: 366\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/nickserv.bg_BG.po b/modules/po/nickserv.bg_BG.po index 902f69d2..336353cc 100644 --- a/modules/po/nickserv.bg_BG.po +++ b/modules/po/nickserv.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/nickserv.es_ES.po b/modules/po/nickserv.es_ES.po index c4a77fba..263887f4 100644 --- a/modules/po/nickserv.es_ES.po +++ b/modules/po/nickserv.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/nickserv.fr_FR.po b/modules/po/nickserv.fr_FR.po index de74a88e..bb05b230 100644 --- a/modules/po/nickserv.fr_FR.po +++ b/modules/po/nickserv.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/nickserv.id_ID.po b/modules/po/nickserv.id_ID.po index 3cee07a4..747260b7 100644 --- a/modules/po/nickserv.id_ID.po +++ b/modules/po/nickserv.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/nickserv.it_IT.po b/modules/po/nickserv.it_IT.po index 31455733..959a87a0 100644 --- a/modules/po/nickserv.it_IT.po +++ b/modules/po/nickserv.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/nickserv.nl_NL.po b/modules/po/nickserv.nl_NL.po index 723eb017..943bb47f 100644 --- a/modules/po/nickserv.nl_NL.po +++ b/modules/po/nickserv.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/nickserv.pl_PL.po b/modules/po/nickserv.pl_PL.po index c864dbc1..b79f5b8f 100644 --- a/modules/po/nickserv.pl_PL.po +++ b/modules/po/nickserv.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/nickserv.pt_BR.po b/modules/po/nickserv.pt_BR.po index 62104726..8ccca85f 100644 --- a/modules/po/nickserv.pt_BR.po +++ b/modules/po/nickserv.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/nickserv.ru_RU.po b/modules/po/nickserv.ru_RU.po index a6bee5a1..0667e311 100644 --- a/modules/po/nickserv.ru_RU.po +++ b/modules/po/nickserv.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "X-Crowdin-File-ID: 185\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/nickserv.pot\n" +"X-Crowdin-File-ID: 368\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/notes.bg_BG.po b/modules/po/notes.bg_BG.po index 47856150..36973c34 100644 --- a/modules/po/notes.bg_BG.po +++ b/modules/po/notes.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/notes.es_ES.po b/modules/po/notes.es_ES.po index 25f96361..451e1b51 100644 --- a/modules/po/notes.es_ES.po +++ b/modules/po/notes.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/notes.fr_FR.po b/modules/po/notes.fr_FR.po index d18759e8..4057fc14 100644 --- a/modules/po/notes.fr_FR.po +++ b/modules/po/notes.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/notes.id_ID.po b/modules/po/notes.id_ID.po index 98850154..5ee29632 100644 --- a/modules/po/notes.id_ID.po +++ b/modules/po/notes.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/notes.it_IT.po b/modules/po/notes.it_IT.po index 622574a1..306cda82 100644 --- a/modules/po/notes.it_IT.po +++ b/modules/po/notes.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/notes.nl_NL.po b/modules/po/notes.nl_NL.po index 8aa0abf4..3939b155 100644 --- a/modules/po/notes.nl_NL.po +++ b/modules/po/notes.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/notes.pl_PL.po b/modules/po/notes.pl_PL.po index 1f32107b..382e9ec4 100644 --- a/modules/po/notes.pl_PL.po +++ b/modules/po/notes.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/notes.pt_BR.po b/modules/po/notes.pt_BR.po index cc11357e..7c456fca 100644 --- a/modules/po/notes.pt_BR.po +++ b/modules/po/notes.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/notes.ru_RU.po b/modules/po/notes.ru_RU.po index c94c8cbf..db4b5b74 100644 --- a/modules/po/notes.ru_RU.po +++ b/modules/po/notes.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "X-Crowdin-File-ID: 186\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notes.pot\n" +"X-Crowdin-File-ID: 350\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/notify_connect.bg_BG.po b/modules/po/notify_connect.bg_BG.po index f590f639..2c2ee5fd 100644 --- a/modules/po/notify_connect.bg_BG.po +++ b/modules/po/notify_connect.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/notify_connect.es_ES.po b/modules/po/notify_connect.es_ES.po index a83bce84..bed2b105 100644 --- a/modules/po/notify_connect.es_ES.po +++ b/modules/po/notify_connect.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/notify_connect.fr_FR.po b/modules/po/notify_connect.fr_FR.po index 881d67da..9157e0d4 100644 --- a/modules/po/notify_connect.fr_FR.po +++ b/modules/po/notify_connect.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/notify_connect.id_ID.po b/modules/po/notify_connect.id_ID.po index 2f970b02..24701947 100644 --- a/modules/po/notify_connect.id_ID.po +++ b/modules/po/notify_connect.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/notify_connect.it_IT.po b/modules/po/notify_connect.it_IT.po index 3976096f..642a01d6 100644 --- a/modules/po/notify_connect.it_IT.po +++ b/modules/po/notify_connect.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/notify_connect.nl_NL.po b/modules/po/notify_connect.nl_NL.po index 9e3b9a7c..6eb55c01 100644 --- a/modules/po/notify_connect.nl_NL.po +++ b/modules/po/notify_connect.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/notify_connect.pl_PL.po b/modules/po/notify_connect.pl_PL.po index 9155d40a..cc11e5c4 100644 --- a/modules/po/notify_connect.pl_PL.po +++ b/modules/po/notify_connect.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/notify_connect.pt_BR.po b/modules/po/notify_connect.pt_BR.po index 4d62416a..c107c0c6 100644 --- a/modules/po/notify_connect.pt_BR.po +++ b/modules/po/notify_connect.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/notify_connect.ru_RU.po b/modules/po/notify_connect.ru_RU.po index f1c5b804..13d46913 100644 --- a/modules/po/notify_connect.ru_RU.po +++ b/modules/po/notify_connect.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "X-Crowdin-File-ID: 187\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/notify_connect.pot\n" +"X-Crowdin-File-ID: 370\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/perform.bg_BG.po b/modules/po/perform.bg_BG.po index 55959c76..c6d95c2d 100644 --- a/modules/po/perform.bg_BG.po +++ b/modules/po/perform.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/perform.es_ES.po b/modules/po/perform.es_ES.po index f9f89e3a..a9a7098e 100644 --- a/modules/po/perform.es_ES.po +++ b/modules/po/perform.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/perform.fr_FR.po b/modules/po/perform.fr_FR.po index 526399ba..dc5cc844 100644 --- a/modules/po/perform.fr_FR.po +++ b/modules/po/perform.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/perform.id_ID.po b/modules/po/perform.id_ID.po index 87f32225..c316cf80 100644 --- a/modules/po/perform.id_ID.po +++ b/modules/po/perform.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/perform.it_IT.po b/modules/po/perform.it_IT.po index c9bf6d9b..6536b7c6 100644 --- a/modules/po/perform.it_IT.po +++ b/modules/po/perform.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/perform.nl_NL.po b/modules/po/perform.nl_NL.po index d8c08746..dd0769a5 100644 --- a/modules/po/perform.nl_NL.po +++ b/modules/po/perform.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/perform.pl_PL.po b/modules/po/perform.pl_PL.po index 86fb98b4..dcb446d1 100644 --- a/modules/po/perform.pl_PL.po +++ b/modules/po/perform.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/perform.pt_BR.po b/modules/po/perform.pt_BR.po index 246d9321..50cf8655 100644 --- a/modules/po/perform.pt_BR.po +++ b/modules/po/perform.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/perform.ru_RU.po b/modules/po/perform.ru_RU.po index b4bab31c..c46e8141 100644 --- a/modules/po/perform.ru_RU.po +++ b/modules/po/perform.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "X-Crowdin-File-ID: 189\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perform.pot\n" +"X-Crowdin-File-ID: 372\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/perleval.bg_BG.po b/modules/po/perleval.bg_BG.po index e9c58232..af19a85d 100644 --- a/modules/po/perleval.bg_BG.po +++ b/modules/po/perleval.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/perleval.es_ES.po b/modules/po/perleval.es_ES.po index 9f65a730..3113321f 100644 --- a/modules/po/perleval.es_ES.po +++ b/modules/po/perleval.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/perleval.fr_FR.po b/modules/po/perleval.fr_FR.po index bc02e552..6595468f 100644 --- a/modules/po/perleval.fr_FR.po +++ b/modules/po/perleval.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/perleval.id_ID.po b/modules/po/perleval.id_ID.po index 358a8a9a..88581e84 100644 --- a/modules/po/perleval.id_ID.po +++ b/modules/po/perleval.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/perleval.it_IT.po b/modules/po/perleval.it_IT.po index 9abef01d..28f58480 100644 --- a/modules/po/perleval.it_IT.po +++ b/modules/po/perleval.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/perleval.nl_NL.po b/modules/po/perleval.nl_NL.po index 2497c70a..a082748b 100644 --- a/modules/po/perleval.nl_NL.po +++ b/modules/po/perleval.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/perleval.pl_PL.po b/modules/po/perleval.pl_PL.po index 4cfff577..b1ca932c 100644 --- a/modules/po/perleval.pl_PL.po +++ b/modules/po/perleval.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/perleval.pt_BR.po b/modules/po/perleval.pt_BR.po index 48023222..389eb47a 100644 --- a/modules/po/perleval.pt_BR.po +++ b/modules/po/perleval.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/perleval.ru_RU.po b/modules/po/perleval.ru_RU.po index 8355feed..72e6eca0 100644 --- a/modules/po/perleval.ru_RU.po +++ b/modules/po/perleval.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "X-Crowdin-File-ID: 190\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/perleval.pot\n" +"X-Crowdin-File-ID: 374\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/pyeval.bg_BG.po b/modules/po/pyeval.bg_BG.po index 848f374d..1294396e 100644 --- a/modules/po/pyeval.bg_BG.po +++ b/modules/po/pyeval.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/pyeval.es_ES.po b/modules/po/pyeval.es_ES.po index 12a76213..475c5b15 100644 --- a/modules/po/pyeval.es_ES.po +++ b/modules/po/pyeval.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/pyeval.fr_FR.po b/modules/po/pyeval.fr_FR.po index 7b9776db..c8d60231 100644 --- a/modules/po/pyeval.fr_FR.po +++ b/modules/po/pyeval.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/pyeval.id_ID.po b/modules/po/pyeval.id_ID.po index 6ff56b0b..fcd3096b 100644 --- a/modules/po/pyeval.id_ID.po +++ b/modules/po/pyeval.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/pyeval.it_IT.po b/modules/po/pyeval.it_IT.po index 3dc13005..043e6856 100644 --- a/modules/po/pyeval.it_IT.po +++ b/modules/po/pyeval.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/pyeval.nl_NL.po b/modules/po/pyeval.nl_NL.po index 543e9d0e..f7fabfbd 100644 --- a/modules/po/pyeval.nl_NL.po +++ b/modules/po/pyeval.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/pyeval.pl_PL.po b/modules/po/pyeval.pl_PL.po index f3961f05..638b0c81 100644 --- a/modules/po/pyeval.pl_PL.po +++ b/modules/po/pyeval.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/pyeval.pt_BR.po b/modules/po/pyeval.pt_BR.po index ef36873d..acaa7976 100644 --- a/modules/po/pyeval.pt_BR.po +++ b/modules/po/pyeval.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/pyeval.ru_RU.po b/modules/po/pyeval.ru_RU.po index 13f55025..27a9bc1f 100644 --- a/modules/po/pyeval.ru_RU.po +++ b/modules/po/pyeval.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "X-Crowdin-File-ID: 191\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/pyeval.pot\n" +"X-Crowdin-File-ID: 376\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/raw.bg_BG.po b/modules/po/raw.bg_BG.po index 759f6bd7..72cf1f9a 100644 --- a/modules/po/raw.bg_BG.po +++ b/modules/po/raw.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/raw.es_ES.po b/modules/po/raw.es_ES.po index 24badec3..a65a4e6d 100644 --- a/modules/po/raw.es_ES.po +++ b/modules/po/raw.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/raw.fr_FR.po b/modules/po/raw.fr_FR.po index 58643842..1e95e5af 100644 --- a/modules/po/raw.fr_FR.po +++ b/modules/po/raw.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/raw.id_ID.po b/modules/po/raw.id_ID.po index 9ac7ab78..779ddd06 100644 --- a/modules/po/raw.id_ID.po +++ b/modules/po/raw.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/raw.it_IT.po b/modules/po/raw.it_IT.po index 46844540..1f7d1d4c 100644 --- a/modules/po/raw.it_IT.po +++ b/modules/po/raw.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/raw.nl_NL.po b/modules/po/raw.nl_NL.po index 8d33c0ad..cf3c62ca 100644 --- a/modules/po/raw.nl_NL.po +++ b/modules/po/raw.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/raw.pl_PL.po b/modules/po/raw.pl_PL.po index f63b7c9c..7b1e3a31 100644 --- a/modules/po/raw.pl_PL.po +++ b/modules/po/raw.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/raw.pt_BR.po b/modules/po/raw.pt_BR.po index 4275586e..a478141d 100644 --- a/modules/po/raw.pt_BR.po +++ b/modules/po/raw.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/raw.ru_RU.po b/modules/po/raw.ru_RU.po index da8b7d27..3ae08285 100644 --- a/modules/po/raw.ru_RU.po +++ b/modules/po/raw.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "X-Crowdin-File-ID: 193\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/raw.pot\n" +"X-Crowdin-File-ID: 320\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/route_replies.bg_BG.po b/modules/po/route_replies.bg_BG.po index bb407e7f..8efc0887 100644 --- a/modules/po/route_replies.bg_BG.po +++ b/modules/po/route_replies.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/route_replies.es_ES.po b/modules/po/route_replies.es_ES.po index 3b933391..74404270 100644 --- a/modules/po/route_replies.es_ES.po +++ b/modules/po/route_replies.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/route_replies.fr_FR.po b/modules/po/route_replies.fr_FR.po index c6058712..7b01c630 100644 --- a/modules/po/route_replies.fr_FR.po +++ b/modules/po/route_replies.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/route_replies.id_ID.po b/modules/po/route_replies.id_ID.po index e34033fa..56d4930f 100644 --- a/modules/po/route_replies.id_ID.po +++ b/modules/po/route_replies.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/route_replies.it_IT.po b/modules/po/route_replies.it_IT.po index ebb85112..33ad5dca 100644 --- a/modules/po/route_replies.it_IT.po +++ b/modules/po/route_replies.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/route_replies.nl_NL.po b/modules/po/route_replies.nl_NL.po index 83070b1c..d059229c 100644 --- a/modules/po/route_replies.nl_NL.po +++ b/modules/po/route_replies.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/route_replies.pl_PL.po b/modules/po/route_replies.pl_PL.po index 57c76f5c..ff6b0894 100644 --- a/modules/po/route_replies.pl_PL.po +++ b/modules/po/route_replies.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/route_replies.pt_BR.po b/modules/po/route_replies.pt_BR.po index 63e50f22..ce14be74 100644 --- a/modules/po/route_replies.pt_BR.po +++ b/modules/po/route_replies.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/route_replies.ru_RU.po b/modules/po/route_replies.ru_RU.po index dbfcc444..1d0bac12 100644 --- a/modules/po/route_replies.ru_RU.po +++ b/modules/po/route_replies.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "X-Crowdin-File-ID: 194\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/route_replies.pot\n" +"X-Crowdin-File-ID: 378\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/sample.bg_BG.po b/modules/po/sample.bg_BG.po index e4c7c047..eaf530ba 100644 --- a/modules/po/sample.bg_BG.po +++ b/modules/po/sample.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/sample.es_ES.po b/modules/po/sample.es_ES.po index 1c0c4fbd..cc7a6e11 100644 --- a/modules/po/sample.es_ES.po +++ b/modules/po/sample.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/sample.fr_FR.po b/modules/po/sample.fr_FR.po index a93358b0..c13f4ec3 100644 --- a/modules/po/sample.fr_FR.po +++ b/modules/po/sample.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/sample.id_ID.po b/modules/po/sample.id_ID.po index 17032ef6..f96e83ec 100644 --- a/modules/po/sample.id_ID.po +++ b/modules/po/sample.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/sample.it_IT.po b/modules/po/sample.it_IT.po index 3c50c8ba..f09fe260 100644 --- a/modules/po/sample.it_IT.po +++ b/modules/po/sample.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/sample.nl_NL.po b/modules/po/sample.nl_NL.po index f6f0384e..f789bfd1 100644 --- a/modules/po/sample.nl_NL.po +++ b/modules/po/sample.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/sample.pl_PL.po b/modules/po/sample.pl_PL.po index 67006132..4d0bcc15 100644 --- a/modules/po/sample.pl_PL.po +++ b/modules/po/sample.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/sample.pt_BR.po b/modules/po/sample.pt_BR.po index 011d0094..4b9c4e86 100644 --- a/modules/po/sample.pt_BR.po +++ b/modules/po/sample.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/sample.ru_RU.po b/modules/po/sample.ru_RU.po index b2fc8e3d..7b7698ef 100644 --- a/modules/po/sample.ru_RU.po +++ b/modules/po/sample.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "X-Crowdin-File-ID: 195\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sample.pot\n" +"X-Crowdin-File-ID: 380\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/samplewebapi.bg_BG.po b/modules/po/samplewebapi.bg_BG.po index 361b138d..b6502d1c 100644 --- a/modules/po/samplewebapi.bg_BG.po +++ b/modules/po/samplewebapi.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/samplewebapi.es_ES.po b/modules/po/samplewebapi.es_ES.po index b1f8ab7e..138fe0aa 100644 --- a/modules/po/samplewebapi.es_ES.po +++ b/modules/po/samplewebapi.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/samplewebapi.fr_FR.po b/modules/po/samplewebapi.fr_FR.po index 147abe93..b3c874ba 100644 --- a/modules/po/samplewebapi.fr_FR.po +++ b/modules/po/samplewebapi.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/samplewebapi.id_ID.po b/modules/po/samplewebapi.id_ID.po index 449e0f48..a12613e1 100644 --- a/modules/po/samplewebapi.id_ID.po +++ b/modules/po/samplewebapi.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/samplewebapi.it_IT.po b/modules/po/samplewebapi.it_IT.po index 163b4858..a8274775 100644 --- a/modules/po/samplewebapi.it_IT.po +++ b/modules/po/samplewebapi.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/samplewebapi.nl_NL.po b/modules/po/samplewebapi.nl_NL.po index 0103896d..aebc82f4 100644 --- a/modules/po/samplewebapi.nl_NL.po +++ b/modules/po/samplewebapi.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/samplewebapi.pl_PL.po b/modules/po/samplewebapi.pl_PL.po index 731afa87..0acc413d 100644 --- a/modules/po/samplewebapi.pl_PL.po +++ b/modules/po/samplewebapi.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/samplewebapi.pt_BR.po b/modules/po/samplewebapi.pt_BR.po index b6f0d482..0dd81910 100644 --- a/modules/po/samplewebapi.pt_BR.po +++ b/modules/po/samplewebapi.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/samplewebapi.ru_RU.po b/modules/po/samplewebapi.ru_RU.po index 04467ac9..d883a1e0 100644 --- a/modules/po/samplewebapi.ru_RU.po +++ b/modules/po/samplewebapi.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "X-Crowdin-File-ID: 196\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/samplewebapi.pot\n" +"X-Crowdin-File-ID: 382\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/sasl.bg_BG.po b/modules/po/sasl.bg_BG.po index d898b9a2..87c1767a 100644 --- a/modules/po/sasl.bg_BG.po +++ b/modules/po/sasl.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/sasl.es_ES.po b/modules/po/sasl.es_ES.po index ac778e0d..4a470962 100644 --- a/modules/po/sasl.es_ES.po +++ b/modules/po/sasl.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/sasl.fr_FR.po b/modules/po/sasl.fr_FR.po index 14db9a8e..c2e63e37 100644 --- a/modules/po/sasl.fr_FR.po +++ b/modules/po/sasl.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/sasl.id_ID.po b/modules/po/sasl.id_ID.po index cf7fffdc..3f4eb6c0 100644 --- a/modules/po/sasl.id_ID.po +++ b/modules/po/sasl.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/sasl.it_IT.po b/modules/po/sasl.it_IT.po index b6aba7be..ae0e9399 100644 --- a/modules/po/sasl.it_IT.po +++ b/modules/po/sasl.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/sasl.nl_NL.po b/modules/po/sasl.nl_NL.po index 714d1753..0210d926 100644 --- a/modules/po/sasl.nl_NL.po +++ b/modules/po/sasl.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/sasl.pl_PL.po b/modules/po/sasl.pl_PL.po index 9606c50a..35fc6d07 100644 --- a/modules/po/sasl.pl_PL.po +++ b/modules/po/sasl.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/sasl.pt_BR.po b/modules/po/sasl.pt_BR.po index 9197a66b..f8eb8242 100644 --- a/modules/po/sasl.pt_BR.po +++ b/modules/po/sasl.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/sasl.ru_RU.po b/modules/po/sasl.ru_RU.po index b8e9d533..33b34148 100644 --- a/modules/po/sasl.ru_RU.po +++ b/modules/po/sasl.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "X-Crowdin-File-ID: 197\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/sasl.pot\n" +"X-Crowdin-File-ID: 384\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/savebuff.bg_BG.po b/modules/po/savebuff.bg_BG.po index 33bed609..f880aa55 100644 --- a/modules/po/savebuff.bg_BG.po +++ b/modules/po/savebuff.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/savebuff.es_ES.po b/modules/po/savebuff.es_ES.po index 90a2b5d3..5fb7d759 100644 --- a/modules/po/savebuff.es_ES.po +++ b/modules/po/savebuff.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/savebuff.fr_FR.po b/modules/po/savebuff.fr_FR.po index 8e51acbc..cf4c2ece 100644 --- a/modules/po/savebuff.fr_FR.po +++ b/modules/po/savebuff.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/savebuff.id_ID.po b/modules/po/savebuff.id_ID.po index d3e8b522..33135a0d 100644 --- a/modules/po/savebuff.id_ID.po +++ b/modules/po/savebuff.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/savebuff.it_IT.po b/modules/po/savebuff.it_IT.po index 0bb0641d..324c992a 100644 --- a/modules/po/savebuff.it_IT.po +++ b/modules/po/savebuff.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/savebuff.nl_NL.po b/modules/po/savebuff.nl_NL.po index 759b2e9e..6faf6b4e 100644 --- a/modules/po/savebuff.nl_NL.po +++ b/modules/po/savebuff.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/savebuff.pl_PL.po b/modules/po/savebuff.pl_PL.po index 157ecd2f..5fa8e12d 100644 --- a/modules/po/savebuff.pl_PL.po +++ b/modules/po/savebuff.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/savebuff.pt_BR.po b/modules/po/savebuff.pt_BR.po index dc756ffc..4ef8fc5c 100644 --- a/modules/po/savebuff.pt_BR.po +++ b/modules/po/savebuff.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/savebuff.ru_RU.po b/modules/po/savebuff.ru_RU.po index 4236d64c..85d6235f 100644 --- a/modules/po/savebuff.ru_RU.po +++ b/modules/po/savebuff.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "X-Crowdin-File-ID: 198\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/savebuff.pot\n" +"X-Crowdin-File-ID: 386\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/send_raw.bg_BG.po b/modules/po/send_raw.bg_BG.po index c99b5a13..c3986755 100644 --- a/modules/po/send_raw.bg_BG.po +++ b/modules/po/send_raw.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/send_raw.es_ES.po b/modules/po/send_raw.es_ES.po index e771ee77..4a1fae36 100644 --- a/modules/po/send_raw.es_ES.po +++ b/modules/po/send_raw.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/send_raw.fr_FR.po b/modules/po/send_raw.fr_FR.po index f8ec5887..85aa7773 100644 --- a/modules/po/send_raw.fr_FR.po +++ b/modules/po/send_raw.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/send_raw.id_ID.po b/modules/po/send_raw.id_ID.po index aa609e5a..0340552c 100644 --- a/modules/po/send_raw.id_ID.po +++ b/modules/po/send_raw.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/send_raw.it_IT.po b/modules/po/send_raw.it_IT.po index b2c3a7e4..709fc069 100644 --- a/modules/po/send_raw.it_IT.po +++ b/modules/po/send_raw.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/send_raw.nl_NL.po b/modules/po/send_raw.nl_NL.po index f7d435cc..43abcf3f 100644 --- a/modules/po/send_raw.nl_NL.po +++ b/modules/po/send_raw.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/send_raw.pl_PL.po b/modules/po/send_raw.pl_PL.po index ebca335f..ea2aeaac 100644 --- a/modules/po/send_raw.pl_PL.po +++ b/modules/po/send_raw.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/send_raw.pt_BR.po b/modules/po/send_raw.pt_BR.po index 778b9e78..2448a16c 100644 --- a/modules/po/send_raw.pt_BR.po +++ b/modules/po/send_raw.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/send_raw.ru_RU.po b/modules/po/send_raw.ru_RU.po index 62b4b66f..bc88712a 100644 --- a/modules/po/send_raw.ru_RU.po +++ b/modules/po/send_raw.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "X-Crowdin-File-ID: 199\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/send_raw.pot\n" +"X-Crowdin-File-ID: 388\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/shell.bg_BG.po b/modules/po/shell.bg_BG.po index 76c66891..56e72b69 100644 --- a/modules/po/shell.bg_BG.po +++ b/modules/po/shell.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/shell.es_ES.po b/modules/po/shell.es_ES.po index 8e344a10..c3e66385 100644 --- a/modules/po/shell.es_ES.po +++ b/modules/po/shell.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/shell.fr_FR.po b/modules/po/shell.fr_FR.po index c946f9e0..539430bd 100644 --- a/modules/po/shell.fr_FR.po +++ b/modules/po/shell.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/shell.id_ID.po b/modules/po/shell.id_ID.po index 93518d04..34ee5b1b 100644 --- a/modules/po/shell.id_ID.po +++ b/modules/po/shell.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/shell.it_IT.po b/modules/po/shell.it_IT.po index b825cb51..3bd0bba4 100644 --- a/modules/po/shell.it_IT.po +++ b/modules/po/shell.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/shell.nl_NL.po b/modules/po/shell.nl_NL.po index acbce2e0..a745612b 100644 --- a/modules/po/shell.nl_NL.po +++ b/modules/po/shell.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/shell.pl_PL.po b/modules/po/shell.pl_PL.po index dd63d3c4..fb7abdf1 100644 --- a/modules/po/shell.pl_PL.po +++ b/modules/po/shell.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/shell.pt_BR.po b/modules/po/shell.pt_BR.po index f320da16..41e540d6 100644 --- a/modules/po/shell.pt_BR.po +++ b/modules/po/shell.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/shell.ru_RU.po b/modules/po/shell.ru_RU.po index 17101efb..a087c46d 100644 --- a/modules/po/shell.ru_RU.po +++ b/modules/po/shell.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "X-Crowdin-File-ID: 200\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/shell.pot\n" +"X-Crowdin-File-ID: 390\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/simple_away.bg_BG.po b/modules/po/simple_away.bg_BG.po index f7c00101..ede2533a 100644 --- a/modules/po/simple_away.bg_BG.po +++ b/modules/po/simple_away.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/simple_away.es_ES.po b/modules/po/simple_away.es_ES.po index 70f491d4..51894376 100644 --- a/modules/po/simple_away.es_ES.po +++ b/modules/po/simple_away.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/simple_away.fr_FR.po b/modules/po/simple_away.fr_FR.po index 2785a515..3993f12e 100644 --- a/modules/po/simple_away.fr_FR.po +++ b/modules/po/simple_away.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/simple_away.id_ID.po b/modules/po/simple_away.id_ID.po index 3aee727d..003abf5b 100644 --- a/modules/po/simple_away.id_ID.po +++ b/modules/po/simple_away.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/simple_away.it_IT.po b/modules/po/simple_away.it_IT.po index 4b21a224..3b37673d 100644 --- a/modules/po/simple_away.it_IT.po +++ b/modules/po/simple_away.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/simple_away.nl_NL.po b/modules/po/simple_away.nl_NL.po index cf568bc8..c8d2f650 100644 --- a/modules/po/simple_away.nl_NL.po +++ b/modules/po/simple_away.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/simple_away.pl_PL.po b/modules/po/simple_away.pl_PL.po index 71dce0e5..23d33c2e 100644 --- a/modules/po/simple_away.pl_PL.po +++ b/modules/po/simple_away.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/simple_away.pt_BR.po b/modules/po/simple_away.pt_BR.po index da28dabb..2c814d47 100644 --- a/modules/po/simple_away.pt_BR.po +++ b/modules/po/simple_away.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/simple_away.ru_RU.po b/modules/po/simple_away.ru_RU.po index 896cbda7..0f7cf14d 100644 --- a/modules/po/simple_away.ru_RU.po +++ b/modules/po/simple_away.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "X-Crowdin-File-ID: 201\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/simple_away.pot\n" +"X-Crowdin-File-ID: 392\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/stickychan.bg_BG.po b/modules/po/stickychan.bg_BG.po index 375ef818..d4da716c 100644 --- a/modules/po/stickychan.bg_BG.po +++ b/modules/po/stickychan.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/stickychan.es_ES.po b/modules/po/stickychan.es_ES.po index 29c5a608..3785bbe6 100644 --- a/modules/po/stickychan.es_ES.po +++ b/modules/po/stickychan.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/stickychan.fr_FR.po b/modules/po/stickychan.fr_FR.po index 8d4b7975..78b83792 100644 --- a/modules/po/stickychan.fr_FR.po +++ b/modules/po/stickychan.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/stickychan.id_ID.po b/modules/po/stickychan.id_ID.po index 689bd71e..54a65e76 100644 --- a/modules/po/stickychan.id_ID.po +++ b/modules/po/stickychan.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/stickychan.it_IT.po b/modules/po/stickychan.it_IT.po index ea47bf9f..be531072 100644 --- a/modules/po/stickychan.it_IT.po +++ b/modules/po/stickychan.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/stickychan.nl_NL.po b/modules/po/stickychan.nl_NL.po index 664aaa7d..7acf5c86 100644 --- a/modules/po/stickychan.nl_NL.po +++ b/modules/po/stickychan.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/stickychan.pl_PL.po b/modules/po/stickychan.pl_PL.po index a03b766d..d34dd46b 100644 --- a/modules/po/stickychan.pl_PL.po +++ b/modules/po/stickychan.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/stickychan.pt_BR.po b/modules/po/stickychan.pt_BR.po index f443e8ab..7594d7e2 100644 --- a/modules/po/stickychan.pt_BR.po +++ b/modules/po/stickychan.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/stickychan.ru_RU.po b/modules/po/stickychan.ru_RU.po index b387623e..d5a11dea 100644 --- a/modules/po/stickychan.ru_RU.po +++ b/modules/po/stickychan.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "X-Crowdin-File-ID: 202\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stickychan.pot\n" +"X-Crowdin-File-ID: 394\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/stripcontrols.bg_BG.po b/modules/po/stripcontrols.bg_BG.po index d711a6e5..b262d062 100644 --- a/modules/po/stripcontrols.bg_BG.po +++ b/modules/po/stripcontrols.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/stripcontrols.es_ES.po b/modules/po/stripcontrols.es_ES.po index a934a5ee..63827d3c 100644 --- a/modules/po/stripcontrols.es_ES.po +++ b/modules/po/stripcontrols.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/stripcontrols.fr_FR.po b/modules/po/stripcontrols.fr_FR.po index 1b5ba780..f121f0e2 100644 --- a/modules/po/stripcontrols.fr_FR.po +++ b/modules/po/stripcontrols.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/stripcontrols.id_ID.po b/modules/po/stripcontrols.id_ID.po index 8904b06c..9be07e7a 100644 --- a/modules/po/stripcontrols.id_ID.po +++ b/modules/po/stripcontrols.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/stripcontrols.it_IT.po b/modules/po/stripcontrols.it_IT.po index 50c10aa2..6bf29fee 100644 --- a/modules/po/stripcontrols.it_IT.po +++ b/modules/po/stripcontrols.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/stripcontrols.nl_NL.po b/modules/po/stripcontrols.nl_NL.po index 54d3d17c..0576373b 100644 --- a/modules/po/stripcontrols.nl_NL.po +++ b/modules/po/stripcontrols.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/stripcontrols.pl_PL.po b/modules/po/stripcontrols.pl_PL.po index 81001f83..edab96f0 100644 --- a/modules/po/stripcontrols.pl_PL.po +++ b/modules/po/stripcontrols.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/stripcontrols.pt_BR.po b/modules/po/stripcontrols.pt_BR.po index cb8a91c1..09674abf 100644 --- a/modules/po/stripcontrols.pt_BR.po +++ b/modules/po/stripcontrols.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/stripcontrols.ru_RU.po b/modules/po/stripcontrols.ru_RU.po index 70020166..b54ba59a 100644 --- a/modules/po/stripcontrols.ru_RU.po +++ b/modules/po/stripcontrols.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "X-Crowdin-File-ID: 203\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/stripcontrols.pot\n" +"X-Crowdin-File-ID: 398\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/watch.bg_BG.po b/modules/po/watch.bg_BG.po index e6f9a61f..c73ef112 100644 --- a/modules/po/watch.bg_BG.po +++ b/modules/po/watch.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/watch.es_ES.po b/modules/po/watch.es_ES.po index 73effead..4af10a9e 100644 --- a/modules/po/watch.es_ES.po +++ b/modules/po/watch.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/watch.fr_FR.po b/modules/po/watch.fr_FR.po index ce7af1b9..f9708148 100644 --- a/modules/po/watch.fr_FR.po +++ b/modules/po/watch.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/watch.id_ID.po b/modules/po/watch.id_ID.po index 95e188dd..4ca9a1b1 100644 --- a/modules/po/watch.id_ID.po +++ b/modules/po/watch.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/watch.it_IT.po b/modules/po/watch.it_IT.po index 3d3e4cf6..c37098ab 100644 --- a/modules/po/watch.it_IT.po +++ b/modules/po/watch.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/watch.nl_NL.po b/modules/po/watch.nl_NL.po index 872c2086..4665aeaa 100644 --- a/modules/po/watch.nl_NL.po +++ b/modules/po/watch.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/watch.pl_PL.po b/modules/po/watch.pl_PL.po index 7bd3ba79..40109109 100644 --- a/modules/po/watch.pl_PL.po +++ b/modules/po/watch.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/watch.pt_BR.po b/modules/po/watch.pt_BR.po index b39abe50..3477fe0d 100644 --- a/modules/po/watch.pt_BR.po +++ b/modules/po/watch.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/watch.ru_RU.po b/modules/po/watch.ru_RU.po index 1f8a4777..cede33c7 100644 --- a/modules/po/watch.ru_RU.po +++ b/modules/po/watch.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "X-Crowdin-File-ID: 204\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/watch.pot\n" +"X-Crowdin-File-ID: 396\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/modules/po/webadmin.bg_BG.po b/modules/po/webadmin.bg_BG.po index 34003085..4734e776 100644 --- a/modules/po/webadmin.bg_BG.po +++ b/modules/po/webadmin.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/webadmin.es_ES.po b/modules/po/webadmin.es_ES.po index 6b048b25..82432061 100644 --- a/modules/po/webadmin.es_ES.po +++ b/modules/po/webadmin.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/modules/po/webadmin.fr_FR.po b/modules/po/webadmin.fr_FR.po index 506c0b66..6094628d 100644 --- a/modules/po/webadmin.fr_FR.po +++ b/modules/po/webadmin.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/modules/po/webadmin.id_ID.po b/modules/po/webadmin.id_ID.po index 3ca4da6e..4c258542 100644 --- a/modules/po/webadmin.id_ID.po +++ b/modules/po/webadmin.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/modules/po/webadmin.it_IT.po b/modules/po/webadmin.it_IT.po index 552ec006..6c714800 100644 --- a/modules/po/webadmin.it_IT.po +++ b/modules/po/webadmin.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/modules/po/webadmin.nl_NL.po b/modules/po/webadmin.nl_NL.po index 60b1cd68..585b9ad7 100644 --- a/modules/po/webadmin.nl_NL.po +++ b/modules/po/webadmin.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/webadmin.pl_PL.po b/modules/po/webadmin.pl_PL.po index e658d179..ac334c3a 100644 --- a/modules/po/webadmin.pl_PL.po +++ b/modules/po/webadmin.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" diff --git a/modules/po/webadmin.pt_BR.po b/modules/po/webadmin.pt_BR.po index 30420399..d511fc75 100644 --- a/modules/po/webadmin.pt_BR.po +++ b/modules/po/webadmin.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/modules/po/webadmin.ru_RU.po b/modules/po/webadmin.ru_RU.po index 38416529..cee5a0ee 100644 --- a/modules/po/webadmin.ru_RU.po +++ b/modules/po/webadmin.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "X-Crowdin-File-ID: 205\n" +======= +"X-Crowdin-File: /1.8.x/modules/po/webadmin.pot\n" +"X-Crowdin-File-ID: 400\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/src/po/znc.bg_BG.po b/src/po/znc.bg_BG.po index 8d95a11a..1d4016a4 100644 --- a/src/po/znc.bg_BG.po +++ b/src/po/znc.bg_BG.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: bg\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/src/po/znc.es_ES.po b/src/po/znc.es_ES.po index de68195f..df2c51d4 100644 --- a/src/po/znc.es_ES.po +++ b/src/po/znc.es_ES.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: es-ES\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Spanish\n" "Language: es_ES\n" diff --git a/src/po/znc.fr_FR.po b/src/po/znc.fr_FR.po index 73fae054..5d330ec7 100644 --- a/src/po/znc.fr_FR.po +++ b/src/po/znc.fr_FR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: fr\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: French\n" "Language: fr_FR\n" diff --git a/src/po/znc.id_ID.po b/src/po/znc.id_ID.po index 65e03754..a0a00621 100644 --- a/src/po/znc.id_ID.po +++ b/src/po/znc.id_ID.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: id\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Indonesian\n" "Language: id_ID\n" diff --git a/src/po/znc.it_IT.po b/src/po/znc.it_IT.po index fbbca59a..4bab2f40 100644 --- a/src/po/znc.it_IT.po +++ b/src/po/znc.it_IT.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: it\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Italian\n" "Language: it_IT\n" diff --git a/src/po/znc.nl_NL.po b/src/po/znc.nl_NL.po index 4125b603..f5e38c40 100644 --- a/src/po/znc.nl_NL.po +++ b/src/po/znc.nl_NL.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: nl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/src/po/znc.pl_PL.po b/src/po/znc.pl_PL.po index 915d3d26..8a9a452a 100644 --- a/src/po/znc.pl_PL.po +++ b/src/po/znc.pl_PL.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pl\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -56,6 +61,7 @@ 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" @@ -77,6 +83,29 @@ msgid "Invalid port" msgstr "Nieprawidłowy port" #: znc.cpp:1813 ClientCommand.cpp:1637 +======= +#: znc.cpp:1562 +msgid "User already exists" +msgstr "Użytkownik już istnieje" + +#: znc.cpp:1670 +msgid "IPv6 is not enabled" +msgstr "IPv6 nie jest włączone" + +#: znc.cpp:1678 +msgid "SSL is not enabled" +msgstr "SSL nie jest włączone" + +#: znc.cpp:1686 +msgid "Unable to locate pem file: {1}" +msgstr "Nie udało się odnaleźć pliku pem: {1}" + +#: znc.cpp:1705 +msgid "Invalid port" +msgstr "Nieprawidłowy port" + +#: znc.cpp:1821 ClientCommand.cpp:1637 +>>>>>>> 1.8.x msgid "Unable to bind: {1}" msgstr "Nie udało się przypiąć: {1}" @@ -284,10 +313,17 @@ msgstr "Użycie: /detach <#kanały>" #: Client.cpp:1369 ClientCommand.cpp:154 msgid "Detached {1} channel" msgid_plural "Detached {1} channels" +<<<<<<< HEAD msgstr[0] "Odpięto kanał {1}" msgstr[1] "" msgstr[2] "" msgstr[3] "Odpięto {1} kanały" +======= +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +>>>>>>> 1.8.x #: Chan.cpp:678 msgid "Buffer Playback..." diff --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po index 84cbffce..b440bd6c 100644 --- a/src/po/znc.pt_BR.po +++ b/src/po/znc.pt_BR.po @@ -6,8 +6,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: pt-BR\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" diff --git a/src/po/znc.ru_RU.po b/src/po/znc.ru_RU.po index f2f250b7..cc9c701d 100644 --- a/src/po/znc.ru_RU.po +++ b/src/po/znc.ru_RU.po @@ -8,8 +8,13 @@ msgstr "" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Project-ID: 289533\n" "X-Crowdin-Language: ru\n" +<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "X-Crowdin-File-ID: 146\n" +======= +"X-Crowdin-File: /1.8.x/src/po/znc.pot\n" +"X-Crowdin-File-ID: 284\n" +>>>>>>> 1.8.x "Project-Id-Version: znc-bouncer\n" "Language-Team: Russian\n" "Language: ru_RU\n" diff --git a/translations/pl-PL b/translations/pl-PL new file mode 100644 index 00000000..1955368a --- /dev/null +++ b/translations/pl-PL @@ -0,0 +1 @@ +SelfName Polski